From bdf413fa47fb6c411cfe7b804b2f7fce3d71a6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Thu, 5 Nov 2020 15:28:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assessmentGroup/edit/components/ApprovalList.vue      | 8 +++-----
 .../assessmentGroup/edit/components/ConfirmList.vue       | 3 +--
 .../assessmentGroup/edit/components/ScoreList.vue         | 3 +--
 src/views/kpi/workbench/initiateAssessment/index.vue      | 1 +
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue
index a6ea0da..06e5644 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue
@@ -211,8 +211,6 @@ export default {
       }
       this.handleClick(params)
       this.$forceUpdate()
-      console.log('this.itemInfo: ', this.itemInfo)
-      console.log('this.list: ', this.list)
     },
     handleDelete (item) {
       if (item.id) {
@@ -238,9 +236,9 @@ export default {
         })
         i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1)
         i.optType = (i.isActive === 0 || i.isActive === -1) ? i.isActive : i.optType
+        console.log('i.optType: ', i.optType)
       })
-      console.log('n: ', n)
-      this.$emit('update:info', this.list)
+      this.$emit('update:info', n)
       this.$forceUpdate()
     }
   },
@@ -258,7 +256,6 @@ export default {
       deep: true,
       handler (n, o) {
         const arr = n
-        console.log('arr: ', arr)
         if (arr.isActive !== 0 && arr.isActive !== -1) {
           if (arr.optType < 1) arr.optType = 1
           arr.name = this.options.filter(i => i.id === arr.optType)[0].name
@@ -269,6 +266,7 @@ export default {
             arr.name = '未指定成员'
           }
         } else {
+          arr.optType = -1
           arr.name = '被考核人自己'
         }
         // n.roleIds = ''
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue
index ed8ab2c..f16d2ad 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue
@@ -249,7 +249,6 @@ export default {
           i.optType = (i.isActive === 0 || i.isActive === -1) ? i.isActive : i.optType
           return i
         })
-        console.log('arr: ', arr)
         this.$emit('update:info', arr)
         this.$forceUpdate()
       }
@@ -262,7 +261,7 @@ export default {
     list: {
       deep: true,
       handler (n, o) {
-        this.handleIsEmit(n)
+        this.handleIsEmit(JSON.parse(JSON.stringify(n)))
       }
     },
     itemInfo: {
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
index 566b554..5bc38d4 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
@@ -244,7 +244,6 @@ export default {
         i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1)
         i.label = '权重评分：' + i.weight1 + '%'
       })
-      console.log('n: ', n)
       this.$emit('update:info', this.list)
       this.$forceUpdate()
     }
@@ -256,7 +255,7 @@ export default {
     list: {
       deep: true,
       handler (n, o) {
-        this.handleIsEmit(n)
+        this.handleIsEmit(JSON.parse(JSON.stringify(n)))
       }
     },
     itemInfo: {
diff --git a/src/views/kpi/workbench/initiateAssessment/index.vue b/src/views/kpi/workbench/initiateAssessment/index.vue
index f486332..a6181df 100644
--- a/src/views/kpi/workbench/initiateAssessment/index.vue
+++ b/src/views/kpi/workbench/initiateAssessment/index.vue
@@ -209,6 +209,7 @@ export default {
       apiInitiateAssessmentInfo(para).then(res => {
         this.dialogSendVisible = false
         if (res.code !== 200) {
+          this.$message.error(res.msg)
           return
         }
         this.$router.push({ name: 'assessment-stepList', query: { id: res.data.id, name: 'assessment-homeList' } })