Merge branch 'new-itsm-wx-handle' of http://git.dashitech.com/seimin/itsm-wx-handle into new-itsm-wx-handle

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}`
+  }
 }
 
 /**
@@ -234,6 +238,13 @@ export function api_inspectionTask(data){
 }
 
 /**
+ * 获取巡检点列表
+ */
+export function api_inspectionNode(data){
+  return post("/simple/data/fetchDataList/inspectionNode", data);
+}
+
+/**
  * 获取巡检执行列表-数量
  */
 export function api_listCount(data){
@@ -275,6 +286,13 @@ export function api_addModel(data){
 }
 
 /**
+ * 巡检扫一扫
+ */
+export function api_scanNodeCode(data){
+  return post("/inspection/scanNodeCode", data);
+}
+
+/**
  * 报修端-公告
  */
 export function api_getNotice(data){

pages.json

@@ -248,6 +248,15 @@
      }
    },
    {
+     "path": "pages/inspection/inspectionScanning/inspectionScanning",
+     "style": {
+       "h5": {
+         "titleNView": false
+       },
+       "enablePullDownRefresh": true
+     }
+   },
+   {
      "path": "pages/inspection/inspectionValue/inspectionValue",
      "style": {
        "h5": {

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -40,6 +40,10 @@
     <view class="zanwu" v-else>
       <text class="newicon newicon-zanwu"></text>
     </view>
+    <view class="toolbar" @click="scanning()">
+      <text class="toolbar-icon newicon newicon-saoma"></text>
+      <text class="toolbar-sao">扫一扫</text>
+    </view>
     <InspectionListFilter v-if="dataInfo.isFilter" @cancelEmit="cancelFilter" @confirmEmit="conformFilter" :evt="dataInfo.evtFilter"></InspectionListFilter>
   </view>
 </template>
@@ -50,7 +54,7 @@
   import { ref, reactive, computed } from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
   import { SM } from "@/http/http.js"
-  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode } from "@/http/api.js"
+  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode, api_scanNodeCode } from "@/http/api.js"
   import { filterFormatDate } from '@/filters/filterFormatDate.js'
   import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
   import { computedStateStyle } from '@/filters/computedStateStyle.js'
@@ -81,7 +85,7 @@
 
   const assignFlag = ref(false);//指派权限
   const qiangdan = ref(false);//接单权限
-
+  
   // 转换协同人
   const computedSynergetic = computed(() => (synergetic) => {
     return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join('，') : ''
@@ -101,6 +105,63 @@
       acceptDate: [],
     },//筛选框数据
   })
+  
+  // 扫一扫
+  function scanning(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    SM().then((ress1) => {
+      // ----------------------------------
+      let postData = {
+        queryTask: 'all',
+        code: ress1,
+        idx: 0,
+        sum: 1,
+        assignAccount: loginUserStore.loginUser.user.account,
+      };
+      api_scanNodeCode(postData).then((res) => {
+        if (res.status == 200) {
+          if(res.totalNum == 1){
+            let data = res.list[0];
+            let postData = {
+              code: ress1,
+              taskId: data.id,
+              account: loginUserStore.loginUser.user.account,
+            };
+            api_scanCode(postData).then((res) => {
+              uni.hideLoading();
+              if (res.status == 200) {
+                inspectionValueStore.setInspectionValueData(res.data);
+                uni.navigateTo({
+                  url: `/pages/inspection/inspectionValue/inspectionValue?inspectionExecuteId=${data.id}`
+                })
+              } else {
+                uni.showToast({
+                  icon: 'none',
+                  title: res.msg || '请求数据失败！'
+                });
+              }
+            });
+          }else{
+            uni.hideLoading();
+            uni.navigateTo({
+              url: `/pages/inspection/inspectionScanning/inspectionScanning?inspectionNodeCode=${res.data.code}&inspectionNodeName=${res.data.name}`
+            })
+          }
+        } else {
+          uni.hideLoading();
+          uni.showToast({
+            icon: 'none',
+            title: res.msg || '请求数据失败！'
+          });
+        }
+      });
+    }).catch(err=>{
+      uni.hideLoading();
+    });
+  }
 
   // 巡检项
   function toInspectionValue(data){
@@ -296,6 +357,31 @@
 </script>
 
 <style lang="scss" scoped>
+.toolbar {
+  position: fixed;
+  left: 0;
+  bottom: var(--window-bottom);
+  z-index: 99;
+  width: 100%;
+  height: 88rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+  border-radius: 4rpx;
+  background-color: #E5E8ED;
+
+  .toolbar-icon {
+    font-size: 52rpx;
+    margin-right: 16rpx;
+    color: #49B856;
+  }
+
+  .toolbar-sao {
+    font-size: 36rpx;
+    color: #333;
+  }
+}
 page{
   height: calc(100vh - var(--window-bottom));
 }
@@ -334,7 +420,7 @@ page{
     }
   }
   .body{
-    margin-bottom: var(--window-bottom);
+    margin-bottom: calc(var(--window-bottom) + 88rpx);
     margin-top: 88rpx;
     border-top: 6rpx solid #EBEBEB;
     .body_item{
@@ -395,10 +481,10 @@ page{
   }
   .zanwu{
     box-sizing: border-box;
-    margin-bottom: var(--window-bottom);
+    margin-bottom: calc(var(--window-bottom) + 88rpx);
     margin-top: 88rpx;
     border-top: 6rpx solid #EBEBEB;
-    height: calc(100vh - var(--window-bottom) - 88rpx);
+    height: calc(100vh - var(--window-bottom) - 176rpx);
     display: flex;
     justify-content: center;
     background-color: #F7F7F7;

pages/inspection/inspectionScanning/inspectionScanning.vue

@@ -0,0 +1,382 @@
+<template>
+  <view class="incidentList">
+    <view class="title">{{dataInfo.inspectionNodeName}}</view>
+    <view class="head">
+      <view class="tab" :class="{active: tab.id === dataInfo.tabActiveId}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.id)">
+        {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
+      </view>
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item" v-for="data in dataInfo.list" :key="data.id">
+        <view class="body_item_head ellipsis-multiline">
+          <text class="sign" v-if="dataInfo.tabActiveId == 1" :class="{signRed: data.exception == 1}">{{data.exception == 1 ? '异常' : '正常'}}</text>{{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
+        </view>
+
+        <view class="body_item_content">
+          <view class="body_item_content_p" v-if="data.inspectionDTO">
+            <text class="name ellipsis">计划标题：{{data.inspectionDTO.name}}</text>
+          </view>
+          <view class="body_item_content_p" v-if="data.signType">
+            <text class="name ellipsis">签到方式：{{data.signType.name}}</text>
+          </view>
+          <view class="body_item_content_p" v-if="data.userDTO || data.groupDTO">
+            <text class="name ellipsis">执行人或组：{{ data.userDTO?.name || data.groupDTO?.groupName }}</text>
+          </view>
+          <view class="body_item_content_p" v-if="data.status || data.addTime">
+            <text class="name ellipsis">状态：{{ data.status?.name}}</text>
+            <text class="date">{{formatDate(data.addTime, 'yyyy-MM-dd HH:mm')}}</text>
+          </view>
+        </view>
+
+        <view class="body_item_foot">
+          <view class="btns pt0">
+            <button v-if="data.status.value === '1' && dataInfo.tabActiveId === 0" @click.stop="toInspectionValue(data)" type="default" class="primaryButton btn">执行</button>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { startOfDay, endOfDay, format, add } from 'date-fns'
+  import { ref, reactive, computed } from 'vue'
+  import { onLoad, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
+  import { SM } from "@/http/http.js"
+  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode, api_inspectionNode } from "@/http/api.js"
+  import { filterFormatDate } from '@/filters/filterFormatDate.js'
+  import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
+  import { computedStateStyle } from '@/filters/computedStateStyle.js'
+  import { computedCurrentLogOverTime } from '@/filters/computedCurrentLogOverTime.js'
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentNumStore } from '@/stores/incidentNum'
+  import { useInspectionListSearchStore } from '@/stores/inspectionListSearch'
+  import { useInspectionValueStore } from '@/stores/inspectionValue'
+  import { useSetTabbar } from '@/share/useSetTabbar.js'
+
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentNumStore = useIncidentNumStore();
+  const inspectionListSearchStore = useInspectionListSearchStore();
+  const inspectionValueStore = useInspectionValueStore();
+  const { formatDate }  = filterFormatDate();
+  const { priorityStyle }  = computedPriorityStyle();
+  const { stateStyle }  = computedStateStyle();
+  const { currentLogOverTime }  = computedCurrentLogOverTime();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const { setTabbar }  = useSetTabbar();
+
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    tabs: [{id: 0, name: '巡检工单', value: 'all', num: ''}, {id: 1, name: '历史工单', value: '', num: ''}],
+    tabActiveId: 0,//当前选择的tab
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    inspectionNodeDTO: {},
+    inspectionNodeCode: '',
+    inspectionNodeName: '',
+  })
+  
+  // 巡检项
+  function toInspectionValue(data){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    // 'inspection|$|1bd0c704-0962-4ed4-b5a6-b5bda3d78231'
+    // 'inspection|$|bc9f61af-99c8-4c86-88f9-f29dd3fc43c0'
+		// 'inspection|$|92e7bb9a-5f58-42f6-991a-fcd67247e295'
+    SM().then((ress1) => {
+      let postData = {
+        code: ress1,
+        taskId: data.id,
+        account: loginUserStore.loginUser.user.account,
+      };
+      api_scanCode(postData).then((res) => {
+        uni.hideLoading();
+        if (res.status == 200) {
+          inspectionValueStore.setInspectionValueData(res.data);
+          uni.navigateTo({
+            url: `/pages/inspection/inspectionValue/inspectionValue?inspectionExecuteId=${data.id}`
+          })
+        } else {
+          uni.showToast({
+            icon: 'none',
+            title: res.msg || '请求数据失败！'
+          });
+        }
+      });
+    }).catch(err=>{
+      uni.hideLoading();
+    });
+  }
+
+  // 点击tab
+  function clickTab(tabId){
+    dataInfo.tabActiveId = tabId;
+    getList(0);
+  }
+
+  // 获取列表信息
+  function getList(idx){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+    let tabActiveObj = dataInfo.tabs.find(v => v.id == dataInfo.tabActiveId);
+    let tabActiveObjIndex = dataInfo.tabs.findIndex(v => v.id == dataInfo.tabActiveId);
+    let postData = {
+        "idx": dataInfo.idx,
+        "sum": 10,
+        "inspectionTask": {
+          "queryTask": tabActiveObj.value || undefined,
+          "assignAccount": tabActiveObj.id == 0 ? loginUserStore.loginUser.user.account : undefined,
+          "inspectionNodeDTO":{
+            code: dataInfo.inspectionNodeCode,
+          }
+        }
+    }
+
+    api_inspectionTask(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        dataInfo.tabs[tabActiveObjIndex].num = res.totalNum;
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+          dataInfo.inspectionNodeDTO = list[0].inspectionNodeDTO;
+        }else{
+          dataInfo.hasMore = false;
+          dataInfo.inspectionNodeDTO = {};
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+
+    getCount(tabActiveObj.id);
+  }
+
+  // 获取列表数量
+  function getCount(id){
+    dataInfo.tabs.forEach(v => {
+      if(v.id != id){
+        let tabActiveObj = v;
+        let postData = {
+            "idx": 0,
+            "sum": 1,
+            "inspectionTask": {
+              "queryTask": tabActiveObj.value || undefined,
+              "assignAccount": tabActiveObj.id == 0 ? loginUserStore.loginUser.user.account : undefined,
+              "inspectionNodeDTO":{
+                code: dataInfo.inspectionNodeCode,
+              }
+            }
+        }
+        api_inspectionTask(postData).then(res => {
+          if(res.status == 200){
+            v.num = res.totalNum;
+          }else{
+            uni.showToast({
+              icon: 'none',
+              title: res.msg || '请求数据失败！'
+            });
+          }
+        })
+      }
+    })
+  }
+  
+  onLoad((option) => {
+    dataInfo.inspectionNodeCode = option.inspectionNodeCode;
+    dataInfo.inspectionNodeName = option.inspectionNodeName;
+    getList(0);
+  })
+
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.toolbar {
+  position: fixed;
+  left: 0;
+  bottom: var(--window-bottom);
+  z-index: 99;
+  width: 100%;
+  height: 88rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+  border-radius: 4rpx;
+  background-color: #E5E8ED;
+
+  .toolbar-icon {
+    font-size: 52rpx;
+    margin-right: 16rpx;
+    color: #49B856;
+  }
+
+  .toolbar-sao {
+    font-size: 36rpx;
+    color: #333;
+  }
+}
+.incidentList{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .title{
+    width: 100%;
+    height: 88rpx;
+    position: fixed;
+    z-index: 99;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: #EBEBEB;
+    font-weight: bold;
+    font-size: 32rpx;
+  }
+  .head{
+    height: 88rpx;
+    display: flex;
+    top: 88rpx;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    background-color: #fff;
+    font-size: 30rpx;
+    .tab{
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 4rpx solid transparent;
+      &.active{
+        color: $uni-primary;
+        border-color: $uni-primary;
+      }
+    }
+    .filter{
+      width: 84rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .newicon-shaixuan{
+        font-size: 36rpx;
+        color: #2C2C2C;
+      }
+    }
+  }
+  .body{
+    margin-top: 176rpx;
+    border-top: 6rpx solid #EBEBEB;
+    .body_item{
+      border-bottom: 8rpx solid #EBEBEB;
+      .body_item_head{
+        word-break: break-all;
+        text-align: justify;
+        text-align: left;
+        margin: 24rpx;
+        font-size: 30rpx;
+        .sign{
+          margin-right: 16rpx;
+          font-weight: bold;
+          color: #49B856;
+          &.signRed{
+            color: #FF0000;
+          }
+        }
+      }
+      .body_item_content{
+        border-top: 1rpx solid #D8D8D8;
+        padding: 24rpx 24rpx 24rpx 48rpx;
+        .body_item_content_p{
+          color: #6A6A6A;
+          font-size: 26rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 24rpx;
+          &:last-of-type{
+            margin-bottom: 0;
+          }
+          .name{
+            flex: 1;
+          }
+          .status{
+            padding: 4rpx 10rpx;
+            border-radius: 20rpx;
+            background-color: #DBE8FE;
+            font-size: 22rpx;
+            color: #006CF9;
+          }
+          .icon_all{
+            .mic-filled,
+            .image-filled
+            {
+              margin-left: 16rpx;
+            }
+          }
+        }
+      }
+      .body_item_foot{
+        border-top: 1rpx solid #D8D8D8;
+        font-size: 26rpx;
+        padding: 24rpx;
+        .foot_info{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .phone-filled{
+            margin-left: 5rpx;
+          }
+        }
+      }
+    }
+  }
+  .zanwu{
+    box-sizing: border-box;
+    margin-top: 176rpx;
+    border-top: 6rpx solid #EBEBEB;
+    height: calc(100vh - 88rpx);
+    display: flex;
+    justify-content: center;
+    background-color: #F7F7F7;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+}
+</style>

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: {