From ed11f2124f3fe17e32a478f13306a78f13a4fca4 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 25 Mar 2022 10:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/epidemic.scss     |   3 +
 .../base/epidemic/veroFocus/veroFocusForm.vue | 154 +++++++++++-------
 .../base/epidemic/veroFocus/veroFocusList.vue |   8 +-
 3 files changed, 105 insertions(+), 60 deletions(-)

diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index 9d6e9580..2164e420 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -4,6 +4,9 @@
 .item_width_2 {
   width: 220px;
 }
+.item_width_3 {
+  width: 180px;
+}
 
 .btn-selperson {
   margin-left: 20px;
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
index d00ef1ff..846c26b4 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
@@ -96,14 +96,15 @@
         <el-tab-pane label="批量添加"
                      name="second">
           <el-form :inline="true"
-                   :model="formData"
+                   :model="formData2"
                    ref="ref_searchform"
                    :label-width="'90px'">
             <el-form-item label="所属网格"
-                          label-width="150px">
-              <el-select class="item_width_2"
+                          label-width="80px">
+              <el-select class="item_width_3"
                          v-model.trim="selGridId"
                          placeholder="请选择"
+                         size="mini"
                          clearable>
                 <el-option v-for="item in gridList"
                            :key="item.value"
@@ -114,70 +115,113 @@
             </el-form-item>
             <el-form-item label="疫苗接种次数小于"
                           label-width="150px">
-              <el-input-number v-model="veroNum"
+              <el-input-number class="item_width_3"
+                               v-model="veroNum"
+                               size="mini"
                                :min="0"
                                :max="20"
                                label="疫苗接种次数小于"></el-input-number>
             </el-form-item>
             <el-button style="margin-left:30px"
-                       size="small"
+                       size="mini"
                        class="diy-button--search"
                        @click="handleSearch">查询</el-button>
             <el-button style="margin-left:10px"
-                       size="small"
+                       size="mini"
                        class="diy-button--reset"
                        @click="resetSearch">重置</el-button>
 
-          </el-form>
+            <el-table ref="ref_table"
+                      class="table"
+                      size="mini"
+                      :data="tableData"
+                      border
+                      :height="tableHeight"
+                      v-loading="tableLoading"
+                      :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                      @select-all="selectAll"
+                      @selection-change="selectionChange"
+                      style="width: 100%">
+              <el-table-column type="selection"
+                               width="55"></el-table-column>
+              <el-table-column label="序号"
+                               header-align="center"
+                               align="center"
+                               type="index"
+                               width="50"></el-table-column>
+
+              <el-table-column prop="personInCharge"
+                               header-align="center"
+                               align="center"
+                               label="姓名"
+                               width="90">
+              </el-table-column>
+              <el-table-column prop="mobile"
+                               header-align="center"
+                               align="center"
+                               label="手机号"
+                               width="110">
+              </el-table-column>
+              <el-table-column prop="gridNames"
+                               header-align="center"
+                               align="center"
+                               label="身份证"
+                               min-width="170">
+              </el-table-column>
+
+            </el-table>
+            <div>
+              <el-pagination @size-change="handleSizeChange"
+                             @current-change="handleCurrentChange"
+                             :current-page.sync="pageNo"
+                             :page-sizes="[20, 50, 100, 200]"
+                             :page-size="pageSize"
+                             layout="sizes, prev, pager, next, total"
+                             :total="total">
+              </el-pagination>
+            </div>
+
+            <el-form-item label="备注"
+                          prop="remark"
+                          label-width="100px"
+                          style="display: block">
+              <el-input class="item_width_1"
+                        type="textarea"
+                        maxlength="500"
+                        show-word-limit
+                        :autosize="{ minRows: 2, maxRows: 5 }"
+                        clearable
+                        placeholder="请输入通知备注"
+                        v-model="formData2.remark"></el-input>
+            </el-form-item>
+
+            <el-form-item label="通知渠道"
+                          prop="noticeWay"
+                          label-width="100px"
+                          style="display: block">
+              <el-checkbox-group v-model="formData2.noticeWay">
+                <el-checkbox key="1"
+                             label="1">小程序通知</el-checkbox>
+                <el-checkbox key="2"
+                             label="2">短信通知</el-checkbox>
+
+              </el-checkbox-group>
+            </el-form-item>
 
-          <el-table ref="ref_table"
-                    class="table"
-                    :data="tableData"
-                    border
-                    :height="tableHeight"
-                    v-loading="tableLoading"
-                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                    @select-all="selectAll"
-                    @selection-change="selectionChange"
-                    style="width: 100%">
-            <el-table-column type="selection"
-                             width="55"></el-table-column>
-            <el-table-column label="序号"
-                             header-align="center"
-                             align="center"
-                             type="index"
-                             width="50"></el-table-column>
-
-            <el-table-column prop="personInCharge"
-                             header-align="center"
-                             align="center"
-                             label="姓名"
-                             width="90">
-            </el-table-column>
-            <el-table-column prop="mobile"
-                             header-align="center"
-                             align="center"
-                             label="手机号"
-                             width="110">
-            </el-table-column>
-            <el-table-column prop="gridNames"
-                             header-align="center"
-                             align="center"
-                             label="身份证"
-                             min-width="170">
-            </el-table-column>
-
-          </el-table>
-          <div>
-            <el-pagination @size-change="handleSizeChange"
-                           @current-change="handleCurrentChange"
-                           :current-page.sync="pageNo"
-                           :page-sizes="[20, 50, 100, 200]"
-                           :page-size="pageSize"
-                           layout="sizes, prev, pager, next, total"
-                           :total="total">
-            </el-pagination>
-          </div>
+            <el-form-item label="通知内容"
+                          prop="noticeContent"
+                          label-width="100px"
+                          style="display: block">
+              <el-input class="item_width_1"
+                        type="textarea"
+                        maxlength="1000"
+                        show-word-limit
+                        :autosize="{ minRows: 4, maxRows: 10 }"
+                        clearable
+                        placeholder="请输入通知内容"
+                        v-model="formData2.noticeContent"></el-input>
+            </el-form-item>
+          </el-form>
 
         </el-tab-pane>
       </el-tabs>
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index 49897bb1..abf5c153 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -233,7 +233,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="850px"
+               width="1050px"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
@@ -669,10 +669,8 @@ export default {
       return (this.clientHeight - 360)
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', ''])
   },
   watch: {