feature_20260108_陈列奖励案任务合并

src/components/deleteUploadImgTaskPhoto.vue

@@ -13,6 +13,8 @@
             :visitsId="visitsId"
             :putInCode="putInCode"
             :photoIdentifyType="photoIdentifyType"
+            :pictureSource="pictureSource"
+            :continuousShoot="continuousShoot"
             @newimgarr="newimgarr"
             ref="uploadVNormal" />
         </div>
@@ -92,6 +94,16 @@ export default {
       type: String,
       default: '',
     },
+    pictureSource: {
+      // 是否允许从相册选择图片 1:允许；0:不允许
+      type: String,
+      default: '0',
+    },
+    continuousShoot: {
+      // 是否允许连拍/相册多选 1:允许；0:不允许
+      type: String,
+      default: '0',
+    },
   },
   watch: {
     imgs: {

src/components/uploadVNormalTaskPhoto.vue

@@ -73,6 +73,16 @@ export default {
       type: String,
       default: '',
     },
+    pictureSource: {
+      // 是否允许从相册选择图片 1:允许；0:不允许
+      type: String,
+      default: '0',
+    },
+    continuousShoot: {
+      // 是否允许连拍/相册多选 1:允许；0:不允许
+      type: String,
+      default: '0',
+    },
     // uploadid: {
     //   type: String,
     //   default: '',
@@ -115,16 +125,6 @@ export default {
     //   type: String,
     //   default: '',
     // },
-    // pictureSource: {
-    //   // 是否允许从相册选择图片 1:允许；0:不允许
-    //   type: String,
-    //   default: '0',
-    // },
-    // continuousShoot: {
-    //   // 是否允许连拍/相册多选 1:允许；0:不允许
-    //   type: String,
-    //   default: '0',
-    // },
     // equipmentCode: {
     //   // 当前任务对应的资产编号
     //   type: String,

src/views/deviceWithin/taskPhotoTaking.vue

@@ -41,10 +41,12 @@
                 :storeGroupId="formData.storeGroupId"
                 :taskList="taskIds"
                 :visitsId="visitsId"
-                :collectionItemId="collectionId"
+                :collectionItemId="item.collectionId"
                 :putInCode="formData.putInCode"
                 :photoIdentifyType="formData.photoIdentifyType"
-                @upDataDetail="getDetaile"></delete-upload-img>
+                @upDataDetail="getDetaile"
+                :pictureSource="item.pictureSource"
+                :continuousShoot="item.continuousShoot"></delete-upload-img>
             </div>
           </div>
         </van-form>
@@ -65,7 +67,6 @@ export default {
       formData: null,
       taskIds: [],
       visitsId: null,
-      collectionId: '',
     };
   },
   activated() {
@@ -84,7 +85,6 @@ export default {
       }).then((res) => {
         if (res.data && res.data.length) {
           this.formData = res.data[0];
-          this.collectionId = this.formData.collectionItemList[0].collectionId;
         } else {
           this.formData = null;
         }