From a25fb99dcd89533d454213f333bcef9b133f0e54 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 30 Mar 2022 09:54:58 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/epidemic/natInfo/natForm.vue | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
index 8d1b761e..f656dd0f 100644
--- a/src/views/modules/base/epidemic/natInfo/natForm.vue
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -162,13 +162,17 @@
                       prop="channel"
                       label-width="150px"
                       style="display: block">
-          <el-checkbox-group v-model="formData.channel">
+
+          <el-checkbox v-model="formData.isSelChannel"
+                       key="0"
+                       label="0">小程序通知</el-checkbox>
+          <!-- <el-checkbox-group v-model="formData.channel">
             <el-checkbox key="0"
                          label="0">小程序通知</el-checkbox>
-            <!-- <el-checkbox key="1"
-                         label="1">短信通知</el-checkbox> -->
+            <el-checkbox key="1"
+                         label="1">短信通知</el-checkbox>
 
-          </el-checkbox-group>
+          </el-checkbox-group> -->
         </el-form-item>
 
         <el-form-item label="通知内容"
@@ -244,6 +248,7 @@ export default {
         natTime: '',
         natAddress: '',
         natResult: '',
+        isSelChannel: false,
         channel: [],
         content: '',
 
@@ -270,7 +275,7 @@ export default {
   methods: {
 
     async initForm (type, icNatId) {
-
+      this.startLoading()
       this.formData.agencyId = this.agencyId
 
       this.$refs['ref_form'].resetFields();
@@ -284,6 +289,8 @@ export default {
         await this.loadFormData()
       }
 
+      this.endLoading()
+
 
     },
 
@@ -354,7 +361,14 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
         this.formData = data
+        this.formData.channel = []
+        this.formData.content = ''
         this.formData.icNatId = this.icNatId
+        if (this.formData.userId) {
+          this.isFromResi = true
+        } else {
+          this.isFromResi = false
+        }
         this.fileList = []
         if (data.fileName) {
           let obj = {
@@ -401,12 +415,19 @@ export default {
         return false;
       }
 
-      if (this.formData.channel.length > 0 && !this.formData.content) {
-        this.$message({
-          type: 'warning',
-          message: '请填写通知内容'
-        })
-        return false;
+      if (this.formData.isSelChannel) {
+        if (!this.formData.content) {
+          this.$message({
+            type: 'warning',
+            message: '请填写通知内容'
+          })
+          return false;
+        } else {
+          this.formData.channel = ['0']
+        }
+
+      } else {
+        this.formData.channel = []
       }
 
       this.btnDisable = true
@@ -518,6 +539,7 @@ export default {
         natTime: '',
         natAddress: '',
         natResult: '',
+        isSelChannel: false,
         channel: [],
         content: '',