11

src/views/modules/base/epidemic/travelForm.vue

@@ -134,20 +134,31 @@
           </el-input>
         </el-form-item>
         <el-form-item label="返回交通方式"
+                      prop="tranId"
                       style="display: block"
                       label-width="150px">
           <el-select class="item_width_2"
-                     v-model.trim="formData.gridId"
+                     v-model.trim="formData.tranId"
                      placeholder="请选择"
                      clearable>
-            <el-option v-for="item in gridList"
+            <el-option v-for="item in tranList"
-                       @click.native="handleSelGrid(item.value)"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item v-if="formData.tranId==='4'"
+                      label="其他"
+                      prop="tranOther"
+                      style="display: block"
+                      label-width="150px">
+          <el-input class="item_width_2"
+                    placeholder="请输入交通方式"
+                    clearable
+                    v-model="formData.tranOther">
+          </el-input>
+        </el-form-item>
         <el-form-item label="来自地区"
                       prop="sourceAddress"
                       style="display: block"
@@ -181,16 +192,15 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="疫苗接种针刺"
+        <el-form-item label="疫苗接种针次"
+                      prop="ym"
                       style="display: block"
                       label-width="150px">
           <el-select class="item_width_2"
-                     v-model.trim="formData.gridId"
+                     v-model.trim="formData.ym"
                      placeholder="请选择"
-                     :disabled="!isFromResi"
                      clearable>
-            <el-option v-for="item in gridList"
+            <el-option v-for="item in ymList"
-                       @click.native="handleSelGrid(item.value)"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
@@ -200,14 +210,13 @@
 
         <el-form-item label="48小时核酸记录"
                       style="display: block"
+                      prop="hs"
                       label-width="150px">
           <el-select class="item_width_2"
-                     v-model.trim="formData.gridId"
+                     v-model.trim="formData.hs"
                      placeholder="请选择"
-                     :disabled="!isFromResi"
                      clearable>
-            <el-option v-for="item in gridList"
+            <el-option v-for="item in hsList"
-                       @click.native="handleSelGrid(item.value)"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
@@ -370,7 +379,12 @@ export default {
         leaveDate: '',
         userType: 'input',
         content: '',
-        channel: []
+        channel: [],
+
+        tranId: '',
+        tranOther: '',
+        hs: '',
+        ym: '',
 
       },
       dataRule: {
@@ -394,13 +408,72 @@ export default {
         ],
         arriveDate: [
           { required: true, message: '来到本地时间不能为空', trigger: 'blur' },
+        ],
+        tranId: [
+          { required: true, message: '交通方式不能为空', trigger: 'blur' },
+        ],
+        tranOther: [
+          { required: true, message: '其他交通方式不能为空', trigger: 'blur' },
+        ],
+        hs: [
+          { required: true, message: '48小时核酸记录不能为空', trigger: 'blur' },
+        ],
+        ym: [
+          { required: true, message: '疫苗接种针刺不能为空', trigger: 'blur' },
         ]
       },
       areaProps: {
         // checkStrictly: true,
         lazy: true,
         lazyLoad: this.lzayLoadArea
+      },
+
+      tranList: [
+        {
+          value: '0',
+          label: '飞机'
+        },
+        {
+          value: '1',
+          label: '动车'
+        },
+        {
+          value: '2',
+          label: '火车'
+        },
+        {
+          value: '3',
+          label: '自驾'
+        },
+        {
+          value: '4',
+          label: '其他'
+        },
+      ],
+      ymList: [
+        {
+          value: '1',
+          label: '1针'
+        },
+        {
+          value: '2',
+          label: '2针'
+        },
+        {
+          value: '3',
+          label: '3针'
         }
+      ],
+      hsList: [
+        {
+          value: '1',
+          label: '是'
+        },
+        {
+          value: '2',
+          label: '否'
+        }
+      ]
 
     }
   },