From c933444a42ddd03ebea303348ee2a570df371965 Mon Sep 17 00:00:00 2001 From: jiangkuan Date: Wed, 26 Apr 2023 17:15:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=92=8C=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main/BookingLedger/detail/style/cargoInfo.less | 2 ++ src/views/main/BookingLedger/detail/style/mailingInfo.less | 3 ++- src/views/main/BookingLedger/list/index.vue | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/main/BookingLedger/detail/style/cargoInfo.less b/src/views/main/BookingLedger/detail/style/cargoInfo.less index 7804427..64b4c48 100644 --- a/src/views/main/BookingLedger/detail/style/cargoInfo.less +++ b/src/views/main/BookingLedger/detail/style/cargoInfo.less @@ -118,6 +118,7 @@ font-size: 14px; line-height: 18px; height: 45px; + color: #000; } /deep/ .ant-form-item-label { @@ -130,6 +131,7 @@ } .line{ height: 45px; + color: #000; } .cargo-mark{ padding: 0; diff --git a/src/views/main/BookingLedger/detail/style/mailingInfo.less b/src/views/main/BookingLedger/detail/style/mailingInfo.less index e8cdd39..9f917ce 100644 --- a/src/views/main/BookingLedger/detail/style/mailingInfo.less +++ b/src/views/main/BookingLedger/detail/style/mailingInfo.less @@ -69,7 +69,7 @@ display: inline-block; font-size: 13px; margin-right: 10px; - color: #666; + color: #000; .iconfont { margin-right: 4px; font-weight: 600; @@ -80,6 +80,7 @@ line-height: 22px; margin-left: 10px; margin-right: 10px; + color: #000; span { margin-left: 4px !important; } diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 0f7fd08..bf12234 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -2027,7 +2027,7 @@ export default { /*订舱表格内字体颜色 */ .mblno { text-align: left; - color: @primary-color; + color: @primary-color !important; span { margin-right: 0.5rem; cursor: pointer; @@ -2050,7 +2050,7 @@ export default { padding: 0 10px; height: 28px; line-height: 26px; - + color:#000; .iconfont { margin-right: 6px; } @@ -2733,6 +2733,9 @@ export default { font-size: 100px; } } +/deep/ .content-table .vxe-body--column .vxe-cell div{ + color: #000; +} .pono { text-align: left; } From dd4a76657cecebd2a47ff74b49069c04861e72e3 Mon Sep 17 00:00:00 2001 From: jiangkuan Date: Thu, 27 Apr 2023 10:52:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=88=B1=E5=8D=95=E6=95=B0=E5=80=BC?= =?UTF-8?q?=E4=BC=A0=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main/BookingLedger/detail/index.vue | 10 ++++++++++ .../main/BookingLedger/detail/modules/basicInfo.vue | 13 ++++++++++++- .../BookingLedger/detail/modules/operationArea.vue | 6 +++++- .../main/BookingLedger/detail/modules/preOrder.vue | 9 +++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 4b58fdf..a0807fe 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -23,6 +23,7 @@ @copy="copyBookingFun" @addSedList="addSedList" @removeOrder="removeOrderFun" + @frompre="frompre" >