Merge branch 'dev-磐石1101' into dev

src/views/modules/base/epidemic/epidRisk/risk.vue

@@ -656,7 +656,13 @@ export default {
     ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
+    sourceAllCode (val) {
 
+      if (val.length === 0) {
+        this.formData.name = ''
+      }
+
+    }
   },
   props: {
 

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

@@ -805,7 +805,7 @@ export default {
       this.timeRange = []
       // this.pageSize = 20
       this.pageNo = 1
-      this.loadTable()
+      // this.loadTable()
     },
 
 

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

@@ -24,7 +24,7 @@
         <el-form-item v-if="formType==='add'"
                       label="所属网格"
                       style="display: block">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.gridId"
                      placeholder="请选择"
                      :disabled="!isFromResi"
@@ -41,7 +41,7 @@
                       label="居民"
                       prop="userId"
                       style="display: block">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.userId"
                      placeholder="请选择"
                      filterable
@@ -59,7 +59,7 @@
         <el-form-item label="姓名"
                       prop="name"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入姓名"
                     clearable
                     :disabled="isFromResi"
@@ -72,7 +72,7 @@
         <el-form-item label="手机号"
                       prop="mobile"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入手机号"
                     clearable
                     :disabled="isFromResi"
@@ -82,7 +82,7 @@
         <el-form-item label="证件号"
                       prop="idCard"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入身份证号或证件号"
                     clearable
                     :disabled="isFromResi"
@@ -92,7 +92,7 @@
         <el-form-item label="户籍地"
                       prop="registeredResidence"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入户籍地"
                     clearable
                     v-model="formData.registeredResidence">
@@ -105,7 +105,7 @@
 
           <el-cascader ref="sourceArea"
                        v-model="sourceAllCode"
-                       class="item_width_2"
+                       class="item_width_4"
                        :props="areaProps"
                        @change="handleSourceArea"
                        clearable></el-cascader>
@@ -114,7 +114,7 @@
         <el-form-item label="详细地址"
                       prop="sourceDetailAddress"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入详细地址"
                     clearable
                     v-model="formData.sourceDetailAddress">
@@ -123,7 +123,7 @@
         <el-form-item label="来曹事由"
                       prop="describeContent"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入来曹事由"
                     clearable
                     v-model="formData.describeContent">
@@ -141,7 +141,7 @@
         <el-form-item label="来到本地时间"
                       style="display: block"
                       prop="arriveDate">
-          <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"
@@ -159,7 +159,7 @@
           <template>
 
             <el-cascader ref="nowArea"
-                         class="item_width_2"
+                         class="item_width_4"
                          :props="areaProps"
                          v-model="nowAllCode"
                          clearable
@@ -169,7 +169,7 @@
         <el-form-item label="详细地址"
                       prop="detailAddress"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="item_width_4"
                     placeholder="请输入详细地址"
                     clearable
                     v-model="formData.detailAddress">
@@ -179,7 +179,7 @@
         <el-form-item label="返回方式"
                       style="display: block"
                       prop="trafficType">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.trafficType"
                      placeholder="请选择"
                      clearable>
@@ -190,12 +190,23 @@
             </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天内旅居史情况"
                       style="display: block"
                       prop="sojournHistory">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.sojournHistory"
                      placeholder="请选择"
                      clearable>
@@ -209,7 +220,7 @@
         </el-form-item>
         <el-form-item label="隔离状态"
                       prop="isolateType">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.isolateType"
                      placeholder="请选择"
                      clearable>
@@ -256,11 +267,11 @@
         <el-form-item label="上报时间"
                       style="display: block"
                       prop="reportingTime">
-          <el-date-picker class="item_width_2"
+          <el-date-picker class="item_width_4"
                           v-model="formData.reportingTime"
-                          format="yyyy-MM-dd HH:mm"
-                          value-format="yyyy-MM-dd HH:mm"
-                          type="datetime"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          type="date"
                           clearable
                           placeholder="选择时间">
           </el-date-picker>
@@ -268,7 +279,7 @@
 
         <el-form-item label="类型"
                       prop="tripDataType">
-          <el-select class="item_width_2"
+          <el-select class="item_width_4"
                      v-model.trim="formData.tripDataType"
                      placeholder="请选择"
                      clearable>
@@ -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
       }
 
 
@@ -633,7 +647,7 @@ export default {
       if (code === 0) {
         this.formData.presentAddress = data.agencyPathName
         this.formData.presentAddressCode = data.areaCode
-        this.formData.detailAddress = data.allName
+        // this.formData.detailAddress = data.allName
 
       } else {
         this.$message.error(msg)
@@ -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)
       }
@@ -689,7 +704,7 @@ export default {
           else url = '/epmetuser/tripreport/update'
 
           console.log(' this.formData', this.formData)
-          return false
+          // return false
           const { data, code, msg } = await requestPost(url, this.formData)
 
           if (code === 0) {