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 }}
{{ item.fieldName }}:
{{ item.reqVal }}
-{{ item.msg }}
+
+
{{ item.fieldName }}:
- + +{{ item.targetVal }}
订舱备注: {{ 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 }}
+