diff --git a/src/views/modules/kpi/manualscore-add-or-update-zlph.vue b/src/views/modules/kpi/manualscore-add-or-update-zlph.vue
index 47b3801b..37ddc445 100644
--- a/src/views/modules/kpi/manualscore-add-or-update-zlph.vue
+++ b/src/views/modules/kpi/manualscore-add-or-update-zlph.vue
@@ -1,50 +1,38 @@
 <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="deptId">
-          <el-input v-model="dataForm.deptId" placeholder="被打分的部门ID"></el-input>
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" 
+    :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+      <el-form-item>
+        <el-form-item label="被打分部门" prop="deptId" v-if="!dataForm.id" style="margin-left: -120px; width: 400px;">
+          <el-cascader
+            v-model="deptIdList"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
+        </el-form-item>
       </el-form-item>
-          <el-form-item label="考核起始年月" prop="scoreDate">
-          <el-input v-model="dataForm.scoreDate" placeholder="考核起始年月"></el-input>
+      <el-form-item label="考核月度" prop="monthString" style="width: 200px">
+        <el-date-picker v-model="dataForm.monthString" :disabled="dataForm.id?true:false"
+            type="month" clearable placeholder="选择月"
+            value-format="yyyy-MM"  format="yyyy-MM">
+        </el-date-picker>
       </el-form-item>
