diff --git a/src/views/modules/kpi/kpirule-add-or-update.vue b/src/views/modules/kpi/kpirule-add-or-update.vue
index 29966a08..9be01ab0 100644
--- a/src/views/modules/kpi/kpirule-add-or-update.vue
+++ b/src/views/modules/kpi/kpirule-add-or-update.vue
@@ -26,17 +26,6 @@
           clearable
         ></el-input>
       </el-form-item>
-      <el-form-item label="规则生成方式" prop="ruleMode">
-        <el-select v-model="dataForm.ruleMode" placeholder="规则生成方式" @change="handleRuleMode(dataForm.ruleMode)">
-          <el-option
-            v-for="item in ruleModeList"
-            :key="item.dictValue"
-            :label="item.dictName"
-            :value="item.dictValue"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="考核周期" prop="kpiCycle">
         <el-select v-model="dataForm.kpiCycle" placeholder="考核周期">
           <el-option
@@ -49,7 +38,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="考核部门类别" prop="deptTypeKey">
-        <el-select v-model="dataForm.deptTypeKey" placeholder="考核周期">
+        <el-select v-model="dataForm.deptTypeKey" placeholder="考核部门类别">
           <el-option
             v-for="item in deptTypeKeyList"
             :key="item.dictValue"
@@ -59,7 +48,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="引用" prop="referenceId" v-if="dataForm.ruleMode === '0'">
+      <el-form-item label="引用" prop="referenceId">
         <el-select v-model="dataForm.referenceId" clearable placeholder="引用" @change="handlereference(dataForm.referenceId)">
           <el-option
             v-for="item in kpiFormulaList"
@@ -70,7 +59,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="入参" prop="metaDataCode" v-if="dataForm.ruleMode === '0'">
+      <el-form-item label="入参" prop="metaDataCode">
         <el-select
           v-model="dataForm.metaDataCode"
           filterable
@@ -88,7 +77,7 @@
         &nbsp; &nbsp;
         <el-button type="primary" @click="addRuleParam(dataForm.metaDataCode)">添加</el-button>
       </el-form-item>
-      <el-table :data="dataForm.ruleParamList" v-if="dataForm.ruleMode === '0' && dataForm.ruleParamList &&dataForm.ruleParamList.length>0" border>
+      <el-table :data="dataForm.ruleParamList" v-if="dataForm.ruleParamList &&dataForm.ruleParamList.length>0" border>
         <el-table-column type="index" width="50" label="序号"></el-table-column>
         <el-table-column prop="id" label="参数表主键" v-if="false"></el-table-column>
         <el-table-column prop="metaDataCode" label="参数名称" :formatter="showMetaDataCodeFormatter"> </el-table-column>
@@ -131,12 +120,12 @@ export default {
         id: '',
         ruleName: '',
         ruleCode: '',
-        ruleMode: '',
-        referenceId: '',
-        kpiCycle: '',
-        deptTypeKey: '',
-        metaDataCode: '',
-        ruleParamList: []
+        ruleMode: '0', // 规则生成方式(0-元公式，1-手工打分，2-投票)
+        referenceId: '', // 引用公式id
+        kpiCycle: '', // 考核周期
+        deptTypeKey: '', // 考核部门类别
+        metaDataCode: '', // 入参
+        ruleParamList: []// 入参列表
       },
       deptTypeKeyList: []
     }
@@ -158,16 +147,9 @@ export default {
             trigger: 'blur'
           }
         ],
