From e57b338560533893cd90e9ba6c437fdf07983a50 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 16 Jun 2022 17:49:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppMessageNotification/chooseUser.vue     | 22 +++++++++++--------
 .../AppMessageNotification/selectDeptUser.vue |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/project/police/AppMessageNotification/chooseUser.vue b/src/project/police/AppMessageNotification/chooseUser.vue
index a1bb5b98..914363d0 100644
--- a/src/project/police/AppMessageNotification/chooseUser.vue
+++ b/src/project/police/AppMessageNotification/chooseUser.vue
@@ -9,16 +9,17 @@
           <u-icon name="arrow-right" color="#999" size="24" style="margin-left:8px;"/>
         </AiAreaPicker>
       </div>
+      <div class="area-flex">
+        <p class="title">部门/人员</p>
+        <AiPagePicker type="custom" :selected.sync="deptUserList" nodeKey="id" :ops="{url:'./selectDeptUser',label:'name'}" valueObj>
+          <!-- <div class="item active" v-for="item in deptUserList" :key="item.id">{{ item.name }}</div>
+          <AiMore v-if="deptUserList.length==0" class="right"/> -->
+          <span class="label" v-if="deptUserList.length">已选择</span>
+          <span v-else style="color:#999;">请选择</span>
+          <u-icon name="arrow-right" color="#999" size="24" style="margin-left:8px;"/>
+        </AiPagePicker>
+      </div>
       <div class="type-content">
-        <div class="type-list">
-          <p v-text="`部门/人员`"/>
-          <div class="list">
-            <AiPagePicker type="custom" :selected.sync="deptUserList" nodeKey="id" :ops="{url:'./selectDeptUser',label:'name'}" valueObj>
-              <div class="item active" v-for="item in deptUserList" :key="item.id">{{ item.name }}</div>
-              <AiMore v-if="deptUserList.length==0" class="right"/>
-            </AiPagePicker>
-          </div>
-        </div>
         <div class="type-list" v-for="(item, index) in tagList" :key="index">
           <p>{{ item.name }}</p>
           <div class="list">
@@ -67,6 +68,9 @@ export default {
     }
   },
   methods: {
+    toSelectDept() {
+      uni.navigateTo({url: `./selectDeptUser`})
+    },
     getTagList() {
       this.$http.post("/app/wxcp/wxcorptag/listAll?size=100").then(res => {
         if (res?.code == 0) {
diff --git a/src/project/police/AppMessageNotification/selectDeptUser.vue b/src/project/police/AppMessageNotification/selectDeptUser.vue
index 288cedfe..2a37efb3 100644
--- a/src/project/police/AppMessageNotification/selectDeptUser.vue
+++ b/src/project/police/AppMessageNotification/selectDeptUser.vue
@@ -54,7 +54,7 @@ export default {
     }
   },
   onLoad() {
-    this.selected = this.$route.query.selected.map(id => ({id})) || []
+    this.selected = this.$route.query.selected?.map(id => ({id})) || []
     this.getAllDepts()
   },
   methods: {