diff --git a/src/views/modules/kpi/kpiresultgrid-add-or-update.vue b/src/views/modules/kpi/kpiresultgrid-add-or-update.vue
index 70040e4d..fa8dde44 100644
--- a/src/views/modules/kpi/kpiresultgrid-add-or-update.vue
+++ b/src/views/modules/kpi/kpiresultgrid-add-or-update.vue
@@ -1,76 +1,31 @@
 <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>
+  <el-dialog :visible.sync="visible" title="详情" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-table border :data="dataList" style="width: 100%;">
+        <el-table-column prop="rownum" label="序号" width="50" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="rule" label="规则" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="detail" :formatter="publishState" label="详情" header-align="center"></el-table-column>
+      </el-table>
     <template slot="footer">
+      <el-button type="primary" @click="tableExport()">{{ $t('export') }}</el-button>
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
 
+<style>
+  .el-table .cell{
+      white-space:pre-line;
+  }
+</style>
 <script>
-import debounce from 'lodash/debounce'
+import Cookies from 'js-cookie'
+import qs from 'qs'
 export default {
   data () {
     return {
+      mixinViewModuleOptions: {
+        exportURL: '/kpi/gridResult/tableExport'
+      },
       visible: false,
       dataForm: {
         id: '',
@@ -79,130 +34,43 @@ export default {
         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' }
-        ]
-      }
+        rownum: '',
+        rule: '',
+        detail: ''
+      },
+      dataList: []
     }
   },
   methods: {
     init () {
       this.visible = true
       this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           this.getInfo()
         }
       })
     },
+    publishState: function (row) {
+      return row.detail.replace(',', '\n')
+    },
     // 获取信息
     getInfo () {
-      this.$http.get(`/kpi/kpiresultgrid/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/kpi/gridResult/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
+        this.dataList = 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(() => {})
+    // Excel导出
+    tableExport () {
+      let id = this.dataForm.id
+      let params = qs.stringify({
+        'token': Cookies.get('token'),
+        'id': id
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+      window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
+    }
   }
 }
 </script>
diff --git a/src/views/modules/kpi/kpiresultgrid.vue b/src/views/modules/kpi/kpiresultgrid.vue
index b9ee2c1b..c5ccd4ec 100644
--- a/src/views/modules/kpi/kpiresultgrid.vue
+++ b/src/views/modules/kpi/kpiresultgrid.vue
@@ -2,45 +2,40 @@
   <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 label="所属机构">
+          <el-cascader
+            v-model="deptIdList"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-form-item label="考核周期起始月">
+          <el-date-picker v-model="dataForm.scoreStartDate"
+              type="month" clearable placeholder="选择月"
+              value-format="yyyy-MM"  format="yyyy-MM">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('kpi:kpiresultgrid:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</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-button v-if="$hasPermission('kpi:gridResult:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</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 prop="rownum" label="排名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="street" label="街道" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="community" label="社区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="grid" 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="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="finalScore" 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>
+            <el-button type="text" size="small" @click="detailQuery(scope.row.id)">详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -67,13 +62,66 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/kpi/kpiresultgrid/page',
+        getDataListURL: '/kpi/gridResult/page',
         getDataListIsPage: true,
-        deleteURL: '/kpi/kpiresultgrid',
-        deleteIsBatch: true
+        deleteURL: '/kpi/gridResult',
+        deleteIsBatch: true,
+        exportURL: '/kpi/gridResult/export'
       },
       dataForm: {
-        id: ''
+        id: '',
+        gridId: '',
+        scoreStartDate: ''
+      },
+      // 所属机构配置
+      deptIdList: [],
+      options: [],
+      streetList: [],
+      communityList: [],
+      gridList: []
+    }
+  },
+  created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
+  },
+  methods: {
+    detailQuery (id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.dataForm.id = id
+        this.$refs.addOrUpdate.init()
+      })
+    }
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
       }
     }
   },