bugfix

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 => v.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 => v.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

@@ -93,13 +93,13 @@
 
   // 所有页码数据
   const formPageList = reactive([]);
-  
+
   // 故障来源列表
   const defaultSourceValue = ref();
 
   // 表单
   const baseForm = ref()
-  
+
   // 图片上传ref数组
   const itemRefs = ref({});
 
@@ -137,7 +137,7 @@
   function changeForm(){
     handleData(true);
   }
-  
+
   // 跳转巡检列表
   function toInspectionExecute(){
     inspectionValueStore.clearInspectionValueData();
@@ -145,7 +145,7 @@
       url: `/pages/inspection/inspectionExecute/inspectionExecute`
     })
   }
-  
+
   // 获取故障来源列表
   function getSources(){
     let postData = {
@@ -160,7 +160,7 @@
       }
     })
   }
-  
+
   // 跳转新建事件
   function toBuildIncident(res){
     let imgList = Object.values(itemRefs.value);
@@ -173,7 +173,7 @@
       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 => v.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,
@@ -209,7 +209,7 @@
         })
       }
     })
-    
+
     nextTick(() => {
       baseForm.value.validate().then(res => {
         console.log('success', res);
@@ -387,15 +387,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;