From cd8ef5b5de3b4daa4f70f786b2f94c15dc7f595e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Wed, 18 Nov 2020 17:38:17 +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

---
 src/views/kpi/assessment/goals/index.vue                  | 2 +-
 .../workbench/assessmentGroup/edit/components/process.vue | 8 +++++---
 .../assessmentGroup/edit/components/templateSet.vue       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/kpi/assessment/goals/index.vue b/src/views/kpi/assessment/goals/index.vue
index 73261d0..0a01b4f 100644
--- a/src/views/kpi/assessment/goals/index.vue
+++ b/src/views/kpi/assessment/goals/index.vue
@@ -93,7 +93,7 @@
                     <el-input clearable size="small" v-model="formIndicators.target"></el-input>
                   </el-form-item>
                    <el-form-item label="考核标准" prop="keyResult">
-                    <el-input size="small" clearable  type="textarea"  v-model="formIndicators.keyResult"></el-input>
+                    <el-input size="small" clearable :rows="24"  type="textarea"  v-model="formIndicators.keyResult"></el-input>
                   </el-form-item>
                    <el-form-item label="权重" prop="weight">
                      <el-input size="small" @input.native="$handleInputInt('formIndicators.checkWeight')"  clearable  v-model="formIndicators.checkWeight">
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/process.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/process.vue
index 5edd495..49da991 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/process.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/process.vue
@@ -76,7 +76,7 @@ export default {
         name: '评分',
         componment: 'Score'
       }, {
-        name: '审批节点',
+        name: '结果确认',
         componment: 'Approval'
       } ],
       dataObject: {}
@@ -136,9 +136,11 @@ export default {
   watch: {
     info: {
       handler (n, o) {
-        this.processLsit.map(j => {
+        console.log('n: ', n)
+        console.log('this.processLsit: ', this.processLsit)
+        this.processLsit.length > 0 && this.processLsit.map(j => {
           for (let i in n) {
-            if (j.id === n[i].id) j.label = n[i].label
+            if (n[i] && j.id === n[i].id) j.label = n[i].label
           }
         })
         this.$emit('update:processInfo', n)
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
index 836fc6d..94280d5 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
@@ -187,7 +187,7 @@
                     <el-input clearable size="small" v-model="formIndicators.name"></el-input>
                   </el-form-item>
                    <el-form-item label="考核标准" prop="keyResult">
-                    <el-input size="small" clearable  type="textarea"  v-model="formIndicators.keyResult"></el-input>
+                    <el-input size="small" resize='vertical' :rows="24" clearable  type="textarea"  v-model="formIndicators.keyResult"></el-input>
                   </el-form-item>
                    <el-form-item label="权重" prop="weight">
                      <el-input size="small" @input.native="$handleInputInt('formIndicators.weight')"    v-model="formIndicators.weight">