From 002a25d20cd470fdf0be1093ecf1aee051204b5f Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 14 Jun 2023 10:40:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=9C=B0=E5=8C=BA=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pidu/AppConversation/AppConversation.vue  | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/project/pidu/AppConversation/AppConversation.vue b/src/project/pidu/AppConversation/AppConversation.vue
index ad8633df..5ef1aa7f 100644
--- a/src/project/pidu/AppConversation/AppConversation.vue
+++ b/src/project/pidu/AppConversation/AppConversation.vue
@@ -5,6 +5,20 @@
         inactive-color="#A1C1E8" :bar-style="barStyle" :active-item-style="activeStyle" active-color="#ffffff " @change="change">
       </u-tabs>
       <div class="top-search">
+        <div class="left">
+          <AiPagePicker type="dept" :selected.sync="deptUserList" nodeKey="id" single @select="deptSelect">
+            <span class="label" v-if="deptUserList.length">{{deptUserList[0].name}}</span>
+            <span v-else style="color:#999;">部门名称</span>
+            <u-icon name="arrow-down" color="#999" size="24" style="margin-left:8px;"/>
+          </AiPagePicker>
+        </div>
+        <div class="right">
+          <u-search v-model="keyword" :clearabled="true" :placeholder="currentTabs != 1 ? '请输入群名称' : '请输入昵称'" :show-action="false" bg-color="#F5F5F5"
+            search-icon-color="#999" color="#999" height="58" @search="getListInit" @clear="getListInit">
+          </u-search>
+        </div>
+      </div>
+      <!-- <div class="top-search">
         <div class="left">
           <u-search v-model="keyword" :clearabled="true" :placeholder="currentTabs != 1 ? '请输入群名称' : '请输入昵称'" :show-action="false" bg-color="#F5F5F5"
             search-icon-color="#999" color="#999" height="58" @search="getListInit" @clear="getListInit">
@@ -26,7 +40,7 @@
             <u-icon name="arrow-down" color="#999" size="24" style="margin-left:8px;"/>
           </AiPagePicker>
         </div>
-      </div>
+      </div> -->
     </AiTopFixed>
     <div class="user-list" v-if="list.length">
       <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
@@ -153,7 +167,11 @@ export default {
     padding: 20px 32px;
     display: flex;
     .left {
-      width: 100%;
+      width: 350px;
+      line-height: 64px;
+    }
+    .right {
+      width: calc(100% - 350px);
     }
   }
   .top-select {