Hua 9 órája
szülő
commit
ccf6afa77f

+ 5 - 1
src/views/InspectDC/Object/Problem/addProblem.vue

@@ -82,6 +82,7 @@ import {useRoute,useRouter} from "vue-router";
 import { useAppStore } from '@/stores/app';
 import {useUserStore} from "@/stores/user";
 import request from "@/utils/request";
+import { jumpPage } from "@/utils/page";
 import axios from 'axios';
 const route = useRoute();
 const userStore = useUserStore();
@@ -236,7 +237,10 @@ async function addPro(){
                     uploadFileToServer(item, res.data.pblmId)
                 })
                 showSuccessToast('添加成功!');
-                router1.go(-1)
+                var par = JSON.parse(router.query.object);
+                jumpPage(`/InspectDC/${par.parObj.planId}/object/${par.parObj.objId}/problems`, {
+                  object: JSON.stringify(par.parObj),
+                })
             }
         });
         

+ 7 - 4
src/views/InspectDC/Object/Problem/index.vue

@@ -145,6 +145,7 @@ function jumpPageToadd() {
   var par = JSON.parse(router.query.object);
   formObj.value.objId = par.objId
   console.log(formObj.value);
+  formObj.value.parObj = par;
   jumpPage(`/addProblem/${par.state}`, { object: JSON.stringify(formObj.value) });
 }
 async function onConfirmDelete() {
@@ -195,20 +196,19 @@ function save128(){
           request.post('/bis/insp/genrl/update', data).then((res) => {
             if (res.success) {
               showSuccessToast('保存成功!');
-              router1.go(-1)
+              var par = JSON.parse(router.query.object);
+              jumpPage(`/inspectDC/${par.planId}/objects`)
             }
           });
         })
-  
 }
-
 function deletePblm(pblmId) {
   pblmId1.value = pblmId;
   showWhy.value = true;
 }
 const objData = ref({});
 function getData() {
-  var par = JSON.parse(router.query.object);``
+  var par = JSON.parse(router.query.object);
   objData.value = par;
   formObj.value = JSON.parse(router.query.object)
   request.get(`/bis/insp/baseNew/getByRgstr/${formObj.value.rgstrId}`).then(res=>{
@@ -226,6 +226,9 @@ function getData() {
   request.post(`/dc/insp/pblm/list/${problemForm.presId}`, problemForm).then(res => {
       if (res.success) {
         pblmList.value = res.data.list;
+        pblmList.value.forEach(item => {
+          item.parObj = JSON.parse(router.query.object);
+        });
       }
   })
   formObj.value.rgstrId = par.rgstrId;

+ 9 - 0
src/views/InspectDC/Object/index.vue

@@ -183,6 +183,15 @@ function getData() {
     list1.value = list.value.filter(item => item.state === '0');
     list2.value = list.value.filter(item => item.state === '1');
     list3.value = list.value.filter(item => item.state === '2');
+    list1.value.forEach(item => {
+      item.planId = route.params.id;
+    });
+    list2.value.forEach(item => {
+      item.planId = route.params.id;
+    });
+    list3.value.forEach(item => {
+      item.planId = route.params.id;
+    });
     loading.value = false;
   });
 

+ 5 - 1
src/views/Problem/detail/indexDc.vue

@@ -104,6 +104,7 @@ import tacObjPblmstbList from './TacObjPblmstbList.vue';
 import {getTacQuestionById} from "@/api/inspect";
 import { showConfirmDialog } from 'vant';
 import {addTacQuestion, getIllegalActById, getTacUnitList} from "@/api/questions";
+import { jumpPage } from "@/utils/page";
 import request from "@/utils/request";
 const route = useRoute();
 const router1 = useRouter();
@@ -260,7 +261,10 @@ async function save(){
                 }
             })
             showSuccessToast('保存成功!');
-            router1.go(-1)
+            var par = JSON.parse(router.query.object);
+            jumpPage(`/InspectDC/${par.parObj.planId}/object/${par.parObj.objId}/problems`, {
+              object: JSON.stringify(par.parObj),
+            })
             fileList.value = []
         }
     });