Merge branch 'fiveadd' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into five-second-add

src/components/tableList.vue

@@ -915,43 +915,75 @@
             }}
           </span>
           <div v-else-if="item.scope === 'changeCLS'">
-            <div v-if="scope.row[item.prop] === 1">
-              <div v-if="scope.row['interfacePushId'] !== 1" style="color: red">
+            <div
+              v-if="
+                !scope.row['interfacePushId'] &&
+                !scope.row['periodPlush']
+              "
+            >
+              <div v-if="scope.row[item.prop] === 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']">
+              <span v-else> 正常 </span>
+            </div>
+            <template v-else>
+              <div
+                v-if="
+                  scope.row['interfacePushId'] === 1 &&
+                  !scope.row['periodPlush']
+                "
+              >
+                <div v-if="scope.row[item.prop] === 1">
                   <div
                     v-if="
-                      scope.row['userUpdates'][0].createTime >
-                      scope.row['officialStatusTime']
+                      scope.row['officialStatusTime'] &&
+                      scope.row['userUpdates'][0].createTime <
+                        scope.row['officialStatusTime']
                     "
-                    style="color: purple"
                   >
-                    有变更
-                    <span
+                    正常
+                  </div>
+                  <div v-else style="color: red">
+                    有变更<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>
+                <span v-else> 正常 </span>
+              </div>
+              <div
+                v-if="
+                  scope.row['interfacePushId'] === 1 &&
+                  scope.row['periodPlush'] === 1
+                "
+              >
+                <div v-if="scope.row[item.prop] === 1">
+                  <div
+                    v-if="
+                      scope.row['officialStatusTime'] &&
+                      scope.row['userUpdates'][0].createTime <
+                        scope.row['officialStatusTime']
+                    "
                   >
+                    正常
+                  </div>
+                  <div v-else style="color: purple">
+                    有变更<span
+                      style="margin-left: 6px; color: blue; cursor: pointer"
+                      @click="isShowBoxsFun(scope.row)"
+                      >查看</span
+                    >
+                  </div>
                 </div>
-              </template>
-            </div>
-            <span v-else> 正常 </span>
+                <span v-else> 正常 </span>
+              </div>
+            </template>
           </div>
           <div v-else-if="item.scope === 'rebuy'">
             <span>{{
@@ -1277,7 +1309,7 @@
         <template slot-scope="scope">
           {{
             scope.row.periodPlush === 1
-              ? `是(${scope.row.plushNum})`
+              ? `是(${scope.row.periodStatusNum})`
               : scope.row.periodPlush === 0
               ? "否"
               : ""