Merge branch 'feature_20250116_拜访门店任务添加照片从相册选择功能' into uat(dev)

# Conflicts:
#	src/components/uploadVNormal.vue
#	src/views/deviceWithin/addStoreVisit.vue

src/components/uploadVNormal.vue

@@ -1,7 +1,13 @@
 <template>
   <div class="questionNamep">
     <div class="cameraDiv" @click="uploadImg">
-      <van-icon class="photo photos" name="photograph" size="22px" color="#969696" />
+      <van-icon
+        v-if="updateImgMode == 'album'"
+        class="photo photos"
+        name="photo-o"
+        size="22px"
+        color="#969696" />
+      <van-icon v-else class="photo photos" name="photograph" size="22px" color="#969696" />
     </div>
     <div id="allmap"></div>
     <div class="mask" v-if="progressFlag">
@@ -105,6 +111,11 @@ export default {
       type: String,
       default: '',
     },
+    updateImgMode: {
+      // 上传图片方式，album：相册选择；camera：相机拍照
+      type: String,
+      default: 'camera',
+    },
   },
   data() {
     return {
@@ -194,7 +205,7 @@ export default {
               wx.chooseImage({
                 count: 1,
                 sizeType: ['original'], // 可以指定是原图还是压缩图，默认二者都有
-                sourceType: ['camera'], // 可以指定来源是相册还是相机，默认二者都有
+                sourceType: [updateImgMode], // 可以指定来源是相册还是相机，默认二者都有
                 defaultCameraMode: 'normal', //表示进入拍照界面的默认模式，目前有normal与batch两种选择，normal表示普通单拍模式，batch表示连拍模式，不传该参数则为normal模式。从3.0.26版本开始支持front和batch_front两种值，其中front表示默认为前置摄像头单拍模式，batch_front表示默认为前置摄像头连拍模式。（注：用户进入拍照界面仍然可自由切换两种模式）
                 isSaveToAlbum: 0, //整型值，0表示拍照时不保存到系统相册，1表示自动保存，默认值是1
                 success: function (res) {

src/views/deviceWithin/addStoreVisit.vue

@@ -2652,6 +2652,32 @@
             ref="uploadVNormal"></upload-img>
         </template>
       </van-cell>
+      <van-cell v-if="pictureSource == '1'">
+        <template #title> <span class="van-f-red">*</span>相册选择</template>
+        <template #right-icon>
+          <upload-img
+            :collectionId="collectionId"
+            :parentCollectionId="parentCollectionId"
+            :secondCollectionId="secondCollectionId"
+            :firstCollectionId="firstCollectionId"
+            :fourthCollectionId="fourthCollectionId"
+            :thirdCollectionId="thirdCollectionId"
+            :imgArr="imgs"
+            :objectType="PhotoType"
+            :shouws="true"
+            :storeGroupId="storeGroupId"
+            :taskId="taskId"
+            :uploadid="uploadid2"
+            :visitModel="1 + ''"
+            :visitsId="visitId"
+            :childIndex="childIndex"
+            :deviceCode="deviceCode"
+            :putInCode="putInCode"
+            @newimgarr="newimgarr1"
+            @typeshow="typeshow"
+            updateImgMode="album"></upload-img>
+        </template>
+      </van-cell>
     </van-dialog>
     <!--    list-->
     <van-dialog v-model="listShow" title="历史回显" show-cancel-button :showConfirmButton="false">
@@ -2812,6 +2838,7 @@ export default {
       putInCode: '',
       examplePhotoImg: '', //示例-操作说明图标地址
       photoIdentifyType: null, //图片识别类型
+      pictureSource: '0',
     };
   },
   beforeRouteLeave(to, from, next) {
@@ -3847,6 +3874,7 @@ export default {
       this.secondCollectionId = val.secondCollectionId;
       this.thirdCollectionId = val.thirdCollectionId;
       this.fourthCollectionId = val.fourthCollectionId;
+      this.pictureSource = val.pictureSource; //是否允许从相册选择图片
       this.indeximg = index;
       this.childIndex = childIndex;
       this.childIndex1 = childIndex1;