From f572f9bcf34a8ef378bbbf3249e5b90190cb744c Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 31 Oct 2022 15:30:01 +0800
Subject: [PATCH] 11

---
 .../modules/base/epidemic/travelForm.vue      | 131 ++++++++++++++----
 1 file changed, 104 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index 30ca0369e..d26c5c89f 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -67,7 +67,8 @@
                     placeholder="请输入姓名"
                     clearable
                     :disabled="isFromResi"
-                    v-model="formData.name" style="margin-right:10px;">
+                    v-model="formData.name"
+                    style="margin-right:10px;">
           </el-input>
           <el-checkbox v-model="formData.heSuanCheck">添加到核酸检测关注名单</el-checkbox>
         </el-form-item>
@@ -94,25 +95,31 @@
                     v-model="formData.idCard">
           </el-input>
         </el-form-item>
-        <el-form-item
-                      label="现居地"
+        <el-form-item label="现居地"
                       prop="presentAddress"
                       style="display: block"
                       label-width="150px">
-          <el-input  v-if="formType == 'detail'" class="item_width_2"
+          <el-input v-if="formType == 'detail'"
+                    class="item_width_2"
                     placeholder="请输入现居地"
                     clearable
                     :disabled="isFromResi"
                     :style="'width: ' + computedWd(formData.presentAddress)"
                     v-model="formData.presentAddress" />
           <template v-else>
-            <el-input v-if="isFromResi" class="item_width_2 mw180"
-                    placeholder="请输入现居地"
-                    clearable
-                    :disabled="isFromResi"
-                    v-model="formData.presentAddress" />
-            <el-cascader v-else ref="nowArea" class="item_width_2" :props="areaProps"
-            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+            <el-input v-if="isFromResi"
+                      class="item_width_2 mw180"
+                      placeholder="请输入现居地"
+                      clearable
+                      :disabled="isFromResi"
+                      v-model="formData.presentAddress" />
+            <el-cascader v-else
+                         ref="nowArea"
+                         class="item_width_2"
+                         :props="areaProps"
+                         v-model="nowAllCode"
+                         clearable
+                         @change="handleNowArea"></el-cascader>
           </template>
         </el-form-item>
         <el-form-item label="详细地址"
@@ -126,16 +133,86 @@
                     v-model="formData.detailAddress">
           </el-input>
         </el-form-item>
-        <el-form-item label="来自地区" prop="sourceAddress" style="display: block" label-width="150px">
-          <el-input v-if="formType == 'detail'" class="item_width_2"
+        <el-form-item label="返回交通方式"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.gridId"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in gridList"
+                       @click.native="handleSelGrid(item.value)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="来自地区"
+                      prop="sourceAddress"
+                      style="display: block"
+                      label-width="150px">
+          <el-input v-if="formType == 'detail'"
+                    class="item_width_2"
                     placeholder=""
                     clearable
                     :disabled="isFromResi"
                     v-model="formData.sourceAddress"
                     :style="'width: ' + computedWd(formData.sourceAddress)">
           </el-input>
-          <el-cascader v-else ref="sourceArea" v-model="sourceAllCode" class="item_width_2" :props="areaProps"
-            @change="handleSourceArea" clearable></el-cascader>
+          <el-cascader v-else
+                       ref="sourceArea"
+                       v-model="sourceAllCode"
+                       class="item_width_2"
+                       :props="areaProps"
+                       @change="handleSourceArea"
+                       clearable></el-cascader>
+        </el-form-item>
+
+        <el-form-item label="详细地址"
+                      prop="detailAddress"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入详细地址"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.detailAddress">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="疫苗接种针刺"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.gridId"
+                     placeholder="请选择"
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in gridList"
+                       @click.native="handleSelGrid(item.value)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="48小时核酸记录"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.gridId"
+                     placeholder="请选择"
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in gridList"
+                       @click.native="handleSelGrid(item.value)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
 
         <el-form-item label="来到本地时间"
@@ -181,19 +258,20 @@
 
         <template v-if="formType != 'detail'">
           <el-form-item label="通知渠道"
-                      prop="channel"
-                      label-width="150px"
+                        prop="channel"
+                        label-width="150px"
                         style="display: block">
             <el-checkbox-group v-model="formData.channel">
               <el-checkbox key="0"
-                          label="0">小程序通知</el-checkbox>
+                           label="0">小程序通知</el-checkbox>
               <!-- <el-checkbox key="1"
                           label="1">短信通知</el-checkbox> -->
 
             </el-checkbox-group>
           </el-form-item>
 
-          <el-form-item v-show="formData.channel.length > 0" label="通知内容"
+          <el-form-item v-show="formData.channel.length > 0"
+                        label="通知内容"
                         prop="content"
                         label-width="150px"
                         style="display: block">
@@ -263,7 +341,7 @@ export default {
       gridList: [],
       personList: [],
       pickerOptions: {
-        disabledDate(time) {
+        disabledDate (time) {
           return time.getTime() > Date.now();
         }
       },
@@ -333,11 +411,11 @@ export default {
     //获取网格下拉框数据
     await this.loadGrid()
   },
-  destroyed() {
+  destroyed () {
     this.nowAllCode = []
   },
   methods: {
-    computedWd(val) {
+    computedWd (val) {
       const len = val.length
       const wd = len * 18
       let w = ''
@@ -345,7 +423,7 @@ export default {
       else w = 220
       return w + 'px'
     },
-    lzayLoadArea(node, resolve) {
+    lzayLoadArea (node, resolve) {
       // this.getArea(node, resolve)
       setTimeout(() => {
         this.getArea(node, resolve)
@@ -389,7 +467,7 @@ export default {
 
 
     },
-    handleSourceArea(val) {
+    handleSourceArea (val) {
       console.log('val-----', val)
       console.log('label-----', this.$refs.sourceArea.getCheckedNodes())
       if (val.length > 0) {
@@ -405,7 +483,7 @@ export default {
       }
 
     },
-    handleNowArea(val) {
+    handleNowArea (val) {
       console.log('val-----', val)
       console.log('label-----', this.$refs.nowArea.getCheckedNodes())
       if (val.length > 0) {
@@ -482,7 +560,7 @@ export default {
       }
 
     },
-    async handleSelAddress(value) {
+    async handleSelAddress (value) {
 
       const url = "/gov/org/house/gethouseinfo/" + value
 
@@ -613,7 +691,6 @@ export default {
     min-width: 260px;
   }
 }
-
 </style>
 
 <style lang='scss'>