From 9d015620cdc1a049a1d9cd860c14103800afe790 Mon Sep 17 00:00:00 2001 From: lilu Date: Fri, 14 Apr 2023 11:24:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=88=AA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main/BookingLedger/list/index.vue | 5 ++++- .../main/BookingLedger/list/modules/formLabel.vue | 14 +++++++++----- .../main/BookingLedger/list/modules/initData.js | 12 +++++++----- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 743bc42..4ab33c9 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -667,7 +667,8 @@ import { GetForwarderlist, DjyUserConfigMulti, DeleteBookingOrder, - ExcuteShippingOrderCompareBatch + ExcuteShippingOrderCompareBatch, + GetTenantLineList } from '@/api/modular/main/BookingLedger' import initData from './modules/initData' @@ -1197,6 +1198,8 @@ export default { return GetPackage case 'ISSUETYPE': return Codeissuetypelist + case 'lineName': + return GetTenantLineList } }, getFromSelectData(func, ...args) { diff --git a/src/views/main/BookingLedger/list/modules/formLabel.vue b/src/views/main/BookingLedger/list/modules/formLabel.vue index 838d80c..b60e7b7 100644 --- a/src/views/main/BookingLedger/list/modules/formLabel.vue +++ b/src/views/main/BookingLedger/list/modules/formLabel.vue @@ -252,11 +252,15 @@ export default { }, getSelectFirst (e) { if (!e) { - this.$emit('selectFirst', { - form: this.labelData, - index: this.formIndex, - value: '' - }) + if (['LINENAME'].includes(this.labelData.label)) { + this.dataList = this.lineList + } else { + this.$emit('selectFirst', { + form: this.labelData, + index: this.formIndex, + value: '' + }) + } } }, completeSelect (value) { diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js index 60c36a2..3c52d9c 100644 --- a/src/views/main/BookingLedger/list/modules/initData.js +++ b/src/views/main/BookingLedger/list/modules/initData.js @@ -60,7 +60,7 @@ export default { { field: 'prepardat', label: 'PREPARDAT', width: 160, title: '预付地点', showHeaderOverflow: true, sortable: true }, { field: 'service', label: 'SERVICE', width: 160, title: '运输条款', showHeaderOverflow: true, sortable: true }, { field: 'sale', label: 'SALE', width: 160, title: '揽货人', showHeaderOverflow: true, sortable: true }, // 销售 - { field: 'lanename', label: 'LANENAME', width: 160, title: '航线', showHeaderOverflow: true, sortable: true }, + { field: 'lanename', label: 'LANENAME', width: 160, title: '船司航线', showHeaderOverflow: true, sortable: true }, // { field: 'servicecontractno', label: 'SERVICECONTRACTNO', width: 160, title: '客户合同号', showHeaderOverflow: true, sortable: true }, // 没有设置该字段的地方 - 暂时去掉 { field: 'bsstatusname', label: 'BSSTATUSNAME', width: 160, title: '业务状态', showHeaderOverflow: true, sortable: true }, { field: 'bookingno', label: 'BOOKINGNO', width: 160, title: '业务编号', showHeaderOverflow: true, sortable: true }, @@ -81,7 +81,7 @@ export default { { field: 'dunno', label: 'DUNNO', width: 120, title: '危险品编号', showHeaderOverflow: true, sortable: true }, { field: 'contractno', label: 'CONTRACTNO', width: 120, title: '合约号', showHeaderOverflow: true, sortable: true }, { field: 'route', label: 'ROUTE', width: 120, title: '航线操作', showHeaderOverflow: true, sortable: true }, - { field: 'lanecode', label: 'LANECODE', width: 120, title: '航线代码', showHeaderOverflow: true, sortable: true }, + // { field: 'lanecode', label: 'LANECODE', width: 120, title: '航线代码', showHeaderOverflow: true, sortable: true }, { field: 'shipperid', label: 'SHIPPERID', width: 120, title: '发货人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段 { field: 'notifypartyid', label: 'NOTIFYPARTYID', width: 120, title: '通知人代码', showHeaderOverflow: true, sortable: true }, // 台账无字段 { field: 'notifypartY2', label: 'NOTIFYPARTY2', width: 120, title: '第二通知人', showHeaderOverflow: true, sortable: true }, // 台账无，详情有 @@ -101,7 +101,8 @@ export default { { 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' } }, { field: 'goodsStatusList', label: 'GOODSSTATUSLIST', minWidth: 160, title: '货物状态', showHeaderOverflow: true, slots: { default: 'goodsStatusList' } }, - { field: 'tmblno', label: 'TMBLNO', width: 120, title: '真提单号', showHeaderOverflow: true, sortable: true } + { field: 'tmblno', label: 'TMBLNO', width: 120, title: '真提单号', showHeaderOverflow: true, sortable: true }, + { field: 'linename', label: 'LINENAME', width: 120, title: '航线', showHeaderOverflow: true, sortable: true } ], // ==== 表单部分 ==== condAllData: [ @@ -127,7 +128,7 @@ export default { { title: '业务编号', align: 'center', width: 120, label: 'BOOKINGNO', type: 'input' }, { title: '业务状态', align: 'center', width: 120, label: 'BSSTATUS', type: 'input' }, // { title: '客户合同号', align: 'center', width: 120, label: 'SERVICECONTRACTNO', type: 'input' }, // 暂时去掉 - { title: '航线代码', align: 'center', width: 120, label: 'LANECODE', type: 'input' }, + // { title: '航线代码', align: 'center', width: 120, label: 'LANECODE', type: 'input' }, { title: '内部航次', align: 'center', width: 120, label: 'VOYNOINNER', type: 'input' }, { title: '海关航次', align: 'center', width: 120, label: 'VOYNO', type: 'input' }, { title: '发货人', align: 'center', width: 120, label: 'SHIPPER', type: 'input' }, @@ -157,7 +158,7 @@ export default { { title: '重量', align: 'center', width: 160, label: 'KGS', type: 'input' }, { title: '尺码', align: 'center', width: 160, label: 'CBM', type: 'input' }, { title: 'HS编码', align: 'center', width: 160, label: 'HSCODE', type: 'input' }, - { title: '航线', align: 'center', width: 160, label: 'LANENAME', type: 'input' }, + { title: '船司航线', align: 'center', width: 160, label: 'LANENAME', type: 'input' }, { title: '设置温度', align: 'center', width: 160, label: 'TEMPSET', type: 'input' }, { title: '通风度', align: 'center', width: 160, label: 'REEFERF', type: 'input' }, { title: '付款方', align: 'center', width: 160, label: 'FREIGHTPAYER', type: 'input' }, @@ -179,6 +180,7 @@ export default { { title: '箱型', align: 'center', width: 120, label: 'CNTRTOTAL', type: 'select', showLabel: 'name' }, { title: '包装', align: 'center', width: 120, label: 'KINDPKGS', type: 'select', showLabel: 'name' }, { title: '签单方式', align: 'center', width: 160, label: 'ISSUETYPE', type: 'select', showLabel: 'enName', showLabel2: 'cnName' }, + { title: '航线', align: 'center', width: 160, label: 'LINENAME', type: 'select', showLabel: 'name' }, { title: '提单份数', align: 'center', From 087f8a4cc4b724ed19b465af487036f68c2c9373 Mon Sep 17 00:00:00 2001 From: lilu Date: Fri, 14 Apr 2023 13:52:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=B0=E9=87=8D=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/modules/goodsTable.vue | 64 ++++++++++--------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue index 7492adc..a5bba06 100644 --- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue +++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue @@ -472,30 +472,30 @@ export default { ) } }, - // { - // field: 'weighdate', - // key: 'weighdate', - // title: '称重日期', - // align: 'left', - // width: 120, - // edit: false, - // renderBodyCell: ({ row, column, rowIndex }, h) => { - // return ( - // { - // console.log('== 选择日期 ==', dateString) - // this.tableData[rowIndex].weighdate = dateString - // row['weighdate'] = dateString - // }} /> - // ) - // }, - // renderHeaderCell: ({ column }, h) => { - // return ( - // - // {this.rules.weightype.required ? * : ''} {column.title} - // - // ) - // } - // }, + { + field: 'weighdate', + key: 'weighdate', + title: '称重日期', + align: 'left', + width: 120, + edit: false, + renderBodyCell: ({ row, column, rowIndex }, h) => { + return ( + { + console.log('== 选择日期 ==', dateString) + this.tableData[rowIndex].weighdate = dateString + row['weighdate'] = dateString + }} /> + ) + }, + renderHeaderCell: ({ column }, h) => { + return ( + + {this.rules.weightype.required ? * : ''} {column.title} + + ) + } + }, ], modelColumns: [ { @@ -1017,7 +1017,7 @@ export default { watch: { details: { handler(nval, oval) { - console.log('=== 修改table内容 ===', nval.ctnInputs, this.pType, this.inTableLoad) + // console.log('=== 修改table内容 ===', nval.ctnInputs, this.pType, this.inTableLoad) if (!this.inSave && !this.inTableLoad) { this.$emit('changeDetail', { detail: nval, @@ -1216,6 +1216,7 @@ export default { this.tableData = arr this.tableLoaded = true this.totalCtnall = '' + console.log('== 箱信息 ==', this.tableData) } else { this.tableData = [] this.tableLoaded = true @@ -1262,6 +1263,7 @@ export default { tareweight: '', weightype: '累加', weighkgs: '', + weighdate: '', rowKey: this.tableData.length > 0 ? Number(this.tableData[this.tableData.length - 1].rowKey) + 1 : 0 } this.tableData.push(data) @@ -1479,7 +1481,8 @@ export default { cbm: item.CBM, tareweight: item.TAREWEIGHT, weightype: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weightype, - weighkgs: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weighkgs + weighkgs: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weighkgs, + weighdate: item.WEIGHDATE } } else { const _data = { @@ -1494,7 +1497,8 @@ export default { cbm: item.CBM, tareweight: item.TAREWEIGHT, weightype: '', - weighkgs: '' + weighkgs: '', + weighdate: item.WEIGHDATE } addTable.push(_data) } @@ -1634,7 +1638,8 @@ export default { cbm: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].cbm, tareweight: item.TAREWEIGHT, weightype: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weightype, - weighkgs: setWeighkgs + weighkgs: setWeighkgs, + weighdate: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].weighdate } } else { const _data = { @@ -1649,7 +1654,8 @@ export default { cbm: '', tareweight: item.TAREWEIGHT, weightype: '', - weighkgs: '' + weighkgs: '', + weighdate: '' } addTable.push(_data) }