-        ruleMode: [
-          {
-            required: true,
-            message: this.$t('validate.required'),
-            trigger: 'blur'
-          }
-        ],
         referenceId: [
           {
-            required: false,
+            required: true,
             message: this.$t('validate.required'),
             trigger: 'blur'
           }
@@ -197,7 +179,6 @@ export default {
     }
   },
   created () {
-    this.getRuleModeList()
     this.getKpiCycleList()
     this.getKpiFormulaList()
     this.getMetaDataCodeList()
@@ -262,18 +243,6 @@ export default {
       1000,
       { leading: true, trailing: false }
     ),
-    // 获取绩效考核规则生成方式
-    getRuleModeList () {
-      this.$http
-        .get(`/sys/dict/listSimple/rule_mode`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.ruleModeList = res.data
-        })
-        .catch(() => {})
-    },
     // 获取绩效考核周期下拉框集合
     getKpiCycleList () {
       this.$http
@@ -339,15 +308,6 @@ export default {
       this.dataForm.ruleParamList.push(temp)
       this.dataForm.metaDataCode = ''
     },
-    // 规则生成方式(0-元公式，1-手工打分，2-投票)
-    handleRuleMode (ruleMode) {
-      // console.log('规则生成方式=' + ruleMode)
-      if (ruleMode === '0') {
-        this.dataForm.metaDataCode = '' // 之前选中参数清空
-        this.dataForm.ruleParamList = [] // 参数列表清空
-        this.dataForm.referenceId = ''// 引用公式id清空
-      }
-    },
     // 引用公式id
     handlereference (referenceId) {
       // console.log('当前选中的引用公式id=' + referenceId)
diff --git a/src/views/modules/kpi/kpirule.vue b/src/views/modules/kpi/kpirule.vue
index 0d0a3d66..741fcf8f 100644
--- a/src/views/modules/kpi/kpirule.vue
+++ b/src/views/modules/kpi/kpirule.vue
@@ -9,7 +9,10 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('kpi:kpirule:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('kpi:kpirule:save')" type="primary" @click="addOrUpdateHandle('0')">新增公式规则</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:kpirule:save')" type="primary" @click="addOrUpdateHandle('1')">新增手动打分规则</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('kpi:kpirule:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -29,7 +32,7 @@
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('kpi:kpirule:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('kpi:kpirule:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.ruleMode,scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('kpi:kpirule:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
@@ -43,8 +46,10 @@
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
+      <!-- 弹窗, 新增 / 修改公式规则 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <!-- 弹窗, 新增 / 修改手动打分规则 -->
+      <manual-score-add-or-update v-if="manualScoreAddOrUpdateVisible" ref="manualScoreAddOrUpdate" @refreshDataList="getDataList"></manual-score-add-or-update>
     </div>
   </el-card>
 </template>
@@ -52,6 +57,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './kpirule-add-or-update'
+import ManualScoreAddOrUpdate from './manual-score-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -65,13 +71,15 @@ export default {
       dataForm: {
         ruleName: ''
       },
+      manualScoreAddOrUpdateVisible: false, // 手动打分新增／更新，弹窗visible状态
       ruleModeList: [],
       kpiCycleList: [],
       deptTypeKeyList: []
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    ManualScoreAddOrUpdate
   },
   created () {
     this.getRuleModeList()
@@ -79,6 +87,24 @@ export default {
     this.getDeptTypeKeyList()
   },
   methods: {
+    // 新增 修改
+    addOrUpdateHandle (ruleMode, id) {
+      if (ruleMode === '0') {
+        // console.log(+'ruleMode=' + ruleMode + '元公式;id=' + id)
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.dataForm.id = id
+          this.$refs.addOrUpdate.init()
+        })
+      } else if (ruleMode === '1') {
+        // console.log('ruleMode=' + ruleMode + '手动打分;id=' + id)
+        this.manualScoreAddOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.manualScoreAddOrUpdate.dataForm.id = id
+          this.$refs.manualScoreAddOrUpdate.init()
+        })
+      }
+    },
     // 获取绩效考核规则生成方式
     getRuleModeList () {
       this.$http.get(`/sys/dict/listSimple/rule_mode`).then(({ data: res }) => {
diff --git a/src/views/modules/kpi/manual-score-add-or-update.vue b/src/views/modules/kpi/manual-score-add-or-update.vue
new file mode 100644
index 00000000..99ca5706
--- /dev/null
+++ b/src/views/modules/kpi/manual-score-add-or-update.vue
@@ -0,0 +1,187 @@
+<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-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="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()">{{
+        $t("confirm")
+      }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      kpiFormulaList: [],
+      metaDataCodeList: [],
+      paramAmount: 100, // 公式参数数量
+      kpiManualScoreList: [], // 手动打分下拉框
+      dataForm: {
+        id: '',
+        ruleName: '',
+        ruleCode: '',
+        ruleMode: '1', // 规则生成方式(0-元公式，1-手工打分，2-投票)
+        referenceId: '', // 关联的手动打分项
+        kpiCycle: '', // 考核周期来源于选择的手动打分项
+        deptTypeKey: '' // 考核部门类别来源于选择的手动打分项
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        ruleName: [
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ],
+        ruleCode: [
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ],
+        referenceId: [
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
+  created () {
+    this.getKpiManualScoreList()
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http
+        .get(`/kpi/kpirule/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data
+          }
+        })
+        .catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs['dataForm'].validate(valid => {
+          if (!valid) {
+            return false
+          }
+          this.$http[!this.dataForm.id ? 'post' : 'put'](
+            '/kpi/kpirule/saveOrUpdate/',
+            this.dataForm
+          )
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg)
+              }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                }
+              })
+            })
+            .catch(() => {})
+        })
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    // 查询手动打分下拉框
+    getKpiManualScoreList () {
+      this.$http
+        .get(`/kpi/kpimanualscore/getKpiManualScoreList`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.kpiManualScoreList = res.data
+        })
+        .catch(() => {})
+    },
+    // 关联的手动打分改变
+    handlereference (referenceId) {
+      console.log('当前选中的手动打分项id=' + referenceId)
+      if (referenceId) {
+        let kpiManualScoreArray = this.kpiManualScoreList
+        for (var i = 0; i < kpiManualScoreArray.length; i++) {
+          if (kpiManualScoreArray[i].id === referenceId) {
+            this.dataForm.kpiCycle = kpiManualScoreArray[i].scoreCycle
+            this.dataForm.deptTypeKey = kpiManualScoreArray[i].deptTypeKey
+          }
+        }
+      } else {
+        this.kpiCycle = ''
+        this.deptTypeKey = ''
+      }
+    }
+  }
+}
+</script>