diff --git a/src/views/modules/kpi/kpiformula-add-or-update.vue b/src/views/modules/kpi/kpiformula-add-or-update.vue
index 73e411cd..3fcb5d55 100644
--- a/src/views/modules/kpi/kpiformula-add-or-update.vue
+++ b/src/views/modules/kpi/kpiformula-add-or-update.vue
@@ -10,9 +10,9 @@
       <el-form-item label="方法名" prop="functionName">
           <el-input v-model="dataForm.functionName" placeholder="方法名"></el-input>
       </el-form-item>
-          <el-form-item label="公式运行方法" prop="formula">
-          <el-input v-model="dataForm.formula" placeholder="公式运行方法（Javascript）" type="textarea"></el-input>
-      </el-form-item>
+        <el-form-item label="公式运行方法"  prop="formula">
+          <el-input :rows="8" v-model="dataForm.formula" placeholder="公式运行方法（Javascript）" type="textarea"></el-input>
+        </el-form-item>
           <el-form-item label="公式参数数量" prop="paramAmount">
           <el-input v-model="dataForm.paramAmount" placeholder="公式参数数量"></el-input>
       </el-form-item>
diff --git a/src/views/modules/kpi/kpiformula.vue b/src/views/modules/kpi/kpiformula.vue
index e1250557..544a7ce4 100644
--- a/src/views/modules/kpi/kpiformula.vue
+++ b/src/views/modules/kpi/kpiformula.vue
@@ -18,14 +18,11 @@
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column type="index" width="50" label="序号"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="code" label="公式编码" header-align="center" align="center" v-if="false"></el-table-column>
         <el-table-column prop="name" label="公式名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="code" label="公式编码" header-align="center" align="center"></el-table-column>
         <el-table-column prop="functionName" label="方法名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="formula" label="公式运行方法" header-align="center" align="center"></el-table-column>
-        <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="paramAmount" width='50' label="参数数量" header-align="center" align="center" ></el-table-column>
+        <el-table-column prop="description" width='400' label="公式描述" header-align="center" align="center"></el-table-column>
         <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">
