From be16d3a02ba710b11642641c9ef3f7bf609c4075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= Date: Mon, 2 Nov 2020 15:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=A9=E6=95=88=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workbench.js | 9 + src/components/getDepart/index.vue | 9 +- src/components/getPersonnel/index.vue | 7 +- src/style/common.less | 2 +- .../performance/components/table copy.vue | 234 ++++++++++++++++++ .../performance/components/table.vue | 182 ++++++++++---- .../kpi/assessment/performance/index.vue | 2 +- src/views/kpi/report/detail/index.vue | 4 +- .../assessmentGroup/edit/components/basis.vue | 47 +++- .../workbench/assessmentGroup/edit/index.vue | 12 +- 10 files changed, 433 insertions(+), 75 deletions(-) create mode 100644 src/views/kpi/assessment/performance/components/table copy.vue diff --git a/src/api/workbench.js b/src/api/workbench.js index debcfdb..652d64a 100644 --- a/src/api/workbench.js +++ b/src/api/workbench.js @@ -8,6 +8,15 @@ export function getWorkList (query) { }) } +// 校验是否有跨组人员 +export function apiCheckStaff (query) { + return request({ + url: '/lz_management/evaluationGroup/checkStaff', + method: 'POST', + data: query + }) +} + // 保存基础设置 export function saveBaseSet (query) { return request({ diff --git a/src/components/getDepart/index.vue b/src/components/getDepart/index.vue index 659e19a..8d883ae 100644 --- a/src/components/getDepart/index.vue +++ b/src/components/getDepart/index.vue @@ -107,7 +107,7 @@ export default { }, beforeMount () {}, mounted () { - this.tags = this.showDataList.list || [] + this.tags = this.showDataList.list.concat([]) || [] this.showData = this.data.length > -1 ? this.data : [] }, methods: { @@ -195,10 +195,7 @@ export default { }, handleCancel () { this.$emit('update:isShow', false) - }, - xcq1 () { - console.log(this.a) - // this.$refs.tree.setChecked(100) + this.$forceUpdate() } }, watch: {} @@ -293,7 +290,7 @@ export default { border-top: 1px solid @borderColor; } .el-dialog__title{ - font-size: 16px; + font-size: 14px; } .dialog-footer{ display: flex; diff --git a/src/components/getPersonnel/index.vue b/src/components/getPersonnel/index.vue index 1dc228a..8c0d612 100644 --- a/src/components/getPersonnel/index.vue +++ b/src/components/getPersonnel/index.vue @@ -257,11 +257,6 @@ export default { handleCancel () { this.$emit('update:isShow', false) this.$forceUpdate() - console.log('isShow: ', this.isShow) - }, - xcq1 () { - console.log(this.a) - // this.$refs.tree.setChecked(100) } }, watch: {} @@ -382,7 +377,7 @@ export default { border-top: 1px solid @borderColor; } .el-dialog__title{ - font-size: 16px; + font-size: 14px; } .dialog-footer{ display: flex; diff --git a/src/style/common.less b/src/style/common.less index 5b69392..0314863 100644 --- a/src/style/common.less +++ b/src/style/common.less @@ -9,7 +9,7 @@ } .commonFont { - font-size: 16px; + font-size: 14px; color: #52575b; } diff --git a/src/views/kpi/assessment/performance/components/table copy.vue b/src/views/kpi/assessment/performance/components/table copy.vue new file mode 100644 index 0000000..490be7c --- /dev/null +++ b/src/views/kpi/assessment/performance/components/table copy.vue @@ -0,0 +1,234 @@ + + + diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue index 8754d9b..227e81e 100644 --- a/src/views/kpi/assessment/performance/components/table.vue +++ b/src/views/kpi/assessment/performance/components/table.vue @@ -1,59 +1,46 @@