bugfix

components/InspectionListFilter.vue

@@ -190,7 +190,9 @@
       idx: 0,
       sum: 9999,
       account: loginUserStore.loginUser.user.account,
-      inspectionForm: {},
+      inspectionForm: {
+        status: {value: "1"},
+      },
     }
     
     api_inspectionForm(postData).then(res => {

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -109,6 +109,7 @@
       mask: true,
     });
     // 'inspection|$|1bd0c704-0962-4ed4-b5a6-b5bda3d78231'
+    // 'inspection|$|bc9f61af-99c8-4c86-88f9-f29dd3fc43c0'
     SM().then((ress1) => {
       let postData = {
         code: ress1,

pages/inspection/inspectionValue/inspectionValue.vue

@@ -123,24 +123,28 @@ import { forIn } from 'lodash-es';
         account: loginUserStore.loginUser.user.account,
         valuesList: [],
       };
+      // baseFormData
       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);
-        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,
-        })
+        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(postData);
       api_addModel(postData).then((res) => {
@@ -176,7 +180,8 @@ import { forIn } from 'lodash-es';
       // value
       if(v.type.value === '3'){
         // 多选
-        value = v.formItemConfigList.filter(v => v.checkDefault === 1).map(v => v.id);
+        let arr = v.formItemConfigList.filter(v => v.checkDefault === 1);
+        value = arr.length ? arr.map(v => v.id) : [];
         console.log('多选', value)
       } else if(v.type.value === '7'){
         // 图片
@@ -201,6 +206,7 @@ import { forIn } from 'lodash-es';
         required: v.required === 1,
         checkType: v.checkType,
         showError: v.showError,
+        orders: v.orders,
         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),
       }
@@ -214,7 +220,8 @@ import { forIn } from 'lodash-es';
       firstPage.forEach(v => {
         // 下拉,单选
         if(v.type === '1' || v.type === '2'){
-          v.isException = v.list.find(vv => formValues[v.key] === vv.value).checkException === 1;
+          let obj = v.list.find(vv => formValues[v.key] === vv.value);
+          v.isException = obj ? obj.checkException === 1 : false;
         } else if(v.type === '3'){
           // 多选
           v.isException = v.list.some(vv => {
@@ -232,7 +239,8 @@ import { forIn } from 'lodash-es';
       firstPage.forEach(v => {
         if(v.type === '1' || v.type === '2'){
           // 下拉,单选
-          v.isException = v.list.find(vv => v.value === vv.value).checkException === 1;
+          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 => {
@@ -257,7 +265,7 @@ import { forIn } from 'lodash-es';
       v.isException = (v.showError === 1 && someIsException) || v.showError === 0;
     })
     
-    firstPage = firstPage.concat(firstPageBottom);
+    firstPage = firstPage.concat(firstPageBottom).sort((a, b) => a.orders - b.orders);
     console.log('firstPage=>', firstPage);
     
     Object.assign(baseFormData, firstPage);