From 9d46f1c8c5664393a9e1edb9fe6d2176c8bc172f Mon Sep 17 00:00:00 2001 From: sunzehua Date: Tue, 27 Feb 2024 08:51:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main/BookingLedger/list/index.vue | 10 +- .../main/Taskmanage/notifications/index.vue | 2 +- src/views/main/mail/mailSetting.vue | 3 + src/views/main/mskBookingOrder/index.vue | 210 +++++++++++++++++- src/views/userLoginReg/Login.vue | 15 +- 5 files changed, 227 insertions(+), 13 deletions(-) diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 8b09b9b..be43e5e 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -1388,7 +1388,7 @@ export default { pageSize: 20, pageSizes: [10, 20, 50, 100, 200, 500] }, - columns: JSON.parse(JSON.stringify(initData.columns)), + columns: [], data: [] }, formTableData: JSON.parse(JSON.stringify(initData.columns)), @@ -1495,6 +1495,11 @@ export default { }, created() { this.createdInit() + if (localStorage.getItem('bookingSetting')) { + this.gridOptions.columns = JSON.parse(localStorage.getItem('bookingSetting')) + } else { + this.gridOptions.columns = JSON.parse(JSON.stringify(initData.columns)) + } }, mounted() { this.onresize() @@ -2299,6 +2304,7 @@ export default { return item.field }) this.gridOptions.columns = JSON.parse(JSON.stringify(this.formTableData)) + localStorage.setItem('bookingSetting', JSON.stringify(this.gridOptions.columns)) const moreTableArr = [] this.fromTableAllData.map((item, index) => { if (!nowTableArr.includes(item.field)) { @@ -2614,11 +2620,13 @@ export default { this.gridOptions.columns = JSON.parse(JSON.stringify(data)) this.$refs.setTableForm.handleCancel() this.editColumnsSave(this.gridOptions.columns) + localStorage.setItem('bookingSetting', JSON.stringify(this.gridOptions.columns)) }, resizableChange(e) { this.gridOptions.columns[e.columnIndex].width = e.resizeWidth this.editColumnsSave(this.gridOptions.columns) + localStorage.setItem('bookingSetting', JSON.stringify(this.gridOptions.columns)) }, editColumnsSave(data = {}) { DjyUserConfigAdd({ diff --git a/src/views/main/Taskmanage/notifications/index.vue b/src/views/main/Taskmanage/notifications/index.vue index f5666bf..fa4b795 100644 --- a/src/views/main/Taskmanage/notifications/index.vue +++ b/src/views/main/Taskmanage/notifications/index.vue @@ -80,7 +80,7 @@
- + 是 diff --git a/src/views/main/mail/mailSetting.vue b/src/views/main/mail/mailSetting.vue index 52bcad8..fd2195c 100644 --- a/src/views/main/mail/mailSetting.vue +++ b/src/views/main/mail/mailSetting.vue @@ -476,6 +476,9 @@ export default { this.loading = true EmailUserAccountGetInfo({ gid: gid }).then(res => { if (res.data.succ) { + if (!res.data.ext.parserList) { + res.data.ext.parserList = [] + } this.addForm = res.data.ext if (this.addForm.useIMAP) { this.addForm.useIMAP = 'true' diff --git a/src/views/main/mskBookingOrder/index.vue b/src/views/main/mskBookingOrder/index.vue index dceb5d3..4e4cfc3 100644 --- a/src/views/main/mskBookingOrder/index.vue +++ b/src/views/main/mskBookingOrder/index.vue @@ -95,29 +95,87 @@ +
货物详情
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + m³/hour + + + + + + + % + + + +
箱型箱量
 - +
- + - + - + - + - + @@ -146,6 +204,34 @@
2024-02-24 06:00
+
+
+
+
运输时间
+
72天数
+
+
+
+
+
+
船名/航次
+
MSC MIA / 408W
+
+
+ + +
+ 选择 +
+ +
+
+
+ Qingdao, China + + Belgrade, Serbia +
+
@@ -160,10 +246,111 @@
2024-02-24 06:00
+
+
+
+
运输时间
+
72天数
+
+
+
+
+
+
船名/航次
+
MSC MIA / 408W
+
+
-
+
+ 选择 +
+
+
+
+
+ Qingdao, China + + Belgrade, Serbia +
+
+
+
+
+
离港
+
2024-02-24 06:00
+
+
+
+
+
+
离港
+
2024-02-24 06:00
+
+
+
+
+
+
运输时间
+
72天数
+
+
+
+
+
+
船名/航次
+
MSC MIA / 408W
+
+
+
+
+
+ 选择 +
+
+
+
+ Qingdao, China + + Belgrade, Serbia +
+
+
+
+
+
离港
+
2024-02-24 06:00
+
+
+
+
+
+
离港
+
2024-02-24 06:00
+
+
+
+
+
+
运输时间
+
72天数
+
+
+
+
+
+
船名/航次
+
MSC MIA / 408W
+
+
+
+
+
+ 选择 +
+
+

共计 4 条船期记录

@@ -214,6 +401,14 @@ export default { border: 1px black dashed; padding: 15px; margin: 10px 0; + display: flex; + align-items: center; + .left{ + width: 80%; + } + .right{ + width: 20%; + } .top{ margin-bottom: 15px; } @@ -225,6 +420,7 @@ export default { } .item{ display: flex; + width: 20%; .item-left{ margin-right: 10px; } diff --git a/src/views/userLoginReg/Login.vue b/src/views/userLoginReg/Login.vue index 82c34e7..1044d72 100644 --- a/src/views/userLoginReg/Login.vue +++ b/src/views/userLoginReg/Login.vue @@ -348,16 +348,23 @@ export default { // 加载字典所有字典到缓存中 this.dictTypeData().then(res => { }) const query = { - typeArr: ['vesselinfo_sort', 'vesselinfo_list_column', 'vesselinfo_page', 'booking_list_cond'] + typeArr: ['vesselinfo_sort', 'vesselinfo_list_column', 'vesselinfo_page', 'booking_list_column'] } DjyUserConfigMulti(this.$qs.stringify(query)).then(res => { const vessArr = [] - res.data.forEach(item => { + let bookArr = [] + res.data.forEach(item => { if (item.type.includes('vesselinfo')) { vessArr.push(item) } - }) - localStorage.setItem('vesselinfoSetting', JSON.stringify(vessArr)) + if (item.type === 'booking_list_column') { + if (item.configJson) { + bookArr = JSON.parse(item.configJson) + } + } + }) + localStorage.setItem('vesselinfoSetting', JSON.stringify(vessArr)) + localStorage.setItem('bookingSetting', JSON.stringify(bookArr)) }) this.$store.dispatch('getVesselinfo') },