695593266@qq.com 6 месяцев назад
Родитель
Сommit
3d07a69a0a
1 измененных файлов с 23 добавлено и 16 удалено
  1. 23 16
      src/views/workOrder/mixins/release.js

+ 23 - 16
src/views/workOrder/mixins/release.js

@@ -812,26 +812,33 @@ export default {
       listArr.map((el, index) => (listMap[el.id] = index));
       let arrList = codeT ? arrMap[codeT].arr : res[0].assignees;
 
-      console.log(arrList, '全部的数据858');
       dataRow.startDate = ''; // 每次计算的时候清空之前的
       dataRow.endDate = '';
-      arrList.map((item) => {
-        if (item.assigneeType.code == dataRow.assignType) {
-          let idx = listMap[item.assigneeId];
-          if (!idx && idx !== 0) {
-            return;
-          }
-          listArr[idx].status = item.status;
-          listArr[idx].startTime = item.startTime;
-          listArr[idx].endTime = item.endTime;
-          listArr[idx].quantity = item.quantity;
-          listArr[idx].weight = item.weight;
-          listArr[idx].changeId = item.id;
-          listArr[idx].teamTimeIds = item.teamTimeIds;
-          this.compareAndSetTime(listArr[idx], dataRow);
-          this.compareEndSetTime(listArr[idx], dataRow);
+
+      if (listArr.length == 0) return;
+
+      listArr.forEach((it) => {
+        if (it.disposalStatus || it.disposalStatus == 0) {
+          arrList.map((item) => {
+            if (item.assigneeType.code == dataRow.assignType) {
+              let idx = listMap[item.assigneeId];
+              if (!idx && idx !== 0) {
+                return;
+              }
+              listArr[idx].status = item.status;
+              listArr[idx].startTime = item.startTime;
+              listArr[idx].endTime = item.endTime;
+              listArr[idx].quantity = item.quantity;
+              listArr[idx].weight = item.weight;
+              listArr[idx].changeId = item.id;
+              listArr[idx].teamTimeIds = item.teamTimeIds;
+              this.compareAndSetTime(listArr[idx], dataRow);
+              this.compareEndSetTime(listArr[idx], dataRow);
+            }
+          });
         }
       });
+
       // 这里重新调用一个方法 计算出 startDate endDate
       this.$set(dataRow, 'list', listArr);
       this.$set(dataRow, 'radioBun', radioBun);