From 8dc6a7cccf2446bff0fd691f5c734c49553f7195 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 1 Mar 2023 10:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E5=8F=91=E6=9C=8B=E5=8F=8B=E5=9C=88?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCooperationPropagandaBeta.vue                 |  4 ++--
 .../AppCooperationPropaganda/addPropaganda.vue       |  2 +-
 .../AppCooperationPropaganda/scopedSelect.vue        |  2 --
 .../huizhili/AppCooperationPropaganda/selectUser.vue | 12 ++++++++++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
index e25f45eb..61ba26bb 100644
--- a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
@@ -49,7 +49,7 @@
         <scroll-view class="select-content" scroll-y="true">
           <div class="type-list">
             <div class="type-title">创建人</div>
-            <AiPagePicker type="custom" :selected.sync="userIdList" nodeKey="createUserId" :ops="{url:`./selectUser`,label: 'id'}">
+            <AiPagePicker type="custom" :selected.sync="userIdList" nodeKey="createUserId" :ops="{url:`./selectUser?tabIndex=${this.tabIndex}`,label: 'id'}">
               <div class="page_picker">
                 <span class="label" v-if="userIdList.length">已选择</span>
                 <span v-else style="color:#999;">请选择</span>
@@ -197,6 +197,7 @@ export default {
       this.endTime = ''
       this.userIdList = []
       this.createUserId = ''
+      this.status = ''
       uni.setStorageSync('userSelect', [])
     },
 
@@ -218,7 +219,6 @@ export default {
       }
       this.filterShow = false
       this.current = 1
-      this.list = []
       this.getList()
     },
     confirmStart(val) {
diff --git a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
index e41facd1..f063230f 100644
--- a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
@@ -23,7 +23,7 @@
         <div style="color: #3399FF;" @click="preview">预览</div>
       </div>
       <div class="content_text">
-        <u-input v-model="content" type="textarea" height="372" :auto-height="true" placeholder="请输入政策、活动、节日问候等内容" maxlength="1300"/>
+        <u-input v-model="content" type="textarea" height="372" :clearable="false" :auto-height="true" placeholder="请输入政策、活动、节日问候等内容" maxlength="1300"/>
       </div>
       <div class="content_fodder">
         <div class="fodder_alls">
diff --git a/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue b/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
index 6eec4f91..9221ce9c 100644
--- a/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
@@ -3,8 +3,6 @@
     <div class="item">
       <div>添加人</div>
       <div @click="selectUser">
-        <!-- <span v-if="selectedUser.length || deptListArr.length">已选择{{ selectedUser.length || deptListArr.length }}
-          <span v-if="selectedUser.length">个网格</span><span v-if="deptListArr.length">个部门</span></span> -->
         <div v-if="type == 1" style="display: inline-block;">
           <span v-if="deptListArr.length">已选择{{ deptListArr.length }}个部门</span>
           <span class="color_gray" v-else>请选择</span>
diff --git a/src/project/huizhili/AppCooperationPropaganda/selectUser.vue b/src/project/huizhili/AppCooperationPropaganda/selectUser.vue
index 8a9303b9..cc1c935a 100644
--- a/src/project/huizhili/AppCooperationPropaganda/selectUser.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/selectUser.vue
@@ -29,6 +29,7 @@ export default {
       selected: {},
       userList: [],
       current: 1,
+      tabIndex: null,
     }
   },
   computed: {
@@ -37,7 +38,8 @@ export default {
       return this.userList?.length > 0
     }
   },
-  onLoad() {
+  onLoad(o) {
+    this.tabIndex = o.tabIndex
     this.selected = uni.getStorageSync('userSelect') || []
     this.getCreateUserList()
   },
@@ -47,7 +49,13 @@ export default {
     },
     getCreateUserList() {
       this.userList = []
-      this.$http.post(`/app/appmasssendingtask/createUserlist`).then(res => {
+      let url = ''
+      if(this.tabIndex == 0) {
+        url = `/app/appmasssendingtask/createUserlist`
+      } else {
+        url = `/app/whchatmomentstask/createUserlist`
+      }
+      this.$http.post(url).then(res => {
         if (res?.data) {
           this.userList = res.data.map(e => ({
             userId: e.create_user_id,