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

pages/assign/assign.vue

@@ -602,6 +602,11 @@
 
   // 获取工作组列表
   function getGroups(){
+    if(!dutyList.value){
+      uni.hideLoading();
+      dataInfo.groupList = [];
+      return;
+    }
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -1453,8 +1458,10 @@
 		};
 		getFetchDataList("simple/data", "incidentCategoryConfig", postData).then(res => {
 			let item = res.list.find(i=>i.categoryId == dataInfo.incidentData.category.id)
-			dutyList.value = item.dutyDTO
-			dataInfo.incidentData.duty = dutyList.value.id
+      if(item){
+        dutyList.value = item.dutyDTO;
+        dataInfo.incidentData.duty = dutyList.value.id;
+      }
 			initForm()
 			console.log(1111,dutyList.value)
 		})

pages/buildIncident/buildIncident.vue

@@ -354,8 +354,10 @@
 			},
 		};
 		getFetchDataList("simple/data", "incidentCategoryConfig", postData).then(res => {
-			let item = res.list.find(i=>i.categoryId == incidentData.category.id) 
-			incidentData.priority = item.priority
+			let item = res.list.find(i=>i.categoryId == incidentData.category.id);
+      if(item){
+        incidentData.priority = item.priority
+      }
 		})
 	}
 	
@@ -445,6 +447,7 @@
   onLoad((option) => {
     handlerStore.clearHandlerData();
     if(option.type == 'inspection'){
+      console.log(incidentBuildStore.incidentBuild.data, 'incidentBuildStore.incidentBuild.data');
       Object.assign(
         incidentData,
         incidentBuildStore.incidentBuild.data,

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -209,7 +209,7 @@
      place: res.inspectionNodeDTO.floorDTO,
      houseNumber: res.inspectionNodeDTO.address,
      source: defaultSourceValue.value,
-     description: res.inspectionFormValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex}`).join('；'),
+     description: res.inspectionFormValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex ? v.valuex : (v.formItemConfigList ? v.formItemConfigList.map(vv => vv.name).join('，') : '')}`).join('；'),
      requester: loginUserStore.loginUser.user,
      branch: loginUserStore.loginUser.user.currentHospital.parent ? loginUserStore.loginUser.user.currentHospital.parent.id : loginUserStore.loginUser.user.currentHospital.id,
      contacts: loginUserStore.loginUser.user.name,

pages/inspection/inspectionScanning/inspectionScanning.vue

@@ -134,7 +134,7 @@
      place: res.inspectionNodeDTO.floorDTO,
      houseNumber: res.inspectionNodeDTO.address,
      source: defaultSourceValue.value,
-     description: res.inspectionFormValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex}`).join('；'),
+     description: res.inspectionFormValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex ? v.valuex : (v.formItemConfigList ? v.formItemConfigList.map(vv => vv.name).join('，') : '')}`).join('；'),
      requester: loginUserStore.loginUser.user,
      branch: loginUserStore.loginUser.user.currentHospital.parent ? loginUserStore.loginUser.user.currentHospital.parent.id : loginUserStore.loginUser.user.currentHospital.id,
      contacts: loginUserStore.loginUser.user.name,

pages/inspection/inspectionValue/inspectionValue.vue

@@ -81,25 +81,27 @@
   import { useInspectionValueStore } from '@/stores/inspectionValue'
   import { forIn } from 'lodash-es';
   import { useIncidentBuildStore } from '@/stores/incidentBuild'
+  import { useUploadFile } from '@/share/useUploadFile.js'
 
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const { goBack }  = useGoBack();
   const inspectionValueStore = useInspectionValueStore();
   const incidentBuildStore = useIncidentBuildStore();
+  const { uploadFile }  = useUploadFile();
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
 
   // 所有页码数据
   const formPageList = reactive([]);
-  
+
   // 故障来源列表
   const defaultSourceValue = ref();
 
   // 表单
   const baseForm = ref()
-  
+
   // 图片上传ref数组
   const itemRefs = ref({});
 
@@ -137,7 +139,7 @@
   function changeForm(){
     handleData(true);
   }
-  
+
   // 跳转巡检列表
   function toInspectionExecute(){
     inspectionValueStore.clearInspectionValueData();
@@ -145,7 +147,7 @@
       url: `/pages/inspection/inspectionExecute/inspectionExecute`
     })
   }
