Tang 3 yıl önce
ebeveyn
işleme
dd9029e670

+ 42 - 10
src/components/tableList.vue

@@ -915,20 +915,52 @@
             }}
           </span>
           <div v-else-if="item.scope === 'changeCLS'">
-            <div v-if="scope.row[item.prop] === 1" :style="scope.row['userUpdates'][0].createTime > scope.row['officialStatusTime'] ? 'color: purple':'color: red'">
-              有变更
-              <span
-                style="margin-left: 6px; color: blue; cursor: pointer"
-                @click="isShowBoxsFun(scope.row)"
-                >查看</span
-              >
+            <div v-if="scope.row[item.prop] === 1">
+              <div v-if="scope.row['interfacePushId'] !== 1" style="color: red">
+                有变更<span
+                  style="margin-left: 6px; color: blue; cursor: pointer"
+                  @click="isShowBoxsFun(scope.row)"
+                  >查看</span
+                >
+              </div>
+              <template v-else>
+                <template v-if="scope.row['officialStatusTime']">
+                  <div
+                    v-if="
+                      scope.row['userUpdates'][0].createTime >
+                      scope.row['officialStatusTime']
+                    "
+                    style="color: purple"
+                  >
+                    有变更
+                    <span
+                      style="margin-left: 6px; color: blue; cursor: pointer"
+                      @click="isShowBoxsFun(scope.row)"
+                      >查看</span
+                    >
+                  </div>
+                  <span v-else> 正常 </span>
+                </template>
+                <div v-else style="color: purple">
+                  有变更
+                  <span
+                    style="margin-left: 6px; color: blue; cursor: pointer"
+                    @click="isShowBoxsFun(scope.row)"
+                    >查看</span
+                  >
+                </div>
+              </template>
             </div>
             <span v-else> 正常 </span>
           </div>
           <div v-else-if="item.scope === 'rebuy'">
-            <span>{{ scope.row[item.prop] === 1 ? "是" : "" }}</span>
+            <span>{{
+              scope.row[item.prop] === 1 && scope.row[item.prop1] === 1
+                ? "是"
+                : ""
+            }}</span>
             <span
-              v-if="scope.row[item.prop] === 1"
+              v-if="scope.row[item.prop] === 1 && scope.row[item.prop1] === 1"
               style="margin-left: 6px; color: blue; cursor: pointer"
               @click="isShowRebuy(scope.row)"
               >查看</span
@@ -1568,7 +1600,7 @@ export default {
       },
       treeDatas: [],
       treeDatas1: [],
-      treeDatas2: []
+      treeDatas2: [],
     };
   },
   computed: {

+ 1 - 0
src/views/Marketing/order/orderList/index.vue

@@ -312,6 +312,7 @@ export default {
           label: "复购-学时冲突",
           width: "120px",
           prop: "rebuy",
+          prop1: "periodPlush",
           hidden: true,
           scope: "rebuy",
         },