From 07ea9a2a9717fd91dddecc2e38fdc539b5912606 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Mon, 28 Sep 2020 16:55:12 +0800
Subject: [PATCH] fix

---
 .../chart/componments/query-form/index.vue    |  2 +-
 .../modules/result/distribution/index.vue     | 32 +++++++++++++++++--
 .../report/componments/query-form/index.vue   | 32 +++++++++++++++++--
 src/views/modules/result/report/index.vue     |  4 ++-
 4 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/result/chart/componments/query-form/index.vue b/src/views/modules/result/chart/componments/query-form/index.vue
index 94c242b..537408c 100644
--- a/src/views/modules/result/chart/componments/query-form/index.vue
+++ b/src/views/modules/result/chart/componments/query-form/index.vue
@@ -99,7 +99,7 @@
       },
       restValue () {
         this.formInline = {}
-        this.selectMonthTime = ''
+        this.selectMonthTime = this.nowDate()
       },
       onsumbit () {
         this.formInline = Object.assign({}, this.formInline, this.isChooseObj)
diff --git a/src/views/modules/result/distribution/index.vue b/src/views/modules/result/distribution/index.vue
index 12b148e..22e92f5 100644
--- a/src/views/modules/result/distribution/index.vue
+++ b/src/views/modules/result/distribution/index.vue
@@ -8,6 +8,7 @@
       :data="dataList"
       border
       v-loading="dataListLoading"
+      @cell-click="jumpDetail"
       style="width: 100%">
       <el-table-column
         prop="businessLine"
@@ -98,6 +99,17 @@
         label="4">
       </el-table-column>
 
+     <!-- <el-table-column
+        header-align="center"
+        align="center"
+        width="100"
+        label="4">
+        <template slot-scope="scope">
+          <span v-if="scope.row.level8 === 0">{{scope.row.level8}}</span>
+          <el-button v-if="scope.row.level8 > 0">{{scope.row.level8}}</el-button>
+        </template>
+      </el-table-column>-->
+
 
     </el-table>
     <el-pagination
@@ -133,13 +145,29 @@
         selectMonthTime: ''
       }
     },
-    created () {
-      this.handleGetTableList()
+    activated () {
     },
     components: {
       queryForm
     },
     methods: {
+      jumpDetail (row, column, event, cell) {
+        if (cell.srcElement.innerText === '0') {
+          this.$message({
+            message: '暂无人员信息',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {
+            }
+          })
+          return
+        }
+        console.log(row.departmentId)
+        console.log(column.label)
+        this.$router.push({name: 'resultReport', query: {departmentId: row.departmentId, departmentName: row.departmentName, type: 2, status: 109, label: column.label}}, () => {
+          this.mainTabsActiveName = this.$route.name
+        })
+      },
       // 获取数据列表
       async handleGetTableList () {
         const loading = this.$loading({
diff --git a/src/views/modules/result/report/componments/query-form/index.vue b/src/views/modules/result/report/componments/query-form/index.vue
index 5a6b22c..36cf753 100644
--- a/src/views/modules/result/report/componments/query-form/index.vue
+++ b/src/views/modules/result/report/componments/query-form/index.vue
@@ -27,7 +27,7 @@
 
 
       <el-form-item :label="`审批进度`">
-        <el-select v-model="status" placeholder="请选择" style="width: 120px"  @change="resetPage">
+        <el-select v-model="status" placeholder="请选择" clearable style="width: 120px"  @change="resetPage">
           <el-option
             v-for="item in statusList"
             :key="item.value"
@@ -50,6 +50,17 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item :label="`类型`">
+        <el-select v-model="type" placeholder="请选择" style="width: 120px" @change="resetPage">
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
 
       <el-form-item label="员工姓名">
         <el-input
@@ -97,6 +108,7 @@
         staffName: null,
         level: null,
         status: null,
+        type: null,
         isChooseObj: {},
         isChoose: false,
         menuList: [],
@@ -118,6 +130,14 @@
             'label': '已完成'
           }
         ],
+        typeList: [
+          {'value': 1,
+            'label': '月初目标'
+          },
+          {'value': 2,
+            'label': '月末结果'
+          }
+        ],
         levelList: [
           {'value': 3.25,
             'label': 3.25
@@ -150,6 +170,13 @@
     beforeMount () { },
     created () {
       this.status = this.$route.query.status
+      this.formInline.departmentName = this.$route.query.departmentName
+      this.formInline.departmentId = this.$route.query.departmentId
+      this.level = this.$route.query.label
+      this.type = this.$route.query.type
+      if (this.type === undefined) {
+        this.type = this.typeList[0].value
+      }
       this.handleGetMenuList()
       this.handleChangeData()
     },
@@ -181,7 +208,8 @@
           selectMonthTime: this.selectMonthTime,
           staffName: this.staffName,
           level: this.level,
-          status: this.status
+          status: this.status,
+          type: this.type
         }
         this.$emit('submit', obj)
       },
diff --git a/src/views/modules/result/report/index.vue b/src/views/modules/result/report/index.vue
index 1597448..424a348 100644
--- a/src/views/modules/result/report/index.vue
+++ b/src/views/modules/result/report/index.vue
@@ -116,7 +116,8 @@
       }
     },
     created () {
-      this.handleGetTableList()
+    },
+    activated () {
     },
     components: {
       queryForm
@@ -170,6 +171,7 @@
         this.staffName = data.staffName
         this.level = data.level
         this.status = data.status
+        this.type = data.type
         this.handleGetTableList()
       },
       initPage () {