From efc1a5a0b08f4f5985858812db4912e3ee588d2d Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 29 Jul 2022 16:45:38 +0800
Subject: [PATCH] 30601

---
 .../Announce/AppAnnounce/components/Add.vue   | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/project/sass/apps/Announce/AppAnnounce/components/Add.vue b/project/sass/apps/Announce/AppAnnounce/components/Add.vue
index b82bb285..c34e05b8 100644
--- a/project/sass/apps/Announce/AppAnnounce/components/Add.vue
+++ b/project/sass/apps/Announce/AppAnnounce/components/Add.vue
@@ -1,5 +1,5 @@
 <template>
-  <ai-detail class="AppAnnounceAdd" v-loading="isLoading">
+  <ai-detail class="AppAnnounceAdd">
     <template slot="title">
       <ai-title :title="id ? '编辑居民群发' : '添加居民群发'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
       </ai-title>
@@ -238,8 +238,7 @@
           :visible.sync="isShowDate"
           width="590px"
           title="定时发送"
-          @close="onClose"
-          @onConfirm="onDateForm">
+          customFooter>
           <el-form ref="dateForm" :model="dateForm" label-width="130px" label-position="right">
             <div class="ai-form">
               <el-form-item label="定时发送时间" style="width: 100%;" prop="choiceTime" :rules="[{ required: true, message: '请选择定时发送时间', trigger: 'change' }]">
@@ -255,12 +254,16 @@
               </el-form-item>
             </div>
           </el-form>
+          <div class="dialog-footer" slot="footer">
+            <el-button @click="onClose">取消</el-button>
+            <el-button @click="onDateForm" type="primary" :loading="isLoading2" style="width: 92px;">确认</el-button>
+          </div>
         </ai-dialog>
       </div>
     </template>
     <template #footer>
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="confirm(0)" style="width: 120px;">通知成员发送</el-button>
+      <el-button type="primary" @click="confirm(0)" :loading="isLoading1" style="width: 120px;">通知成员发送</el-button>
       <el-button type="primary" @click="confirm(1)">定时发送</el-button>
     </template>
   </ai-detail>
@@ -286,6 +289,8 @@
       return {
         info: {},
         department: [],
+        isLoading1: false,
+        isLoading2: false,
         fileList: [],
         isShowAddLink: false,
         isShowAddMiniapp: false,
@@ -595,7 +600,11 @@
               ...this.fileList
             ]
 
-            this.isLoading = true
+            if (sendType === 0) {
+              this.isLoading1 = true
+            } else {
+              this.isLoading2 = true
+            }
             this.instance.post(`/app/appmasssendingtask/addOrUpdate`, {
               ...this.form,
               id: this.params.id,
@@ -616,11 +625,14 @@
                 setTimeout(() => {
                   this.cancel(true)
                 }, 600)
+              } else {
+                this.isLoading1 = false
+                this.isLoading2 = false
               }
 
-              this.isLoading = false
             }).catch(() => {
-              this.isLoading = false
+              this.isLoading1 = false
+              this.isLoading2 = false
             })
           }
         })