From b04f57d1e04c6cfa0748458685faf26ed9ca97ab Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 2 Sep 2022 17:47:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addPropaganda.vue                         | 18 +++++-----
 .../AppCooperationPropaganda/scopedSelect.vue | 18 +++++++---
 .../selectGridMember.vue                      | 35 ++++++++++---------
 3 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/src/project/saas/AppCooperationPropaganda/addPropaganda.vue b/src/project/saas/AppCooperationPropaganda/addPropaganda.vue
index 679382d6..e2b92da8 100644
--- a/src/project/saas/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/project/saas/AppCooperationPropaganda/addPropaganda.vue
@@ -27,8 +27,8 @@
       <div class="content_fodder">
         <!-- <div style="color: #8E8F91;">添加素材</div> -->
         <div class="fodder_alls">
-          <!-- <div class="fodder_add"><u-icon name="plus" color="#CCD0D3" size="32"></u-icon></div> -->
-          <AiUploader :def.sync="files" placeholder="添加素材" type="file" :limit="9" multiple action="/admin/file/add2"></AiUploader>
+          <div class="fodder_add" @click="showFodder"><u-icon name="plus" color="#CCD0D3" size="32"></u-icon></div>
+          <!-- <AiUploader :def.sync="files" placeholder="添加素材" type="file" :limit="9" multiple action="/admin/file/add2"></AiUploader> -->
         </div>
       </div>
     </div>
@@ -61,6 +61,10 @@
       </div>
     </div>
 
+    <!-- <AiConsole>调试工具</AiConsole> -->
+
+
+
     <u-picker v-model="showTaskTime" :params="params" mode="time" @confirm="choiceTime"></u-picker>
 
     <div class="mask" v-show="showPopup" @tap="showPopup = false">
@@ -86,7 +90,6 @@
                 <img :src="fileIcon(item.name)" alt="">
               </div>
             </div>
-            
           </div>
 
         </div>
@@ -95,11 +98,10 @@
         </div>
       </div>
     </div>
-    
-    <AiConsole></AiConsole>
 
+    
     <div class="btn">
-      <div class="submitBtn" @click="confirm">发送</div>
+      <div class="submitBtn" @click="confirm">通知成员发送</div>
     </div>
 
   </div>
@@ -131,6 +133,7 @@ export default {
       userList: [],
       userListIds: [],
       showPopup: false,
+      showFodder: false,
       params: {
         year: true,
         month: true,
@@ -256,9 +259,6 @@ export default {
         console.log(err);
       })
     }
-  },
-  onShow() {
-    
   },
   onLoad(o) {
     this.type = o.index;
diff --git a/src/project/saas/AppCooperationPropaganda/scopedSelect.vue b/src/project/saas/AppCooperationPropaganda/scopedSelect.vue
index b9c1d1c8..c7913c08 100644
--- a/src/project/saas/AppCooperationPropaganda/scopedSelect.vue
+++ b/src/project/saas/AppCooperationPropaganda/scopedSelect.vue
@@ -3,28 +3,29 @@
     <div class="item">
       <div>添加人</div>
       <div @click="selectUser">
-        <span>请选择</span>
+        <span v-if="selectedUser.length">已选择{{ selectedUser.length }}名成员</span>
+        <span class="color_gray" v-else>请选择</span>
         <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
       </div>
     </div>
     <div class="item">
       <div>包含标签</div>
       <div @click="toTagsList(0)">
-        <span>请选择</span>
+        <span class="color_gray">请选择</span>
         <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
       </div>
     </div>
     <div class="item">
       <div>剔除标签</div>
       <div @click="toTagsList(1)">
-        <span>请选择</span>
+        <span class="color_gray">请选择</span>
         <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
       </div>
     </div>
     <div class="item">
       <div>添加时间</div>
       <div @click="showCalendar = true">
-        <span v-if="!startTime.length && !endTime.length">请选择</span>
+        <span v-if="!startTime.length && !endTime.length" class="color_gray">请选择</span>
         <span v-if="startTime.length && endTime.length">{{ startTime }} - {{ endTime }}</span>
         <u-icon name="arrow-right" color="#CCD0D3"></u-icon>
       </div>
@@ -61,6 +62,7 @@ export default {
       sex: "0",
       userList: [],
       userListIds: [],
+      selectedUser: []
     }
   },
   methods: {
@@ -111,6 +113,10 @@ export default {
   onLoad(o) {
     this.type = o.type;
     document.title = this.type == 1? '按部门选择':'按网格选择'
+    uni.$on("pagePicker:custom", res => {
+      // console.log(res)
+      this.selectedUser = res
+    })
   }
 
 }
@@ -151,6 +157,10 @@ export default {
     }
   }
 
+  .color_gray {
+    color: #CCD0D3;
+  }
+
   .btn {
     position: fixed;
     bottom: 0;
diff --git a/src/project/saas/AppCooperationPropaganda/selectGridMember.vue b/src/project/saas/AppCooperationPropaganda/selectGridMember.vue
index b29b67b7..f4ec1343 100644
--- a/src/project/saas/AppCooperationPropaganda/selectGridMember.vue
+++ b/src/project/saas/AppCooperationPropaganda/selectGridMember.vue
@@ -5,7 +5,7 @@
         <span v-for="(item, index) in selectGridPath" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span
             style="color:#3F8DF5" @click="girdNameClick(item, index)">{{ item.girdName }}</span></span>
       </div>
-      <div class="cards" v-for="(item, index) in treeList" :key="item.id" @click="itemClick(item)">
+      <div class="cards" v-for="item in treeList" :key="item.id" @click="itemClick(item)">
         <div class="imges">
           <!-- <img src="./images/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
                @click.stop="girdClick(item, index)"/>
@@ -61,6 +61,7 @@ export default {
   onLoad() {
     this.selected.id = this.$route.query.id
     this.getAllGrids()
+    this.selected = uni.getStorageSync('userSelect') || []
   },
   onShow() {
     document.title = '选择人员'
@@ -89,7 +90,7 @@ export default {
       this.userList = []
       this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${id}`).then((res) => {
         if (res?.data) {
-          this.userList = res.data.map(e => ({...e, isChecked: e.id == this.selected.id}))
+          this.userList = res.data.map(e => ({...e, isChecked: e.id == this.selected.forEach(i => i.id)}))
         }
       })
     },
@@ -117,28 +118,30 @@ export default {
     //   this.$forceUpdate()
     // },
 
-    userClick(row, index) {
-      if (this.userList[index].isChecked) {//取消
-        this.userList[index].isChecked = false
-        this.selected = {}
-      } else {
-        this.userList.map((item, i) => {
-          item.isChecked = index == i
-        })
-        this.selected = {...row, kind: "user"}
-      }
-      this.$forceUpdate()
+    userClick(row) {
+      row.isChecked = !!!row.isChecked
+      // if (this.userList[index].isChecked) {//取消
+      //   this.userList[index].isChecked = false
+      //   this.selected = {}
+      // } else {
+      //   this.userList.map((item, i) => {
+      //     item.isChecked = index == i
+      //   })
+      //   this.selected = {...row, kind: "user"}
+      // }
+      this.selected = this.userList.filter(v=> v.isChecked)
+      uni.setStorageSync('userSelect', this.selected)
     },
 
     submit() {
-      if (this.selected.id != null) {
+      if (!this.selected.length) {
+        return this.$u.toast('请选择网格员')
+      } else {
         uni.navigateBack({
           success: () => {
             uni.$emit("pagePicker:custom", this.selected)
           }
         })
-      } else {
-        return this.$u.toast('请选择网格或网格员')
       }
     },
   }