From cf92dd87c14208dec88e81db046bc023ef0c539b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Fri, 14 Apr 2023 09:10:49 +0800
Subject: [PATCH] 4/14

---
 src/views/main/BookingLedger/list/index.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 179851f..0ca629f 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -305,8 +305,8 @@
               </p>
               <p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
               <p>{{ item.fieldName }}:</p>
-              <p v-if="!isDiff" v-html="item.mergeHtml"></p>
-              <p v-else>{{ item.targetVal }}</p>
+              <p v-if="!item.isDiff">{{ item.targetVal }}</p>
+              <p v-else v-html="item.mergeHtml"></p>
             </div>
           </div>
           <div class="TaskShippingOrderCompareMain">
@@ -334,8 +334,8 @@
               </p>
               <p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
               <p>{{ item.fieldName }}:</p>
-              <p v-if="!isDiff" v-html="item.mergeHtml"></p>
-              <p v-else>{{ item.targetVal }}</p>
+              <p v-if="!item.isDiff">{{ item.targetVal }}</p>
+              <p v-else v-html="item.mergeHtml"></p>
             </div>
           </div>
         </div>
@@ -1895,8 +1895,12 @@ export default {
             if (!res.data.succ) {
               this.$message.success(res.data.msg)
             } else {
-              this.TaskShippingOrderCompareData = res.data.extra
-              this.TaskShippingOrderCompareVisible = true
+              if (res.data.extra) {
+                this.TaskShippingOrderCompareData = res.data.extra
+                this.TaskShippingOrderCompareVisible = true
+              } else {
+                this.$message.success(res.data.msg)
+              }
             }
           } else {
             this.spinning = false