From 4357b1398e85f5d18917b8261202da155a9ff851 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Tue, 24 Oct 2023 17:44:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/modules/basicInfo.vue | 24 ++- .../detail/modules/rightContent.vue | 27 ++- .../list/components/bookCard.vue | 196 +++++++++++++----- .../main/BookingLedger/list/indexTest.vue | 2 +- .../system/account/settings/Security.vue | 10 +- 5 files changed, 176 insertions(+), 83 deletions(-) diff --git a/src/views/main/BookingLedger/detail/modules/basicInfo.vue b/src/views/main/BookingLedger/detail/modules/basicInfo.vue index 6e9724b..be88e0d 100644 --- a/src/views/main/BookingLedger/detail/modules/basicInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/basicInfo.vue @@ -355,7 +355,7 @@ prop="voynoinner" > - + @@ -370,7 +370,7 @@ prop="voynoinner" > - + @@ -384,7 +384,7 @@ has-feedback prop="voyno" > - + @@ -398,7 +398,7 @@ has-feedback prop="voyno" > - + @@ -1159,6 +1159,14 @@ export default { if (type === 'voynoinner' && this.details.voyno == '') { this.details.voyno = this.details[type] } + if (type === 'voynoinner' && value == '') { + this.details.voyno = '' + this.details.vessel = '' + } + if (type === 'voyno' && value == '') { + this.details.voynoinner = '' + this.details.vessel = '' + } if (type === 'epCode' && this.details.carrierid === 'ESL') { this.details.tmblno = this.details[type] } @@ -1221,7 +1229,12 @@ export default { this.details.vessel = res.vessel || '' this.details.atd = res.atd || '' this.details.etd = res.etd || '' - if (res.voyno.includes('1MA')) { + if (Object.keys(res).length == 0) { + this.details.voyno = '' + this.details.voynoinner = '' + } + if (res.voyno) { + if (res.voyno.includes('1MA')) { this.details.voyno = res.voyno.replace('1MA', '') || '' } else { if (res.voyno.includes('1NC')) { @@ -1230,6 +1243,7 @@ export default { this.details.voyno = res.voyno || '' } } + } this.details.voynoinner = res.voynoInside || '' } else if (type === 'shipagency') { this.details.shipagency = res.name || '' diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue index fd9353e..51d0caf 100644 --- a/src/views/main/BookingLedger/detail/modules/rightContent.vue +++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue @@ -149,29 +149,20 @@ {{ serive.showName }}
-
- - + +
{{ serive.showName }}
-
-
@@ -1280,7 +1271,9 @@ export default { display: flex; flex-wrap: wrap; } - +.box-list :last-child{ + border: none !important; +} .goods-box { display: flex; align-items: center; @@ -1313,15 +1306,15 @@ export default { } .serve-icon { - font-size: 22px; + font-size: 19px; display: block; margin: 0 auto; margin-bottom: 5px; } .round { - width: 22px; - height: 22px; + width: 19px; + height: 19px; line-height: 15px; border-radius: 50%; // margin-right: 3px; @@ -1370,5 +1363,9 @@ export default { .isBr { width: 100%; + margin: 3px 0; + height: 1px; + border: 1px dashed #d5cbcb; } + diff --git a/src/views/main/BookingLedger/list/components/bookCard.vue b/src/views/main/BookingLedger/list/components/bookCard.vue index 52bcb1c..7ffcddc 100644 --- a/src/views/main/BookingLedger/list/components/bookCard.vue +++ b/src/views/main/BookingLedger/list/components/bookCard.vue @@ -32,106 +32,183 @@
-
+
-
XXXX
+
+
船名/航次:CSCL INDIAN OCEAN/058W
+
开船日期:2023-10-23
+
截单时间:2023-10-24 12:30
+
MSK
+
-
委托单位:青岛德茂
-
开船日期:2023-10-2
-
订舱代理:测试数据测试数据
+
订舱票数:5
+
箱量:1
+
已用箱:10票
+
已截单:5票
+
海放数:7
+
码放数:4
-
+
-
XXXX
+
+
船名/航次:CSCL INDIAN OCEAN/058W
+
开船日期:2023-10-23
+
截单时间:2023-10-24 12:30
+
MSK
-
委托单位:青岛德茂
-
开船日期:2023-10-2
-
订舱代理:测试数据测试数据
+
订舱票数:5
+
箱量:1
+
已用箱:10票
+
已截单:5票
+
海放数:7
+
码放数:4
-
+
-
XXXX
+
+
船名/航次:CSCL INDIAN OCEAN/058W
+
开船日期:2023-10-23
+
截单时间:2023-10-24 12:30
+
MSK
-
委托单位:青岛德茂
-
开船日期:2023-10-2
-
订舱代理:测试数据测试数据
+
订舱票数:5
+
箱量:1
+
已用箱:10票
+
已截单:5票
+
海放数:7
+
码放数:4
-
+
-
XXXX
+
+
船名/航次:CSCL INDIAN OCEAN/058W
+
开船日期:2023-10-23
+
截单时间:2023-10-24 12:30
+
MSK
-
委托单位:青岛德茂
-
开船日期:2023-10-2
-
订舱代理:测试数据测试数据
+
订舱票数:5
+
箱量:1
+
已用箱:10票
+
已截单:5票
+
海放数:7
+
码放数:4
-
+
-
XXXX
- MSK +
+
船名/航次:CSCL INDIAN OCEAN/058W
+
开船日期:2023-10-23
+
截单时间:2023-10-24 12:30
+
+ PIL
-
委托单位:青岛德茂
-
开船日期:2023-10-2
-
订舱代理:测试数据测试数据
+
订舱票数:5
+
箱量:1
+
已用箱:10票
+
已截单:5票
+
海放数:7
+
码放数:4
-
+
-
XXXX
- MSK +
+
船名/航次:CSCL INDIAN OCEAN/058W
+
开船日期:2023-10-23
+
截单时间:2023-10-24 12:30
+
+ PIL
-
委托单位:青岛德茂
-
开船日期:2023-10-2
-
订舱代理:测试数据测试数据
+
订舱票数:5
+
箱量:1
+
已用箱:10票
+
已截单:5票
+
海放数:7
+
码放数:4
-
+
-
XXXX
- MSK +
+
船名/航次:CSCL INDIAN OCEAN/058W
+
开船日期:2023-10-23
+
截单时间:2023-10-24 12:30
+
+ PIL
-
委托单位:青岛德茂
-
开船日期:2023-10-2
-
订舱代理:测试数据测试数据
+
订舱票数:5
+
箱量:1
+
已用箱:10票
+
已截单:5票
+
海放数:7
+
码放数:4
-
+
-
XXXX
- MSK +
+
船名/航次:CSCL INDIAN OCEAN/058W
+
开船日期:2023-10-23
+
截单时间:2023-10-24 12:30
+
+ PIL
-
委托单位:青岛德茂
-
开船日期:2023-10-2
-
订舱代理:测试数据测试数据
+
订舱票数:5
+
箱量:1
+
已用箱:10票
+
已截单:5票
+
海放数:7
+
码放数:4
-
+
-
XXXX
- MSK +
+
船名/航次:CSCL INDIAN OCEAN/058W
+
开船日期:2023-10-23
+
截单时间:2023-10-24 12:30
+
+ PIL
-
委托单位:青岛德茂
-
开船日期:2023-10-2
-
订舱代理:测试数据测试数据
+
订舱票数:5
+
箱量:1
+
已用箱:10票
+
已截单:5票
+
海放数:7
+
码放数:4
@@ -154,6 +231,9 @@ export default { methods: { handleBack() { this.$emit('back') + }, + handleInto() { + this.$emit('back') } } } @@ -167,7 +247,7 @@ export default { .content { margin-top: 50px; - padding: 0 100px; + padding: 0 10px; display: flex; flex-wrap: wrap; } @@ -175,8 +255,9 @@ export default { .card { border: 1px #ebebeb solid; border-radius: 15px; - margin-right: 70px; - width: 200px; + margin-right: 1%; + width: 19%; + background-color: #f9f9f9; padding-bottom: 8px; -webkit-transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1); transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1); @@ -207,6 +288,9 @@ export default { &:hover::after { opacity: 1; } + &:nth-child(5){ + margin-right: 0px !important; + } .card-top { border-top-left-radius: 15px; @@ -214,14 +298,14 @@ export default { background-color: rgb(126, 206, 243); padding: 5px; color: white; - font-size: 35px; + font-size: 25px; font-weight: bold; text-align: center; position: relative; .card-top-title { color: black; - font-size: 12px; + font-size: 15px; text-align: left; padding-left: 5px; } @@ -249,7 +333,7 @@ export default { font-size: 13px; color: #67aaef; display: flex; - justify-content: flex-start; + justify-content: space-between; } } } diff --git a/src/views/main/BookingLedger/list/indexTest.vue b/src/views/main/BookingLedger/list/indexTest.vue index 3363063..b182910 100644 --- a/src/views/main/BookingLedger/list/indexTest.vue +++ b/src/views/main/BookingLedger/list/indexTest.vue @@ -132,7 +132,7 @@