|
@@ -127,9 +127,15 @@
|
|
|
import { getCollectionInfosBatch, addCollectionAnswerBatch, getVisitsDetail } from '@/api/index';
|
|
import { getCollectionInfosBatch, addCollectionAnswerBatch, getVisitsDetail } from '@/api/index';
|
|
|
import taskTips from './taskTips';
|
|
import taskTips from './taskTips';
|
|
|
import deleteUploadImgTaskPhoto from '@/components/deleteUploadImgTaskPhoto';
|
|
import deleteUploadImgTaskPhoto from '@/components/deleteUploadImgTaskPhoto';
|
|
|
|
|
+import { mapState } from 'vuex';
|
|
|
export default {
|
|
export default {
|
|
|
name: 'abnortaskPhotoTakingmalVisit',
|
|
name: 'abnortaskPhotoTakingmalVisit',
|
|
|
components: { taskTips, deleteUploadImgTaskPhoto },
|
|
components: { taskTips, deleteUploadImgTaskPhoto },
|
|
|
|
|
+ computed: {
|
|
|
|
|
+ ...mapState({
|
|
|
|
|
+ userInfo: (state) => state.user.userInfo,
|
|
|
|
|
+ }),
|
|
|
|
|
+ },
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
isEdit: true,
|
|
isEdit: true,
|
|
@@ -245,12 +251,10 @@ export default {
|
|
|
objectType: this.$route.query.photoType, // 是 string 照片类型,取任务上的照片类型,如果没有则取手动选择的照片类型
|
|
objectType: this.$route.query.photoType, // 是 string 照片类型,取任务上的照片类型,如果没有则取手动选择的照片类型
|
|
|
locationRemark: this.$refs.taskPhoto[0].locationRemark, // 是 String 当前地址信息
|
|
locationRemark: this.$refs.taskPhoto[0].locationRemark, // 是 String 当前地址信息
|
|
|
mediaInfos: [],
|
|
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 = [];
|
|
formData.mediaInfos = [];
|
|
|
} else {
|
|
} else {
|
|
|
formData.mediaInfos = this.$refs.taskPhoto[0].imgArr;
|
|
formData.mediaInfos = this.$refs.taskPhoto[0].imgArr;
|