From f889b51fef837bd711d56a077c1f9223e6457c10 Mon Sep 17 00:00:00 2001
From: leave <>
Date: Thu, 29 Oct 2020 10:02:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EvaluationTeamFilter/index.vue | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/components/EvaluationTeamFilter/index.vue b/src/components/EvaluationTeamFilter/index.vue
index 94953dc..e1b2159 100644
--- a/src/components/EvaluationTeamFilter/index.vue
+++ b/src/components/EvaluationTeamFilter/index.vue
@@ -24,11 +24,13 @@
             ref="refChooseTable"
             max-height="394"
             @selection-change="handleSelectionChange"
+            :row-key="handleGetRowKeys"
             v-if="tableList.length"
           >
             <el-table-column
               type="selection"
               width="40"
+              :reserve-selection="true"
             ></el-table-column>
             <el-table-column
               prop="name"
@@ -66,13 +68,11 @@
             :data="seleactedList"
             :show-header="false"
             max-height="394"
-            :row-key="handleGetRowKeys"
             v-if="seleactedList.length>0"
           >
             <el-table-column
               type="selection"
               width="40"
-              :reserve-selection="true"
             >
               <template slot-scope="scope">
                 <i
@@ -141,7 +141,7 @@ export default {
       seleactedList: [],
       pageInfo: {
         currPage: 1,
-        pageSize: 20,
+        pageSize: 1,
         totalCount: 1,
         totalPage: 1
       }
@@ -153,29 +153,20 @@ export default {
   },
   watch: {
     dialogVisible (newVal, oldVal) {
-      if (newVal) {
-        if (this.filtersDic.currPage === undefined || !this.filtersDic.currPage) {
-          this.filtersDic['currPage'] = this.pageInfo.currPage
-        }
-        if (this.filtersDic.pageSize === undefined || !this.filtersDic.pageSize) {
-          this.filtersDic['pageSize'] = this.pageInfo.pageSize
-        }
+      if (newVal !== oldVal && newVal) {
         this.handleDataList()
       }
     }
   },
   methods: {
     handleDataList () {
-      apiGetEvaluationTeamList(this.filtersDic).then(res => {
+      let paraDic = Object.assign(this.pageInfo, this.filtersDic)
+      apiGetEvaluationTeamList(paraDic).then(res => {
         this.pageInfo.currPage = res.data.currPage
         this.pageInfo.totalCount = res.data.totalCount
         this.pageInfo.totalPage = res.data.totalPage
         this.tableList = res.data.list
       })
-      // for (let index = 0; index < 100; index++) {
-      //   let dic = { id: index.toString(), name: '12月绩效考核' + index.toString(), count: '12' }
-      //   this.tableList.push(dic)
-      // }
     },
     // handleGetRowStyle () {
     //   return { 'height': '44px' }
@@ -190,22 +181,32 @@ export default {
     },
     handleCancel () {
       this.handleClear()
+      this.tableList = []
+      this.seleactedList = []
+      this.pageInfo = {
+        currPage: 1,
+        pageSize: 1,
+        totalCount: 1,
+        totalPage: 1
+      }
       this.$emit('close')
     },
     handleSubmit () {
       this.$emit('submitClick', this.seleactedList)
+      this.handleCancel()
     },
     handleSelectionChange (val) {
       this.seleactedList = val
     },
     handleCurrentChange (val) {
       this.pageInfo.currPage = val
-      this.filtersDic['currPage'] = this.pageInfo.currPage
       this.handleDataList()
     },
     handleClear () {
-      this.seleactedList = []
-      this.$refs.refChooseTable.clearSelection()
+      if (this.seleactedList.length) {
+        this.$refs.refChooseTable.clearSelection()
+        this.seleactedList = []
+      }
     },
     handleDelete (item, index) {
       this.seleactedList.splice(index, 1)

From 211958792e32c7546987364d571a04cd5964dc83 Mon Sep 17 00:00:00 2001
From: leave <>
Date: Thu, 29 Oct 2020 10:11:54 +0800
Subject: [PATCH 2/2] no message

---
 src/components/EvaluationTeamFilter/desc.md   | 5 +++++
 src/components/EvaluationTeamFilter/index.vue | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 src/components/EvaluationTeamFilter/desc.md

diff --git a/src/components/EvaluationTeamFilter/desc.md b/src/components/EvaluationTeamFilter/desc.md
new file mode 100644
index 0000000..050dc1e
--- /dev/null
+++ b/src/components/EvaluationTeamFilter/desc.md
@@ -0,0 +1,5 @@
+  # <dialog-team-filter :dialogVisible="showTem" :filtersDic="filtersDic"   @close="showTem=false"   @submitClick="handlSubmitClick" ></dialog-team-filter>
+# dialogVisible    Boolean    false 隐藏 true 显示
+# filtersDic       Object     筛选参数
+#  @close          function   关闭弹窗
+#  @submitClick    function   提交结果 传参 选中list
\ No newline at end of file
diff --git a/src/components/EvaluationTeamFilter/index.vue b/src/components/EvaluationTeamFilter/index.vue
index e1b2159..b3fcbc3 100644
--- a/src/components/EvaluationTeamFilter/index.vue
+++ b/src/components/EvaluationTeamFilter/index.vue
@@ -1,5 +1,4 @@
-// 考评组筛选
-<template>
+ <template>
   <div class="team-filter commonFont">
     <el-dialog
       title="考评组筛选"