From d02a580830f574b471438f42a57d6989efcd7e4a Mon Sep 17 00:00:00 2001 From: lilu Date: Fri, 31 Mar 2023 18:29:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E7=89=A9?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E4=B8=BB=E6=8F=90=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=EF=BC=8Cpono=E5=B7=A6=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main/BookingLedger/detail/index.vue | 8 +++++++- .../BookingLedger/detail/modules/rightContent.vue | 12 ++++++++++++ src/views/main/BookingLedger/list/index.vue | 9 +++++++++ .../main/BookingLedger/list/modules/initData.js | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 71baaa6..2d75f91 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -120,6 +120,7 @@ @changeDetail="changeDetailFun" @rules="getRules" @upDateRight="upDateRightFun" + @inGoodsSave="inGoodsSaveFun" > @@ -419,7 +420,8 @@ export default { hasTableRules: false, inAddSave: false, hasHbList: false, - detailsLoadOver: false + detailsLoadOver: false, + inGoodsSave: false } }, computed: { @@ -1327,6 +1329,7 @@ export default { // if (this.inPageLoading) { // return false // } + if (this.inGoodsSave) { return false } const key = this.$route.fullPath const lastPages = this.needSavePages const $data = this.needSavePages[key] || {} @@ -1342,6 +1345,9 @@ export default { this.$set(lastPages, key, $data) this.setNeedSavePages(lastPages) }, + inGoodsSaveFun (data) { + this.inGoodsSave = data + }, // 箱信息计算 calc(num1, num2, calcStr) { diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue index 6eee050..2b1062a 100644 --- a/src/views/main/BookingLedger/detail/modules/rightContent.vue +++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue @@ -682,7 +682,11 @@ export default { // }) this.$nextTick(() => { this.booGoodsStatusItem = res.data + this.$emit('inGoodsSave', true) this.details.goodsStatus = res.data + setTimeout(() => { + this.$emit('inGoodsSave', false) + }, 400) }) this.$message.success('货物状态设置成功') this.GoodsStatusVisible = false @@ -733,7 +737,11 @@ export default { that.locaGoodsStatus.splice(index, 1) that.details.goodsStatus.forEach((item, index2) => { if (item.systemCode == data.systemCode) { + that.$emit('inGoodsSave', true) that.details.goodsStatus.splice(index2, 1) + setTimeout(() => { + that.$emit('inGoodsSave', false) + }, 1200) } }) @@ -765,7 +773,11 @@ export default { .then(res => { if (res.success) { this.booGoodsStatusItem = res.data + this.$emit('inGoodsSave', true) this.details.goodsStatus = res.data + setTimeout(() => { + this.$emit('inGoodsSave', false) + }, 400) } }) .catch(err => { diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 1798bda..c077f09 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -123,6 +123,11 @@ + @@ -1778,6 +1783,7 @@ export default { diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js index 25ceab4..4166340 100644 --- a/src/views/main/BookingLedger/list/modules/initData.js +++ b/src/views/main/BookingLedger/list/modules/initData.js @@ -98,7 +98,7 @@ export default { { field: 'placedeliveryid', label: 'PLACEDELIVERYID', width: 120, title: '交货地代码', showHeaderOverflow: true, sortable: true }, { field: 'portloadid', label: 'PORTLOADID', width: 120, title: '装货港代码', showHeaderOverflow: true, sortable: true }, { field: 'portdischargeid', label: 'PORTDISCHARGEID', width: 120, title: '卸货港代码', showHeaderOverflow: true, sortable: true }, - { field: 'pono', label: 'PONO', width: 120, title: 'PO NO', showHeaderOverflow: true, sortable: true }, + { field: 'pono', label: 'PONO', width: 120, title: 'PO NO', showHeaderOverflow: true, sortable: true, slots: { default: 'pono' } }, // 以下为新增字段 { field: 'dzRemark', label: 'DZREMARK', width: 160, title: '单证备注', showHeaderOverflow: true, sortable: true, slots: { default: 'dzRemark' } }, { field: 'czRemark', label: 'CZREMARK', width: 160, title: '操作备注', showHeaderOverflow: true, sortable: true, slots: { default: 'czRemark' } }, From 0b861b379b6f26255c761335037419dbb61be08a Mon Sep 17 00:00:00 2001 From: lilu Date: Mon, 3 Apr 2023 10:22:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/BasicLayout.vue | 2 +- src/store/modules/booking.js | 51 ++++++++++++------- .../detail/components/selectView.vue | 1 + 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 89c69fd..ed32a64 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -165,7 +165,7 @@ export default { this.setBlfrtList() this.setCtnallList() this.setLineList() - this.setBookingInitData() + // this.setBookingInitData() } } } diff --git a/src/store/modules/booking.js b/src/store/modules/booking.js index b270e8d..d428844 100644 --- a/src/store/modules/booking.js +++ b/src/store/modules/booking.js @@ -268,6 +268,12 @@ const booking = { case 'ck': allData['warehouseInitList'] = $data break + case 'dcdl': + allData['forwarderInitList'] = $data + break + case 'forwarder': + allData['shipagencyInitList'] = $data + break case 'portload': allData['placereceiptidInitList'] = $data allData['portloadidInitList'] = $data @@ -282,30 +288,39 @@ const booking = { allData['payableatInitList'] = $data break case 'user': - allData['saleInitList'] = $data - allData['opInitList'] = $data - allData['docInitList'] = $data - allData['custserviceInitList'] = $data - allData['routeInitList'] = $data + allData['saleInitList'] = $data.result + allData['opInitList'] = $data.result + allData['docInitList'] = $data.result + allData['custserviceInitList'] = $data.result + allData['routeInitList'] = $data.result break case 'contractno': - allData['goodsnameInitList'] = $data // 这里返回的是品名 + allData['contractnoInitList'] = $data + break + case 'goodsName': + allData['goodsnameInitList'] = $data break - case 'customer': - // 这里返回的数据应该为 委托单位，订舱代理，目前返回错误 - const customernameList = [] - const forwarderList = [] - $data.map((customer, cindex) => { - console.log(customer.propString.includes('customername'), customer.propString.includes('forwarder')) - if (customer.propString.includes('customername')) { - customernameList.push(customer) + case 'wtdw': + allData['customernameInitList'] = $data + break + case 'service': + allData['serviceInitList'] = $data + break + case 'template': + const shipperInitList = [] + const consigneeInitList = [] + const notifierInitList = [] + $data.map((tempalte, cindex) => { + if (tempalte.type.includes('10')) { + shipperInitList.push(tempalte) + } + if (tempalte.type.includes('20')) { + consigneeInitList.push(tempalte) } - if (customer.propString.includes('forwarder')) { - forwarderList.push(customer) + if (tempalte.type.includes('30')) { + notifierInitList.push(tempalte) } }) - allData['customernameInitList'] = customernameList - allData['forwarderInitList'] = forwarderList break } }) diff --git a/src/views/main/BookingLedger/detail/components/selectView.vue b/src/views/main/BookingLedger/detail/components/selectView.vue index af1cb24..c0e1fa5 100644 --- a/src/views/main/BookingLedger/detail/components/selectView.vue +++ b/src/views/main/BookingLedger/detail/components/selectView.vue @@ -372,6 +372,7 @@ export default { } }, getSelectFirst (e, canClick = true) { + // console.log('获取焦点', e, this.value) if (canClick) { this.$refs.selectView.$refs.vcSelect.$refs.arrow.click() } else { From 8882f2dd1dc0532ec95120f69ab0c4ec643499d6 Mon Sep 17 00:00:00 2001 From: lilu Date: Mon, 3 Apr 2023 10:43:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/booking.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/store/modules/booking.js b/src/store/modules/booking.js index d428844..78b1985 100644 --- a/src/store/modules/booking.js +++ b/src/store/modules/booking.js @@ -48,9 +48,9 @@ const booking = { destinationidInitList: [], placedeliveryidInitList: [], payableatInitList: [], - shipperInitList: [], // 发货人 - 没有 - consigneeInitList: [], // 收货人 - 没有 - notifierInitList: [], // 通知人 - 没有 + shippernameInitList: [], // 发货人 - 没有 + consigneenameInitList: [], // 收货人 - 没有 + notifypartynameInitList: [], // 通知人 - 没有 // 签单信息 issueplaceInitList: [], prepardatInitList: [], @@ -307,20 +307,23 @@ const booking = { allData['serviceInitList'] = $data break case 'template': - const shipperInitList = [] - const consigneeInitList = [] - const notifierInitList = [] + const shippernameInitList = [] + const consigneenameInitList = [] + const notifypartynameInitList = [] $data.map((tempalte, cindex) => { if (tempalte.type.includes('10')) { - shipperInitList.push(tempalte) + shippernameInitList.push(tempalte) } if (tempalte.type.includes('20')) { - consigneeInitList.push(tempalte) + consigneenameInitList.push(tempalte) } if (tempalte.type.includes('30')) { - notifierInitList.push(tempalte) + notifypartynameInitList.push(tempalte) } }) + allData['shippernameInitList'] = shippernameInitList + allData['consigneenameInitList'] = consigneenameInitList + allData['notifypartynameInitList'] = notifypartynameInitList break } }) From d506bf2ce480ddcc9e059d4f7bfc9f362a3e7254 Mon Sep 17 00:00:00 2001 From: lilu Date: Mon, 3 Apr 2023 14:23:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/components/selectView.vue | 2 +- .../detail/modules/basicInfo.vue | 82 +++++++++++++------ .../BookingLedger/detail/style/basicInfo.less | 17 +++- 3 files changed, 74 insertions(+), 27 deletions(-) diff --git a/src/views/main/BookingLedger/detail/components/selectView.vue b/src/views/main/BookingLedger/detail/components/selectView.vue index c0e1fa5..4e28a21 100644 --- a/src/views/main/BookingLedger/detail/components/selectView.vue +++ b/src/views/main/BookingLedger/detail/components/selectView.vue @@ -513,7 +513,7 @@ export default { .select_overlap { cursor: pointer; height: 32px; - width: 300px; + width: 100%; position: absolute; top: 0; left: 0; diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue index 8557343..4a482b9 100644 --- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue @@ -33,10 +33,10 @@ > - + @@ -154,20 +154,24 @@ has-feedback prop="contractno" > - - +
+ + + +
@@ -197,15 +201,19 @@ has-feedback prop="vessel" > - +
+ + +