Browse Source

Merge branch 'feature_20250415_公装主管任务' into uat(dev)

zhujindu 7 months ago
parent
commit
2e841a426d

+ 1 - 1
src/components/uploadVTask.vue

@@ -175,7 +175,7 @@ export default {
       });
       // 允许补填 添加上补填标识
       if (this.allowWriteAgain) {
-        form.isWriteAgain = '1';
+        form.writeAgain = '1';
       }
       addPhotov(form).then((res) => {
         if (res.code == 200) {

+ 8 - 0
src/views/week/VisitSummaryAdd.vue

@@ -474,6 +474,14 @@ export default {
                 collectionItemLists[q].answerValue = findCustom.join(',');
               }
             }
+            // 照片
+            if (collectionItemLists[q].answerType == 'zp') {
+              let fileIdList = [];
+              collectionItemLists[q].fileInfoList.forEach((item) => {
+                fileIdList.push(item.id);
+              });
+              collectionItemLists[q].fileIdList = fileIdList;
+            }
           }
           this.collectionItemList = collectionItemLists;
         }

+ 2 - 2
src/views/week/VisitSummaryDetail.vue

@@ -157,7 +157,7 @@ export default {
         }
         this.imgList = imgList;
         this.writeAgain = res.data.customItemList.some((item) => {
-          return item.writeAgain === '1';
+          return item.allowWriteAgain;
         });
 
         this.collectionItemLists = res.data.customItemList;
@@ -189,7 +189,7 @@ export default {
         }
       }
       // 获取所有可以补填的题
-      let customItemList = collectionItemList.filter((item) => item.writeAgain == '1');
+      let customItemList = collectionItemList.filter((item) => item.allowWriteAgain);
       console.log(customItemList);
       // // 照片
       let zpDataList = customItemList.find((item) => item.answerType == 'zp');