-          <el-form-item label="打分的部门ID" prop="creatorDeptId">
-          <el-input v-model="dataForm.creatorDeptId" placeholder="打分的部门ID"></el-input>
-      </el-form-item>
-          <el-form-item label="打分的部门名称" prop="creatorDeptName">
-          <el-input v-model="dataForm.creatorDeptName" placeholder="打分的部门名称"></el-input>
-      </el-form-item>
-          <el-form-item label="得分" prop="score">
-          <el-input v-model="dataForm.score" 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 label="考核年度" prop="year">
+          <el-input v-model="dataForm.year" placeholder="考核年度"></el-input>
+      </el-form-item> -->
+          <!-- <el-form-item label="考核打分类型 0-月，1-年" prop="scoreType">
+          <el-input v-model="dataForm.scoreType" placeholder="考核打分类型 0-月，1-年"></el-input>
+      </el-form-item> -->
+          <el-form-item label="得分" prop="manualScore" style="width: 400px">
+          <el-select v-model="dataForm.manualScore">
+            <el-option
+              v-for="item in manualScoreType"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -63,10 +51,15 @@ export default {
       dataForm: {
         id: '',
         deptId: '',
-        scoreDate: '',
+        deptName: '',
+        month: '',
+        monthString: '',
+        year: '',
+        scoreType: 0,
         creatorDeptId: '',
         creatorDeptName: '',
-        score: '',
+        score: 0,
+        manualScore: '',
         parentDeptIds: '',
         parentDeptNames: '',
         allDeptIds: '',
@@ -77,7 +70,28 @@ export default {
         updatedBy: '',
         updatedTime: '',
         delFlag: ''
-      }
+      },
+      // 所属机构配置
+      deptIdList: [],
+      options: [],
+      manualScoreType: [
+        {
+          "id": '优',
+          "name": '优'
+        },
+        {
+          "id": '良',
+          "name": '良'
+        },
+        {
+          "id": '中',
+          "name": '中'
+        },
+        {
+          "id": '差',
+          "name": '差'
+        }
+      ]
     }
   },
   computed: {
@@ -86,64 +100,46 @@ export default {
         deptId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        scoreDate: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        creatorDeptId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        creatorDeptName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        score: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptIds: [
+        monthString: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        parentDeptNames: [
+        manualScoreType: [
           { 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: [
+        manualScore: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
   },
+  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: {
     init () {
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
+        this.dataForm.allDeptNames = ''
+        this.dataForm.deptId = ''
         if (this.dataForm.id) {
           this.getInfo()
         }
+        this.deptIdList = []
       })
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`//manualscore/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/kpi/manualscore-zlph/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -159,7 +155,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('//manualscore/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/manualscore-zlph/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -174,7 +170,16 @@ export default {
           })
         }).catch(() => {})
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+     }, 1000, { 'leading': true, 'trailing': false })
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.deptId = ''
+      } else if (val.length > 0) {
+        this.dataForm.deptId = this.deptIdList[val.length - 1]
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/modules/kpi/manualscore-zlph.vue b/src/views/modules/kpi/manualscore-zlph.vue
index 489c89a4..890a9902 100644
--- a/src/views/modules/kpi/manualscore-zlph.vue
+++ b/src/views/modules/kpi/manualscore-zlph.vue
@@ -3,41 +3,64 @@
     <div class="mod-__manualscore}">
       <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-form-item label="考核周期起始月">
+          <el-date-picker v-model="dataForm.month"
+              type="month" clearable placeholder="选择月"
+              value-format="yyyy-MM"  format="yyyy-MM">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="被打分机构类型">
+          <el-select v-model="dataForm.deptType">
+            <el-option
+              v-for="item in kpiManualRuleList"
+              :key="item.id"
+              :label="item.deptName"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </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(':manualscore:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('manualscore-zlph:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+          <el-form-item>
+          <el-button type="info" @click="exportTemplate()">导出录入模板</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission(':manualscore:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-upload class="upload-demo"
+                     ref="upload"
+                     v-loading="dataListLoading"
+                     :action="uploadUrl"
+                     :limit="1"
+                     :on-success='uploadSuccess'
+                     :on-error='errorExceed'
+                     accept=".xls,.xlsx">
+            <el-button type="primary">导入打分结果</el-button>
+          </el-upload>
         </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="deptId" label="被打分的部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="scoreDate" label="考核起始年月" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="creatorDeptId" label="打分的部门ID" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
+        <el-table-column prop="deptName" label="被打分部门" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="month" :formatter="showMonthYMD" label="考核月度" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column prop="year" label="考核年度" header-align="center" align="center"></el-table-column> -->
+        <el-table-column prop="scoreType" label="考核打分类型" header-align="center" align="center"></el-table-column>
         <el-table-column prop="creatorDeptName" label="打分的部门名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="score" 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(':manualscore:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':manualscore:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button></template>
         </el-table-column>
       </el-table>
       <el-pagination
@@ -58,23 +81,142 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './manualscore-add-or-update-zlph'
+import Cookies from 'js-cookie'
+import qs from 'qs'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '//manualscore/page',
+        getDataListURL: '/kpi/manualscore-zlph/page',
         getDataListIsPage: true,
-        deleteURL: '//manualscore',
-        deleteIsBatch: true
+        deleteURL: '/kpi/manualscore-zlph',
+        deleteIsBatch: true,
+        exportTemplateURL: '/kpi/manualscore-zlph/exportTemplate'
       },
       dataForm: {
-        id: ''
-      }
+        id: '',
+        deptType: 'street_dept', // 被打分的机构类型
+        month: '',
+        scoreType: '0' // 考核打分类型 0-月，1-年
+      },
+      upLoadUrl: '',
+      // 所属机构配置
+      deptIdList: [],
+      options: [],
+      kpiManualRuleList: [
+        {
+          "id": 'street_dept',
+          "deptName": '街道'
+        },
+        {
+          "id": 'community_party',
+          "deptName": '社区'
+        },
+        {
+          "id": 'grid_party',
+          "deptName": '网格'
+        }
+      ]
     }
   },
   components: {
     AddOrUpdate
+  },
+  created () {
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/kpi/manualscore-zlph/importManualScoreExcel?token=${Cookies.get('token')}`
+    // 所属机构创建
+    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: {
+    // 导出录入模板
+    exportTemplate () {
+      let month = this.dataForm.month
+      let deptType = this.dataForm.deptType
+      let scoreType = this.dataForm.scoreType
+      let params = qs.stringify({
+        'token': Cookies.get('token'),
+        'month': month,
+        'deptType': deptType,
+        'scoreType': scoreType
+      })
+      // let paramsJson = {
+      //   'month': month, 'deptType': deptType, 'scoreType': scoreType
+      // }
+      if (!deptType) {
+        return this.$message.error('考核规则不能为空')
+      }
+      if (!month) {
+        return this.$message.error('考核周期起始月不能为空')
+      }
+      // 表格检查
+      // this.$http.get(`/kpi/manualscore-zlph/checkExportTemplate`, { params: paramsJson }).then(({ data: res }) => {
+      //   if (res.code !== 0) {
+      //     return this.$message.error(res.msg)
+      //   } else {
+          window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportTemplateURL}?${params}`
+      //   }
+      // }).catch(() => { })
+    },
+    errorExceed (file, fileList) {
+      this.$message.error('上传失败请重试')
+    },
+    uploadSuccess (response, file, fileList) {
+      this.dataListLoading = false
+      this.$refs.upload.clearFiles()
+      if (response.code !== 0 || (response.data !== null && response.data.length > 0)) {
+        this.errordataList = response.data
+        if (this.errordataList != null && this.errordataList.length > 0) {
+          this.faultDataVisible = true
+        } else {
+          this.$message.error(response.msg)
+        }
+        return
+      }
+      this.$message({
+        message: this.$t('prompt.success'),
+        type: 'success',
+        duration: 500,
+        onClose: () => {
+          this.getDataList()
+        }
+      })
+    },
+    showMonthYMD (row, column) {
+      return row.month.substring(0, 10)
+    },
+  },
+  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]
+      }
+    }
   }
 }
 </script>