From ef74dfef4a3f40c21a310aaf4eab10f428b63f90 Mon Sep 17 00:00:00 2001
From: Yuanjianghong <hbzgyjh@126.com>
Date: Tue, 30 Nov 2021 19:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86Form?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project/project.js             |  2 +-
 src/views/project/ProjectDetail.vue    |  2 -
 src/views/project/ProjectList.vue      | 51 ++++++++++++++++++++------
 src/views/project/ProjectStepForm.vue  | 17 ++++++---
 src/views/project/form/ProjectForm.vue | 10 +----
 src/views/project/form/Result.vue      |  9 +++--
 6 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/src/api/project/project.js b/src/api/project/project.js
index c42a51b..8d2d006 100644
--- a/src/api/project/project.js
+++ b/src/api/project/project.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 const projectApi = {
-  add: 'project/add',
+  add: 'project/addOrUpdate',
   getDict:'project/dict/get',
   list: 'project/pageList',
   get: 'project/get',
diff --git a/src/views/project/ProjectDetail.vue b/src/views/project/ProjectDetail.vue
index 3240ab7..8aa2268 100644
--- a/src/views/project/ProjectDetail.vue
+++ b/src/views/project/ProjectDetail.vue
@@ -350,8 +350,6 @@ export default {
   .detail-layout {
     margin-left: unset;
   }
-  .text {
-  }
   .status-list {
     text-align: left;
   }
diff --git a/src/views/project/ProjectList.vue b/src/views/project/ProjectList.vue
index 8bdcc46..625ddb3 100644
--- a/src/views/project/ProjectList.vue
+++ b/src/views/project/ProjectList.vue
@@ -42,7 +42,14 @@
         <a-button v-if="hasPerm('project:add')" type="primary" icon="plus" @click="handledCreate">新增项目</a-button>
       </a-space>
 
-      <s-table ref="table" size="default" rowKey="id" :columns="columns" :data="loadData" :pageNum="Number(this.$route.query.projectPageNum) || 1">
+      <s-table
+        ref="table"
+        size="default"
+        rowKey="id"
+        :columns="columns"
+        :data="loadData"
+        :pageNum="Number(this.$route.query.projectPageNum) || 1"
+      >
         <span slot="serial" slot-scope="text, record, index">
           {{ index + 1 }}
         </span>
@@ -50,12 +57,11 @@
           <template>
             <a v-if="hasPerm('project:edit')" href="javascript:;" @click="handledCreate(record)">修改</a>
             <a-divider type="vertical" />
+            <a v-if="hasPerm('project:list')" href="javascript:;" @click="handleDetail(record)">详情</a>
+            <a-divider type="vertical" />
             <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
               <a v-if="hasPerm('project:del')" href="javascript:;">删除</a>
             </a-popconfirm>
-            <a-divider type="vertical" />
-            <a v-if="hasPerm('project:list')" href="javascript:;" @click="handleDetail(record)">详情</a>
-            <a-divider type="vertical" />
           </template>
         </span>
       </s-table>
@@ -129,20 +135,43 @@ export default {
       },
     }
   },
-  created() {},
+  //生命周期 - 创建完成
+  created() {
+    this.changeType()
+  },
+  //生命周期 - 销毁完成
+  destroyed() {},
+  // 监控data中的数据变化
+  watch: {
+    $route(to, from) {  //to是前往的路由  from是去往的路由 同一个组件只会渲染一次
+      this.changeType(to.path)
+      this.$refs.table.refresh(true)
+    },
+  },
   methods: {
     // 增
     handledCreate(record) {
       this.$router.push({
-        path: '/project/projectStepForm', 
+        path: '/project/projectStepForm',
         query: {
+          t: this.queryParam.type, //自主项目还是系统项目，控制路由跳转
           projectId: record.id, //项目id
           projectQueryParam: this.queryParam, //查询参数
-          projectPageNum: this.$refs.table.localPagination.current  //当前页
-        }
-      });
-    }
-  }    
+          projectPageNum: this.$refs.table.localPagination.current, //当前页
+        },
+      })
+    },
+    //变更类型
+    changeType(path) {
+      var arr = []
+      if(path){
+        arr = path.split('/')
+      }else{
+        arr = this.$route.path.split('/')
+      }
+      this.queryParam.type = arr[arr.length - 1]
+    },
+  },
 }
 </script>
 
