bug1293

src/views/tentative/detect/test-form.vue

@@ -599,47 +599,52 @@ const tableFormSaveClick = async () => {
       if(checkrelationString.value.length>0){
         listItemBaseData.value.projectPosition=checkrelationString.value
       }
-    
-    let FormData = ListItemRef.value?.getFormData()
-    let FormRegExpJson = ListItemRef.value?.getFormRegExpJson()
-    //效验数据
-    if (getObjNullValue(FormRegExpJson)) {
-        setFormRegExpJson(FormRegExpJson)
-    } else if (FormData.length > 0) {
-        tableFormSaveLoading.value = true
-        const {error, code,data} = await dataApi.saveExcelBussData({
-            ...listItemBaseData.value,
-            isBatchSave:1,
-            dataInfo: {orderList: FormData},
-            // deviceUseIds:listDeviceUseIds.value
-        })
-        console.log(data,'data');
-        nodeIdvalue.value=data
-        tableFormSaveLoading.value = false
-        if (!error && code === 200) {
-            window?.$message?.success('保存成功')
-            listItemBaseData.value.deviceUseIds=''
-            checkTabId.value=''
-            if(!isaddType){
-                bussPdfsClick(router.currentRoute.value.query.id)
-            }else{
-                bussPdfsClick(nodeIdvalue.value)
-                // toBackClick()
+      console.log(listItemBaseData.value.detectionResult,'istItemBaseData.value.detectionResult');
+    if(tabTypeKey.value==='2'&&listItemBaseData.value.detectionResult===''){
+         window.$message?.warning('请选择是否合格')
+    }else{
+            let FormData = ListItemRef.value?.getFormData()
+            let FormRegExpJson = ListItemRef.value?.getFormRegExpJson()
+            //效验数据
+            if (getObjNullValue(FormRegExpJson)) {
+                setFormRegExpJson(FormRegExpJson)
+            } else if (FormData.length > 0) {
+                tableFormSaveLoading.value = true
+                const {error, code,data} = await dataApi.saveExcelBussData({
+                    ...listItemBaseData.value,
+                    isBatchSave:1,
+                    dataInfo: {orderList: FormData},
+                    // deviceUseIds:listDeviceUseIds.value
+                })
+                console.log(data,'data');
+                nodeIdvalue.value=data
+                tableFormSaveLoading.value = false
+                if (!error && code === 200) {
+                    window?.$message?.success('保存成功')
+                    listItemBaseData.value.deviceUseIds=''
+                    checkTabId.value=''
+                    if(!isaddType){
+                        bussPdfsClick(router.currentRoute.value.query.id)
+                    }else{
+                        bussPdfsClick(nodeIdvalue.value)
+                        // toBackClick()
+                    }
+                
+                    getTableDataAll()
+                }
+            } else {
+            
+                if(!isaddType){
+                        window.$message?.warning('请先选择你需要编辑的表格')
+                    bussPdfsClick(router.currentRoute.value.query.id)
+                }else{
+                    window.$message?.warning('请先选择你需要新增的表格')
+                }
+                
+            
             }
-           
-            getTableDataAll()
-        }
-    } else {
-       
-         if(!isaddType){
-                 window.$message?.warning('请先选择你需要编辑的表格')
-              bussPdfsClick(router.currentRoute.value.query.id)
-         }else{
-             window.$message?.warning('请先选择你需要新增的表格')
-         }
-        
-    
     }
+    
 }
 
 //效验数据