diff --git a/src/views/modules/kpi/kpiresultgrid-add-or-update.vue b/src/views/modules/kpi/kpiresultgrid-add-or-update.vue
new file mode 100644
index 00000000..70040e4d
--- /dev/null
+++ b/src/views/modules/kpi/kpiresultgrid-add-or-update.vue
@@ -0,0 +1,208 @@
+<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' : '80px'">
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+      </el-form-item>
+          <el-form-item label="手动打分得分" prop="manualScore">
+          <el-input v-model="dataForm.manualScore" placeholder="手动打分得分"></el-input>
+      </el-form-item>
+          <el-form-item label="工作得分" prop="workScore">
+          <el-input v-model="dataForm.workScore" placeholder="工作得分"></el-input>
+      </el-form-item>
+          <el-form-item label="投票得分" prop="voteScore">
+          <el-input v-model="dataForm.voteScore" placeholder="投票得分"></el-input>
+      </el-form-item>
+          <el-form-item label="最终得分" prop="finalScore">
+          <el-input v-model="dataForm.finalScore" placeholder="最终得分"></el-input>
+      </el-form-item>
+          <el-form-item label="考核周期开始日" prop="startDate">
+          <el-input v-model="dataForm.startDate" placeholder="考核周期开始日"></el-input>
+      </el-form-item>
+          <el-form-item label="考核周期结束日" prop="endDate">
+          <el-input v-model="dataForm.endDate" placeholder="考核周期结束日"></el-input>
+      </el-form-item>
+          <el-form-item label="网格长名称" prop="gridLeader">
+          <el-input v-model="dataForm.gridLeader" placeholder="网格长名称"></el-input>
+      </el-form-item>
+          <el-form-item label="考核周期(字典值 代表月，季，年)" prop="kpiCycle">
+          <el-input v-model="dataForm.kpiCycle" placeholder="考核周期(字典值 代表月，季，年)"></el-input>
+      </el-form-item>
+          <el-form-item label="所有上级机构id" prop="parentDeptIds">
+          <el-input v-model="dataForm.parentDeptIds" placeholder="所有上级机构id"></el-input>
+      </el-form-item>
+          <el-form-item label="所有上级机构名称" prop="parentDeptNames">
+          <el-input v-model="dataForm.parentDeptNames" placeholder="所有上级机构名称"></el-input>
+      </el-form-item>
+          <el-form-item label="所有机构id" prop="allDeptIds">
+          <el-input v-model="dataForm.allDeptIds" placeholder="所有机构id"></el-input>
+      </el-form-item>
+          <el-form-item label="所有机构名称" prop="allDeptNames">
+          <el-input v-model="dataForm.allDeptNames" placeholder="所有机构名称"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记"></el-input>
+      </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,
+      dataForm: {
+        id: '',
+        gridId: '',
+        manualScore: '',
+        workScore: '',
+        voteScore: '',
+        finalScore: '',
+        startDate: '',
+        endDate: '',
+        gridLeader: '',
+        kpiCycle: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        delFlag: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        manualScore: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        workScore: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        voteScore: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        finalScore: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        startDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        endDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridLeader: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        kpiCycle: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        parentDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        parentDeptNames: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptNames: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/kpi/kpiresultgrid/${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/kpiresultgrid/', 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 })
+  }
+}
+</script>
diff --git a/src/views/modules/kpi/kpiresultgrid.vue b/src/views/modules/kpi/kpiresultgrid.vue
new file mode 100644
index 00000000..b9ee2c1b
--- /dev/null
+++ b/src/views/modules/kpi/kpiresultgrid.vue
@@ -0,0 +1,84 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-kpi__kpiresultgrid}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:kpiresultgrid:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:kpiresultgrid:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="manualScore" label="手动打分得分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="workScore" label="工作得分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="voteScore" label="投票得分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="finalScore" label="最终得分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="startDate" label="考核周期开始日" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="endDate" label="考核周期结束日" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridLeader" label="网格长名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="kpiCycle" label="考核周期(字典值 代表月，季，年)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentDeptIds" label="所有上级机构id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="所有上级机构名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptIds" label="所有机构id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="所有机构名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></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"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" 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:kpiresultgrid:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('kpi:kpiresultgrid:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './kpiresultgrid-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/kpi/kpiresultgrid/page',
+        getDataListIsPage: true,
+        deleteURL: '/kpi/kpiresultgrid',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/kpi/kpirule-add-or-update.vue b/src/views/modules/kpi/kpirule-add-or-update.vue
index 9be01ab0..76c7f563 100644
--- a/src/views/modules/kpi/kpirule-add-or-update.vue
+++ b/src/views/modules/kpi/kpirule-add-or-update.vue
@@ -200,7 +200,7 @@ export default {
     // 获取信息
     getInfo () {
       this.$http
-        .get(`/kpi/kpirule/${this.dataForm.id}`)
+        .get(`/kpi/rule/${this.dataForm.id}`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -220,7 +220,7 @@ export default {
             return false
           }
           this.$http[!this.dataForm.id ? 'post' : 'put'](
-            '/kpi/kpirule/saveOrUpdate/',
+            '/kpi/rule/saveOrUpdate/',
             this.dataForm
           )
             .then(({ data: res }) => {
diff --git a/src/views/modules/kpi/kpirule.vue b/src/views/modules/kpi/kpirule.vue
index 741fcf8f..1d1c39af 100644
--- a/src/views/modules/kpi/kpirule.vue
+++ b/src/views/modules/kpi/kpirule.vue
@@ -21,13 +21,11 @@
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column type="index" width="50" label="序号"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="ruleName" label="考核规则名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="ruleCode" label="考核规则编码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="ruleMode" label="规则生成方式" header-align="center" align="center" :formatter="showRuleModeFormatter"></el-table-column>
-        <el-table-column prop="referenceId" label="引用ID" header-align="center" align="center" v-if="false"></el-table-column>
+        <el-table-column prop="ruleName" label="规则名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ruleCode" label="规则编码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ruleMode" width="100" label="生成方式" header-align="center" align="center" :formatter="showRuleModeFormatter"></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="kpiCycle" width="50" label="考核周期" header-align="center" align="center" :formatter="showKpiCycleFormatter"></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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
@@ -63,9 +61,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/kpi/kpirule/query',
+        getDataListURL: '/kpi/rule/query',
         getDataListIsPage: true,
-        deleteURL: '/kpi/kpirule',
+        deleteURL: '/kpi/rule',
         deleteIsBatch: true
       },
       dataForm: {