-  
+
   // 获取故障来源列表
   function getSources(){
     let postData = {
@@ -160,20 +162,22 @@
       }
     })
   }
-  
+
   // 跳转新建事件
   function toBuildIncident(res){
-    let imgList = Object.values(itemRefs.value);
+    let imgList = Object.values(itemRefs.value).filter(Boolean);
     let repairImgList = [];
     if(imgList.length){
-      repairImgList = imgList[0].baseFormData.handlerImgList;
+      let firstOne = baseFormData.find(v => v.type == '7');
+      let index = imgList.findIndex(v => v.extra == firstOne.id);
+      repairImgList = index > -1 ? imgList[index].baseFormData.handlerImgList : [];
     }
 
     let incidentData = {
       place: res.inspectionNode.floorDTO,
       houseNumber: res.inspectionNode.address,
       source: defaultSourceValue.value,
-      description: res.inspectionValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex}`).join('；'),
+      description: res.inspectionValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex ? v.valuex : (v.formItemConfigList ? v.formItemConfigList.map(vv => vv.name).join('，') : '')}`).join('；'),
       requester: loginUserStore.loginUser.user,
       branch: loginUserStore.loginUser.user.currentHospital.parent ? loginUserStore.loginUser.user.currentHospital.parent.id : loginUserStore.loginUser.user.currentHospital.id,
       contacts: loginUserStore.loginUser.user.name,
@@ -182,7 +186,7 @@
       department: res.inspectionForm.repairDeptDTO,
       priority: res.inspectionForm.priorityDTO,
       repairImgList,
-      inspectionTaskId: res.id,
+      inspectionTaskId: inspectionExecuteId.value,
     }
     console.log(repairImgList, 'repairImgList')
     console.log(incidentData, 'incidentData')
@@ -193,6 +197,11 @@
     })
   }
 
+  // 报修图片
+  function repairOrderImg(imgObj, incidentId){
+    return uploadFile(imgObj, 'wechatRequesterIncident', incidentId, incidentId)
+  }
+
   // 保存
   function submit(){
     console.log(itemRefs.value);
@@ -209,7 +218,7 @@
         })
       }
     })
-    
+
     nextTick(() => {
       baseForm.value.validate().then(res => {
         console.log('success', res);
@@ -218,9 +227,19 @@
           mask: true,
         });
         console.log(formValues);
+
+        let imgList = Object.values(itemRefs.value).filter(Boolean);
+        let repairImgList = [];
+        if(imgList.length){
+          let firstOne = baseFormData.find(v => v.type == '7');
+          let index = imgList.findIndex(v => v.extra == firstOne.id);
+          repairImgList = index > -1 ? imgList[index].baseFormData.handlerImgList : [];
+        }
+
         let postData = {
           account: loginUserStore.loginUser.user.account,
           valuesList: [],
+          inspectionPhotos: repairImgList.length ? repairImgList : undefined,
         };
         // baseFormData
         for(let key in formValues){
@@ -270,6 +289,15 @@
                 		}
                 	}
                 });
+
+                // 上传图片到故障工单
+                let requestList = [];
+                repairImgList.map((imgObj) => {
+                  let repairOrderImg$ = repairOrderImg(imgObj, res.incidentId);
+                  requestList.push(repairOrderImg$);
+                })
+
+                Promise.all(requestList).then(resList => {})
               } else if(res.inspectionForm.showOrder == 1){
                 // 是否显示生成维修单
                 uni.showModal({
@@ -387,15 +415,18 @@
 
     // 其他项
     if(!isException){
+      console.log(firstPage, 'firstPage')
+      console.log(formValues, 'formValues')
+      console.log(isException, 'isException')
       firstPage.forEach(v => {
         // 下拉,单选
         if(v.type === '1' || v.type === '2'){
-          let obj = v.list.find(vv => formValues[v.key] === vv.value);
+          let obj = v.list.find(vv => v.value === vv.value);
           v.isException = obj ? obj.checkException === 1 : false;
         } else if(v.type === '3'){
           // 多选
           v.isException = v.list.some(vv => {
-            if(formValues[v.key].includes(vv.value)){
+            if(v.value.includes(vv.value)){
               return vv.checkException === 1;
             }else{
               return false;