diff --git a/src/views/project/ProjectStepForm.vue b/src/views/project/ProjectStepForm.vue
index 9f13b4a..93366fe 100644
--- a/src/views/project/ProjectStepForm.vue
+++ b/src/views/project/ProjectStepForm.vue
@@ -12,7 +12,7 @@
     </a-steps>
     <div class="content">
       <!-- <keep-alive exclude="result"> -->
-      <step1 v-if="currentTab === 0" :projectForm="form" @nextStep="nextStep" />
+      <step1 v-if="currentTab === 0" :projectForm="form" @nextStep="nextStep" @close="close" />
       <step2 v-if="currentTab === 1" :projectForm="form" @nextStep="nextStep" @prevStep="prevStep" />
       <step3 v-if="currentTab === 2" :projectForm="form" @nextStep="nextStep" @prevStep="prevStep" />
       <step4 v-if="currentTab === 3" :projectForm="form" @nextStep="nextStep" @prevStep="prevStep" />
@@ -52,7 +52,7 @@ export default {
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
-    console.log('分步表单创建完成')
+    console.log('分步表单创建完成',this.$route)
     if (this.$route.query.projectId) {
       getProjectDetail({ id: this.$route.query.projectId }).then((res) => {
         this.form = res.data
@@ -66,6 +66,8 @@ export default {
     return {
       title: '',
       currentTab: 0,
+      sourcePath: '',
+      t: '',
       labelCol: {
         xs: { span: 24 },
         sm: { span: 6 },
@@ -79,6 +81,7 @@ export default {
       confirmLoading: false,
       type: '',
       form: {
+        t: this.$route.query.t,
         trainWay: '2',
         totalScore: '100',
       },
@@ -139,11 +142,13 @@ export default {
     },
     //关闭页面，跳转list页面
     close() {
+      console.log('close------', this.$route.query.t)
       this.$router.push({
-        path: '/project/list',
-        query:{
-          
-        }
+        path: '/project/list/'+this.$route.query.t,
+        query: {
+          t: this.$route.query.t,
+          queryParam: this.$route.query.projectQueryParam,
+        },
       })
     },
   },
diff --git a/src/views/project/form/ProjectForm.vue b/src/views/project/form/ProjectForm.vue
index 7553232..16da7aa 100644
--- a/src/views/project/form/ProjectForm.vue
+++ b/src/views/project/form/ProjectForm.vue
@@ -155,14 +155,8 @@ export default {
   },
   methods: {
     close() {
-      this.$router.push({
-        path: '/project/list',
-      })
-    },
-    add(type) {
-      this.modalTitle = '新增菜单'
-      this.visible = true
-      this.formLoading = false
+      console.log('Form返回list页面')
+      this.$emit('close');
     },
     //获取字典值,请求查询培训种类
     fetchTemplateData() {
diff --git a/src/views/project/form/Result.vue b/src/views/project/form/Result.vue
index 34b5420..a4bfb59 100644
--- a/src/views/project/form/Result.vue
+++ b/src/views/project/form/Result.vue
@@ -1,7 +1,6 @@
 <template>
   <a-result :status="projectSaveStatus" :title="projectSaveStatus" :sub-title="description">
     <template #extra>
-      <a-button type="primary" @click="toPrev">返回修改</a-button>
       <a-button type="primary" @click="toProjectList">去列表页</a-button>
     </template>
   </a-result>
@@ -45,8 +44,12 @@ export default {
     },
     toProjectList() {
       this.$router.push({
-        path: '/project/list',
-        query: { projectPageNum: 1 },
+        path: '/project/list'+this.$route.query.t,
+        query: { 
+          t: this.$route.query.t,
+          projectPageNum: 1 ,
+          queryParam: this.$route.query.projectQueryParam,
+          },
       })
     },
   },