巡检图片上传

components/DsFilePicker.vue

@@ -3,16 +3,19 @@
 </template>
 
 <script setup>
-  import { defineEmits, ref, reactive, defineProps } from 'vue'
+  import { defineEmits, ref, reactive, defineProps, defineExpose } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useUploadFile } from '@/share/useUploadFile.js'
 
   const emit = defineEmits(['cancelEmit', 'knowEmit']);
-  const { inspectionExecuteId } = defineProps({
+  const { inspectionExecuteId, extra } = defineProps({
     inspectionExecuteId: {
       type: Number,
-    }
+    },
+    extra: {
+      type: Number,
+    },
   });
   const loginUserStore = useLoginUserStore();
   const { uploadFile }  = useUploadFile();
@@ -24,11 +27,22 @@
   
   // 处理图片
   const handlerImgRef = ref(null)
-  // handlerImgRef.value.upload();
+  
+  // 上传图片
+  const uploadFn = () => {
+    handlerImgRef.value.upload();
+  }
+  
+  defineExpose({
+    uploadFn,
+    baseFormData,
+    extra,
+    inspectionExecuteId,
+  })
   
   // 处理图片
   function handlerOrderImg(imgObj){
-    return uploadFile(imgObj, 'incident', inspectionExecuteId.value)
+    return uploadFile(imgObj, 'inspection', inspectionExecuteId, extra)
   }
   
   // 上传报修图片成功
@@ -46,18 +60,18 @@
     })
     
     Promise.all(requestList).then(resList => {
-      uni.hideLoading();
-      console.log(resList);
-      uni.showToast({
-      	icon: 'none',
-        title: '建单成功',
-        mask: true,
-      });
-      setTimeout(() => {
-        uni.reLaunch({
-          url: '/pages/incidentList/incidentList',
-        })
-      }, 1500)
+      // uni.hideLoading();
+      // console.log(resList);
+      // uni.showToast({
+      // 	icon: 'none',
+      //   title: '建单成功',
+      //   mask: true,
+      // });
+      // setTimeout(() => {
+      //   uni.reLaunch({
+      //     url: '/pages/incidentList/incidentList',
+      //   })
+      // }, 1500)
     })
   }
   
@@ -79,7 +93,7 @@
   }
   
   onLoad((option) => {
-    console.log(inspectionExecuteId)
+    console.log(extra)
   })
 </script>
 

http/api.js

