From 90619d320a6f67e962131bf40fe9717faf7dffc4 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 11:22:48 +0800
Subject: [PATCH] fix

---
 .../distribution/componments/query-form/index.vue    | 12 ++++++++++--
 .../result/report/componments/query-form/index.vue   | 11 +++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/result/distribution/componments/query-form/index.vue b/src/views/modules/result/distribution/componments/query-form/index.vue
index e0e0a29..0c4b3d3 100644
--- a/src/views/modules/result/distribution/componments/query-form/index.vue
+++ b/src/views/modules/result/distribution/componments/query-form/index.vue
@@ -3,10 +3,10 @@
   <div>
     <div class="staff-archives-title"></div>
     <el-form :inline="true" :model="formInline" class="demo-form-inline staff-archives-form">
-      <el-form-item label="选择部门">
+      <el-form-item label="选择部门" >
         <el-input
           placeholder="请选择部门"
-          @focus="isChoose=true"
+          @focus="handleShowDep"
           readonly
           :value="formInline.departmentName"
         ></el-input>
@@ -19,6 +19,7 @@
           v-model="selectMonthTime"
           value-format="yyyy-MM"
           @change="changeApplyMonth"
+          style="width: 120px"
         >
         </el-date-picker>
       </el-form-item>
@@ -80,6 +81,10 @@
       // this.selectMonthTime = this.monthTime
     },
     methods: {
+      handleShowDep () {
+        this.isChoose = true
+        this.initDep = this.formInline.departmentName
+      },
       async  handleChangeData () {
         this.onSubmit()
       },
@@ -106,6 +111,9 @@
         this.selectMonthTime = ''
       },
       onsumbit () {
+        if (this.isChooseObj.departmentName !== this.initDep) {
+          this.resetPage()
+        }
         this.formInline = Object.assign({}, this.formInline, this.isChooseObj)
         this.isChoose = false
       },
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 4fdfbbe..dfc6974 100644
--- a/src/views/modules/result/report/componments/query-form/index.vue
+++ b/src/views/modules/result/report/componments/query-form/index.vue
@@ -6,7 +6,7 @@
       <el-form-item label="选择部门" >
         <el-input
           placeholder="选择部门"
-          @focus="isChoose=true"
+          @focus="handleShowDep"
           readonly
           :value="formInline.departmentName"
           style="width: 120px"
@@ -67,7 +67,7 @@
     </el-form>
 
     <el-dialog title="选择部门" :visible.sync="isChoose" width="30%">
-      <el-tree :data="menuList" :props="defaultProps" @node-click="handleNodeClick">
+      <el-tree :data="menuList" :props="defaultProps" @node-click="handleNodeClick" >
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <span>{{ data.departmentName }}</span>
           <span>({{ data.memberCount }})人</span>
@@ -155,6 +155,10 @@
     beforeUpdate () {
     },
     methods: {
+      handleShowDep () {
+        this.isChoose = true
+        this.initDep = this.formInline.departmentName
+      },
       async  handleChangeData () {
         this.onSubmit()
       },
@@ -187,6 +191,9 @@
         this.level = ''
       },
       onsumbit () {
+        if (this.isChooseObj.departmentName !== this.initDep) {
+          this.resetPage()
+        }
         this.formInline = Object.assign({}, this.formInline, this.isChooseObj)
         this.isChoose = false
       },