Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

.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
+VUE_APP_API_BASE_URL=http://60.209.125.238:25805
+# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api

.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
 

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')
             }
           }
         })

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'
+              )
             }
           }
         })

src/views/main/BookingLedger/list/index.vue

@@ -300,9 +300,13 @@
             >
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
-              <p>{{ item.msg }}</p>
+              <p v-if="item.msg">
+                <a-icon type="close" :style="{ color: 'red' }" />
+              </p>
+              <p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
               <p>{{ item.fieldName }}:</p>
-              <p v-html="item.mergeHtml"></p>
+              <p v-if="!isDiff" v-html="item.mergeHtml"></p>
+              <p v-else>{{ item.targetVal }}</p>
             </div>
           </div>
           <div class="TaskShippingOrderCompareMain">
@@ -325,9 +329,13 @@
             >
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
-              <p>{{ item.msg }}</p>
+              <p v-if="item.msg">
+                <a-icon type="close" :style="{ color: 'red' }" />
+              </p>
+              <p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
               <p>{{ item.fieldName }}:</p>
-              <p v-html="item.mergeHtml"></p>
+              <p v-if="!isDiff" v-html="item.mergeHtml"></p>
+              <p v-else>{{ item.targetVal }}</p>
             </div>
           </div>
         </div>
@@ -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;

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]