试验自检关联工程用途部位修改

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

@@ -344,7 +344,7 @@ const getSearchNodeTablesall = async (type) => {
                 testData.value= getArrValue(data)
                 testData.value.forEach((item)=>{
                     let bussDataInfoTrialData=item.bussDataInfoTrial
-                        if(Object.keys(bussDataInfoTrialData).length!==0){
+                        if(bussDataInfoTrialData&&Object.keys(bussDataInfoTrialData).length!==0){
                             for(var key in bussDataInfoTrialData){
                             console.log(key,bussDataInfoTrialData[key])
                             item[key]=bussDataInfoTrialData[key]
@@ -359,7 +359,7 @@ const getSearchNodeTablesall = async (type) => {
                  reportData.value= getArrValue(data)
                  reportData.value.forEach((item)=>{
                 let bussDataInfoTrialData=item.bussDataInfoTrial
-                      if(Object.keys(bussDataInfoTrialData).length!==0){
+                      if(bussDataInfoTrialData&&Object.keys(bussDataInfoTrialData).length!==0){
                             for(var key in bussDataInfoTrialData){
                             console.log(key,bussDataInfoTrialData[key])
                             item[key]=bussDataInfoTrialData[key]
@@ -528,17 +528,19 @@ const linksRelateModalSave =async () => {
             idarr.push(item.primaryKeyId)
         })
         checkrelationString.value=idarr.toString()
-         const { error, code, data } = await dataApi.projectpositionSubmit({
-            id: dataId,
-            projectPosition:checkrelationString.value,
-        })
-        if (!error && code === 200) {
-            window.$message?.success('操作成功')
-           linksRelateModal.value = false
-        }else {
-            window.$message?.warning(error)
-             linksRelateModal.value = false 
-        }   
+        // listItemBaseData.value.projectPosition=checkrelationString.value
+         linksRelateModal.value = false
+        //  const { error, code, data } = await dataApi.projectpositionSubmit({
+        //     id: dataId,
+        //     projectPosition:checkrelationString.value,
+        // })
+        // if (!error && code === 200) {
+        //     window.$message?.success('操作成功')
+        //    linksRelateModal.value = false
+        // }else {
+        //     window.$message?.warning(error)
+        //      linksRelateModal.value = false 
+        // }   
           
 }
 const linksRelateModalClose = () => {
@@ -583,23 +585,24 @@ const linksRawTableSelection = (rows) => {
 }
 
 const linksRawModalSave =async () => {
-        const { error, code, data } = await dataApi.rawMaterialSubmit({
-        id: dataId,
-        ids:tableRawCheckedKeysid.value,
-        projectId: projectId.value,
-        contractId: contractId.value,
-        primaryKeyId: nodeId,
-        type: authBtnTabKey.value,
-     })
-    if (!error && code === 200) {
-            window.$message?.success('操作成功')
-            tableRawCheckedKeys.value=[]
-            linksRawModal.value = false
-            tableRawRef.value?.clearSelection();
-     }
-     else {
-        window.$message?.warning(error)
-     }   
+    console.log(tableRawCheckedKeysid.value,'tableRawCheckedKeysid.value');
+    //     const { error, code, data } = await dataApi.rawMaterialSubmit({
+    //     id: dataId,
+    //     ids:tableRawCheckedKeysid.value,
+    //     projectId: projectId.value,
+    //     contractId: contractId.value,
+    //     primaryKeyId: nodeId,
+    //     type: authBtnTabKey.value,
+    //  })
+    // if (!error && code === 200) {
+    //         window.$message?.success('操作成功')
+    //         tableRawCheckedKeys.value=[]
+    //         linksRawModal.value = false
+    //         tableRawRef.value?.clearSelection();
+    //  }
+    //  else {
+    //     window.$message?.warning(error)
+    //  }   
      
 }
 
@@ -741,7 +744,7 @@ const tableFormSaveClick = async () => {
         listItemBaseData.value.projectPosition=checkrelationString.value
       }
     if(tabTypeKey.value==='2'&&listItemBaseData.value.detectionResult===''){
-         window.$message?.warning('请选择是否合格')
+         window.$message?.warning('请选择报告单是否合格')
     }else{
             // let FormData = ListItemRef.value?.getFormData()
   
@@ -802,7 +805,10 @@ const tableFormSaveClick = async () => {
             //效验数据
           
             if (FormData.length > 0) {
-                tableFormSaveLoading.value = true
+              if(  listItemBaseData.value.detectionResult===''&& listItemBaseData.value.tableType == "1,2"){
+                   window.$message?.warning('请选择报告单是否合格')
+              }else{
+                    tableFormSaveLoading.value = true
                 const {error, code,data} = await dataApi.saveExcelBussData({
                     ...listItemBaseData.value,
                     isBatchSave:1,
@@ -827,6 +833,8 @@ const tableFormSaveClick = async () => {
                 
                     getTableDataAll()
                 }
+              }
+              
             } else {
                 
                 if(!isaddType){