diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index bafab1a..ef2b5de 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -653,7 +653,10 @@ export default { issueplace: $data.bookingDetails.issueplace, prepardat: $data.bookingDetails.prepardat, route: $data.bookingDetails.route, - shippingMethod: $data.bookingDetails.shippingMethod + shippingMethod: $data.bookingDetails.shippingMethod, + shipper: $data.bookingDetails.shipper, + consignee: $data.bookingDetails.consignee, + notifyparty: $data.bookingDetails.notifyparty } this.bookingDetails = { ...JSON.parse(JSON.stringify(initDetail)), ...copyData } } else { @@ -973,7 +976,10 @@ export default { issueplace: res.data.issueplace, prepardat: res.data.prepardat, route: res.data.route, - shippingMethod: res.data.shippingMethod + shippingMethod: res.data.shippingMethod, + shipper: res.data.shipper, + consignee: res.data.consignee, + notifyparty: res.data.notifyparty } newData = { ...JSON.parse(JSON.stringify(initDetail)), ...copyData } } diff --git a/src/views/main/BookingLedger/list/modules/formLabel.vue b/src/views/main/BookingLedger/list/modules/formLabel.vue index b60e7b7..2b0cfd3 100644 --- a/src/views/main/BookingLedger/list/modules/formLabel.vue +++ b/src/views/main/BookingLedger/list/modules/formLabel.vue @@ -163,7 +163,7 @@ export default { } }, computed: { - ...mapGetters(['carrierList', 'yardList', 'packageList', 'issuetypeList', 'blfrtList', 'lineList', 'bookingInitData']) + ...mapGetters(['carrierList', 'ctnallList', 'yardList', 'packageList', 'issuetypeList', 'blfrtList', 'lineList', 'bookingInitData']) }, mounted() { }, methods: { @@ -252,8 +252,8 @@ export default { }, getSelectFirst (e) { if (!e) { - if (['LINENAME'].includes(this.labelData.label)) { - this.dataList = this.lineList + if (['LINENAME', 'CNTRTOTAL', 'KINDPKGS', 'ISSUETYPE', 'YARDID', 'CARRIER', 'NOBILL', 'CARGOID'].includes(this.labelData.label)) { + this.dataList = this.emnuData(this.labelData.label) } else { this.$emit('selectFirst', { form: this.labelData, @@ -263,6 +263,26 @@ export default { } } }, + emnuData (type) { + switch (type) { + case 'LINENAME': + return this.lineList + case 'CNTRTOTAL': + return this.ctnallList + case 'KINDPKGS': + return this.packageList + case 'ISSUETYPE': + return this.issuetypeList + case 'YARDID': + return this.yardList + case 'CARRIER': + return this.carrierList + case 'NOBILL': + return this.labelData.data + case 'CARGOID': + return this.labelData.data + } + }, completeSelect (value) { const val = value.split('-')[1] this.$emit('change', {