Эх сурвалжийг харах

试验自检填报新增后不跳转页面

duy 2 жил өмнө
parent
commit
270c174094

+ 12 - 4
src/views/tentative/detect/test-form.vue

@@ -357,7 +357,7 @@ const getSearchNodeTables = async () => {
 const getSearchNodeTablesall = async (type) => {
   
         const { error, code, data } = await dataApi.searchNodeTables({
-            id: dataId,
+            id: dataId.length>0?dataId:nodeIdvalue.value,
             projectId: projectId.value,
             contractId: contractId.value,
             primaryKeyId: nodeId,
@@ -792,6 +792,7 @@ const tableFormSaveClick = async () => {
                 }
            } 
            else { //编辑
+           console.log(alllistData.value,'alllistData.value');
                 FormData = alllistData.value;
 
                 const info = getStoreData('test-form')
@@ -816,8 +817,10 @@ const tableFormSaveClick = async () => {
                     if (listItemBaseData.value.tableType.length === 1) { //从原始数据过滤当前页面数据
                         notChangeData = orgAlllistData.value.filter(e => e.tableType === listItemBaseData.value.tableType);
                     }
+    
                 } 
                 else if (setTypes.length == 1) {// 操作过一边的数据
+                console.log(FormData,'FormData');
                     let tableTypeArr = listItemBaseData.value.tableType.split(",");
                     if (tableTypeArr[0] != type) { //两边都有数据/当前操作的数据不是进来时的选项,筛选另一边的数据
                         listItemBaseData.value.tableType = "1,2"
@@ -825,7 +828,6 @@ const tableFormSaveClick = async () => {
                 } else { //两边都操作
                     listItemBaseData.value.tableType = "1,2"
                 }
-
                 notChangeData.forEach(item => {
                     let data = {
                         projectId: item.projectId,
@@ -901,11 +903,17 @@ const tableFormSaveClick = async () => {
                      alllistData.value=[]
                     if(!isaddType){
                         bussPdfsClick(router.currentRoute.value.query.id)
-                          toBackClick()
+                        //   toBackClick()
+                         getSearchNodeTables()
+                         getSearchNodeTablesall(1)
+                         getSearchNodeTablesall(2)
                     }else{
                           listItemBaseData.value.id=data
                     bussPdfsClick(nodeIdvalue.value)
-                    toBackClick()
+                     getSearchNodeTables()
+                     getSearchNodeTablesall(1)
+                     getSearchNodeTablesall(2)
+                    // toBackClick()
                     //  setTimeout(() => {
                     //         window?.location?.reload()  //刷新页面
                     //  }, 1000);