@dongkboy 5 месяцев назад
Родитель
Сommit
f0b15ca51d

+ 9 - 2
src/views/quoteConfig/project/index.vue

@@ -86,7 +86,7 @@ import { useRouter, useRoute } from 'vue-router'
 
 const myRouter = useRouter()
 const muRoute = useRoute()
-
+console.log(muRoute.query.id)
 const searchCompany = () => {
   currentPage.value = 1
   pageSize.value = 10
@@ -105,11 +105,17 @@ const search = () => {
 let companyOption = ref([])
 let companyIndex = ref(0)
 let companyId = ref('')
+
 const initCompany = () => {
   api.projectApi.getCompanyList().then(res => {
     if(res.code == 200) {
       companyOption.value = res.data
-      companyId.value = companyOption.value[companyIndex.value].id
+      if(muRoute.query.id){
+        companyIndex.value = companyOption.value.findIndex(a => a.id == muRoute.query.id)
+      }else{
+        companyIndex.value = 0
+      }
+      companyId.value = muRoute.query.id || companyOption.value[companyIndex.value].id
       initData()
     } else {
       ElMessage({
@@ -140,6 +146,7 @@ let tableData = ref([])
 let currentPage = ref(0)
 let pageSize = ref(10)
 let total = ref(0)
+
 const initData = () => {
   api.projectApi.getSchemeList({
     pages: currentPage.value,

+ 8 - 2
src/views/quoteConfig/project/modules/projectAdd.vue

@@ -693,7 +693,10 @@ const initEdit = () => {
 // 取消
 const quit = () => {
   myRouter.push({
-    path: '/quoteConfig/agreement/project'
+    path: '/quoteConfig/agreement/project',
+    query: {
+      id: myRoute.query.companyId
+    }
   })
 }
 // 保存
@@ -739,7 +742,10 @@ const save = async (ProjectAddRef: FormInstance | undefined) => {
             type: 'success'
           })
           myRouter.push({
-            path: '/quoteConfig/agreement/project'
+            path: '/quoteConfig/agreement/project',
+            query: {
+              id: myRoute.query.companyId
+            }
           })
         } else if(res.code != 400) {
           ElMessage({