From 6e5a1c3921d8fdd08c1ffaaf22bf64f1db40cd74 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 27 Jun 2022 10:45:29 +0800
Subject: [PATCH] BUG 30340

---
 .../AppMassNotification/components/Add.vue    | 38 +------------------
 .../components/SelectDeptUser.vue             |  3 +-
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index fa28190b..7933039e 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -15,20 +15,16 @@
 
           <template #content>
             <el-form size="small" class="ai-form" :rules="rules" ref="form" :model="form" label-width="100px" label-position="right">
-
               <el-form-item label="发送方式" prop="messageSource" style="width: 50%">
                 <el-radio v-model="form.messageSource" label="2">居民群</el-radio>
                 <el-radio v-model="form.messageSource" label="1">居民</el-radio>
               </el-form-item>
-
               <el-form-item label="地区选择" style="width: 100%">
                 <ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" multiple size="small" placeholder="全部地区"/>
               </el-form-item>
-
               <el-form-item label="发送范围" style="width: 100%">
                 <select-dept-user v-model="form.deptList" v-bind="$props" :source="form.messageSource"/>
               </el-form-item>
-
             </el-form>
           </template>
         </ai-card>
@@ -131,11 +127,7 @@ export default {
         contentType: 'text',
         fileList: [],
         organization: '',
-        deptList: [{
-          corpId: "",
-          objList: [],
-          tagId: [],
-        }],
+        deptList: [],
       },
       tags: [],
       subTags: {},
@@ -151,10 +143,6 @@ export default {
       imgs: [],
       videos: [],
       files: [],
-      // orgIdList: '',
-      // orgNameList: [],
-      // orgSelect: '',
-      // orgAllList: [],
       rules: {
         content: [{required: true, message: '请输入群发内容'}],
         messageSource: [{required: true, message: '请选择群发方式'}],
@@ -162,7 +150,6 @@ export default {
       },
     }
   },
-
   computed: {
     ...mapState(['user']),
     tagsChange() {
@@ -174,37 +161,16 @@ export default {
       return this.form.areaId = this.areaId.toString();
     },
   },
-  // watch: {
-  //   orgNameList: {
-  //     handler: function (v) {
-  //       this.orgSelect = `已选择${v.length}个组织`
-  //     }
-  //   }
-  // },
-
   created() {
     if (this.$route.query.id) {
       this.getInfo()
     }
     this.areaRootId = [this.user.info.areaId.substr(0, 6), '000000'].join("")
   },
-
-
   methods: {
     handleAreaSelect(v) {
       this.areaName = v?.[0]?.label
     },
-
-    // 标签
-    // getSubTags() {
-    //   this.instance.post(`/app/wxcp/wxgroupchattag/listAllByCorp?dvcpId=${this.orgIdList}`).then(res => {
-    //     if (res?.data) {
-    //       console.log(res);
-    //       this.subTags = res.data.records
-    //     }
-    //   })
-    // },
-    
     getInfo() {
       this.instance.post(`/app/pushmessage/detail?id=${this.$route.query.id}`).then(res => {
         if (res?.data) {
@@ -270,7 +236,7 @@ export default {
     cancel(isRefresh) {
       this.$emit('change', {
         type: 'List',
-        isRefresh: isRefresh ? true : false
+        isRefresh: !!isRefresh
       })
     }
   }
diff --git a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
index 91e74ad2..fb94055b 100644
--- a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
+++ b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
@@ -108,7 +108,7 @@ export default {
         params: {departmentId, status: 1, cid}
       }).then(res => {
         if (res?.data) {
-          res.data = res.data.map(e => ({...e, kind: "user"}))
+          res.data = res.data.map(e => ({...e, kind: "user", checked: false}))
           this.options = [this.options, res.data].flat()
         }
       })
@@ -160,7 +160,6 @@ export default {
       return !!this.selected.find(e => e.uid == uid)
     },
     handleCheck(row, i) {
-      row.checked = !row.checked
       if (row.checked) {
         this.selected.push(row)
       } else {