From b0d83ab7e274e538b874a2a8b7a8f121f11e94a6 Mon Sep 17 00:00:00 2001 From: leewand Date: Wed, 2 Sep 2020 11:54:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=80=83=E8=AF=84=E8=AE=A1=E5=88=92=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/par/examPlan/ParExamItem.vue | 25 ++++++++++++++----- src/views/par/examPlan/ParExamPlan.vue | 6 ++++- .../par/examPlan/ParExamPlanPersonnel.vue | 4 +++ 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/views/par/examPlan/ParExamItem.vue b/src/views/par/examPlan/ParExamItem.vue index 8bca1f1..964575e 100644 --- a/src/views/par/examPlan/ParExamItem.vue +++ b/src/views/par/examPlan/ParExamItem.vue @@ -17,7 +17,7 @@ :dataSource="itemList" :loading="loading" :rowKey="row => row.id" - :pagination=false + :pagination="false" :rowSelection="{ selectedRowKeys: this.selectedRowKeys, onChange: this.onSelectChange }"> @@ -99,6 +99,9 @@ export default { this.loading = false if (this.param.kpxm !== '' && this.param.kpxm !== null && this.param.kpxm !== undefined) { this.selectedRowKeys = this.param.kpxmid.split(',') + } else { + this.selectedRowKeys = [] + this.selectedRows = [] } }) } else if (this.type === 'personnel') { @@ -108,7 +111,7 @@ export default { pagination.total = res.result.totalCount this.pagination = pagination this.loading = false - if (this.param.kpxm !== '' && this.param.kpxm !== null && this.param.kpxm !== undefined) { + if (this.param.kpxmid) { this.selectedRowKeys = this.param.kpxmid.split(',') } }) @@ -129,18 +132,26 @@ export default { this.queryParam.kpdl = record.kpgzfl this.queryParam.id = record.id this.loadData(this.queryParam) - this.selectedRowKeys = record.kpxmid.split(',') + /* this.selectedRowKeys = [] + if (record.kpxmid) { + this.selectedRowKeys = record.kpxmid.split(',') + } else { + this.selectedRowKeys = [] + this.selectedRows = [] + } */ }, onSelectChange (selectedRowKeys, selectedRows) { + debugger this.selectedRowKeys = selectedRowKeys this.selectedRows = selectedRows }, handleEditOk () { const params = [] - this.selectedRows.forEach((item, index) => { - params.push({ kpxid: item.id, kpxmflid: this.param.id }) + this.selectedRowKeys.forEach((item, index) => { + params.push({ kpxid: item, kpxmflid: this.param.id }) }) - insertItem(params) + const paramsFnl = { kpxmflid: this.param.id, list: params } + insertItem(paramsFnl) .then(res => { if (res.status === 200) { this.$notification['success']({ @@ -173,6 +184,8 @@ export default { * 关闭弹出框 */ close () { + this.selectedRowKeys = [] + this.selectedRows = [] this.editVisible = false this.itemList = [] this.pagination = { diff --git a/src/views/par/examPlan/ParExamPlan.vue b/src/views/par/examPlan/ParExamPlan.vue index 6f64026..b4173b4 100644 --- a/src/views/par/examPlan/ParExamPlan.vue +++ b/src/views/par/examPlan/ParExamPlan.vue @@ -116,6 +116,10 @@ export default { title: '考评结束时间', dataIndex: 'jssj' }, + { + title: '考评周期', + dataIndex: 'kpzqName' + }, { title: '单位类型', dataIndex: 'dwlx', @@ -140,7 +144,7 @@ export default { }, { title: '创建人', - dataIndex: 'crtUser' + dataIndex: 'crtName' }, { title: '创建时间', diff --git a/src/views/par/examPlan/ParExamPlanPersonnel.vue b/src/views/par/examPlan/ParExamPlanPersonnel.vue index f3c4d8a..db1001f 100644 --- a/src/views/par/examPlan/ParExamPlanPersonnel.vue +++ b/src/views/par/examPlan/ParExamPlanPersonnel.vue @@ -113,6 +113,10 @@ export default { title: '考评结束时间', dataIndex: 'jssj' }, + { + title: '考评周期', + dataIndex: 'kpzqName' + }, { title: '考评单位', dataIndex: 'kprName' -- Gitee From 37fb8d2b49c59020e5d3beba8c9d877c2648288a Mon Sep 17 00:00:00 2001 From: leewand Date: Wed, 2 Sep 2020 14:41:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=80=83=E8=AF=84=E8=AE=A1=E5=88=92=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/par/examPlan/ParExamCate.vue | 1 + src/views/par/examPlan/ParExamItem.vue | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/par/examPlan/ParExamCate.vue b/src/views/par/examPlan/ParExamCate.vue index 63e586c..5e511b6 100644 --- a/src/views/par/examPlan/ParExamCate.vue +++ b/src/views/par/examPlan/ParExamCate.vue @@ -99,6 +99,7 @@ export default { methods: { // 加载数据方法 loadData (parameter) { + this.loading = true queryCate(parameter).then(res => { this.cateList = res.result.data const pagination = { ...this.pagination } diff --git a/src/views/par/examPlan/ParExamItem.vue b/src/views/par/examPlan/ParExamItem.vue index 964575e..d75c02b 100644 --- a/src/views/par/examPlan/ParExamItem.vue +++ b/src/views/par/examPlan/ParExamItem.vue @@ -90,19 +90,20 @@ export default { methods: { // 加载数据方法 loadData (parameter) { + this.loading = true if (this.type === 'org') { queryItem(parameter).then(res => { this.itemList = res.result.data const pagination = { ...this.pagination } pagination.total = res.result.totalCount this.pagination = pagination - this.loading = false if (this.param.kpxm !== '' && this.param.kpxm !== null && this.param.kpxm !== undefined) { this.selectedRowKeys = this.param.kpxmid.split(',') } else { this.selectedRowKeys = [] this.selectedRows = [] } + this.loading = false }) } else if (this.type === 'personnel') { queryItemPersonnel(parameter).then(res => { @@ -110,10 +111,13 @@ export default { const pagination = { ...this.pagination } pagination.total = res.result.totalCount this.pagination = pagination - this.loading = false if (this.param.kpxmid) { this.selectedRowKeys = this.param.kpxmid.split(',') + } else { + this.selectedRowKeys = [] + this.selectedRows = [] } + this.loading = false }) } }, -- Gitee From 51f5484588957c1a3454b65081eb3091d2e5005b Mon Sep 17 00:00:00 2001 From: leewand Date: Wed, 2 Sep 2020 15:12:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=80=83=E8=AF=84=E8=AE=A1=E5=88=92=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/par/examPlan/ParExamItem.vue | 1 - src/views/par/examPlan/ParExamPlan.vue | 6 ++++-- src/views/par/examPlan/ParExamPlanPersonnel.vue | 6 ++++-- src/views/par/examPlan/PlanItem.vue | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/views/par/examPlan/ParExamItem.vue b/src/views/par/examPlan/ParExamItem.vue index d75c02b..ae52a1e 100644 --- a/src/views/par/examPlan/ParExamItem.vue +++ b/src/views/par/examPlan/ParExamItem.vue @@ -145,7 +145,6 @@ export default { } */ }, onSelectChange (selectedRowKeys, selectedRows) { - debugger this.selectedRowKeys = selectedRowKeys this.selectedRows = selectedRows }, diff --git a/src/views/par/examPlan/ParExamPlan.vue b/src/views/par/examPlan/ParExamPlan.vue index b4173b4..676a051 100644 --- a/src/views/par/examPlan/ParExamPlan.vue +++ b/src/views/par/examPlan/ParExamPlan.vue @@ -53,7 +53,7 @@ - + 制定考评项 @@ -106,7 +106,9 @@ export default { columns: [ { title: '考评名称', - dataIndex: 'kpjhmc' + dataIndex: 'kpjhmc', + width: '200px', + ellipsis: true }, { title: '考评开始时间', diff --git a/src/views/par/examPlan/ParExamPlanPersonnel.vue b/src/views/par/examPlan/ParExamPlanPersonnel.vue index db1001f..059df8f 100644 --- a/src/views/par/examPlan/ParExamPlanPersonnel.vue +++ b/src/views/par/examPlan/ParExamPlanPersonnel.vue @@ -50,7 +50,7 @@ - + 制定考评项 @@ -103,7 +103,9 @@ export default { columns: [ { title: '考评名称', - dataIndex: 'kpjhmc' + dataIndex: 'kpjhmc', + width: '200px', + ellipsis: true }, { title: '考评开始时间', diff --git a/src/views/par/examPlan/PlanItem.vue b/src/views/par/examPlan/PlanItem.vue index 59b035a..4887e8a 100644 --- a/src/views/par/examPlan/PlanItem.vue +++ b/src/views/par/examPlan/PlanItem.vue @@ -10,7 +10,7 @@ > - + - + -- Gitee