From 7eadcb1036df827800c3acb15ea9ab69c7744cc8 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 26 Aug 2022 15:51:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/icvaccineprarmeter-add-or-update.vue  | 17 ++++++---
 src/views/modules/sys/icvaccineprarmeter.vue  | 38 +++++++++++--------
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
index 088537fa8..52a10a142 100644
--- a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
+++ b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')"
              :close-on-click-modal="false"
              :close-on-press-escape="false"
-             center>
+             left>
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" class="form">
       <el-form-item label="所属网格" label-width="150px" prop="gridId">
         <el-select class="item_width_2"
@@ -113,10 +113,10 @@
           <el-input class="item_width_2" style="width: 200px; margin-right: 20px" clearable v-model="dataForm.name"  placeholder="姓名"></el-input>
       </el-form-item>
       <el-form-item label="联系电话" label-width="150px" prop="mobile">
-          <el-input v-model="dataForm.mobile" class="item_width_2"  placeholder="联系电话"></el-input>
+          <el-input v-model="dataForm.mobile" class="item_width_2" style="width: 200px; margin-right: 20px"  placeholder="联系电话"></el-input>
       </el-form-item>
       <el-form-item label="身份证号" label-width="150px" prop="idCard">
-          <el-input v-model="dataForm.idCard" class="item_width_2" placeholder="身份证号"></el-input>
+          <el-input v-model="dataForm.idCard" class="item_width_2" style="width: 200px; margin-right: 20px" placeholder="身份证号"></el-input>
       </el-form-item>
       <el-form-item label="是否接种" label-width="150px">
           <el-select class="item_width_2"
@@ -137,11 +137,12 @@
             type="date"
             placeholder="选择日期时间"
             value-format="yyyy-MM-dd"
+            style="width: 200px; margin-right: 20px"
         >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="dataForm.isVaccination === '1'" label="第一次接种地点" label-width="150px" >
-          <el-input v-model="dataForm.firstVacSite" class="item_width_2" placeholder="第一次接种地点"></el-input>
+          <el-input v-model="dataForm.firstVacSite" class="item_width_2" style="width: 200px; margin-right: 20px" placeholder="第一次接种地点"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.isVaccination === '1'" label="第二次接种时间" label-width="150px">
         <el-date-picker
@@ -149,11 +150,12 @@
             type="date"
             placeholder="选择日期时间"
             value-format="yyyy-MM-dd"
+            style="width: 200px; margin-right: 20px"
         >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="dataForm.isVaccination === '1'" label="第二次接种地点" label-width="150px">
-          <el-input v-model="dataForm.secondVacSite" class="item_width_1" placeholder="第二次接种地点"></el-input>
+          <el-input v-model="dataForm.secondVacSite" class="item_width_1" style="width: 200px; margin-right: 20px" placeholder="第二次接种地点"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.isVaccination === '1'" label="第三次接种时间" label-width="150px">
         <el-date-picker
@@ -161,11 +163,12 @@
             type="date"
             placeholder="选择日期时间"
             value-format="yyyy-MM-dd"
+            style="width: 200px; margin-right: 20px"
         >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="dataForm.isVaccination === '1'" label="第三次接种地点" label-width="150px">
-          <el-input v-model="dataForm.thirdVacSite" class="item_width_2" placeholder="第三次接种地点"></el-input>
+          <el-input v-model="dataForm.thirdVacSite" class="item_width_2" style="width: 200px; margin-right: 20px" placeholder="第三次接种地点"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.isVaccination === '0'" label="原因" label-width="150px">
           <el-select class="item_width_2"
@@ -585,9 +588,11 @@
         this.resetData();
         this.visible = false;
         this.btnDisable = false;
+        this.$emit('refreshDataList')
       } else {
         this.btnDisable = false;
         this.$message.error(msg);
+        this.$emit('refreshDataList')
       }
 
       // this.$refs['dataForm'].validate((valid) => {
diff --git a/src/views/modules/sys/icvaccineprarmeter.vue b/src/views/modules/sys/icvaccineprarmeter.vue
index f3f1145d6..c40d61212 100644
--- a/src/views/modules/sys/icvaccineprarmeter.vue
+++ b/src/views/modules/sys/icvaccineprarmeter.vue
@@ -112,10 +112,10 @@
                   clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="身份证号" prop="idCard">
+        <el-form-item label="证件号" prop="idCard">
           <el-input
                   v-model="dataForm.idCard"
-                  placeholder="身份证号"
+                  placeholder="证件号"
                   clearable
           ></el-input>
         </el-form-item>
@@ -169,31 +169,35 @@
           </el-upload>
           <el-button class="diy-button--reset" size="small" @click="handleExport">导出</el-button>
         </div>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
-                style="width: 100%;" class="resi-table">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                class="resi-table"
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%; height: 524px;overflow: auto;">
         <el-table-column label="序号" header-align="center" align="center" width="50px">
           <template slot-scope="scope">
             {{scope.$index+1}}
           </template>
         </el-table-column>
         <el-table-column prop="gridName" label="网格名称" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="villageName" label="所属小区名称" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="buildName" label="所属楼宇名称" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="unitName" label="单元名" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="villageName" label="所属小区" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="buildName" label="所属楼宇" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="unitName" label="单元" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
         <el-table-column prop="homeName" label="房间名" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
         <el-table-column prop="householdTypeName" label="户口性质" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
         <el-table-column prop="name" label="姓名" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
         <el-table-column prop="mobile" label="联系电话" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center" width="100" show-overflow-tooltip></el-table-column>
         <el-table-column prop="isVaccinationName" label="是否接种" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="firstVacTime" label="第一次接种时间" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="firstVacSite" label="第一次接种地点" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="secondVacTime" label="第二次接种时间" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="secondVacSite" label="第二次接种地点" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="thirdVacTime" label="第三次接种时间" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="thirdVacSite" label="第三次接种地点" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="reason" label="原因" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="note" label="备注" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="firstVacTime" label="第一次接种时间" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="firstVacSite" label="第一次接种地点" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="secondVacTime" label="第二次接种时间" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="secondVacSite" label="第二次接种地点" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="thirdVacTime" label="第三次接种时间" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="thirdVacSite" label="第三次接种地点" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="reason" label="原因" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="note" label="备注" header-align="center" align="center" width="110" show-overflow-tooltip></el-table-column>
         <el-table-column prop="checkStateName" label="审核状态" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
         <el-table-column prop="checkReason" label="审核理由" header-align="center" align="center" width="80" show-overflow-tooltip></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
@@ -615,6 +619,8 @@ export default {
 </script>
 <style lang="scss" scoped>
   @import '@/assets/scss/buttonstyle.scss';
+  @import "@/assets/scss/modules/visual/communityManage.scss";
+  @import "@/assets/scss/modules/management/list-main.scss";
 
   .resi-container .resi-card-table {
     ::v-deep .el-table th {