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

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>
@@ -1906,8 +1906,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