@@ -161,8 +161,12 @@ export function api_workHourManagement(data){
 /**
  * 上传附件
  */
-export function api_uploadAttachment(type, id){
-  return `${path}/common/common/uploadAttachment/${type}/${id}/${id}`
+export function api_uploadAttachment(type, id, extra){
+  if(extra){
+    return `${path}/common/common/uploadAttachment/${type}/${id}/${extra}`
+  }else{
+    return `${path}/common/common/uploadAttachment/${type}/${id}/${id}`
+  }
 }
 
 /**

pages/inspection/inspectionValue/inspectionValue.vue

@@ -7,7 +7,7 @@
           <uni-forms-item v-if="item.type === '1'" class="formItem" :required="item.required" :name="item.key">
             <template v-slot:label>
               <view class="customLabelWrap">
-                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+                <text :class="{'is-required': item.required}">*</text><text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
               </view>
             </template>
             <uni-data-picker :placeholder="'请选择' + item.name" :popup-title="'请选择' + item.name" :localdata="item.list" v-model="formValues[item.key]" @change="changeForm()">
@@ -17,7 +17,7 @@
           <uni-forms-item v-if="item.type === '2'" class="formItem" :required="item.required" :name="item.key">
             <template v-slot:label>
               <view class="customLabelWrap">
-                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+                <text :class="{'is-required': item.required}">*</text><text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
               </view>
             </template>
             <uni-data-checkbox v-model="formValues[item.key]" @change="changeForm()" :localdata="item.list" />
@@ -26,7 +26,7 @@
           <uni-forms-item v-if="item.type === '3'" class="formItem" :required="item.required" :name="item.key">
             <template v-slot:label>
               <view class="customLabelWrap">
-                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+                <text :class="{'is-required': item.required}">*</text><text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
               </view>
             </template>
             <uni-data-checkbox v-model="formValues[item.key]" @change="changeForm()" multiple :localdata="item.list" />
@@ -35,7 +35,7 @@
           <uni-forms-item v-if="item.type === '4'" class="formItem" :required="item.required" :name="item.key">
             <template v-slot:label>
               <view class="customLabelWrap">
-                <text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
+                <text :class="{'is-required': item.required}">*</text><text class="customLabel">{{item.name}}</text><text v-if="item.isException" class="customLabel red">&nbsp;异</text>
               </view>
             </template>
             <uni-number-box v-model="formValues[item.key]" @change="changeForm()" :min="-9999" :max="9999" :placeholder="'请输入' + item.name"></uni-number-box>
@@ -50,7 +50,7 @@
           </uni-forms-item>
           <!-- 图片上传 -->
           <uni-forms-item v-if="item.type === '7' && item.isException" class="formItem" :label="item.name" :required="item.required" :name="item.key">
-            <DsFilePicker v-model="formValues[item.key]"></DsFilePicker>
+            <DsFilePicker :extra="item.id" :inspectionExecuteId="inspectionExecuteId" :ref="(el) => itemRefs[item.id] = el"></DsFilePicker>
           </uni-forms-item>
           <!-- 分割线 -->
           <view class="detail_head" v-if="item.type === '8'">
@@ -70,7 +70,7 @@
   import fromPairs from 'lodash-es/fromPairs'
   import keyBy from 'lodash-es/keyBy'
   import DsFilePicker from '@/components/DsFilePicker.vue';
-  import { ref, reactive } from 'vue'
+  import { ref, reactive, nextTick } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
   import { api_addModel } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
@@ -79,7 +79,7 @@
   import { useGoBack } from '@/share/useGoBack.js'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useInspectionValueStore } from '@/stores/inspectionValue'
-import { forIn } from 'lodash-es';
+  import { forIn } from 'lodash-es';
 
   useSetTitle();
   const loginUserStore = useLoginUserStore();
@@ -94,6 +94,9 @@ import { forIn } from 'lodash-es';
 
   // 表单
   const baseForm = ref()
+  
+  // 图片上传ref数组
+  const itemRefs = ref({});
 
   const inspectionExecuteId = ref()
 
@@ -132,57 +135,81 @@ import { forIn } from 'lodash-es';
 
   // 保存
   function submit(){
-    baseForm.value.validate().then(res => {
-      console.log('success', res);
-      uni.showLoading({
-        title: "加载中",
-        mask: true,
-      });
-      console.log(formValues);
-      let postData = {
-        account: loginUserStore.loginUser.user.account,
-        valuesList: [],
-      };
-      // baseFormData
-      for(let key in formValues){
-        let obj = baseFormData.find(v => v.key === key);
-        if(!((obj.type === '5' && !obj.isException) || (obj.type === '6' && !obj.isException) || (obj.type === '7' && !obj.isException))){
-          let name = obj.name;
-          let itemId = obj.id;
-          let _formPageList = dataInfo.inspectionFormDTO?.formPageList || [];
-          _formPageList = _formPageList.map(v => v.formItemList).flat();
-          let formItem = _formPageList.find(v => v.id === itemId);
-          postData.valuesList.push({
-            taskId: inspectionExecuteId.value,
-            nodeId: dataInfo.id,
-            formId: dataInfo.inspectionFormDTO.id,
-            itemId: formItem.id,
-            pageId: formItem.pageId,
-            orders: formItem.orders,
-            name,
-            valuex: (formItem.type.value === '1' || formItem.type.value === '2' || formItem.type.value === '3') ? '' : formValues[key].toString(),
-            configIds: (formItem.type.value === '1' || formItem.type.value === '2' || formItem.type.value === '3') ? formValues[key].toString() : undefined,
-            hosId: dataInfo.inspectionFormDTO.hosId,
-          })
-        }
+    console.log(itemRefs.value);
+    console.log(formValues);
+    console.log(baseFormData);
+    // 处理图片上传检验问题
+    Object.values(itemRefs.value).forEach(v => {
+      console.log(v.inspectionExecuteId);
+      console.log(v.extra);
+      if(v && v.baseFormData.handlerImgList.length){
+        baseFormData.forEach(vv => {
+          if(vv.id == v.extra){
+            formValues[vv.key] = v.inspectionExecuteId;
+            vv.value = v.inspectionExecuteId;
+          }
+        })
       }
-      console.log(postData);
-      api_addModel(postData).then((res) => {
-        uni.hideLoading();
-        if (res.status == 200) {
-          inspectionValueStore.clearInspectionValueData();
-          uni.reLaunch({
-            url: `/pages/inspection/inspectionExecute/inspectionExecute`
-          })
-        } else {
-          uni.showToast({
-            icon: 'none',
-            title: res.msg || '请求数据失败！'
-          });
+    })
+    
+    nextTick(() => {
+      baseForm.value.validate().then(res => {
+        console.log('success', res);
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        console.log(formValues);
+        let postData = {
+          account: loginUserStore.loginUser.user.account,
+          valuesList: [],
+        };
+        // baseFormData
+        for(let key in formValues){
+          let obj = baseFormData.find(v => v.key === key);
+          if(!((obj.type === '5' && !obj.isException) || (obj.type === '6' && !obj.isException) || (obj.type === '7' && !obj.isException))){
+            let name = obj.name;
+            let itemId = obj.id;
+            let _formPageList = dataInfo.inspectionFormDTO?.formPageList || [];
+            _formPageList = _formPageList.map(v => v.formItemList).flat();
+            let formItem = _formPageList.find(v => v.id === itemId);
+            postData.valuesList.push({
+              taskId: inspectionExecuteId.value,
+              nodeId: dataInfo.id,
+              formId: dataInfo.inspectionFormDTO.id,
+              itemId: formItem.id,
+              pageId: formItem.pageId,
+              orders: formItem.orders,
+              name,
+              valuex: (formItem.type.value === '1' || formItem.type.value === '2' || formItem.type.value === '3') ? '' : formValues[key].toString(),
+              configIds: (formItem.type.value === '1' || formItem.type.value === '2' || formItem.type.value === '3') ? formValues[key].toString() : undefined,
+              hosId: dataInfo.inspectionFormDTO.hosId,
+            })
+          }
         }
-      });
-    }).catch(err => {
-      console.log('err', err);
+        console.log(postData);
+        console.log(itemRefs.value);
+        // return;
+        api_addModel(postData).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            Object.values(itemRefs.value).forEach(v => {
+              v && v.uploadFn();
+            })
+            inspectionValueStore.clearInspectionValueData();
+            uni.reLaunch({
+              url: `/pages/inspection/inspectionExecute/inspectionExecute`
+            })
+          } else {
+            uni.showToast({
+              icon: 'none',
+              title: res.msg || '请求数据失败！'
+            });
+          }
+        });
+      }).catch(err => {
+        console.log('err', err);
+      })
     })
   }
 
@@ -232,11 +259,11 @@ import { forIn } from 'lodash-es';
       }
     });
 
-    let firstPageBottom = firstPage.filter(v => v.type === '5' || v.type === '6');
+    let firstPageBottom = firstPage.filter(v => v.type === '5' || v.type === '6' || v.type === '7');
     firstPage = firstPage.filter(v => v.type !== '5' && v.type !== '6' && v.type !== '7');
 
     // 其他项
-    if(isException){
+    if(!isException){
       firstPage.forEach(v => {
         // 下拉,单选
         if(v.type === '1' || v.type === '2'){
@@ -320,6 +347,13 @@ import { forIn } from 'lodash-es';
 </script>
 
 <style lang="scss" scoped>
+.customLabelWrap{
+  .is-required{
+    color: #dd524d;
+    font-weight: bold;
+    margin-top: 8rpx;
+  }
+}
 .inspectionValue{
   height: 100%;
   display: flex;

share/useUploadFile.js

@@ -42,13 +42,13 @@ export function useUploadFile() {
   /**
    * 上传图片
    */
-  const uploadFile = async (imgObj, type, incidentId) => {
+  const uploadFile = async (imgObj, type, incidentId, extra) => {
 		console.log('44444', type)
 		if(imgObj.extname=='mp4' || imgObj.extname=='avi' || imgObj.extname=='mpeg' || 
 			imgObj.extname=='wmv' || imgObj.extname=='mov' || imgObj.extname=='3gp' ||
 			imgObj.extname=='flv' || imgObj.extname=='mkv'){
 			return uni.uploadFile({
-			  url: api_uploadAttachment(type, incidentId),
+			  url: api_uploadAttachment(type, incidentId, extra),
 			  filePath: imgObj.path,
 			  name: 'file',
 			  formData: {
@@ -74,7 +74,7 @@ export function useUploadFile() {
 			let tp = window.URL.createObjectURL(fileSrc)
 			console.log('压缩后', tp);
 			return uni.uploadFile({
-			  url: api_uploadAttachment(type, incidentId),
+			  url: api_uploadAttachment(type, incidentId, extra),
 			  filePath: tp,
 			  name: 'file',
 			  formData: {