diff --git a/.env.development b/.env.development index 302ad8cd..fdf39764 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,11 @@ +### + # @Author: 张同海 14166000+zhangtonghai@user.noreply.gitee.com + # @Date: 2024-04-17 10:30:29 + # @LastEditors: 张同海 14166000+zhangtonghai@user.noreply.gitee.com + # @LastEditTime: 2024-04-18 16:02:47 + # @FilePath: \ds-wms-client-web\.env.development + # @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE +### # Whether to open mock VITE_USE_MOCK = true diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js index f8b3e156..7adadfcb 100644 --- a/src/views/operation/seaexport/api/BookingLedger.js +++ b/src/views/operation/seaexport/api/BookingLedger.js @@ -1,4 +1,37 @@ import { request } from '/@/utils/request' +// 编辑 (Auth) +export function BookingOrderSave(parameter) { + return request({ + url: '/opApi/SeaExport/EditSeaExport', + method: 'post', + data: parameter, + }) +} +// 列表 (Auth) +export function PageDataByBooking(parameter) { + return request({ + url: '/opApi/SeaExport/GetSeaExportList', + method: 'post', + data: parameter, + }) +} +// 获取单证员列表 (Auth) +export function GetVouchingClerkList(parameter) { + return request({ + url: '/mainApi/ClientCommon/GetVouchingClerkList', + method: 'get', + params: parameter, + }) +} +// 获取场站下拉列表 (Auth) +export function GetYardClientList(parameter) { + return request({ + url: '/mainApi/ClientCommon/GetYardClientList', + method: 'get', + params: parameter, + }) +} + /** * 分页查询订舱主表 * @params PageSize @@ -11,13 +44,7 @@ export function BookingOrderPage(parameter) { params: parameter, }) } -export function PageDataByBooking(parameter) { - return request({ - url: '/mainApi/SeaExport/GetSeaExportList', - method: 'post', - data: parameter, - }) -} + // 更新用户高级查询条件设置 (Auth) export function UpdateUserQuerySet(parameter) { return request({ @@ -42,23 +69,6 @@ export function GetCarrierlist(parameter) { params: parameter, }) } -// 编辑 (Auth) -export function BookingOrderSave(parameter) { - return request({ - url: '/mainApi/SeaExport/EditSeaExport', - method: 'post', - data: parameter, - }) -} - -// 获取单证员列表 (Auth) -export function GetVouchingClerkList(parameter) { - return request({ - url: '/mainApi/ClientCommon/GetVouchingClerkList', - method: 'get', - params: parameter, - }) -} /** * 获取订舱明细 diff --git a/src/views/operation/seaexport/detail/components/selectView.vue b/src/views/operation/seaexport/detail/components/selectView.vue index cf4278eb..e70c010f 100644 --- a/src/views/operation/seaexport/detail/components/selectView.vue +++ b/src/views/operation/seaexport/detail/components/selectView.vue @@ -70,7 +70,10 @@ voyno: any etd: any } - import { GetVouchingClerkList } from '/@/views/operation/seaexport/api/BookingLedger' + import { + GetVouchingClerkList, + GetYardClientList, + } from '/@/views/operation/seaexport/api/BookingLedger' import { ref } from 'vue' import { useMessage } from '/@/hooks/web/useMessage' const { notification } = useMessage() @@ -103,16 +106,22 @@ } } function getSelectFirst(e, canClick = true) { + console.log(e, canClick, RefselectView.value, 'getSelectFirst') + // if (canClick) { // RefselectView.value.$refs.vcSelect.$refs.arrow.click() // } else { // RefselectView.value.focus() // } RefselectView.value.focus() + console.log(open.value) + open.value = true + console.log(open.value) if ( [ 'doc', + 'blType', // --------------- 'cargoid', 'nobill', @@ -132,6 +141,15 @@ 'shippercountry', ].includes(props.type) ) { + console.log(props.type) + + if (props.type === 'blType') { + selectList.value = emnuData(props.type) + inLoading.value = false + console.log(selectList.value) + + return false + } // if (props.type === 'yard') { // if (this.yardFilter.length === 0) { // selectList.value = this.yardList @@ -238,157 +256,174 @@ } } function emnuData(type) { - switch ( - type - // case 'cargoid': - // return [ - // { - // name: 'S 普通货', - // code: 'S', - // }, - // { - // name: 'R 冻柜', - // code: 'R', - // }, - // { - // name: 'D 危险品', - // code: 'D', - // }, - // { - // name: 'O 超限箱', - // code: 'O', - // }, - // ] - // case 'nobill': - // return [ - // { - // name: 'ONE', - // code: 'ONE', - // }, - // { - // name: 'TWO', - // code: 'TWO', - // }, - // { - // name: 'THREE', - // code: 'THREE', - // }, - // { - // name: 'FOUR', - // code: 'FOUR', - // }, - // { - // name: 'FIVE', - // code: 'FIVE', - // }, - // { - // name: 'SIX', - // code: 'SIX', - // }, - // { - // name: 'SEVEN', - // code: 'SEVEN', - // }, - // { - // name: 'EIGHT', - // code: 'EIGHT', - // }, - // { - // name: 'NINE', - // code: 'NINE', - // }, - // { - // name: 'TEN', - // code: 'TEN', - // }, - // ] - // case 'copynobill': - // return [ - // { - // name: 'ONE', - // code: 'ONE', - // }, - // { - // name: 'TWO', - // code: 'TWO', - // }, - // { - // name: 'THREE', - // code: 'THREE', - // }, - // { - // name: 'FOUR', - // code: 'FOUR', - // }, - // { - // name: 'FIVE', - // code: 'FIVE', - // }, - // { - // name: 'SIX', - // code: 'SIX', - // }, - // { - // name: 'SEVEN', - // code: 'SEVEN', - // }, - // { - // name: 'EIGHT', - // code: 'EIGHT', - // }, - // { - // name: 'NINE', - // code: 'NINE', - // }, - // { - // name: 'TEN', - // code: 'TEN', - // }, - // ] - // case 'masterBolIndicator': - // return [ - // { ID: '1', NAME: 'Carrier filing HBL | 船公司发HBL' }, - // { ID: '2', NAME: 'Self filing HBL | 自己发' }, - // { ID: '3', NAME: 'Not Applicable/Straight bl | 无HBL' }, - // ] - // case 'salerCode': - // return [ - // { ID: 'CN087', NAME: 'CN087 | GRACE SUN' }, - // { ID: 'CN096', NAME: 'CN096 | LEON LIANG' }, - // { ID: 'CN097', NAME: 'CN097 | CHARLES GAO' }, - // { ID: 'CN098', NAME: 'CN098 | TERESA LIU SHAN' }, - // { ID: 'CN106', NAME: 'CN106 | HOKI YU' }, - // { ID: 'CN107', NAME: 'CN107 | WILLIAM YANG JING YU' }, - // { ID: 'CN099', NAME: 'CN099 | HELEN ZHANG' }, - // { ID: 'CN100', NAME: 'CN100 | LEOREN' }, - // ] - // case 'yard': - // return this.yardList - // case 'kindpkgs': - // return this.packageList - // case 'carrierid': - // return this.carrierList - // case 'carrier': - // return this.carrierList - // case 'issuetype': - // return this.issuetypeList - // case 'blfrt': - // return this.blfrtList - // case 'lineName': - // return this.lineList - // case 'shippingMethod': - // const arr = this.$options.filters['dictData']('ShippingMethod') || [] - // return arr - // case 'sourceName': - // return this.sourceList - // case 'notifypartycountry': - // return this.countryList - // case 'consigneecountry': - // return this.countryList - // case 'shippercountry': - // return this.countryList - ) { + switch (type) { + case 'blType': + return [ + { + name: '整箱', + code: '整箱', + }, + { + name: '拼箱单票', + code: '拼箱单票', + }, + { + name: '拼箱主票', + code: '拼箱主票', + }, + { + name: '拼箱分票', + code: '拼箱分票', + }, + ] } + // case 'cargoid': + // return [ + // { + // name: 'S 普通货', + // code: 'S', + // }, + // { + // name: 'R 冻柜', + // code: 'R', + // }, + // { + // name: 'D 危险品', + // code: 'D', + // }, + // { + // name: 'O 超限箱', + // code: 'O', + // }, + // ] + // case 'nobill': + // return [ + // { + // name: 'ONE', + // code: 'ONE', + // }, + // { + // name: 'TWO', + // code: 'TWO', + // }, + // { + // name: 'THREE', + // code: 'THREE', + // }, + // { + // name: 'FOUR', + // code: 'FOUR', + // }, + // { + // name: 'FIVE', + // code: 'FIVE', + // }, + // { + // name: 'SIX', + // code: 'SIX', + // }, + // { + // name: 'SEVEN', + // code: 'SEVEN', + // }, + // { + // name: 'EIGHT', + // code: 'EIGHT', + // }, + // { + // name: 'NINE', + // code: 'NINE', + // }, + // { + // name: 'TEN', + // code: 'TEN', + // }, + // ] + // case 'copynobill': + // return [ + // { + // name: 'ONE', + // code: 'ONE', + // }, + // { + // name: 'TWO', + // code: 'TWO', + // }, + // { + // name: 'THREE', + // code: 'THREE', + // }, + // { + // name: 'FOUR', + // code: 'FOUR', + // }, + // { + // name: 'FIVE', + // code: 'FIVE', + // }, + // { + // name: 'SIX', + // code: 'SIX', + // }, + // { + // name: 'SEVEN', + // code: 'SEVEN', + // }, + // { + // name: 'EIGHT', + // code: 'EIGHT', + // }, + // { + // name: 'NINE', + // code: 'NINE', + // }, + // { + // name: 'TEN', + // code: 'TEN', + // }, + // ] + // case 'masterBolIndicator': + // return [ + // { ID: '1', NAME: 'Carrier filing HBL | 船公司发HBL' }, + // { ID: '2', NAME: 'Self filing HBL | 自己发' }, + // { ID: '3', NAME: 'Not Applicable/Straight bl | 无HBL' }, + // ] + // case 'salerCode': + // return [ + // { ID: 'CN087', NAME: 'CN087 | GRACE SUN' }, + // { ID: 'CN096', NAME: 'CN096 | LEON LIANG' }, + // { ID: 'CN097', NAME: 'CN097 | CHARLES GAO' }, + // { ID: 'CN098', NAME: 'CN098 | TERESA LIU SHAN' }, + // { ID: 'CN106', NAME: 'CN106 | HOKI YU' }, + // { ID: 'CN107', NAME: 'CN107 | WILLIAM YANG JING YU' }, + // { ID: 'CN099', NAME: 'CN099 | HELEN ZHANG' }, + // { ID: 'CN100', NAME: 'CN100 | LEOREN' }, + // ] + // case 'yard': + // return this.yardList + // case 'kindpkgs': + // return this.packageList + // case 'carrierid': + // return this.carrierList + // case 'carrier': + // return this.carrierList + // case 'issuetype': + // return this.issuetypeList + // case 'blfrt': + // return this.blfrtList + // case 'lineName': + // return this.lineList + // case 'shippingMethod': + // const arr = this.$options.filters['dictData']('ShippingMethod') || [] + // return arr + // case 'sourceName': + // return this.sourceList + // case 'notifypartycountry': + // return this.countryList + // case 'consigneecountry': + // return this.countryList + // case 'shippercountry': + // return this.countryList } function getSelectBlur(e) { open.value = false @@ -483,9 +518,13 @@ switch (type) { case 'GetVouchingClerkList': return GetVouchingClerkList + case 'GetYardClientList': + return GetYardClientList } } function handleChange(op) { + console.log(op) + let Dop = op[0] inEdit.value = true setTimeout(() => { diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue index 84906e86..a80bcf49 100644 --- a/src/views/operation/seaexport/detail/index.vue +++ b/src/views/operation/seaexport/detail/index.vue @@ -224,173 +224,274 @@ import mastetMore from './modules/mastetMore.vue' import rightContent from './modules/rightContent.vue' import sedOrder from './modules/sedOrder.vue' + // const initDetail = { + // id: 0, + // parentId: 0, + // customername: '', + // customerid: '', + // carrier: 'CMA', + // carrierid: 'CMA', + // forwarder: '', + // forwarderid: '', + // pono: '', + // mblno: '', + // hblno: '', + // epCode: '', + // custno: '', + // contractno: '', + // vessel: '', + // voyno: '', + // voynoinner: '', + // lanecode: '', + // etd: '', + // atd: '', + // lanename: '', + // shipagency: '', + // shipagencyid: '', + // lineName: '', + // sale: '', + // saleid: '', + // op: '', + // opid: '', + // doc: '', + // docid: '', + // custservice: '', + // custserviceid: '', + // route: '', + // routeid: '', + // dzRemark: '', + // czRemark: '', + // // shipper: '', + // shipperContent: '', + // notifypartY2: '', + // feeself: false, + // // consignee: '', + // consigneeContent: '', + // // notifyparty: '', + // notifyPartyContent: '', + // yard: '', + // yardid: '', + // customser: '', + // customserid: '', + // trucker: '', + // truckerid: '', + // agentname: '', + // agentId: '', + // // agentid: '', + // warehouse: '', + // warehouseID: '', + // eta: '', + // // closingdate: '', + // closingDate: '', + // closedocdate: '', + // closevgmdate: '', + // portload: '', + // portloadid: '', + // transport: '', + // transportid: '', + // portdischarge: '', + // portdischargeid: '', + // destination: '', + // destinationid: '', + // placedelivery: '', + // placedeliveryid: '', + // placereceipt: '', + // placereceiptid: '', + // pkgs: 0, + // kindpkgs: '', + // kgs: 0, + // cbm: 0, + // yardremark: '', + // yardcontract: '', + // yardcontracttel: '', + // yardcontractemail: '', + // pkgstotal: '', + // kgstotal: '', + // cbmtotal: '', + // marks: '', + // goodsname: '', + // goodscode: '', + // cargoid: '', + // hscode: '', + // description: '', + // totalno: '', + // issuetype: '', + // issuedate: '', + // issueplace: '', + // issueplaceid: '', + // nobill: '', + // copynobill: '', + // prepardat: '', + // prepardatid: '', + // payableat: '', + // payableatid: '', + // blfrt: '', + // thirdpayaddr: '', + // service: 'CY-CY', + // reeferf: '', + // tempset: '', + // tempid: '', + // tempmin: '', + // tempmax: '', + // humidity: '', + // dclass: '', + // dunno: '', + // dpage: '', + // dlabel: '', + // linkman: '', + // soremark: '', + // siremark: '', + // ctnInputs: [], + // weituo: '', + // freightpayer: '', + // scaccode: '', + // itncode: '', + // iscontainersoc: 0, + // tempFiles: [], + // bookingEDIExt: { + // weiTuoFang: '', + // ediAttn: '', + // ediAttnTel: '', + // ediAttnMail: '', + // sendCode: '', + // receiveCode: '', + // amsConsignee: '', + // amsNotifyParty: '', + // opEName: '', + // opTel: '', + // opEmail: '', + // goodsName: '', + // orderRemark: '', + // kingTareweight: '', + // exRemark1: '', + // exRemark2: '', + // exRemark3: '', + // exRemark4: '', + // consigneeEdiCode: '', + // shipperEdiCode: '', + // notifyCdoe: '', + // salerCode: '', + // salerCodeName: '', + // emanifestHbl: '', + // masterBolIndicator: '', + // masterBolIndicatorName: '', + // s0CC0C: '', + // ckhi: '', + // cncm: '', + // wncm: '', + // acihbl: '', + // }, + // hbList: [], + // remark: [], + // file: [], + // log: [], + // item: [], + // statuslog: [], + // extendState: { + // isLockBooking: false, + // }, + // autoYardImport: {}, + // } const initDetail = { - id: 0, - parentId: 0, - customername: '', - customerid: '', - carrier: 'CMA', - carrierid: 'CMA', - forwarder: '', - forwarderid: '', - pono: '', - mblno: '', + cntrNo: '', + // ---------- + doc: '', + bsno: '1', hblno: '', - epCode: '', - custno: '', - contractno: '', - vessel: '', + mblno: '', voyno: '', - voynoinner: '', - lanecode: '', - etd: '', - atd: '', - lanename: '', - shipagency: '', - shipagencyid: '', - lineName: '', - sale: '', - saleid: '', - op: '', - opid: '', - doc: '', - docid: '', - custservice: '', - custserviceid: '', - route: '', - routeid: '', - dzRemark: '', - czRemark: '', - // shipper: '', + blType: '整箱', + irCode: '', + remark: '', + applyNo: '', + stlName: '', + transNo: '', + bookingNo: '', + invoiceNo: '', + voucherNo: '', + contractNo: '', + customerNo: '', + sourceCode: '', + accountDate: '1', + bookingType: '', + grossWeight: '', + insuranceer: '', + insuranceNo: '', + measurement: '', + operatorFax: '', + operatorTel: '', + customername: '', + operatorCode: '', + temperatureUnit: '', + financialStaffEmail: '', + financialStaffTel: '', + financialStaffFax: '', + serviceContractNo: '', + noPkgs: '', + operatorEmail: '', + yard: '', shipperContent: '', - notifypartY2: '', - feeself: false, - // consignee: '', consigneeContent: '', - // notifyparty: '', notifyPartyContent: '', - yard: '', - yardid: '', - customser: '', - customserid: '', - trucker: '', - truckerid: '', - agentname: '', - agentId: '', - // agentid: '', - warehouse: '', - warehouseID: '', - eta: '', - // closingdate: '', - closingDate: '', - closedocdate: '', - closevgmdate: '', - portload: '', - portloadid: '', + description: '', + mblFrt: '', + noBill: '', + vessel: '', + service: '', + yardTel: '', + loadPort: '', + yardATTN: '', + IssueType: '', + orderType: '', + payableAt: '', + prepareAt: '', + tradeTerm: '', transport: '', - transportid: '', - portdischarge: '', - portdischargeid: '', + wareHouse: '', + copyNoBill: '', + issuePlace: '', destination: '', - destinationid: '', - placedelivery: '', - placedeliveryid: '', - placereceipt: '', - placereceiptid: '', - pkgs: 0, - kindpkgs: '', - kgs: 0, - cbm: 0, - yardremark: '', - yardcontract: '', - yardcontracttel: '', - yardcontractemail: '', - pkgstotal: '', - kgstotal: '', - cbmtotal: '', + packingType: '', + agentContent: '', + receiptPlace: '', + deliveryPlace: '', + dischargePort: '', + financialStaffCode: '', marks: '', - goodsname: '', - goodscode: '', - cargoid: '', - hscode: '', - description: '', - totalno: '', - issuetype: '', - issuedate: '', - issueplace: '', - issueplaceid: '', - nobill: '', - copynobill: '', - prepardat: '', - prepardatid: '', - payableat: '', - payableatid: '', - blfrt: '', - thirdpayaddr: '', - service: 'CY-CY', - reeferf: '', - tempset: '', - tempid: '', - tempmin: '', - tempmax: '', + hsCode: '', + cargoId: '', + linkMan: '', + totalNo: '', + dangerNo: '', humidity: '', - dclass: '', - dunno: '', - dpage: '', - dlabel: '', - linkman: '', - soremark: '', - siremark: '', - ctnInputs: [], - weituo: '', - freightpayer: '', - scaccode: '', - itncode: '', - iscontainersoc: 0, - tempFiles: [], - bookingEDIExt: { - weiTuoFang: '', - ediAttn: '', - ediAttnTel: '', - ediAttnMail: '', - sendCode: '', - receiveCode: '', - amsConsignee: '', - amsNotifyParty: '', - opEName: '', - opTel: '', - opEmail: '', - goodsName: '', - orderRemark: '', - kingTareweight: '', - exRemark1: '', - exRemark2: '', - exRemark3: '', - exRemark4: '', - consigneeEdiCode: '', - shipperEdiCode: '', - notifyCdoe: '', - salerCode: '', - salerCodeName: '', - emanifestHbl: '', - masterBolIndicator: '', - masterBolIndicatorName: '', - s0CC0C: '', - ckhi: '', - cncm: '', - wncm: '', - acihbl: '', - }, - hbList: [], - remark: [], - file: [], - log: [], - item: [], - statuslog: [], - extendState: { - isLockBooking: false, - }, - autoYardImport: {}, + cntrTotal: '', + goodsName: '', + dangerPage: '', + dangerClass: '', + dangerLabel: '', + reeferQuantity: '', + temperatureMax: '', + temperatureMin: '', + temperatureSet: '', + // ---------------------------- + voyno2N: '', + customNo: '', + kindPkgs: '', + masterNo: '1', + vessel2N: '', + ediRemark: '', + cntrSealNo: '', + enterprise: '', + tranStatus: '', + transRemark: '', + inspectionNo: '', + termDelivery: '', + manifestStatus: '', + insperctService: '', + masterDescription: '', + masterShipperContent: '', + masterConsigneeContent: '', + masterNotifyPartyContent: '', } const bookingEDIExtData = { weiTuoFang: '', @@ -430,8 +531,8 @@ const type = ref(route.query.type || 'CMA') const isCopy = ref(route.query.isCopy || false) const Showtabs = ref(false) - // const bookingDetails = ref(initDetail) - const bookingDetails = ref() + const bookingDetails = ref({ ...initDetail }) + // const bookingDetails = ref() const tabBarStyle = ref({ background: '#fff', padding: '0 20px', @@ -657,7 +758,7 @@ historyData.value[id.value] = hisData } if (appStore.gethasbookingDetail) { - bookingDetails.value = {} + bookingDetails.value = { ...initDetail } } next() setTimeout(() => { @@ -768,7 +869,13 @@ const FnOk = () => { console.log(bookingDetails.value, RefbasicInfo.value.RefbasicFrom.getFieldsValue()) - const _data = { ...bookingDetails.value, ...RefbasicInfo.value.RefbasicFrom.getFieldsValue() } + const _data = { + ...initDetail, + ...bookingDetails.value, + ...RefbasicInfo.value.RefbasicFrom.getFieldsValue(), + ...RefmailingInfo.value.RefmailingFrom.getFieldsValue(), + ...RefcargoInfo.value.RefcargoFrom.getFieldsValue(), + } // delete _data.hbList appStore.setinBookingDetailsSave(true) // if (route.query.isCopy) { @@ -1038,6 +1145,45 @@ // check() // } } + // 组件的值发生变化时 + function changeDetailFun(data) { + const { detail } = data + console.log(data, detail.value, bookingDetails.value, 'changeDetailFun') + // if (ifCompare(bookingDetails.value, detail.value) && !inChildLoading.value) { + // checkSaveFun({ type: 'details', hasChange: true }) + // } + bookingDetails.value = detail.value + } + // 校验两个对象是否一致 + // function ifCompare(object1, object2) { + // var o1keys = Object.keys(object1) + // var o2keys = Object.keys(object2) + // if (o2keys.length !== o1keys.length) return false + // for (let i = 0; i <= o1keys.length - 1; i++) { + // const key = o1keys[i] + // if (!o2keys.includes(key)) return false + // if (object2[key] !== object1[key]) return false + // } + // return true + // } + function checkSaveFun(data) { + if (inGoodsSave.value) { + return false + } + const key = route.fullPath + const lastPages = appStore.getneedSavePages + const $data = appStore.getneedSavePages[key] || {} + if (!detailsLoadOver.value) { + data.hasChange = false + } + if (data.type === 'details') { + $data.details = data.hasChange + } else if (data.type === 'hbList') { + $data.hbList = data.hasChange + } + lastPages[key] = $data + appStore.setneedSavePages(lastPages) + } // ============================================ function getRouterHis() { inChildLoading.value = true @@ -1345,15 +1491,7 @@ RefrightContent.value.saveServiceBasic(data) } } - function changeDetailFun(data) { - console.log(data) - const { detail } = data - if (ifCompare(bookingDetails.value, detail) && !inChildLoading.value) { - checkSaveFun({ type: 'details', hasChange: true }) - } - bookingDetails.value = detail - } function changectnall(arr) { let str = '' arr.forEach((item, index) => { @@ -1406,17 +1544,7 @@ function pkgsEnCapitalFun(data) { bookingDetails.value.totalno = data } - function ifCompare(object1, object2) { - var o1keys = Object.keys(object1) - var o2keys = Object.keys(object2) - if (o2keys.length !== o1keys.length) return false - for (let i = 0; i <= o1keys.length - 1; i++) { - const key = o1keys[i] - if (!o2keys.includes(key)) return false - if (object2[key] !== object1[key]) return false - } - return true - } + function changeParentTabs(type) { mainOrderActiveKey.value = type } @@ -1444,7 +1572,7 @@ }, 100) } function init() { - bookingDetails.value = JSON.parse(JSON.stringify(initDetail)) + bookingDetails.value = { ...initDetail } excuteRules.value = [] excuteRulesType.value = '' Showtabs.value = false @@ -2196,24 +2324,7 @@ console.log(err) }) } - function checkSaveFun(data) { - if (inGoodsSave.value) { - return false - } - const key = route.fullPath - const lastPages = appStore.getneedSavePages - const $data = appStore.getneedSavePages[key] || {} - if (!detailsLoadOver.value) { - data.hasChange = false - } - if (data.type === 'details') { - $data.details = data.hasChange - } else if (data.type === 'hbList') { - $data.hbList = data.hasChange - } - lastPages[key] = $data - appStore.setneedSavePages(lastPages) - } + function changeHBFun(data) { const arr = [] data.map((item: any) => { diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue index 84b33e55..103a1c31 100644 --- a/src/views/operation/seaexport/detail/modules/basicInfo.vue +++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue @@ -6,11 +6,27 @@ style="margin-bottom: 10px" size="small" ref="RefbasicFrom" - :selfUpdate="true" - :model="details" + :model="PropsDetails" :rules="rules" > + + + + +
@@ -98,7 +110,7 @@
@@ -309,7 +321,7 @@
@@ -448,7 +460,7 @@ @@ -465,7 +477,7 @@ @@ -482,7 +494,7 @@ @@ -499,7 +511,7 @@ @@ -516,7 +528,7 @@ @@ -533,7 +545,7 @@
@@ -575,12 +587,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 是 + 否 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + 业务备注 + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+ + + + diff --git a/src/views/operation/seaexport/detail/modules/ediMore.vue b/src/views/operation/seaexport/detail/modules/ediMore.vue index b57c71dd..0badbf9c 100644 --- a/src/views/operation/seaexport/detail/modules/ediMore.vue +++ b/src/views/operation/seaexport/detail/modules/ediMore.vue @@ -863,143 +863,59 @@
-