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 @@ - 保存 + 保存 + 保存并发布 @@ -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)