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.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 @@ + + + + From d346a10c9726e4fcea5c7e02605a6af687d82c53 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:48:46 +0800 Subject: [PATCH 3/5] 4/13 --- .env | 5 +++-- .env.development | 10 ++++++---- .env.preview | 8 ++++---- .../BookingLedger/detail/modules/operationArea.vue | 4 ++-- .../BookingLedger/detail/modules/sedOperationArea.vue | 7 +++++-- src/views/main/Printing/index.vue | 2 +- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.env b/.env index 313a590..81e1c0e 100644 --- a/.env +++ b/.env @@ -1,5 +1,6 @@ NODE_ENV=production VUE_APP_PREVIEW=true //VUE_APP_API_BASE_URL=http://192.168.1.205:25800 -VUE_APP_API_BASE_URL=http://60.209.125.238:25805 -//VUE_APP_API_BASE_URL=http://127.0.0.1:5000 \ No newline at end of file +//VUE_APP_API_BASE_URL=http://127.0.0.1:5000 +# VUE_APP_API_BASE_URL=http://60.209.125.238:25805 +VUE_APP_API_BASE_URL=http://47.104.85.216:12345 \ No newline at end of file diff --git a/.env.development b/.env.development index ebc7bf9..54b5db6 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,12 @@ NODE_ENV=development 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://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 -# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 +# process.env.VUE_APP_API_BASE_URL + +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 c4ab64b..9e6b6b7 100644 --- a/.env.preview +++ b/.env.preview @@ -1,7 +1,7 @@ NODE_ENV=production 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://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 -# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 \ 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/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue index aea345f..9ee05df 100644 --- a/src/views/main/BookingLedger/detail/modules/operationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue @@ -1036,9 +1036,9 @@ export default { } else { // this.$message.success(res.data) if (this.PrintType == 1) { - window.open(` http://60.209.125.238:25805/BookingOrder/ViewPrintPdf/${res.data}`, '_blank') + window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/ViewPrintPdf/${res.data}`, '_blank') } else { - window.open(` http://60.209.125.238:25805/BookingOrder/downloadPrint?filename=${res.data}`, '_blank') + window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`, '_blank') } } }) diff --git a/src/views/main/BookingLedger/detail/modules/sedOperationArea.vue b/src/views/main/BookingLedger/detail/modules/sedOperationArea.vue index 53e2fdd..60210de 100644 --- a/src/views/main/BookingLedger/detail/modules/sedOperationArea.vue +++ b/src/views/main/BookingLedger/detail/modules/sedOperationArea.vue @@ -155,9 +155,12 @@ export default { } else { // this.$message.success(res.data) if (this.PrintType == 1) { - window.open(` http://60.209.125.238:25805/BookingOrder/ViewPrintPdf/${res.data}`, '_blank') + window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/ViewPrintPdf/${res.data}`, '_blank') } else { - window.open(` http://60.209.125.238:25805/BookingOrder/downloadPrint?filename=${res.data}`, '_blank') + window.open( + ` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`, + '_blank' + ) } } }) diff --git a/src/views/main/Printing/index.vue b/src/views/main/Printing/index.vue index 56f5b26..d31c43c 100644 --- a/src/views/main/Printing/index.vue +++ b/src/views/main/Printing/index.vue @@ -474,7 +474,7 @@ export default { return Text }, FnDFile(Data) { - window.open(` http://60.209.125.238:25805/BookingPrintTemplate/download?id=${Data.id}`, '_blank') + window.open(` ${process.env.VUE_APP_API_BASE_URL}/BookingPrintTemplate/download?id=${Data.id}`, '_blank') }, columnChange(data) { this.ColumnsQuery = [...data] From 20d1b54771c8b7c69a3b78ee23c04ac15ad44119 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:10:48 +0800 Subject: [PATCH 4/5] 4/13 --- .env | 4 +-- .env.development | 8 ++--- .env.preview | 8 ++--- src/views/main/BookingLedger/list/index.vue | 35 ++++++++++++--------- 4 files changed, 30 insertions(+), 25 deletions(-) diff --git a/.env b/.env index 81e1c0e..eb69854 100644 --- a/.env +++ b/.env @@ -2,5 +2,5 @@ NODE_ENV=production VUE_APP_PREVIEW=true //VUE_APP_API_BASE_URL=http://192.168.1.205:25800 //VUE_APP_API_BASE_URL=http://127.0.0.1:5000 -# VUE_APP_API_BASE_URL=http://60.209.125.238:25805 -VUE_APP_API_BASE_URL=http://47.104.85.216:12345 \ No newline at end of file +VUE_APP_API_BASE_URL=http://60.209.125.238:25805 +# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api \ No newline at end of file diff --git a/.env.development b/.env.development index 54b5db6..0fc3239 100644 --- a/.env.development +++ b/.env.development @@ -1,12 +1,12 @@ NODE_ENV=development 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://60.209.125.238:25805 +VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805 # process.env.VUE_APP_API_BASE_URL -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://47.104.85.216:12345/api +# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api //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 9e6b6b7..029fbe5 100644 --- a/.env.preview +++ b/.env.preview @@ -1,7 +1,7 @@ NODE_ENV=production 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://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 -VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 \ No newline at end of file +# 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 diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index fc18c64..93f51e7 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -300,9 +300,13 @@ >

{{ item.fieldName }}:

{{ item.reqVal }}

-

{{ item.msg }}

+

+ +

+

{{ item.fieldName }}:

-

+

+

{{ item.targetVal }}

@@ -325,10 +329,10 @@ >

{{ item.fieldName }}:

{{ item.reqVal }}

-

- {{ item.msg }} +

+

-

+

{{ 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 }}

@@ -334,7 +334,7 @@

{{ item.fieldName }}:

-

+

{{ item.targetVal }}