diff --git a/src/views/modules/kpi/kpiformula-add-or-update.vue b/src/views/modules/kpi/kpiformula-add-or-update.vue
index 53b7c8f9..73e411cd 100644
--- a/src/views/modules/kpi/kpiformula-add-or-update.vue
+++ b/src/views/modules/kpi/kpiformula-add-or-update.vue
@@ -21,24 +21,6 @@
       </el-form-item>
           <el-form-item label="备注" prop="remark">
           <el-input v-model="dataForm.remark" placeholder="备注" type="textarea"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision" v-if="false">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy" v-if="false">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime" v-if="false">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy" v-if="false">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime" v-if="false">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标记" prop="delFlag" v-if="false">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -62,13 +44,7 @@ export default {
         formula: '',
         paramAmount: '',
         description: '',
-        remark: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: '',
-        delFlag: ''
+        remark: ''
       }
     }
   },
@@ -95,24 +71,6 @@ export default {
         ],
         remark: [
           { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
diff --git a/src/views/modules/kpi/kpiformula.vue b/src/views/modules/kpi/kpiformula.vue
index 2b439586..e1250557 100644
--- a/src/views/modules/kpi/kpiformula.vue
+++ b/src/views/modules/kpi/kpiformula.vue
@@ -26,12 +26,7 @@
         <el-table-column prop="paramAmount" label="公式参数数量" header-align="center" align="center" ></el-table-column>
         <el-table-column prop="description" label="公式描述" header-align="center" align="center"></el-table-column>
         <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center" v-if="false"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标记" header-align="center" align="center" v-if="false"></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:kpiformula:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
diff --git a/src/views/modules/kpi/kpirule-add-or-update.vue b/src/views/modules/kpi/kpirule-add-or-update.vue
index bcaba724..29966a08 100644
--- a/src/views/modules/kpi/kpirule-add-or-update.vue
+++ b/src/views/modules/kpi/kpirule-add-or-update.vue
@@ -37,21 +37,21 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="引用" prop="referenceId" v-if="dataForm.ruleMode === '0'">
-        <el-select v-model="dataForm.referenceId" clearable placeholder="引用" @change="handlereference(dataForm.referenceId)">
+      <el-form-item label="考核周期" prop="kpiCycle">
+        <el-select v-model="dataForm.kpiCycle" placeholder="考核周期">
           <el-option
-            v-for="item in kpiFormulaList"
-            :key="item.id"
-            :label="item.formulaName"
-            :value="item.id"
+            v-for="item in kpiCycleList"
+            :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-form-item label="考核部门类别" prop="deptTypeKey">
+        <el-select v-model="dataForm.deptTypeKey" placeholder="考核周期">
           <el-option
-            v-for="item in kpiCycleList"
+            v-for="item in deptTypeKeyList"
             :key="item.dictValue"
             :label="item.dictName"
             :value="item.dictValue"
@@ -59,6 +59,17 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="引用" prop="referenceId" v-if="dataForm.ruleMode === '0'">
+        <el-select v-model="dataForm.referenceId" clearable placeholder="引用" @change="handlereference(dataForm.referenceId)">
+          <el-option
+            v-for="item in kpiFormulaList"
+            :key="item.id"
+            :label="item.formulaName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="入参" prop="metaDataCode" v-if="dataForm.ruleMode === '0'">
         <el-select
           v-model="dataForm.metaDataCode"
@@ -123,9 +134,11 @@ export default {
         ruleMode: '',
         referenceId: '',
         kpiCycle: '',
+        deptTypeKey: '',
         metaDataCode: '',
         ruleParamList: []
-      }
+      },
+      deptTypeKeyList: []
     }
   },
   computed: {
@@ -166,6 +179,13 @@ export default {
             trigger: 'blur'
           }
         ],
+        deptTypeKey: [
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ],
         ruleParam: [
           {
             required: false,
@@ -181,12 +201,16 @@ export default {
     this.getKpiCycleList()
     this.getKpiFormulaList()
     this.getMetaDataCodeList()
+    this.getDeptTypeKeyList()
   },
   methods: {
     init () {
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
+        this.dataForm.ruleParamList = []
+        this.dataForm.referenceId = ''
+        this.dataForm.metaDataCode = ''
         if (this.dataForm.id) {
           this.getInfo()
         }
@@ -334,6 +358,15 @@ export default {
           this.paramAmount = kpiFormulaArray[i].paramAmount
         }
       }
+    },
+    // 获取考核部门类别下拉框
+    getDeptTypeKeyList () {
+      this.$http.get(`/sys/dict/listSimple/org_type`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.deptTypeKeyList = res.data
+      }).catch(() => { })
     }
   }
 }
diff --git a/src/views/modules/kpi/kpirule.vue b/src/views/modules/kpi/kpirule.vue
index 9122c46e..0d0a3d66 100644
--- a/src/views/modules/kpi/kpirule.vue
+++ b/src/views/modules/kpi/kpirule.vue
@@ -25,12 +25,8 @@
         <el-table-column prop="referenceId" label="引用ID" header-align="center" align="center" v-if="false"></el-table-column>
         <el-table-column prop="referenceName" label="引用" header-align="center" align="center"></el-table-column>
         <el-table-column prop="kpiCycle" label="考核周期" header-align="center" align="center" :formatter="showKpiCycleFormatter"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center" v-if="false"></el-table-column>
+        <el-table-column prop="deptTypeKey" label="考核部门类别" header-align="center" align="center" :formatter="showDeptTypeKeyFormatter"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标记" header-align="center" align="center" v-if="false"></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>
@@ -70,7 +66,8 @@ export default {
         ruleName: ''
       },
       ruleModeList: [],
-      kpiCycleList: []
+      kpiCycleList: [],
+      deptTypeKeyList: []
     }
   },
   components: {
@@ -79,6 +76,7 @@ export default {
   created () {
     this.getRuleModeList()
     this.getKpiCycleList()
+    this.getDeptTypeKeyList()
   },
   methods: {
     // 获取绩效考核规则生成方式
@@ -116,6 +114,25 @@ export default {
         }
       }
       return ''
+    },
+    // 获取考核部门类别下拉框
+    getDeptTypeKeyList () {
+      this.$http.get(`/sys/dict/listSimple/org_type`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.deptTypeKeyList = res.data
+      }).catch(() => { })
+    },
+    // 转换考核部门显示名称
+    showDeptTypeKeyFormatter: function (row, column) {
+      if (row.deptTypeKey) {
+        let dict = this.deptTypeKeyList.filter(item => item.dictValue === row.deptTypeKey)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
     }
   }
 }