Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
This commit is contained in:
qinjie
commit
4660e88510
|
|
@ -31,13 +31,13 @@ export default {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
queryParam: { id: this.$route.query.terminalTrainId },
|
||||
queryParam: this.$route.query.terminalTrainId,
|
||||
detailData: {},
|
||||
}
|
||||
},
|
||||
created: function () {
|
||||
let parameter = {}
|
||||
terminalTrainGet(Object.assign(parameter, this.queryParam)).then((res) => {
|
||||
terminalTrainGet(this.queryParam).then((res) => {
|
||||
this.detailData = res.data
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
<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" @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: '新增终端培训',
|
||||
}
|
||||
|
|
@ -77,25 +79,34 @@ export default {
|
|||
console.log('提交的数据', this.form)
|
||||
terminalTrainEdit(this.form).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.$message.success('新增成功')
|
||||
this.handleCancel()
|
||||
this.$message.success('保存成功！')
|
||||
this.$router.push({
|
||||
//跳转list页面
|
||||
path: '/project/project/terminalTrain/list',
|
||||
query: {
|
||||
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,
|
||||
},
|
||||
})
|
||||
} else {
|
||||
this.$message.error('新增失败：' + res.msg)
|
||||
this.handleCancel()
|
||||
this.$message.error('保存失败：' + res.msg)
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
created() {
|
||||
console.log('1---', this.$store.state.user)
|
||||
if (this.$route.query.id) {
|
||||
this.form = terminalTrainGet(this.$route.query.id).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.form = res.data;
|
||||
this.form = res.data
|
||||
} else {
|
||||
this.$message.error('获取数据失败：' + res.msg)
|
||||
}
|
||||
}
|
||||
)
|
||||
})
|
||||
}
|
||||
}, //生命周期 - 创建完成（可以访问当前this实例）
|
||||
mounted() {}, //生命周期 - 挂载完成（可以访问DOM元素）
|
||||
|
|
|
|||
|
|
@ -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' },
|
||||
{ type: 'date', placeholder: '结束时间', key: 'endDate' },
|
||||
{ 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,20 +200,19 @@ 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)
|
||||
},
|
||||
handledCreate() {
|
||||
handledCreate() { //新增
|
||||
this.$router.push({
|
||||
path: '/project/terminalTrain/form',
|
||||
query: {
|
||||
type: 1, //新增
|
||||
terminalTrainName: this.$route.query.terminalTrainName,
|
||||
terminalTrainStatus: this.$route.query.terminalTrainStatus,
|
||||
terminalTrainStartDate: this.$route.query.terminalTrainStartDate,
|
||||
|
|
|
|||
Loading…
Reference in New Issue