diff --git a/.env b/.env index 313a590..eb69854 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://127.0.0.1:5000 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://47.104.85.216:12345/api \ No newline at end of file diff --git a/.env.development b/.env.development index 0eda409..0fc3239 100644 --- a/.env.development +++ b/.env.development @@ -3,6 +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 +# process.env.VUE_APP_API_BASE_URL + # VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api 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/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index 3165069..743bc42 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,9 +329,13 @@ >

{{ item.fieldName }}:

{{ item.reqVal }}

-

{{ item.msg }}

+

+ +

+

{{ item.fieldName }}:

-

+

+

{{ item.targetVal }}

@@ -2667,7 +2675,8 @@ export default { } .TaskShippingOrderCompareP { border-bottom: 1px solid #000; - padding-bottom: 5px; + padding: 5px; + background: #0000000e; .TaskShippingOrderCompareSpan { font-weight: bolder; color: red; @@ -2703,13 +2712,22 @@ export default { margin-bottom: 0.5rem; > p { flex: 1; - &:nth-child(3) { - flex: 2; - background: #facd91; - border: 1px solid red; - margin: 0 1rem; - padding-left: 0.5rem; - } + // &:nth-child(3) { + // flex: 2; + // 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 @@ + + + + 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]