diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue index 17de67d..2abe14c 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue @@ -213,8 +213,8 @@ export default { this.form.depIds = c.value this.personnelList = a this.showData = c - this.form.id = res.id - this.form.name = res.name + this.form.id = this.$route.query.copy ? '' : res.id + this.form.name = this.$route.query.copy ? '' : res.name } catch (error) { this.$message.error(error.msg) } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/index.vue b/src/views/kpi/workbench/assessmentGroup/edit/index.vue index cbf486b..c2c53e7 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/index.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/index.vue @@ -66,8 +66,6 @@ export default { }, async handSaveBasisc () { - console.log('this.processInfo: ', this.processInfo) - console.log('this.basisForm: ', this.basisForm) if (!this.basisForm.name) { return this.$message.error('请输入考评组名称') } @@ -82,7 +80,6 @@ export default { this.basisForm = res this.templateForm.evaluationGroupId = res.id for (let i in this.processInfo) { - console.log('processInfo: ', i) try { let res1 = await saveDetailProcs(Object.assign({}, this.processInfo[i].chartDetails, {evaluationGroupId: res.id})) console.log('res: ', res1) diff --git a/src/views/kpi/workbench/assessmentGroup/groundTable.vue b/src/views/kpi/workbench/assessmentGroup/groundTable.vue index 7ff16f4..8e01598 100644 --- a/src/views/kpi/workbench/assessmentGroup/groundTable.vue +++ b/src/views/kpi/workbench/assessmentGroup/groundTable.vue @@ -66,7 +66,25 @@
- 99 + + + + + +
@@ -78,13 +96,15 @@ import PopupRight from '@/components/PopupRight' export default { data () { return { + selectId: '', showRight: false, params: { 'currPage': 1, 'pageSize': 10 }, form: {}, - tableData: [] + tableData: [], + copyList: [] } }, components: { @@ -96,8 +116,17 @@ export default { this.handleGetData() }, methods: { + handleRowChange (data) { + this.selectId = data.id + }, handleSubmit () { + if (!this.selectId) { + this.$message.error('请选择考评组!') + return + } + console.log('this.copyList : ', this.copyList) this.showRight = false + this.$router.push({name: 'workbench-edit-group', query: {id: this.selectId, copy: 1}}) }, handleCancel () { this.showRight = false @@ -105,9 +134,14 @@ export default { handlePush (id) { this.$router.push({name: 'workbench-edit-group', query: {id}}) }, - handleToEidtCopy (id) { + async handleToEidtCopy (id) { + let res = await getWorkList({ + 'currPage': 1, + 'pageSize': 99999 + }) + if (res.code !== 200) return + this.copyList = res.data.list this.showRight = true - // this.$router.push({name: 'workbench-edit-group', query: {id: id, copy: 1}}) }, handleChange (value) { this.params = { @@ -121,9 +155,10 @@ export default { this.params.currPage = value this.handleGetData() }, - async handleGetData () { + async handleGetData (parmas = Object.assign({}, this.params)) { try { - let res = await getWorkList(Object.assign({}, this.params)) + let res = await getWorkList(parmas) + if (res.code !== 200) return res = res.data console.log('res: ', res) this.tableData = res.list @@ -170,9 +205,28 @@ export default { } - +