From 3cde78e20b47be25b2c6cd6d178beb78c1d31c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 25 Feb 2020 10:53:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E6=89=93=E5=88=86=20=E8=80=83=E6=A0=B8=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E4=B8=8B=E6=8B=89=E7=AD=9B=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/kpi/rule-add-or-update.vue  |  8 +-
 .../kpi/rule-manualScore-add-or-update.vue    | 89 ++++++++++++-------
 2 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/src/views/modules/kpi/rule-add-or-update.vue b/src/views/modules/kpi/rule-add-or-update.vue
index 9235259a..66e6957c 100644
--- a/src/views/modules/kpi/rule-add-or-update.vue
+++ b/src/views/modules/kpi/rule-add-or-update.vue
@@ -14,16 +14,10 @@
                   placeholder="考核规则名称"
                   clearable></el-input>
       </el-form-item>
-      <!-- <el-form-item label="考核类别"
-                    prop="ruleCode">
-        <el-input v-model="dataForm.ruleCode"
-                  placeholder="考核类别" 
-                  clearable></el-input>
-      </el-form-item> -->
       <el-form-item label="考核类别"
                     prop="ruleCode">
         <el-select v-model="dataForm.ruleCode"
-                   placeholder="考核周期">
+                   placeholder="考核类别">
           <el-option v-for="item in dictTypeList"
                      :key="item.dictValue"
                      :label="item.dictName"
diff --git a/src/views/modules/kpi/rule-manualScore-add-or-update.vue b/src/views/modules/kpi/rule-manualScore-add-or-update.vue
index e5cf4e56..d40a19b8 100644
--- a/src/views/modules/kpi/rule-manualScore-add-or-update.vue
+++ b/src/views/modules/kpi/rule-manualScore-add-or-update.vue
@@ -1,46 +1,55 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="!dataForm.id ? $t('add') : $t('update')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
-      :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'"
-    >
-      <el-form-item label="考核规则名称" prop="ruleName">
-        <el-input
-          v-model="dataForm.ruleName"
-          placeholder="考核规则名称"
-          clearable
-        ></el-input>
+  <el-dialog :visible.sync="visible"
+             :title="!dataForm.id ? $t('add') : $t('update')"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+      <el-form-item label="考核规则名称"
+                    prop="ruleName">
+        <el-input v-model="dataForm.ruleName"
+                  placeholder="考核规则名称"
+                  clearable></el-input>
       </el-form-item>
-      <el-form-item label="考核规则编码" prop="ruleCode">
+      <!-- <el-form-item label="考核规则编码" prop="ruleCode">
         <el-input
           v-model="dataForm.ruleCode"
           placeholder="考核规则编码"
           clearable
         ></el-input>
+      </el-form-item> -->
+      <el-form-item label="考核类别"
+                    prop="ruleCode">
+        <el-select v-model="dataForm.ruleCode"
+                   placeholder="考核类别">
+          <el-option v-for="item in dictTypeList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="关联的手动打分" prop="referenceId">
-        <el-select v-model="dataForm.referenceId" clearable placeholder="关联的手动打分" @change="handlereference(dataForm.referenceId)">
-          <el-option
-            v-for="item in kpiManualScoreList"
-            :key="item.id"
-            :label="item.scoreName"
-            :value="item.id"
-          >
+      <el-form-item label="关联的手动打分"
+                    prop="referenceId">
+        <el-select v-model="dataForm.referenceId"
+                   clearable
+                   placeholder="关联的手动打分"
+                   @change="handlereference(dataForm.referenceId)">
+          <el-option v-for="item in kpiManualScoreList"
+                     :key="item.id"
+                     :label="item.scoreName"
+                     :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{
         $t("confirm")
       }}</el-button>
     </template>
@@ -65,7 +74,8 @@ export default {
         referenceId: '', // 关联的手动打分项
         kpiCycle: '', // 考核周期来源于选择的手动打分项
         deptTypeKey: '' // 考核部门类别来源于选择的手动打分项
-      }
+      },
+      dictTypeList: [],
     }
   },
   computed: {
@@ -97,6 +107,7 @@ export default {
   },
   created () {
     this.getKpiManualScoreList()
+    this.getDictTypeList()
   },
   methods: {
     init () {
@@ -121,7 +132,19 @@ export default {
             ...res.data
           }
         })
-        .catch(() => {})
+        .catch(() => { })
+    },
+    // 获取考核类别下拉框集合
+    getDictTypeList () {
+      this.$http
+        .get(`/sys/dict/listSimple/kpi_rule_code_manual_score`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.dictTypeList = res.data
+        })
+        .catch(() => { })
     },
     // 表单提交
     dataFormSubmitHandle: debounce(
@@ -148,7 +171,7 @@ export default {
                 }
               })
             })
-            .catch(() => {})
+            .catch(() => { })
         })
       },
       1000,
@@ -164,7 +187,7 @@ export default {
           }
           this.kpiManualScoreList = res.data
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 关联的手动打分改变
     handlereference (referenceId) {