diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index a65ca5f..a5dd9e1 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -1411,6 +1411,9 @@ export default { mblno: res.data.mblno } }) + setTimeout(() => { + this.inAddSave = false + }, 2000) } that.setInBookingDetailsSave(false) this.saveBtnFlag = false @@ -1744,6 +1747,8 @@ export default { this.bookingDetails.kgs = val || this.bookingDetails.kgs } else if (type === 'totalPkgs') { this.bookingDetails.pkgs = val || this.bookingDetails.pkgs + const enCapitalRes = this.$refs.cargoInfo.SetTOTALNO(this.bookingDetails.pkgs) + this.bookingDetails.totalno = enCapitalRes } else if (type === 'totalCbm') { this.bookingDetails.cbm = val || this.bookingDetails.cbm } @@ -1769,6 +1774,8 @@ export default { changeCtnInfoFun({ type, val }) { if (type === 'kindpkgs') { this.bookingDetails.kindpkgs = val + const enCapitalRes = this.$refs.cargoInfo.SetTOTALNO(this.bookingDetails.pkgs) + this.bookingDetails.totalno = enCapitalRes } }, removeOrderFun() { diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue index fd5d1e5..2fd168b 100644 --- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue +++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue @@ -1624,16 +1624,6 @@ export default { const cntrnoArr = [] let kindpkgsOld = '' this.tableData = [] - {/* for (let i = this.tableData.length - 1; i >= 0; i--) { - if (!this.tableData[i].cntrno) { - this.tableData.splice(i, 1) - } else { - cntrnoArr.push(this.tableData[i].cntrno) - } - if (this.tableData[i] && this.tableData[i].kindpkgs !== '') { - kindpkgsOld = this.tableData[i].kindpkgs - } - } */} const lastNum = this.tableData.length > 0 ? Number(this.tableData[this.tableData.length - 1].rowKey) + 1 : 0 data.map((item, index) => { const _data = { @@ -1773,6 +1763,7 @@ export default { const data = JSON.parse(res.data) const addTable = [] const cntrnoArr = [] + console.log(data) this.tableData.map((item, index) => { if (!item.cntrno) { // delete this.tableData[index] @@ -1781,6 +1772,13 @@ export default { cntrnoArr.push(item.cntrno) } }) + for (let i = this.tableData.length - 1; i >= 0; i--) { + if (!this.tableData[i].cntrno) { + this.tableData.splice(i, 1) + } else { + cntrnoArr.push(this.tableData[i].cntrno) + } + } const lastNum = this.tableData.length > 0 ? Number(this.tableData[this.tableData.length - 1].rowKey) + 1 : 0 data.map((item, index) => { if (cntrnoArr.includes(item.CNTRNO)) { @@ -1823,6 +1821,7 @@ export default { addTable.push(_data) } }) + console.log(this.tableData,addTable) this.tableData = [...this.tableData, ...addTable] this.$forceUpdate() } else { diff --git a/src/views/main/SendCar/addForm.vue b/src/views/main/SendCar/addForm.vue index 9870eef..a561874 100644 --- a/src/views/main/SendCar/addForm.vue +++ b/src/views/main/SendCar/addForm.vue @@ -1175,6 +1175,7 @@ export default { }) this.ContactsData = res.data.ext.contaList } + this.isGuaJi = res.data.ext.isGuaJi setTimeout(() => { this.form.setFieldsValue({ ...res.data.ext }) this.WebData = res.data.ext