From 88c325a5a11bd2875003d4e39c86253a9517858c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Thu, 11 Jan 2024 17:12:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080591=E3=80=8180700?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SelectUser.vue            | 17 +++++++++++++----
 src/components/SelectUserByWorkGroup.vue | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/components/SelectUser.vue b/src/components/SelectUser.vue
index fbc5ef2..34ef6a5 100644
--- a/src/components/SelectUser.vue
+++ b/src/components/SelectUser.vue
@@ -1,6 +1,6 @@
 <!-- 选择评价人员 -->
 <template>
-  <van-popup class="history-list-popup" v-model="isShow" position="right" :style="{ width: '100%', height: '100%' }">
+  <van-popup class="history-list-popup" v-if="isShow" v-model="isShow" position="right" :style="{ width: '100%', height: '100%' }">
     <!--    增加一个标题-->
     <custom-header :title="$t('selectUser')" :leftArrow="true" :handle-left="handleLeft"></custom-header>
     <div class="list-container">
@@ -9,13 +9,14 @@
         show-action
         input-align="center"
         placeholder="请输入姓名/工号"
-        @search="onSearch">
+        @search="onSearch"
+        @clear="onSearch">
         <template #action>
           <div @click="onSearch">搜索</div>
         </template>
       </van-search>
 
-      <van-dropdown-menu :close-on-click-overlay="false" :close-on-click-outside="false">
+      <van-dropdown-menu :close-on-click-overlay="true" :close-on-click-outside="true">
         <!--组织机构-->
         <van-dropdown-item :title="selectedDepart" ref="departDropdownItem">
           <van-cascader
@@ -328,6 +329,7 @@ export default {
     },
     hide () {
       this.isShow = false
+      Object.assign(this.$data, this.$options.data())
     },
     // 获取组织机构树
     getSysCategoryTree () {
@@ -341,17 +343,18 @@ export default {
     },
     handleDepartChange ({ value, selectedOptions }) {
       this.tempSelectedDepart = selectedOptions.find(tt => tt.value === value) || {}
-      console.log(this.tempSelectedDepart)
     },
     handleConfirmDepart () {
       this.$refs.departDropdownItem.toggle()
       this.selectedDepart = this.tempSelectedDepart.departName
+      this.onSearch()
     },
     handleClearDepart () {
       this.$refs.departDropdownItem.toggle()
       this.selectedDepart = '组织机构'
       this.tempSelectedDepart = {}
       this.departId = null
+      this.onSearch()
     },
     // 初始化角色字典
     initRoleList () {
@@ -370,11 +373,13 @@ export default {
       this.$refs.roleDropdownItem.toggle()
       this.selectedRole = '角色'
       this.roleId = null
+      this.onSearch()
     },
     handleConfirmRole (value) {
       this.$refs.roleDropdownItem.toggle()
       this.roleId = value.value
       this.selectedRole = value.text
+      this.onSearch()
     },
     handleCancelRole () {
       this.$refs.roleDropdownItem.toggle()
@@ -469,6 +474,10 @@ export default {
   }
 }
 
+/deep/ .van-cascader__options {
+  max-height: 50vh;
+}
+
 .dropdown-operate-box {
   width: 100%;
   display: flex;
diff --git a/src/components/SelectUserByWorkGroup.vue b/src/components/SelectUserByWorkGroup.vue
index 309c631..9140286 100644
--- a/src/components/SelectUserByWorkGroup.vue
+++ b/src/components/SelectUserByWorkGroup.vue
@@ -1,5 +1,5 @@
 <template>
-  <van-popup class="history-list-popup" v-model="isShow" position="right" :style="{ width: '100%', height: '100%' }">
+  <van-popup class="history-list-popup" v-model="isShow" v-if="isShow" position="right" :style="{ width: '100%', height: '100%' }">
     <!--    增加一个标题-->
     <custom-header :title="$t('selectUser')" :leftArrow="true" :handle-left="handleLeft"></custom-header>
     <div class="list-container">
@@ -8,13 +8,14 @@
         show-action
         input-align="center"
         placeholder="请输入姓名/工号"
-        @search="onSearch">
+        @search="onSearch"
+        @clear="onSearch">
         <template #action>
           <div @click="onSearch">搜索</div>
         </template>
       </van-search>
 
-      <van-dropdown-menu :close-on-click-overlay="false" :close-on-click-outside="false">
+      <van-dropdown-menu :close-on-click-overlay="true" :close-on-click-outside="true">
         <!--  内部工作组  -->
         <van-dropdown-item :title="selectedWorkGroup" ref="workGroupDropdownItem">
           <van-cascader
@@ -332,6 +333,7 @@ export default {
     },
     hide () {
       this.isShow = false
+      Object.assign(this.$data, this.$options.data())
     },
     // 获取内部工作组
     getWorkGroup () {
@@ -350,12 +352,14 @@ export default {
     handleConfirmDepart () {
       this.$refs.workGroupDropdownItem.toggle()
       this.selectedWorkGroup = this.tempSelectedWorkGroup.name
+      this.onSearch()
     },
     handleClearDepart () {
       this.$refs.workGroupDropdownItem.toggle()
       this.selectedWorkGroup = '组织机构'
       this.tempSelectedWorkGroup = {}
       this.workingGroupId = null
+      this.onSearch()
     },
     // 初始化角色字典
     initRoleList () {
@@ -374,11 +378,13 @@ export default {
       this.$refs.roleDropdownItem.toggle()
       this.selectedRole = '角色'
       this.roleName = null
+      this.onSearch()
     },
     handleConfirmRole (value) {
       this.$refs.roleDropdownItem.toggle()
       this.roleName = value.text
       this.selectedRole = value.text
+      this.onSearch()
     },
     handleCancelRole () {
       this.$refs.roleDropdownItem.toggle()
@@ -487,4 +493,8 @@ export default {
 /deep/ .van-picker__toolbar {
   height: auto;
 }
+
+/deep/ .van-cascader__options {
+  max-height: 50vh;
+}
 </style>