From cd5e3a368e9817a1676a6fccb4301aea21fe2463 Mon Sep 17 00:00:00 2001 From: xiongchengqiang Date: Tue, 15 Dec 2020 14:45:45 +0800 Subject: [PATCH 01/54] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performance/components/table.vue | 7 ++- .../kpi/assessment/performance/index.vue | 1 + src/views/kpi/tablePrint/index.vue | 53 ++++++++++--------- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue index e1d77d5..a7e0443 100644 --- a/src/views/kpi/assessment/performance/components/table.vue +++ b/src/views/kpi/assessment/performance/components/table.vue @@ -281,8 +281,11 @@ export default { } } }, - mounted () { - this.handleGrt375() + async mounted () { + await this.handleGrt375() + if (this.$route.query.detailId) { + this.handleLookProcess(this.$route.query.detailId) + } }, methods: { // 获取指标任务详情 diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue index 3c9501b..c1a0c68 100644 --- a/src/views/kpi/assessment/performance/index.vue +++ b/src/views/kpi/assessment/performance/index.vue @@ -222,6 +222,7 @@ export default { if (this.isNoRouter) { await this.handleStartsReq() } + await this.handleList() }, methods: { diff --git a/src/views/kpi/tablePrint/index.vue b/src/views/kpi/tablePrint/index.vue index 6ebccc3..4971051 100644 --- a/src/views/kpi/tablePrint/index.vue +++ b/src/views/kpi/tablePrint/index.vue @@ -10,8 +10,8 @@ 考核月份
- 2020年9月 + style="width:130px"> + {{obj.assessCycle}}
@@ -27,7 +27,7 @@
- 熊成强 + {{obj.currentApprovalStaffName}}
@@ -35,7 +35,7 @@
- 设计部 + {{obj.departmentOne}}
@@ -43,7 +43,7 @@
- / + {{obj.departmentTwo}}
@@ -51,7 +51,7 @@
- / + {{obj.departmentThree}}
@@ -74,7 +74,7 @@
考核维度
-
+
目标/指标
@@ -96,26 +96,26 @@ 评分说明
-
+
- 业绩 + {{i.name}}
-
-
几月交易额
-
几月交易额
-
几月交易额
-
几月交易额
-
几月交易额
+
+
{{j.target}}
+
{{j.keyResult}}
几月交易额
+
{{j.checkResult}}
+
{{j.superScore || '/'}}
+
{{j.acquireScore || '/'}}
几月交易额
-
业务考核结果
-
70%
+
业务考核结果
+
{{Math.round((j.checkWeight * 100) * 1000) / 1000 }}%
/
/
2.512
@@ -123,14 +123,19 @@
-
zui
-
zui
-
zui
+
最终绩效考核评分
+
3.234
+
/
-
直属上级确认绩效考核内容与结果 +
最终绩效考核结果等级
+
3.5+
+
/
+
+
+
直属上级确认绩效考核内容与结果 签字：
-
直属上级确认绩效考核内容与结果 +
直属上级确认绩效考核内容与结果 签字：
@@ -180,7 +185,7 @@ export default { border-left: 1px solid #666666; &-title { .center(); - width: 1460px; + width: 1480px; height: 50px; border-top: 1px solid #666666; border-right: 1px solid #666666; @@ -239,7 +244,7 @@ export default { border-bottom: 1px solid #666666; } .bg{ - background: rgb(245, 187, 120); + // background: rgb(245, 187, 120); } } From b41c3b33b166ce8b7ee1a2ba7a86a0f0cb102509 Mon Sep 17 00:00:00 2001 From: xiongchengqiang Date: Tue, 15 Dec 2020 15:23:18 +0800 Subject: [PATCH 02/54] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performance/components/pinglun.vue | 3 +++ src/views/kpi/tablePrint/index.vue | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/views/kpi/assessment/performance/components/pinglun.vue b/src/views/kpi/assessment/performance/components/pinglun.vue index a9c1ac2..fdb79b2 100644 --- a/src/views/kpi/assessment/performance/components/pinglun.vue +++ b/src/views/kpi/assessment/performance/components/pinglun.vue @@ -71,6 +71,9 @@ export default { From 9aed08d0cd50add414f0866e2599616a6c787ba9 Mon Sep 17 00:00:00 2001 From: xiongchengqiang Date: Tue, 15 Dec 2020 15:53:06 +0800 Subject: [PATCH 03/54] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kpi/assessment/performance/components/table.vue | 9 +++++---- src/views/kpi/workbench/home/index.vue | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue index a7e0443..d03597e 100644 --- a/src/views/kpi/assessment/performance/components/table.vue +++ b/src/views/kpi/assessment/performance/components/table.vue @@ -282,10 +282,11 @@ export default { } }, async mounted () { - await this.handleGrt375() - if (this.$route.query.detailId) { - this.handleLookProcess(this.$route.query.detailId) - } + console.log('this.$route.query: ', this.$route.query) + // await this.handleGrt375() + // if (this.$route.params.detailId) { + // this.handleLookProcess(this.$route.query.detailId) + // } }, methods: { // 获取指标任务详情 diff --git a/src/views/kpi/workbench/home/index.vue b/src/views/kpi/workbench/home/index.vue index 15a7dbc..81cbd6f 100644 --- a/src/views/kpi/workbench/home/index.vue +++ b/src/views/kpi/workbench/home/index.vue @@ -69,7 +69,8 @@ export default { this.$nextTick(() => { this.$router.replace({ name: item[0].name, - query: this.$route.query + query: this.$route.query, + params: this.$route.query }) }) } From 3bb130eac12bb213b9e33c5ec86be120fade19f6 Mon Sep 17 00:00:00 2001 From: xiongchengqiang Date: Tue, 15 Dec 2020 16:00:09 +0800 Subject: [PATCH 04/54] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kpi/assessment/performance/components/table.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue index d03597e..2ca316f 100644 --- a/src/views/kpi/assessment/performance/components/table.vue +++ b/src/views/kpi/assessment/performance/components/table.vue @@ -282,11 +282,10 @@ export default { } }, async mounted () { - console.log('this.$route.query: ', this.$route.query) - // await this.handleGrt375() - // if (this.$route.params.detailId) { - // this.handleLookProcess(this.$route.query.detailId) - // } + await this.handleGrt375() + if (this.$route.params.detailId) { + this.handleLookProcess(this.$route.query.detailId) + } }, methods: { // 获取指标任务详情 From 4b59f3956efa9d0557ad39870dd685b56dff57ec Mon Sep 17 00:00:00 2001 From: xiongchengqiang Date: Tue, 15 Dec 2020 17:09:03 +0800 Subject: [PATCH 05/54] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performance/components/pinglun.vue | 14 +++++--- .../performance/components/process.vue | 34 ++++++++++++++----- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/views/kpi/assessment/performance/components/pinglun.vue b/src/views/kpi/assessment/performance/components/pinglun.vue index fdb79b2..bed0405 100644 --- a/src/views/kpi/assessment/performance/components/pinglun.vue +++ b/src/views/kpi/assessment/performance/components/pinglun.vue @@ -22,7 +22,7 @@ #
{{i.gmtCreate}}
-
+
评论 「{{i.taskName}}」
@@ -46,6 +46,10 @@ export default { isJilu: { type: Boolean, default: false + }, + background: { + type: String, + default: '#cfe5fc' } }, // 1，修改名称，2修改进度 ，3名称和进度都修改 @@ -71,6 +75,8 @@ export default { From dfebafabaf90a43faaeb2f173d3b43463c403bcc Mon Sep 17 00:00:00 2001 From: xiongchengqiang Date: Fri, 18 Dec 2020 15:23:10 +0800 Subject: [PATCH 54/54] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index eda6d84..7cdb174 100644 --- a/src/App.vue +++ b/src/App.vue @@ -36,7 +36,7 @@ export default { computed: { }, async created () { - if (!dd.other) { + if (dd.other) { var vConsole = new VConsole({ vConsole_switch_x: 0, vConsole_switch_y: 0