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' }
// 此处省略部分数据
]
}