111

src/assets/scss/modules/management/epidemic.scss

@@ -17,7 +17,7 @@
     width: 180px;
   }
   .item_width_4 {
-    width: 300px;
+    width: 350px;
   }
 
   .btn-selperson {

src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue

@@ -37,7 +37,7 @@
           </div>
           <div class="info-prop">
             <span class="info-title-3">48小时核酸：</span>
-            <span>{{ formData.natOutcome||'--'  }}</span>
+            <span>{{ formData.natOutcomeName||'--'  }}</span>
           </div>
 
           <div class="info-prop">
@@ -55,15 +55,20 @@
           </div>
           <div class="info-prop">
             <span class="info-title-3">返回方式：</span>
-            <span>{{ formData.trafficType||'--'  }}</span>
+            <span>{{ formData.trafficTypeName||'--'  }}</span>
+          </div>
+          <div v-if="formData.trafficTypeExplain"
+               class="info-prop">
+            <span class="info-title-3">具体方式：</span>
+            <span>{{ formData.trafficTypeExplain||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">7天内旅居史情况：</span>
-            <span>{{ formData.sojournHistory||'--'  }}</span>
+            <span>{{ formData.sojournHistoryName||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">隔离状态：</span>
-            <span>{{ formData.isolateType||'--'  }}</span>
+            <span>{{ formData.isolateTypeName||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">备注：</span>
@@ -71,11 +76,11 @@
           </div>
           <div class="info-prop">
             <span class="info-title-3">是否落实"落地检"：</span>
-            <span>{{ formData.isArriveCheck||'--'  }}</span>
+            <span>{{ formData.isArriveCheckName||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">是否到达曹县：</span>
-            <span>{{ formData.isArrive||'--'  }}</span>
+            <span>{{ formData.isArriveName||'--'  }}</span>
           </div>
 
           <div class="info-prop">
@@ -84,7 +89,7 @@
           </div>
           <div class="info-prop">
             <span class="info-title-3">类型：</span>
-            <span>{{ formData.tripDataType||'--'  }}</span>
+            <span>{{ formData.tripDataTypeName||'--'  }}</span>
           </div>
 
         </div>

src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue

@@ -190,6 +190,17 @@
             </el-option>
           </el-select>
 
+        </el-form-item>
+        <el-form-item v-if="formData.trafficType==='5'"
+                      label="具体方式"
+                      style="display: block"
+                      prop="trafficTypeExplain">
+          <el-input class="item_width_4"
+                    placeholder="请输入具体方式"
+                    clearable
+                    v-model="formData.trafficTypeExplain">
+          </el-input>
+
         </el-form-item>
 
         <el-form-item label="7天内旅居史情况"
@@ -447,12 +458,15 @@ export default {
         presentAddress: [
           { required: true, message: '来曹居住地点不能为空', trigger: 'change' },
         ],
-        // detailAddress: [
-        //   { required: true, message: '来曹居住详细地址不能为空', trigger: 'change' },
-        // ],      
+        detailAddress: [
+          { required: true, message: '来曹居住详细地址不能为空', trigger: 'change' },
+        ],
 
         trafficType: [
           { required: true, message: '返回方式不能为空', trigger: 'change' },
+        ],
+        trafficTypeExplain: [
+          { required: true, message: '具体方式不能为空', trigger: 'change' },
         ]
       },
       areaProps: {
@@ -504,7 +518,7 @@ export default {
 
       } else {
         const { user } = this.$store.state
-        this.nowAllCode = user.areaCodePath
+        // this.nowAllCode = user.areaCodePath
       }
       // this.$refs['ref_form'].resetFields();
 
@@ -526,7 +540,7 @@ export default {
         this.isFromResi = false
         this.formData.userType = 'input'
         const { user } = this.$store.state
-        this.nowAllCode = user.areaCodePath
+        // this.nowAllCode = user.areaCodePath
       }
 
 
@@ -659,9 +673,10 @@ export default {
         console.log('deda-------', data)
         this.formData = { ...data, channel: [], content: '' }
         this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
+        this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
 
         if (data.userType == 'icresi') this.isFromResi = true
-        else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
+
       } else {
         this.$message.error(msg)
       }