From 4e36d686f1adf3a1508337496d61539d9286c229 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 2 Sep 2022 14:47:43 +0800
Subject: [PATCH] bug

---
 .../AppCooperationPropaganda/addPropaganda.vue     | 14 +++++++++-----
 .../saas/AppCooperationPropaganda/scopedSelect.vue |  7 ++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/project/saas/AppCooperationPropaganda/addPropaganda.vue b/src/project/saas/AppCooperationPropaganda/addPropaganda.vue
index eacbbef6..6d517d79 100644
--- a/src/project/saas/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/project/saas/AppCooperationPropaganda/addPropaganda.vue
@@ -38,9 +38,9 @@
         <div>宣发需要审批</div>
         <u-switch v-model="enableExamine" size="40" @change="enableExamine = !!enableExamine"></u-switch>
       </div>
-      <div class="examine_person" v-if="enableExamine == true" @click="getDeptUser">
+      <div class="examine_person" v-if="enableExamine == true" >
         <div><span class="color_red">*</span><span class="title">审批人</span></div>
-        <div>
+        <div @click="getDeptUser">
           <span v-if="!userList.length">请选择人员 <u-icon name="arrow-right" color="#CCD0D3"/></span>
           <div v-if="userList.length">
             <AiOpenData type="departmentName" :openid="departmentId"/>
@@ -51,7 +51,7 @@
         <div>定时发送</div>
         <u-switch v-model="isTimedTask" size="40" @change="isTimedTask = !!isTimedTask"></u-switch>
       </div>
-      <div class="examine_person" v-if="isTimedTask == true" @click="getDeptUser">
+      <div class="examine_person" v-if="isTimedTask == true">
         <div><span class="color_red">*</span><span class="title">发送时间</span></div>
         <div @click="showTaskTime = true">
           <span style="color: '#CCD0D3'" v-if="!form.choiceTime.length">请选择</span>
@@ -187,13 +187,17 @@ export default {
     confirm() {
       if(this.flag) return
 
-      this.form.contents = [
+      const firstContent = [
         { 
           content: this.content,
           msgType: '0'
         },
-        ...this.files
       ]
+      this.form.contents.push(...firstContent)
+
+      const fileLists = this.files.map(item=> {
+        if(this.getExtension(item.name)==)
+      })
 
       if(!this.form.contents.length) {
         return this.$u.toast("请输入发送内容")
diff --git a/src/project/saas/AppCooperationPropaganda/scopedSelect.vue b/src/project/saas/AppCooperationPropaganda/scopedSelect.vue
index c8a0e725..1a3472aa 100644
--- a/src/project/saas/AppCooperationPropaganda/scopedSelect.vue
+++ b/src/project/saas/AppCooperationPropaganda/scopedSelect.vue
@@ -60,6 +60,7 @@ export default {
       endTime: '',
       sex: "0",
       userList: [],
+      userListIds: [],
     }
   },
   methods: {
@@ -82,9 +83,9 @@ export default {
         selectedUserIds: this.userList?.map(e => e.id)
       }).then((res)=>{
         console.log(res);
-          // if(res?.departmentList) {
-          //   this.departmentId = res.departmentList[0].id
-          // }
+          if(res?.userList) {
+            this.userListIds = res.userList.map(e => e.id)
+          }
         }
       ).catch((err) => {
         console.log(err);