Bladeren bron

feature_20260330_拜访连拍速度优化

zhujindu 2 weken geleden
bovenliggende
commit
613f3e54fc
2 gewijzigde bestanden met toevoegingen van 19 en 7 verwijderingen
  1. 10 2
      src/components/deleteUploadImgTaskPhoto.vue
  2. 9 5
      src/views/deviceWithin/taskPhotoTaking.vue

+ 10 - 2
src/components/deleteUploadImgTaskPhoto.vue

@@ -39,9 +39,15 @@
 import { ImagePreview } from 'vant';
 import { removePhotoBatch } from '@/api/index';
 import uploadVNormalTaskPhoto from '@/components/uploadVNormalTaskPhoto';
+import { mapState } from 'vuex';
 export default {
   name: 'deleteUploadImgTaskPhoto',
   components: { uploadVNormalTaskPhoto },
+  computed: {
+    ...mapState({
+      userInfo: (state) => state.user.userInfo,
+    }),
+  },
   props: {
     formData: {
       type: Object,
@@ -97,8 +103,9 @@ export default {
     formData: {
       handler(val) {
         this.imgArr = [];
+        // <!-- 0=企业微信,1=H5相机 -->
         if (val) {
-          if (val.collectionItemList[0].fileInfoList) {
+          if (this.userInfo.photoMethod == '1') {
             this.imgArr = val.collectionItemList[0].fileInfoList || [];
           } else {
             if (val.mediaInfos) {
@@ -151,7 +158,8 @@ export default {
       const { localIds, locationRemark, source } = data;
       this.locationRemark = locationRemark;
       console.log(source);
-      if (source == 'weixin') {
+      // 0=企业微信,1=H5相机
+      if (this.userInfo.photoMethod == '0') {
         this.syncUpload(localIds);
       } else {
         this.$emit('upDataDetail');

+ 9 - 5
src/views/deviceWithin/taskPhotoTaking.vue

@@ -127,9 +127,15 @@
 import { getCollectionInfosBatch, addCollectionAnswerBatch, getVisitsDetail } from '@/api/index';
 import taskTips from './taskTips';
 import deleteUploadImgTaskPhoto from '@/components/deleteUploadImgTaskPhoto';
+import { mapState } from 'vuex';
 export default {
   name: 'abnortaskPhotoTakingmalVisit',
   components: { taskTips, deleteUploadImgTaskPhoto },
+  computed: {
+    ...mapState({
+      userInfo: (state) => state.user.userInfo,
+    }),
+  },
   data() {
     return {
       isEdit: true,
@@ -245,12 +251,10 @@ export default {
         objectType: this.$route.query.photoType, //	是	string	照片类型,取任务上的照片类型,如果没有则取手动选择的照片类型
         locationRemark: this.$refs.taskPhoto[0].locationRemark, //	是	String	当前地址信息
         mediaInfos: [],
+        isH5: this.userInfo.photoMethod == '1' ? true : false, // 是否H5拍照 1:是;0:否
       };
-      // 如果已经上传过照片了,则提交时以已上传的照片为准;如果没有上传过照片,则以当前页面的照片为准
-      if (
-        this.formData.collectionItemList[0].fileInfoList &&
-        this.formData.collectionItemList[0].fileInfoList.length > 0
-      ) {
+      // 0=企业微信,1=H5相机
+      if (this.userInfo.photoMethod == '1') {
         formData.mediaInfos = [];
       } else {
         formData.mediaInfos = this.$refs.taskPhoto[0].imgArr;