From df5ceee7be6b738c5310d35610feddd57d09eb49 Mon Sep 17 00:00:00 2001
From: Yuanjianghong <hbzgyjh@126.com>
Date: Wed, 3 Nov 2021 10:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=9F=B9=E8=AE=AD=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../terminalTrain/TerminalTrainForm.vue       |  8 ++---
 .../terminalTrain/TerminalTrainList.vue       | 35 ++++++++++---------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/views/project/terminalTrain/TerminalTrainForm.vue b/src/views/project/terminalTrain/TerminalTrainForm.vue
index bd1ec72..105ea96 100644
--- a/src/views/project/terminalTrain/TerminalTrainForm.vue
+++ b/src/views/project/terminalTrain/TerminalTrainForm.vue
@@ -31,7 +31,8 @@
       <a-form-model-item label="备注">
         <a-input v-model="form.remark" type="textarea" />
       </a-form-model-item>
-      <a-button htmlType="submit" type="primary"> 保存 </a-button>
+      <a-button htmlType="submit" type="primary" > 保存 </a-button>
+      <a-button htmlType="submit" type="primary"  @click="() => { this.form.status = 2 }"> 保存并发布 </a-button>
     </a-form-model>
   </a-card>
 </template>
@@ -63,6 +64,7 @@ export default {
         contact: '',
         phone: '',
         remark: '',
+        status: 1,
       },
       titleName: '新增终端培训',
     }
@@ -94,10 +96,6 @@ export default {
         }
       })
     },
-
-    close() {
-      console.log('Form跳转页面', this.form)
-    },
   },
   created() {
     console.log('1---', this.$store.state.user)
diff --git a/src/views/project/terminalTrain/TerminalTrainList.vue b/src/views/project/terminalTrain/TerminalTrainList.vue
index 3499cb4..4e68445 100644
--- a/src/views/project/terminalTrain/TerminalTrainList.vue
+++ b/src/views/project/terminalTrain/TerminalTrainList.vue
@@ -113,9 +113,11 @@ export default {
           dataIndex: 'status',
           key: 'status',
           customRender: (text, record, index) => {
-            // 完成状态 0-未完成 1-已完成
-            if (text == 0) return '未完成'
-            else if (text == 1) return '已完成'
+            if (text == '1') return '未发布'
+            else if (text == '2') return '未开始'
+            else if (text == '3') return '进行中'
+            else if (text == '4') return '已结束'
+            else if (text == '5') return '已终止'
           },
         },
         { title: '创建人员', width: 'auto', align: 'center', dataIndex: 'createBy', key: 'createBy' },
@@ -148,8 +150,8 @@ export default {
             { id: '5', name: '已终止' },
           ],
         },
-        { type: 'date', placeholder: '开始时间', key: 'startDate', format:'yyyy-MM-dd' },
-        { type: 'date', placeholder: '结束时间', key: 'endDate', format:'yyyy-MM-dd' },
+        { type: 'date', placeholder: '开始时间', key: 'startDate', format:'YYYY-MM-DD' },
+        { type: 'date', placeholder: '结束时间', key: 'endDate', format:'YYYY-MM-DD' },
       ]
     },
   },
@@ -168,7 +170,8 @@ export default {
       terminalTrainDel({ ids: record.id }).then((res) => {
         console.log(res)
         if (res.code == 200) {
-          this.$message.info('删除成功')
+          this.$message.info('删除成功');
+          this.$refs.table.refresh();
         }
       })
     },
@@ -182,11 +185,11 @@ export default {
         path: '/project/terminalTrain/detail',
         query: {
           terminalTrainId: record.id,
-          terminalTrainName: this.$route.query.terminalTrainName,
-          terminalTrainStatus: this.$route.query.terminalTrainStatus,
-          terminalTrainStartDate: this.$route.query.terminalTrainStartDate,
-          terminalTrainEndDate: this.$route.query.terminalTrainEndDate,
-          terminalTrainPageNum: this.$route.query.terminalTrainPageNum,
+          terminalTrainName: this.queryParam.name,
+          terminalTrainStatus: this.queryParam.status,
+          terminalTrainStartDate: this.queryParam.startDate,
+          terminalTrainEndDate: this.queryParam.endDate,
+          terminalTrainPageNum: this.$refs.table.localPagination.current,
         },
       })
       console.log('跳转详情页面 id:', record.id)
@@ -197,11 +200,11 @@ export default {
         path: '/project/terminalTrain/form',
         query: {
           id: record.id,  //编辑
-          terminalTrainName: this.$route.query.terminalTrainName,
-          terminalTrainStatus: this.$route.query.terminalTrainStatus,
-          terminalTrainStartDate: this.$route.query.terminalTrainStartDate,
-          terminalTrainEndDate: this.$route.query.terminalTrainEndDate,
-          terminalTrainPageNum: this.$route.query.terminalTrainPageNum,
+          terminalTrainName: this.queryParam.name || null,
+          terminalTrainStatus: this.queryParam.status || null,
+          terminalTrainStartDate: this.queryParam.startDate || null,
+          terminalTrainEndDate: this.queryParam.endDate || null,
+          terminalTrainPageNum: this.$refs.table.localPagination.current || null,
         },
       })
       console.log('编辑 id:', record)