From 115ffb9ac3042c100e2493a60c236c8183d6bfbf Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 3 Mar 2023 13:50:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addPropaganda.vue                         | 23 +++++++++----------
 .../AppCooperationPropaganda/scopedSelect.vue |  5 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
index 3a4ee704..4d88c193 100644
--- a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
@@ -405,6 +405,17 @@ export default {
 
     confirm() {
       if(this.flag) return
+      if(!this.form.taskTitle) {
+        return this.$u.toast('请输入任务名称')
+      }
+
+      if(!this.form.sendScope || !this.sum.length) {
+        return this.$u.toast('请选择发送范围')
+      }
+
+      if(!this.content || form.wxGroups.length) {
+        return this.$u.toast("请输入发送内容")
+      }
       this.form.contents = []
       // 文本
       const firstContent = [
@@ -446,18 +457,6 @@ export default {
         this.forms.contents = this.form.contents
         this.forms.taskTitle = this.form.taskTitle
       }
-      
-      if(!this.form.taskTitle) {
-        return this.$u.toast('请输入任务名称')
-      }
-
-      if(!this.form.sendScope) {
-        return this.$u.toast('请选择发送范围')
-      }
-
-      if(!this.form.contents.length) {
-        return this.$u.toast("请输入发送内容")
-      }
 
       if(this.enableExamine) { // 是否需要审批，0：否、1：是
         if(!this.form.examines.length) {
diff --git a/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue b/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
index 28d3c710..9f364b5a 100644
--- a/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/scopedSelect.vue
@@ -99,6 +99,7 @@ export default {
       }).then((res)=>{
         if(res?.departmentList) {
           this.deptListArr = res.departmentList
+          uni.setStorageSync('deptList', this.deptListArr)
         }
       }).catch((err) => {
         this.$u.toast(err)
@@ -131,8 +132,8 @@ export default {
   onShow() {
     // 网格或者部门
     this.selectedUser = uni.getStorageSync('girdSelect') || []
-    this.deptListArr = uni.getStorageSync('deptList') || []
-    
+      this.deptListArr = uni.getStorageSync('deptList') || []
+
     // 添加时间
     this.startTime = uni.getStorageSync('startTime')
     this.endTime = uni.getStorageSync('endTime')