From a61c567d948744403be0dfa293a7898d0d78f2f6 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 3 Nov 2022 13:57:23 +0800
Subject: [PATCH] 11

---
 .../scss/modules/management/epidemic.scss     |  3 +
 .../modules/base/epidemic/travelDetail.vue    |  2 +-
 .../modules/base/epidemic/travelForm.vue      | 57 ++++++++++---------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index f8ff057cd..333c1ab39 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -16,6 +16,9 @@
   .item_width_3 {
     width: 180px;
   }
+  .item_width_4 {
+    width: 350px;
+  }
 
   .btn-selperson {
     margin-left: 20px;
diff --git a/src/views/modules/base/epidemic/travelDetail.vue b/src/views/modules/base/epidemic/travelDetail.vue
index 08333068f..4eda3f199 100644
--- a/src/views/modules/base/epidemic/travelDetail.vue
+++ b/src/views/modules/base/epidemic/travelDetail.vue
@@ -118,7 +118,7 @@ export default {
       await this.loadFormData(row.id)
 
       this.initLoading = true
-      console.log('formtype', type)
+
 
     },
 
diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index c022c6b17..dd8e28a75 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -26,7 +26,7 @@
                       label="所属网格"
                       style="display: block"
                       label-width="150px">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.gridId"
                      placeholder="请选择"
                      :disabled="!isFromResi"
@@ -44,7 +44,7 @@
                       prop="userId"
                       style="display: block"
                       label-width="150px">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.userId"
                      placeholder="请选择"
                      filterable
@@ -63,7 +63,7 @@
                       prop="name"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入姓名"
                     clearable
                     :disabled="isFromResi"
@@ -77,7 +77,7 @@
                       prop="mobile"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入手机号"
                     clearable
                     :disabled="isFromResi"
@@ -88,7 +88,7 @@
                       prop="idCard"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入身份证号或证件号"
                     clearable
                     :disabled="isFromResi"
@@ -100,7 +100,7 @@
                       style="display: block"
                       label-width="150px">
           <el-input v-if="formType == 'detail'"
-                    class="item_width_2"
+                    class="item_width_4"
                     placeholder="请输入现居地"
                     clearable
                     :disabled="isFromResi"
@@ -108,14 +108,14 @@
                     v-model="formData.presentAddress" />
           <template v-else>
             <el-input v-if="isFromResi"
-                      class="item_width_2 mw180"
+                      class="item_width_4 mw180"
                       placeholder="请输入现居地"
                       clearable
                       :disabled="isFromResi"
                       v-model="formData.presentAddress" />
             <el-cascader v-else
                          ref="nowArea"
-                         class="item_width_2"
+                         class="item_width_4"
                          :props="areaProps"
                          v-model="nowAllCode"
                          clearable
@@ -126,7 +126,7 @@
                       prop="detailAddress"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入详细地址"
                     clearable
                     :disabled="isFromResi"
@@ -137,7 +137,7 @@
                       prop="trafficType"
                       style="display: block"
                       label-width="150px">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.trafficType"
                      placeholder="请选择"
                      clearable>
@@ -153,7 +153,7 @@
                       prop="trafficTypeExplain"
                       style="display: block"
                       label-width="150px">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入交通方式"
                     clearable
                     v-model="formData.trafficTypeExplain">
@@ -164,7 +164,7 @@
                       style="display: block"
                       label-width="150px">
           <el-input v-if="formType == 'detail'"
-                    class="item_width_2"
+                    class="item_width_4"
                     placeholder=""
                     clearable
                     :disabled="isFromResi"
@@ -174,21 +174,20 @@
           <el-cascader v-else
                        ref="sourceArea"
                        v-model="sourceAllCode"
-                       class="item_width_2"
+                       class="item_width_4"
                        :props="areaProps"
                        @change="handleSourceArea"
                        clearable></el-cascader>
         </el-form-item>
 
         <el-form-item label="详细地址"
-                      prop="detailAddress"
+                      prop="sourceDetailAddress"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入详细地址"
                     clearable
-                    :disabled="isFromResi"
-                    v-model="formData.detailAddress">
+                    v-model="formData.sourceDetailAddress">
           </el-input>
         </el-form-item>
 
@@ -196,7 +195,7 @@
                       prop="vaccineNum"
                       style="display: block"
                       label-width="150px">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.vaccineNum"
                      placeholder="请选择"
                      clearable>
@@ -212,7 +211,7 @@
                       style="display: block"
                       prop="isNatRecord"
                       label-width="150px">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.isNatRecord"
                      placeholder="请选择"
                      clearable>
@@ -228,7 +227,7 @@
                       style="display: block"
                       prop="arriveDate"
                       label-width="150px">
-          <el-date-picker class="item_width_2"
+          <el-date-picker class="item_width_4"
                           v-model="formData.arriveDate"
                           :picker-options="pickerOptions"
                           format="yyyy-MM-dd HH:mm"
@@ -242,7 +241,7 @@
                       style="display: block"
                       prop="leaveDate"
                       label-width="150px">
-          <el-date-picker class="item_width_2"
+          <el-date-picker class="item_width_4"
                           v-model="formData.leaveDate"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
@@ -374,6 +373,7 @@ export default {
         presentAddressPathCode: '',
         sourceAddress: '',
         sourceAddressPathCode: '',
+        sourceDetailAddress: '',
         arriveDate: '',
         remark: '',
         leaveDate: '',
@@ -406,6 +406,9 @@ export default {
         sourceAddress: [
           { required: true, message: '来自地区不能为空', trigger: 'change' },
         ],
+        sourceDetailAddress: [
+          { required: true, message: '来自地区详细地址不能为空', trigger: 'change' },
+        ],
         arriveDate: [
           { required: true, message: '来到本地时间不能为空', trigger: 'change' },
         ],
@@ -415,12 +418,12 @@ export default {
         trafficTypeExplain: [
           { required: true, message: '其他交通方式不能为空', trigger: 'change' },
         ],
-        // isNatRecord: [
-        //   { required: true, message: '48小时核酸记录不能为空', trigger: 'change' },
-        // ],
-        // vaccineNum: [
-        //   { required: true, message: '疫苗接种针刺不能为空', trigger: 'change' },
-        // ]
+        isNatRecord: [
+          { required: true, message: '48小时核酸记录不能为空', trigger: 'change' },
+        ],
+        vaccineNum: [
+          { required: true, message: '疫苗接种针刺不能为空', trigger: 'change' },
+        ]
       },
       areaProps: {
         // checkStrictly: true,