From b047eee1604078792251c58296eec11fa4425b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Thu, 13 Apr 2023 15:47:48 +0800 Subject: [PATCH 1/5] 4/13 --- src/views/main/BookingLedger/list/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 7f76d40..934d370 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -325,7 +325,8 @@ >
{{ item.fieldName }}:
{{ item.reqVal }}
-{{ item.msg }}
+{{ item.msg }}
+{{ item.fieldName }}:
From c49ac49019d621975e9553e94c0e029627ce8a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Thu, 13 Apr 2023 16:42:48 +0800 Subject: [PATCH 2/5] 4/13 --- .env.development | 4 +- .env.preview | 4 +- src/views/main/BookingLedger/list/index.vue | 22 +- .../main/BookingLedger/list/index_zth.vue | 2731 +++++++++++++++++ 4 files changed, 2752 insertions(+), 9 deletions(-) create mode 100644 src/views/main/BookingLedger/list/index_zth.vue diff --git a/.env.development b/.env.development index 0eda409..ebc7bf9 100644 --- a/.env.development +++ b/.env.development @@ -3,8 +3,8 @@ VUE_APP_PREVIEW=true VUE_APP_API_BASE_URL=http://60.209.125.238:25805 VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805 -# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api -# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api +# VUE_APP_API_BASE_URL=http://47.104.85.216:12345 +# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 //VUE_APP_API_BASE_URL=http://127.0.0.1:5000 //VUE_APP_SOCKET_BASE_URL=http://127.0.0.1:5000 diff --git a/.env.preview b/.env.preview index 029fbe5..c4ab64b 100644 --- a/.env.preview +++ b/.env.preview @@ -3,5 +3,5 @@ VUE_APP_PREVIEW=true VUE_APP_API_BASE_URL=http://60.209.125.238:25805 VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805 -# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api -# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api \ No newline at end of file +# VUE_APP_API_BASE_URL=http://47.104.85.216:12345 +# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 \ No newline at end of file diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 934d370..fc18c64 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -325,10 +325,13 @@ >{{ item.fieldName }}:
{{ item.reqVal }}
-{{ item.msg }}
- +
+
{{ item.fieldName }}:
- + +{{ item.targetVal }}
@@ -2689,11 +2692,20 @@ export default { flex: 1; &:nth-child(3) { flex: 2; - background: #facd91; - border: 1px solid red; margin: 0 1rem; padding-left: 0.5rem; + &.TaskShippingOrderCompareMainThird { + background: #facd91; + border: 1px solid red; + } } + // &.TaskShippingOrderCompareMainThird { + // flex: 2; + // background: #facd91; + // border: 1px solid red; + // margin: 0 1rem; + // padding-left: 0.5rem; + // } } &.BoxNo { padding-top: 0.5rem; diff --git a/src/views/main/BookingLedger/list/index_zth.vue b/src/views/main/BookingLedger/list/index_zth.vue new file mode 100644 index 0000000..7a39331 --- /dev/null +++ b/src/views/main/BookingLedger/list/index_zth.vue @@ -0,0 +1,2731 @@ + +订舱备注: {{ row.soremark }}
+截单备注: {{ row.siremark }}
+ +没有更多数据了!
+ + ++ {{ TaskShippingOrderCompareData.compareTime }} 比对异常 合计 + {{ TaskShippingOrderCompareData.showDetailList.length }} 条 +
+提单号:(本地数据)
+--------------------------
+{{ TaskShippingOrderCompareData.mBlNo }}
+提单号:(场站数据)
+--------------------------
+{{ TaskShippingOrderCompareData.mBlNo }}
+{{ item.fieldName }}:
+{{ item.reqVal }}
+{{ item.msg }}
+{{ item.fieldName }}:
+ +箱信息:(本地数据)
+箱信息:(场站数据)
+{{ item.fieldName }}:
+{{ item.reqVal }}
+{{ item.msg }}
+{{ item.fieldName }}:
+ +最近使用
+{{ e }}
+{{ item.fieldName }}:
{{ item.reqVal }}
-{{ item.msg }}
+
+
{{ item.fieldName }}:
- + +{{ item.targetVal }}
{{ item.fieldName }}:
{{ item.reqVal }}
-
-
+
{{ item.fieldName }}:
{{ item.targetVal }}
@@ -2654,7 +2658,8 @@ export default { } .TaskShippingOrderCompareP { border-bottom: 1px solid #000; - padding-bottom: 5px; + padding: 5px; + background: #0000000e; .TaskShippingOrderCompareSpan { font-weight: bolder; color: red; @@ -2690,15 +2695,15 @@ export default { margin-bottom: 0.5rem; > p { flex: 1; - &:nth-child(3) { - flex: 2; - margin: 0 1rem; - padding-left: 0.5rem; - &.TaskShippingOrderCompareMainThird { - background: #facd91; - border: 1px solid red; - } - } + // &:nth-child(3) { + // flex: 2; + // margin: 0 1rem; + // padding-left: 0.5rem; + // &.TaskShippingOrderCompareMainThird { + // background: #facd91; + // border: 1px solid red; + // } + // } // &.TaskShippingOrderCompareMainThird { // flex: 2; // background: #facd91; From 93a1176951b52212357dc291e9d05530ce5cd3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com> Date: Thu, 13 Apr 2023 17:15:39 +0800 Subject: [PATCH 5/5] 4/13 --- src/views/main/BookingLedger/list/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 93f51e7..179851f 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -305,7 +305,7 @@{{ item.fieldName }}:
- +{{ item.targetVal }}
{{ item.fieldName }}:
- +{{ item.targetVal }}