From 99f5e9624cd615eec8b72e614ee73bbb666c47bb Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 7 Sep 2022 11:04:05 +0800
Subject: [PATCH] 31013

---
 .../cooperationDetail.vue                     |  1 +
 .../addPropaganda.vue                         | 14 +----
 .../cooperationDetail.vue                     |  1 +
 .../AppCooperationPropaganda/scopedSelect.vue |  2 -
 .../selectGridMember.vue                      | 57 ++++---------------
 .../AppCooperationPropaganda/sendScoped.vue   |  2 +-
 6 files changed, 16 insertions(+), 61 deletions(-)

diff --git a/src/apps/AppCooperationPropaganda/cooperationDetail.vue b/src/apps/AppCooperationPropaganda/cooperationDetail.vue
index 413efa08..3fcb37a9 100644
--- a/src/apps/AppCooperationPropaganda/cooperationDetail.vue
+++ b/src/apps/AppCooperationPropaganda/cooperationDetail.vue
@@ -247,6 +247,7 @@ export default {
             sendStatus: this.tabIndex==0? this.subIndex0: this.subIndex1,
             taskId: this.id,
             current: this.current,
+            size: 3000,
           },
         })
         .then((res) => {
diff --git a/src/project/saas/AppCooperationPropaganda/addPropaganda.vue b/src/project/saas/AppCooperationPropaganda/addPropaganda.vue
index e9ed2dd2..6f8fab97 100644
--- a/src/project/saas/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/project/saas/AppCooperationPropaganda/addPropaganda.vue
@@ -39,7 +39,6 @@
               <div class="name">{{ item.name }}</div>
               <div class="size">{{ item.fileSizeStr }}</div>
             </div>
-            <!-- <div class="reUpload" @click="handleReUpload(index)">重新上传</div> -->
             <div class="remove" @click="remove" style="color: #f72c27">删除</div>
           </div>
         </div>
@@ -74,10 +73,6 @@
       </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">
@@ -159,7 +154,7 @@ export default {
       files: [], 
       showTaskTime: false,
       userList: [],
-      userListIds: [],
+      // userListIds: [],
       showPopup: false,
       showFodder: false,
       showUpload: false,
@@ -300,11 +295,6 @@ export default {
       })
     },
 
-    // handleReUpload(i) {
-    //   this.showUpload = true
-    //   this.remove(i)
-    // },
-
     remove(index) {
       this.files.splice(index, 1)
     },
@@ -388,7 +378,7 @@ export default {
         selectedUserIds: this.userList?.map(e => e.id)
       }).then((res)=>{
           if(res?.userList) {
-            this.userListIds = res.userList.map(e => e.id)
+            this.userList = res.userList
           }
         }
       ).catch((err) => {
diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
index c4f89b30..2d8f9769 100644
--- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
+++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
@@ -236,6 +236,7 @@ export default {
             sendStatus: this.tabIndex==0? this.subIndex0: this.subIndex1,
             taskId: this.id,
             current: this.current,
+            size: 3000,
           },
         })
         .then((res) => {
diff --git a/src/project/saas/AppCooperationPropaganda/scopedSelect.vue b/src/project/saas/AppCooperationPropaganda/scopedSelect.vue
index c5ab9883..cef3f31d 100644
--- a/src/project/saas/AppCooperationPropaganda/scopedSelect.vue
+++ b/src/project/saas/AppCooperationPropaganda/scopedSelect.vue
@@ -41,8 +41,6 @@
 
     <u-calendar v-model="showCalendar" mode="range" @change="selectDate"></u-calendar>
 
-    <AiConsole></AiConsole>
-
     <div class="btn">
       <div class="submitBtn" @click="submit">确定</div>
     </div>
diff --git a/src/project/saas/AppCooperationPropaganda/selectGridMember.vue b/src/project/saas/AppCooperationPropaganda/selectGridMember.vue
index 4592ae02..5b3e75ed 100644
--- a/src/project/saas/AppCooperationPropaganda/selectGridMember.vue
+++ b/src/project/saas/AppCooperationPropaganda/selectGridMember.vue
@@ -18,19 +18,6 @@
           <img src="./images/right-icon.png" alt="" class="imgs"/>
         </div>
       </div>
-      <!-- <div class="userCards" v-for="(e, index) in userList" :key="e.id">
-        <div class="imges">
-          <img src="./images/xzh.png" alt="" class="imgselect" v-if="e.isChecked" @click="userClick(e, index)"/>
-          <img src="./images/xz.png" alt="" class="imgselect" v-else @click="userClick(e, index)"/>
-          <img src="./images/tx@2x.png" alt="" class="avatras"/>
-        </div>
-        <div class="rights fill">
-          <div class="applicationNames">
-            <AiOpenData v-if="e.name" type="userName" :openid="e.name" style="display: block;"/>
-          </div>
-          <div class="idNumbers">{{ e.phone }}</div>
-        </div>
-      </div> -->
       <AiEmpty description="暂无数据" v-if="!hasData"/>
     </div>
     <div class="subBtn" @click="submit">
@@ -80,19 +67,19 @@ export default {
       this.treeList = this.allData.filter(e => !e.parentGirdId)
       this.selectGridPath = [{girdName: "可选范围", id: ''}]
     },
-    itemClick({id, girdName}) {
-      this.selectGridPath.push({girdName, id})
-      this.getGridsAndUsersByParent(id)
+    itemClick({id,girdName,isChecked}) {
+      this.selectGridPath.push({girdName,id})
+      this.getGridsAndUsersByParent(id,isChecked)
     },
 
-    getGridsAndUsersByParent(id) {
-      this.treeList = this.allData.filter(e => e.parentGirdId == id)
-      this.userList = []
-      this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${id}`).then((res) => {
-        if (res?.data) {
-          this.userList = res.data.map(e => ({...e, isChecked: this.selected.find(i => i.id==e.id)}))
-        }
-      })
+    getGridsAndUsersByParent(id,checkType) {
+      if(checkType) {
+        this.selected.push(this.treeList)
+      }
+      this.treeList = this.allData.filter(e => (e.parentGirdId == id)).map(v=> 
+      ({...v,isChecked: this.selected.find(i=> i.id==v.id)}))
+      
+      this.$forceUpdate()
     },
     girdNameClick(row, index) {
       this.userList = []
@@ -106,16 +93,6 @@ export default {
     },
     girdClick(row) {
       row.isChecked = !!!row.isChecked
-      // if (this.treeList[index].isChecked) {//取消
-      //   this.treeList[index].isChecked = false
-      //   this.selected = {}
-      // } else {
-      //   this.treeList.map((item, i) => {
-      //     item.isChecked = index == i
-      //   })
-      //   this.selected = {...row, kind: "grid"}
-      // }
-
       if(row.isChecked) {
         this.selected.push(row)
       } else {
@@ -125,18 +102,6 @@ export default {
       this.$forceUpdate()
     },
 
-    // userClick(row) {
-    //   row.isChecked = !!!row.isChecked
-    //   if(row.isChecked){
-    //     this.selected.push(row)
-    //   }else{
-    //     console.log(this.selected)
-    //     let index=this.selected.findIndex(item=>row.id===item.id)
-    //     index>=0&&this.selected.splice(index, 1)
-    //   }
-    //   uni.setStorageSync('userSelect', this.selected)
-    // },
-
     submit() {
       if (!this.selected.length) {
         return this.$u.toast('请选择网格员')
diff --git a/src/project/saas/AppCooperationPropaganda/sendScoped.vue b/src/project/saas/AppCooperationPropaganda/sendScoped.vue
index 82821ae5..1d55d328 100644
--- a/src/project/saas/AppCooperationPropaganda/sendScoped.vue
+++ b/src/project/saas/AppCooperationPropaganda/sendScoped.vue
@@ -15,7 +15,7 @@
       </div>
     </div>
 
-    <AiConsole></AiConsole>
+    <AiConsole />
 
     <div class="btn">
       <div class="submitBtn" @click="submit">确定</div>