From 3e67cbe5758c169872965951ba873dc86bfba3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Wed, 7 Dec 2022 10:42:24 +0800 Subject: [PATCH 1/5] 12/7 --- src/views/main/BookingLedger/list/index.vue | 31 +++++++++---- .../BookingLedger/list/modules/initData.js | 46 +++++++++++++++---- 2 files changed, 60 insertions(+), 17 deletions(-) diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index ef1bf10..1d25bed 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -34,12 +34,12 @@ > 查询 重置 - 多提单号查询 - + + 多提单号查询 + + + + {{ advanced ? '收起查询' : '更多查询' }} @@ -444,7 +444,7 @@ export default { this.editColumnsSave(this.gridOptions.columns) }, - resizableChange (e) { + resizableChange(e) { this.gridOptions.columns[e.columnIndex].width = e.resizeWidth console.log('==== 列宽拖动 =====', e.resizeWidth, this.gridOptions.columns[e.columnIndex]) this.editColumnsSave(this.gridOptions.columns) @@ -563,7 +563,21 @@ export default { // 多表单 moreNumSubmit() { - this.formRes.MBLNO = this.moreNumVal.replace(/\n|\r/g, ',') + let data = '' + this.moreNumVal + .replace(/\n|\r/g, ',') + .split(',') + .forEach(item => { + if (item.replace(/\s*/g, '')) { + if (data) { + data = `${data},${item}` + } else { + data = item + } + } + }) + + this.formRes.MBLNO = data this.$refs['fromlabel-MBLNO'][0].$data.value = this.formRes.MBLNO this.$forceUpdate() this.moreNumCancel() @@ -571,7 +585,6 @@ export default { moreNumCancel() { this.moreNumVisible = false } - } } diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js index 120537b..b4e46e4 100644 --- a/src/views/main/BookingLedger/list/modules/initData.js +++ b/src/views/main/BookingLedger/list/modules/initData.js @@ -3,11 +3,26 @@ export default { { type: 'checkbox', width: 60, noDraggable: true }, { field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true }, { field: 'yard', width: 120, title: '场站', showHeaderOverflow: true, sortable: true }, - { field: 'mblno', width: 160, title: '提单号', showHeaderOverflow: true, showOverflow: false, sortable: true, slots: { default: 'mblno' } }, - { field: 'vessel', width: 120, title: '船名航次', showHeaderOverflow: true, sortable: true, slots: { default: 'vessel' } }, + { + field: 'mblno', + width: 160, + title: '主提单号', + showHeaderOverflow: true, + showOverflow: false, + sortable: true, + slots: { default: 'mblno' } + }, + { + field: 'vessel', + width: 120, + title: '船名航次', + showHeaderOverflow: true, + sortable: true, + slots: { default: 'vessel' } + }, { field: 'etd', width: 160, title: '开船日期', showHeaderOverflow: true, sortable: true }, { field: 'voyno', width: 120, title: '海关航次', showHeaderOverflow: true }, - { field: 'bookingStatus', width: 120, title: '定舱状态', showHeaderOverflow: true }, + { field: 'bookingStatus', width: 120, title: '订舱状态', showHeaderOverflow: true }, { field: 'vgm', width: 120, title: 'VGM', showHeaderOverflow: true }, { field: 'billStatus', width: 120, title: '提单状态', showHeaderOverflow: true }, { field: 'portdischarge', width: 120, title: '卸货港', showHeaderOverflow: true, sortable: true }, @@ -19,11 +34,26 @@ export default { columnsAllData: [ { field: 'carrier', width: 120, title: '船公司', showHeaderOverflow: true, sortable: true }, { field: 'yard', width: 120, title: '场站', showHeaderOverflow: true, sortable: true }, - { field: 'mblno', width: 160, title: '提单号', showHeaderOverflow: true, showOverflow: false, sortable: true, slots: { default: 'mblno' } }, - { field: 'vessel', width: 120, title: '船名航次', showHeaderOverflow: true, sortable: true, slots: { default: 'vessel' } }, + { + field: 'mblno', + width: 160, + title: '主提单号', + showHeaderOverflow: true, + showOverflow: false, + sortable: true, + slots: { default: 'mblno' } + }, + { + field: 'vessel', + width: 120, + title: '船名航次', + showHeaderOverflow: true, + sortable: true, + slots: { default: 'vessel' } + }, { field: 'etd', width: 160, title: '开船日期', showHeaderOverflow: true, sortable: true }, { field: 'voyno', width: 120, title: '海关航次', showHeaderOverflow: true }, - { field: 'bookingStatus', width: 120, title: '定舱状态', showHeaderOverflow: true }, + { field: 'bookingStatus', width: 120, title: '订舱状态', showHeaderOverflow: true }, { field: 'vgm', width: 120, title: 'VGM', showHeaderOverflow: true }, { field: 'billStatus', width: 120, title: '提单状态', showHeaderOverflow: true }, { field: 'portdischarge', width: 120, title: '卸货港', showHeaderOverflow: true, sortable: true }, @@ -56,7 +86,7 @@ export default { { field: 'notifyparty', width: 120, title: '通知人', showHeaderOverflow: true, sortable: true }, { field: 'op', width: 120, title: '操作人', showHeaderOverflow: true, sortable: true }, { field: 'payableat', width: 120, title: '到付地点', showHeaderOverflow: true, sortable: true }, - { field: 'placedelivery', width: 120, title: '交货地', showHeaderOverflow: true, sortable: true }, + { field: 'placedelivery', width: 120, title: '交货地', showHeaderOverflow: true, sortable: true } ], condAllData: [ { title: '业务编号', align: 'center', width: 120, label: 'BSNO', type: 'input' }, @@ -97,7 +127,7 @@ export default { { title: '交货地代码', align: 'center', width: 120, label: 'PLACEDELIVERYID', type: 'input' }, { title: '交货地', align: 'center', width: 120, label: 'PLACEDELIVERY', type: 'input' }, { title: '目的地代码', align: 'center', width: 120, label: 'DESTINATIONID', type: 'input' }, - { title: '目的地', align: 'center', width: 120, label: 'DESTINATION', type: 'input' }, + { title: '目的地', align: 'center', width: 120, label: 'DESTINATION', type: 'input' } // 此处省略部分数据 ] } From 38299ee8f2e73a9103c382726b272ad5c815f1b2 Mon Sep 17 00:00:00 2001 From: liuxiaoxue <1126966868@qq.com> Date: Wed, 7 Dec 2022 10:45:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?VGM=E9=93=BE=E6=8E=A5=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=A1=86=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/BookingLedger/detail/modules/operationArea.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index cdf8535..396fd92 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -256,8 +256,8 @@ has-feedback >
- - 复制 + +
@@ -383,7 +383,7 @@ has-feedback >
- +
From ebd14e76b2b4427edf5e126ee0fd5d5d68eb5e73 Mon Sep 17 00:00:00 2001 From: liuxiaoxue <1126966868@qq.com> Date: Wed, 7 Dec 2022 10:49:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?vgm=E9=93=BE=E6=8E=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main/BookingLedger/detail/modules/operationArea.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index 396fd92..aa8f2bd 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -1124,6 +1124,9 @@ export default { }