From f114c9497a43b90d848d7a70823ff70a9254e272 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 13 Jul 2022 18:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Announce/AppAnnounce/components/Add.vue   | 33 ++++++++-----------
 .../Announce/AppAnnounce/components/List.vue  |  2 +-
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/project/sass/apps/Announce/AppAnnounce/components/Add.vue b/project/sass/apps/Announce/AppAnnounce/components/Add.vue
index 6ffc8ff9..335bb431 100644
--- a/project/sass/apps/Announce/AppAnnounce/components/Add.vue
+++ b/project/sass/apps/Announce/AppAnnounce/components/Add.vue
@@ -10,29 +10,21 @@
           <ai-card title="基本信息">
             <template #content>
               <div class="ai-form">
-                <el-form-item label="姓名" prop="name" :rules="[{ required: true, message: '请输入姓名', trigger: 'blur' }]">
-                  <el-input size="small" placeholder="请输入姓名" v-model="form.name"></el-input>
+                <el-form-item label="任务名称" prop="name" style="width: 100%;" :rules="[{ required: true, message: '请输入任务名称', trigger: 'blur' }]">
+                  <el-input size="small" placeholder="请输入任务名称" v-model="form.name"></el-input>
                 </el-form-item>
-                <el-form-item label="账号" prop="id" :rules="[{ required: true, message: '请输入账号', trigger: 'blur' }]">
-                  <el-input size="small" :disabled="!!id" placeholder="成员唯一标识，设定以后不支持修改" v-model="form.id"></el-input>
-                </el-form-item>
-                <el-form-item label="手机号" prop="mobile" :rules="[{ required: true, validator: validatorPhone, trigger: 'blur' }]">
-                  <el-input size="small" placeholder="请输入手机号" v-model="form.mobile"></el-input>
-                </el-form-item>
-                <el-form-item label="性别" prop="gender">
+                <el-form-item label="发送范围" style="width: 100%;" prop="gender">
                   <el-radio-group v-model="form.gender">
-                    <el-radio label="1">男</el-radio>
-                    <el-radio label="2">女</el-radio>
+                    <el-radio label="1">全部居民群</el-radio>
+                    <el-radio label="2">按部门选择</el-radio>
+                    <el-radio label="3">按网格选择</el-radio>
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item label="座机" prop="telephone">
-                  <el-input size="small" placeholder="请输入座机" v-model="form.telephone"></el-input>
-                </el-form-item>
-                <el-form-item label="邮箱" prop="email">
-                  <el-input size="small" placeholder="请输入邮箱" v-model="form.email"></el-input>
-                </el-form-item>
-                <el-form-item label="地址" style="width: 100%;" prop="address">
-                  <el-input size="small" style="width: 100%;" placeholder="请输入地址" v-model="form.address"></el-input>
+                <el-form-item label="消息提醒" prop="name" style="width: 100%;" :rules="[{ required: true, message: '请输入任务名称', trigger: 'blur' }]">
+                  <el-switch
+                    v-model="form.status"
+                    active-text="开启后，创建的群发任务需要审批人进行审批">
+                  </el-switch>
                 </el-form-item>
               </div>
             </template>
@@ -82,7 +74,8 @@
           departmentName: '',
           departmentIds: [],
           tagIds: [],
-          id: ''
+          id: '',
+          status: false
         },
         id: '',
         tagsList: []
diff --git a/project/sass/apps/Announce/AppAnnounce/components/List.vue b/project/sass/apps/Announce/AppAnnounce/components/List.vue
index 5dbece36..b865315f 100644
--- a/project/sass/apps/Announce/AppAnnounce/components/List.vue
+++ b/project/sass/apps/Announce/AppAnnounce/components/List.vue
@@ -50,7 +50,6 @@
         style="margin-top: 6px;"
         :current.sync="search.current"
         :size.sync="search.size"
-        @handleSelectionChange="handleSelectionChange"
         @getList="getList">
         <el-table-column slot="username" label="姓名">
           <template slot-scope="{ row }">
@@ -91,6 +90,7 @@ export default {
         startDate: '',
         endDate: ''
       },
+      tableData: [],
       loading: false,
       total: 0,
       colConfigs: [