From f04ea2777d68be032fd1b98ffefec1469e9cf2cb Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 2 Mar 2023 09:24:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addPropaganda.vue                         | 25 ++++++++++---------
 .../AppCooperationPropaganda/scopedSelect.vue | 11 +++++---
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
index d1a4af64..528f360e 100644
--- a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
@@ -59,10 +59,9 @@
       <div class="examine_person" v-if="enableExamine == true">
         <div><span class="color_red">*</span><span class="title">审批人</span></div>
         <div @click="getDeptUser">
-          <span v-if="!userList.length" class="color_gray">请选择人员<u-icon name="arrow-right" color="#CCD0D3"></u-icon></span>
-          <div v-if="userList.length">
-            <AiOpenData type="departmentName" :openid="departmentId"/>
-          </div>
+          <span v-if="!form.examines.length" class="color_gray">请选择<u-icon name="arrow-right" color="#CCD0D3"></u-icon></span>
+          <span v-else>已选择{{ form.examines.length }}名人员</span>
+            <!-- <AiOpenData type="departmentName" :openid="departmentId"/> -->
         </div>
       </div>
       <div class="examineChange">
@@ -449,15 +448,15 @@ export default {
         if(!this.form.examines.length) {
           return this.$u.toast("请选择审批人")
         } else {
-          this.form.examineList = this.form.examineList
+          this.forms.examines = this.form.examines
         }
         this.form.enableExamine = 1
         this.forms.enableExamine = 1 
       } else {
         this.form.enableExamine = 0
         this.forms.enableExamine = 0 
-        this.form.examineList = []
-        this.form.examineList = []
+        this.form.examines = []
+        this.form.examines = []
       }
 
       if(this.isTimedTask) {   // 发送类型，0：立即发送、1：定时发送
@@ -534,14 +533,16 @@ export default {
         fromDepartmentId: 0,
         mode: "multi",
         type: ["user"],
-        selectedUserIds: this.form.examineList?.map(e => e.id)
+        selectedUserIds: this.form.examines?.map(e => e.id)
       }).then((res)=>{
-          if(res?.userList) {
-            this.form.examineList = res.userList
+        if (res.err_msg == "selectEnterpriseContact:ok") {
+          if(typeof res.result == 'string') {
+            res.result = JSON.parse(res.result) 
           }
+          this.form.examines = res.result.userList
         }
-      ).catch((err) => {
-        console.log(err);
+      }).catch((err) => {
+        this.$u.toast(err)
       })
     }
   },
diff --git a/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue b/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
index 3184fb49..3c8f0e51 100644
--- a/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
@@ -98,12 +98,15 @@ export default {
         type: ["department"],  // 选部门
         selectedDepartmentIds: this.deptListArr?.map(e => e.id)  // 已选部门ID列表。用于多次选人时可重入
       }).then((res)=>{
-          if(res?.userList) {
-            console.log(res,'企微通讯录');
-            this.deptListArr = res.userList
+        console.log(res,'企微通讯录');
+        if(res.err_msg == "selectEnterpriseContact:ok") {
+          if(typeof res.result == 'string') {
+            res.result = JSON.parse(res.result) 
+            //由于目前各个终端尚未完全兼容，需要开发者额外判断result类型以保证在各个终端的兼容性
           }
+          this.deptListArr = res.result.departmentList
         }
-      ).catch((err) => {
+      }).catch((err) => {
         this.$u.toast(err)
       })
     },