BUG修复

manifest.json

@@ -62,7 +62,7 @@
         "devServer" : {
             "proxy" : {
                 "/service" : {
-                    "target" : "http://192.168.4.105", //请求的目标域名
+                    "target" : "http://192.168.3.111", //请求的目标域名
 										// "target" : "http://192.168.4.163", //宋程玉本地
                     "changeOrigin" : true, //是否跨域
                     "secure" : false

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -108,6 +108,7 @@
       title: "加载中",
       mask: true,
     });
+    // 'inspection|$|1bd0c704-0962-4ed4-b5a6-b5bda3d78231'
     SM().then((ress1) => {
       let postData = {
         code: ress1,

pages/inspection/inspectionValue/inspectionValue.vue

@@ -5,32 +5,31 @@
         <template v-for="(item, index) of baseFormData" :key="index">
           <!-- 下拉 -->
           <uni-forms-item v-if="item.type === '1'" class="formItem" :label="item.name" :required="item.required" :name="item.key">
-            <uni-data-picker :placeholder="'请选择' + item.name" :popup-title="'请选择' + item.name" :localdata="item.list" v-model="formValues[item.key]">
+            <uni-data-picker :placeholder="'请选择' + item.name" :popup-title="'请选择' + item.name" :localdata="item.list" v-model="formValues[item.key]" @change="changeForm()">
             </uni-data-picker>
           </uni-forms-item>
           <!-- 单选 -->
           <uni-forms-item v-if="item.type === '2'" class="formItem" :label="item.name" :required="item.required" :name="item.key">
-            <uni-data-checkbox v-model="formValues[item.key]" :localdata="item.list" />
+            <uni-data-checkbox v-model="formValues[item.key]" @change="changeForm()" :localdata="item.list" />
           </uni-forms-item>
           <!-- 多选 -->
           <uni-forms-item v-if="item.type === '3'" class="formItem" :label="item.name" :required="item.required" :name="item.key">
-            <uni-data-checkbox v-model="formValues[item.key]" multiple :localdata="item.list" />
+            <uni-data-checkbox v-model="formValues[item.key]" @change="changeForm()" multiple :localdata="item.list" />
           </uni-forms-item>
           <!-- 数字 -->
           <uni-forms-item v-if="item.type === '4'" class="formItem" :label="item.name" :required="item.required" :name="item.key">
-            <uni-number-box v-model="formValues[item.key]" :placeholder="'请输入' + item.name"></uni-number-box>
+            <uni-number-box v-model="formValues[item.key]" @change="changeForm()" :min="-9999" :max="9999" :placeholder="'请输入' + item.name"></uni-number-box>
           </uni-forms-item>
           <!-- 单行 -->
-          <uni-forms-item v-if="item.type === '5'" class="formItem" :label="item.name" :required="item.required" :name="item.key">
+          <uni-forms-item v-if="item.type === '5' && item.isException" class="formItem" :label="item.name" :required="item.required" :name="item.key">
             <uni-easyinput v-model="formValues[item.key]" :placeholder="'请输入' + item.name" />
           </uni-forms-item>
           <!-- 多行 -->
-          <uni-forms-item v-if="item.type === '6'" class="formItem" :label="item.name" :required="item.required" :name="item.key">
+          <uni-forms-item v-if="item.type === '6' && item.isException" class="formItem" :label="item.name" :required="item.required" :name="item.key">
             <uni-easyinput type="textarea" v-model="formValues[item.key]" :placeholder="'请输入' + item.name" />
           </uni-forms-item>
-          
           <!-- 图片上传 -->
-          <uni-forms-item v-if="item.type === '7'" class="formItem" :label="item.name" :required="item.required" :name="item.key">
+          <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>
           </uni-forms-item>
           <!-- 分割线 -->
@@ -70,6 +69,9 @@ import { forIn } from 'lodash-es';
   // 主题颜色
   const primaryColor = ref(defaultColor)
   
+  // 所有页码数据
+  const formPageList = reactive([]);
+  
   // 表单
   const baseForm = ref()
   
@@ -103,6 +105,11 @@ import { forIn } from 'lodash-es';
     // { type: 7, name: '', value: [], list: [], required: false, checkType: 0, valueMin: '', valueMax: '', },
   ])
   
+  // 修改
+  function changeForm(){
+    handleData(true);
+  }
+  
   // 保存
   function submit(){
     baseForm.value.validate().then(res => {
@@ -113,14 +120,15 @@ import { forIn } from 'lodash-es';
       });
       console.log(formValues);
       let postData = {
+        account: loginUserStore.loginUser.user.account,
         valuesList: [],
       };
       for(let key in formValues){
         let name = baseFormData.find(v => v.key === key).name;
         let itemId = baseFormData.find(v => v.key === key).id;
-        let formPageList = dataInfo.inspectionFormDTO?.formPageList || [];
-        formPageList = formPageList.map(v => v.formItemList).flat();
-        let formItem = formPageList.find(v => v.id === itemId);
+        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,
@@ -155,7 +163,7 @@ import { forIn } from 'lodash-es';
   }
   
   // 处理数据
-  function handleData(formPageList){
+  function handleData(isException = false){
     // 目前只取第一页
     let firstPage = formPageList[0]?.formItemList || [];
     
@@ -164,6 +172,8 @@ import { forIn } from 'lodash-es';
     firstPage = firstPage.map((v, i) => {
       let value = '';
       v.formItemConfigList = v.formItemConfigList || [];
+      
+      // value
       if(v.type.value === '3'){
         // 多选
         value = v.formItemConfigList.filter(v => v.checkDefault === 1).map(v => v.id);
@@ -186,20 +196,79 @@ import { forIn } from 'lodash-es';
         key: `field${i}`,
         type: v.type.value,
         name: v.name,
-        value,
-        list: v.formItemConfigList ? v.formItemConfigList.map(v => ({text: v.name, value: v.id})) : [],
+        value: isException ? formValues[`field${i}`] : value,
+        list: v.formItemConfigList ? v.formItemConfigList.map(v => ({text: v.name, value: v.id, checkException: v.checkException, uncheckException: v.uncheckException})) : [],
         required: v.required === 1,
         checkType: v.checkType,
+        showError: v.showError,
         valueMin: v.checkType === 2 ? v.valueLow : ( v.checkType === 1 ? (v.valuex - v.valueGap) : undefined),
         valueMax: v.checkType === 2 ? v.valueUp : ( v.checkType === 1 ? (v.valuex + v.valueGap) : undefined),
       }
-    }).filter(v => v.type !== '7');
+    });
+    
+    let firstPageBottom = firstPage.filter(v => v.type === '5' || v.type === '6');
+    firstPage = firstPage.filter(v => v.type !== '5' && v.type !== '6' && v.type !== '7');
+    
+    // 其他项
+    if(isException){
+      firstPage.forEach(v => {
+        // 下拉,单选
+        if(v.type === '1' || v.type === '2'){
+          v.isException = v.list.find(vv => formValues[v.key] === vv.value).checkException === 1;
+        } else if(v.type === '3'){
+          // 多选
+          v.isException = v.list.some(vv => {
+            if(formValues[v.key].includes(vv.value)){
+              return vv.checkException === 1;
+            }else{
+              return false;
+            }
+          })
+        } else if(v.type === '4'){
+          v.isException = (v.value < v.valueMin) || (v.value > v.valueMax);
+        }
+      })
+    }else{
+      firstPage.forEach(v => {
+        if(v.type === '1' || v.type === '2'){
+          // 下拉,单选
+          v.isException = v.list.find(vv => v.value === vv.value).checkException === 1;
+        } else if(v.type === '3'){
+          // 多选
+          v.isException = v.list.some(vv => {
+            if(v.value.includes(vv.value)){
+              return vv.checkException === 1;
+            }else{
+              return false;
+            }
+          })
+        } else if(v.type === '4'){
+          // 数值
+          v.isException = (formValues[v.key] < v.valueMin) || (formValues[v.key] > v.valueMax);
+        }
+      })
+    }
+    
+    // 单行|多行|图片上传
+    let someIsException = firstPage.filter(v => v.type !== '8').some(v => v.isException);
+    console.log('someIsException=>', someIsException)
+    firstPageBottom.forEach(v => {
+      console.log('v.showError=>', v.showError)
+      v.isException = (v.showError === 1 && someIsException) || v.showError === 0;
+    })
+    
+    firstPage = firstPage.concat(firstPageBottom);
+    console.log('firstPage=>', firstPage);
+    
     Object.assign(baseFormData, firstPage);
     console.log('baseFormData=>', baseFormData);
+    
     Object.assign(formValues, fromPairs(firstPage.filter(v => v.type !== '8').map(v => ([v.key, v.value]))));
     console.log('formValues=>', formValues);
+    
     let rulesObj = keyBy(firstPage.filter(v => v.type !== '8'), 'key');
     console.log(rulesObj)
+    
     for(let key in rulesObj){
       rulesObj[key] = {
         rules: [
@@ -216,8 +285,8 @@ import { forIn } from 'lodash-es';
     // 巡检项
     if(inspectionValueStore.inspectionValue.data){
       Object.assign(dataInfo, inspectionValueStore.inspectionValue.data);
-      let formPageList = dataInfo.inspectionFormDTO?.formPageList || [];
-      handleData(formPageList)
+      Object.assign(formPageList, dataInfo.inspectionFormDTO?.formPageList || []);
+      handleData()
     }
   })
 </script>