From 6d537f8a602ceecbca825955f5feb30cdc2e4b7f Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 26 Dec 2019 16:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=933319=20-=20=E8=80=83=E6=A0=B8?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E3=80=81=E6=89=8B=E5=8A=A8=E6=89=93=E5=88=86?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/kpi/manualScore.vue    | 50 +++++++++++++++++++++++-
 src/views/modules/kpi/resultGrid.vue     | 12 +++++-
 src/views/modules/kpi/resultSuperior.vue |  9 ++++-
 3 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/kpi/manualScore.vue b/src/views/modules/kpi/manualScore.vue
index ef10a062..2522ed36 100644
--- a/src/views/modules/kpi/manualScore.vue
+++ b/src/views/modules/kpi/manualScore.vue
@@ -2,6 +2,14 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpimanualscore}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader
+            v-model="deptIdList"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
+        </el-form-item>
         <el-form-item label="考核规则名称">
           <el-select clearable v-model="dataForm.ruleId">
             <el-option
@@ -108,7 +116,13 @@ export default {
       faultDataVisible: false,
       errordataList: [],
       kpiManualRuleList: [], // 已绑定手动打分的考核规则列表
-      kpiCycleList: []// 考核周期字典表值
+      kpiCycleList: [], // 考核周期字典表值
+      // 所属机构配置
+      deptIdList: [],
+      options: [],
+      streetList: [],
+      communityList: [],
+      gridList: []
     }
   },
   components: {
@@ -118,6 +132,16 @@ export default {
     this.getKpiManualRule()
     this.getKpiCycleList()
     this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/kpi/manualScore/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: {
@@ -197,6 +221,30 @@ export default {
         }
       })
     }
+  },
+  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>
diff --git a/src/views/modules/kpi/resultGrid.vue b/src/views/modules/kpi/resultGrid.vue
index 3cb2f943..2dbacd6e 100644
--- a/src/views/modules/kpi/resultGrid.vue
+++ b/src/views/modules/kpi/resultGrid.vue
@@ -26,8 +26,10 @@
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center" width="440"></el-table-column>
         <el-table-column prop="leaderName" label="网格长" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="startDate" label="考核周期开始日" header-align="center" align="center" :formatter="startDateFormat"></el-table-column>
+        <el-table-column prop="endDate" label="考核周期结束日" header-align="center" align="center" :formatter="endDateFormat"></el-table-column>
         <!-- 手动打分 -->
-        <el-table-column prop="manualScore" 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" width="160"></el-table-column>
         <el-table-column prop="finalScore" label="总分" header-align="center" align="center" width="160"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
@@ -92,6 +94,14 @@ export default {
       .catch(() => {})
   },
   methods: {
+    // 考核周期开始日字段,格式化
+    startDateFormat: function (row) {
+      return row.startDate.substring(0, 10)
+    },
+    // 考核周期结束日字段,格式化
+    endDateFormat: function (row) {
+      return row.endDate.substring(0, 10)
+    },
     detailQuery (id) {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
diff --git a/src/views/modules/kpi/resultSuperior.vue b/src/views/modules/kpi/resultSuperior.vue
index a12e5ca0..6f95c849 100644
--- a/src/views/modules/kpi/resultSuperior.vue
+++ b/src/views/modules/kpi/resultSuperior.vue
@@ -10,6 +10,12 @@
             clearable
           ></el-cascader>
         </el-form-item>
+        <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 @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -62,7 +68,8 @@ export default {
         exportURL: '/kpi/kpiresultsuperior/export'
       },
       dataForm: {
-        id: ''
+        id: '',
+        scoreStartDate: ''
       },
       // 所属机构配置
       deptIdList: [],