From 72a63e1fdc9e763464cf175f00a8db0bb0426401 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 6 Dec 2022 08:39:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=8F=A3=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppGetewayRegister/getewayAdd.vue         | 235 +-----------------
 .../AppGetewayRegister/getewayDetail.vue      |  94 -------
 2 files changed, 3 insertions(+), 326 deletions(-)

diff --git a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
index 026b922..f9cea95 100644
--- a/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
+++ b/src/project/pingchang/AppGetewayRegister/getewayAdd.vue
@@ -16,17 +16,6 @@
             </div>
           </div>
         </div>
-        <!-- <div class="form-item">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i>*</i>
-              <h2>身份证号</h2>
-            </div>
-            <div class="form-item__right">
-              <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="18" @blur="idNumberChange"/>
-            </div>
-          </div>
-        </div> -->
         <div class="form-item">
           <div class="form-item__wrapper">
             <div class="form-item__title">
@@ -49,50 +38,11 @@
             </div>
           </div>
         </div>
-        <!-- <div class="form-item">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i>*</i>
-              <h2>人员类别</h2>
-            </div>
-            <div class="form-item__right">
-              <AiSelect v-model="form.type" dict="EP_registerPersonType" class="select"></AiSelect>
-            </div>
-          </div>
-        </div>
-        <div class="form-item">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i>*</i>
-              <h2>高危行业</h2>
-            </div>
-            <div class="form-item__right">
-              <AiSelect v-model="form.highRiskIndustries" dict="EP_highRiskIndustries" class="select"></AiSelect>
-            </div>
-          </div>
-        </div> -->
       </div>
 
       <!-- 行程信息 -->
       <div class="title">行程信息</div>
       <div class="form-item__group">
-        <!-- <div class="form-item">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i>*</i>
-              <h2>出发时间</h2>
-            </div>
-            <div class="form-item__right">
-              <div class="ai-area" @click="isShowStartTime = true">
-                <div class="ai-area__wrapper">
-                  <span class="label" v-if="form.startTime">{{ form.startTime }}</span>
-                  <i v-else>请选择</i>
-                  <u-icon name="arrow-right" color="#ddd"/>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div> -->
         <div class="form-item">
           <div class="form-item__wrapper">
             <div class="form-item__title">
@@ -110,55 +60,7 @@
             </div>
           </div>
         </div>
-        <!-- <div class="form-item form-item__textarea">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i style="margin-right:8px;"></i>
-              <h2>出发地详址</h2>
-            </div>
-            <div class="form-item__right">
-              <textarea auto-height v-model="form.startAddress" :maxlength="500" placeholder="请尽量详细填写至街道、小区。"
-                        placeholder-style="font-size: 16px"></textarea>
-            </div>
-          </div>
-        </div> -->
-        <!-- <div class="form-item form-item__imgs">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i>*</i>
-              <h2>出行方式</h2>
-            </div>
-            <div class="form-item__right">
-              <div class="travelType">
-                <div class="travelItem" v-for="(v,index) in travelTypeDict" :key="index" :class="[travelType.includes(v.dictValue)? 'active':'']" @click="travelTypeSelect(v.dictValue)">{{ v.dictName }}</div>
-              </div>
-            </div>
-          </div>
-        </div> -->
-
-        <!-- <div class="form-item">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i style="margin-right:8px;"></i>
-              <h2>车次/车牌/航班</h2>
-            </div>
-            <div class="form-item__right">
-              <input placeholder="请输入" v-model="form.trainNo" :maxlength="20"/>
-            </div>
-          </div>
-        </div> -->
-        <!-- <div class="form-item form-item__textarea">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i style="margin-right:8px;"></i>
-              <h2>行程描述</h2>
-            </div>
-            <div class="form-item__right">
-              <textarea auto-height style="height: 90px" v-model="form.description" :maxlength="500" placeholder="请输入行程描述"
-                        placeholder-style="font-size: 16px"></textarea>
-            </div>
-          </div>
-        </div> -->
+        
         <div class="form-item">
           <div class="form-item__wrapper">
             <div class="form-item__title">
@@ -207,72 +109,6 @@
         </div>
       </div>
 
-      <!-- 健康状况 -->
-      <!-- <div class="title">健康状况</div>
-      <div class="form-item__group">
-        <div class="form-item form-item__imgs">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i>*</i>
-              <h2>是否有风险旅居史？</h2>
-            </div>
-            <div class="form-item__right">
-              <AiRadio style="width: 100%;" v-model="form.fromHighRiskArea" dict="yesOrNo"/>
-            </div>
-          </div>
-        </div>
-        <div class="form-item" v-show="form.fromHighRiskArea == 1">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i>*</i>
-              <h2>风险地区</h2>
-            </div>
-            <div class="form-item__right">
-              <AiAreaPicker class="ai-area" v-model="form.highRiskAreaId" :fullName.sync="form.highRiskAreaName" all>
-                <div class="ai-area__wrapper">
-                  <span class="label" v-if="form.highRiskAreaName">{{ form.highRiskAreaName }}</span>
-                  <i v-else>请选择</i>
-                  <u-icon name="arrow-right" color="#ddd"/>
-                </div>
-              </AiAreaPicker>
-            </div>
-          </div>
-        </div>
-        <div class="form-item form-item__imgs">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i>*</i>
-              <h2>近七日内是否接触新冠确诊或疑似患者？</h2>
-            </div>
-            <div class="form-item__right">
-              <AiRadio style="width: 100%;" v-model="form.contactPatients" dict="epidemicTouchInFourteen"/>
-            </div>
-          </div>
-        </div>
-        <div class="form-item form-item__imgs">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i>*</i>
-              <h2>是否有健康异常情况？</h2>
-            </div>
-            <div class="form-item__right">
-              <AiRadio style="width: 100%;" v-model="form.abnormalHealth" dict="yesOrNo"/>
-            </div>
-          </div>
-        </div>
-        <div class="form-item" v-if="form.abnormalHealth==1">
-          <div class="form-item__wrapper">
-            <div class="form-item__title">
-              <i>*</i>
-              <h2>异常情况</h2>
-            </div>
-            <div class="form-item__right">
-              <AiSelect dict="EP_abnormalType" v-model="form.abnormalType" class="select"></AiSelect>
-            </div>
-          </div>
-        </div>
-      </div> -->
-
       <!-- 同行情况 -->
       <div class="title">同行情况</div>
       <div class="form-item__group">
@@ -295,8 +131,7 @@
         </div>
         <div class="addCount" @click="addCountHandle" v-if="form.companionCount > 0">添加同行人</div>
       </div>
-
-      <u-picker mode="time" :params="params" v-model="isShowStartTime" @confirm="onStartChange"></u-picker>
+      
       <u-picker mode="time" :params="params" v-model="isShowEndTime" @confirm="onEndChange"></u-picker>
       
       <div class="btn-wrapper">
@@ -323,8 +158,6 @@ export default {
         phone: '',  
         name: '',
         idNumber: '',
-        // type: '', // 人员类别
-        // highRiskIndustries: '',
         startTime: '',
         startAreaId: '',
         startAreaName: '',
@@ -472,7 +305,6 @@ export default {
           this.form = res.data
           this.people = res.data.companionList
           this.travelType = res.data.travelType?.split(',')
-          // this.form.startTime = res.data.startTime.substr(0, res.data.startTime.length - 3)
           this.form.arriveTime = res.data.arriveTime.substr(0, res.data.arriveTime.length - 3)
           this.startAreaId = res.data.startAreaId
           this.startAreaName = res.data.startAreaName
@@ -526,7 +358,6 @@ export default {
           this.startAreaName = res.data.startAreaName
           this.form.arriveAreaId = res.data.arriveAreaId
           this.form.arriveAreaName = res.data.arriveAreaName
-          // this.form.startAddress = res.data.startAddress || ''
           this.form.arriveAddress = res.data.arriveAddress || ''
         }
       })
@@ -538,14 +369,6 @@ export default {
         return this.$toast('请选择卡口')
       }
 
-      // if (!this.form.idNumber) {
-      //   return this.$toast('请输入身份证号')
-      // }
-
-      // if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.form.idNumber)) {
-      //   return this.$toast('请输入正确的身份证账号')
-      // }
-
       if (!this.form.phone) {
         return this.$toast('请输入手机号码')
       }
@@ -558,22 +381,6 @@ export default {
         return this.$toast('请输入姓名')
       }
 
-      // if (!this.form.highRiskIndustries) {
-      //   return this.$toast('请选择高危行业')
-      // }
-
-      // if (!this.form.type) {
-      //   return this.$toast('请选择人员类别')
-      // }
-      
-      // if (!this.form.startTime) {
-      //   return this.$toast('请选择出发时间')
-      // }
-
-      // if (new Date(this.form.startTime.replace(/-/g, '/')).getTime() > new Date().getTime()) {
-      //   return this.$toast('出发时间不得晚于当前时间')
-      // }
-
       if (!this.startAreaId) {
         return this.$toast('请选择从哪来')
       }
@@ -582,14 +389,7 @@ export default {
         return this.$toast('出发地必须选至县级及以下')
       }
 
-      // if (!this.form.startAddress) {
-      //   return this.$toast('请输入出发地详址')
-      // }
-
-      // if (!this.travelType.length) {
-      //   return this.$toast('请选择出行方式')
-      // }
-      
+     
       if (!this.form.arriveTime) {
         return this.$toast('请选择抵平时间')
       }
@@ -606,34 +406,6 @@ export default {
         return this.$toast('目的地必须选到村或社区')
       }
 
-      // if (!this.form.arriveAddress) {
-      //   return this.$toast('请输入到达地址')
-      // }
-
-      // if (!this.form.fromHighRiskArea) {
-      //   return this.$toast('请选择是否有风险旅居史')
-      // }
-
-      // if (this.form.fromHighRiskArea == 1) {
-      //   if (!this.form.highRiskAreaId) {
-      //     return this.$toast('请选择风险旅居地区')
-      //   }
-      // }
-
-      // if (!this.form.contactPatients) {
-      //   return this.$toast('请选择近七日内是否接触新冠确诊或疑似患者')
-      // }
-      
-      // if (!this.form.abnormalHealth) {
-      //   return this.$toast('请选择是否有健康异常情况')
-      // }
-
-      // if (this.form.abnormalHealth == 1) {
-      //   if (!this.form.abnormalType) {
-      //     return this.$toast('请选择异常情况')
-      //   }
-      // }
-
       if (!this.form.companionCount || this.form.companionCount == 0) {
         this.form.companionCount = 0
         this.form.companionList = []
@@ -663,7 +435,6 @@ export default {
         startAreaId: this.startAreaId,
         startAreaName: this.startAreaName,
         travelType: this.travelType.toString(),
-        // startTime: this.form.startTime + ':00',
         arriveTime: this.form.arriveTime + ':00',
       }).then(res => {
         this.$hideLoading()
diff --git a/src/project/pingchang/AppGetewayRegister/getewayDetail.vue b/src/project/pingchang/AppGetewayRegister/getewayDetail.vue
index 0fb8f1b..0df115f 100644
--- a/src/project/pingchang/AppGetewayRegister/getewayDetail.vue
+++ b/src/project/pingchang/AppGetewayRegister/getewayDetail.vue
@@ -31,14 +31,6 @@
           <span>{{ info.name }}</span>
         </div>
       </div>
-      <!-- <div class="detail-info__item">
-        <div class="left">
-          <label>身份证号</label>
-        </div>
-        <div class="right">
-          <span>{{ info.idNumber }}</span>
-        </div>
-      </div> -->
       <div class="detail-info__item">
         <div class="left">
           <label>联系方式</label>
@@ -48,52 +40,9 @@
           <span style="color: #4181FF">{{ info.phone }}</span>
         </div>
       </div>
-      <!-- <div class="detail-info__item">
-        <div class="left">
-          <label>人员类别</label>
-        </div>
-        <div class="right">
-          <span>{{ $dict.getLabel('EP_registerPersonType', info.type) }}</span>
-        </div>
-      </div> -->
-      <!-- <div class="detail-info__item">
-        <div class="left">
-          <label>高危行业</label>
-        </div>
-        <div class="right">
-          <span>{{ $dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries) }}</span>
-        </div>
-      </div> -->
     </div>
     <div class="detail-info">
       <h2>行程信息</h2>
-      <!-- <div class="detail-info__item">
-        <div class="left">
-          <label>出行方式</label>
-        </div>
-        <div class="right">
-          <span v-for="(item, index) in travelType" :key="index">
-            {{ $dict.getLabel('EP_travelType', item) }}
-            <span v-show="index < travelType.length - 1">，</span>
-          </span>
-        </div>
-      </div> -->
-      <!-- <div class="detail-info__item">
-        <div class="left">
-          <label>车次/航班</label>
-        </div>
-        <div class="right">
-          <span>{{ info.trainNo }}</span>
-        </div>
-      </div> -->
-      <!-- <div class="detail-info__item">
-        <div class="left">
-          <label>出发时间</label>
-        </div>
-        <div class="right">
-          <span>{{ info.startTime && info.startTime.substr(0, info.startTime.length - 3) }}</span>
-        </div>
-      </div> -->
       <div class="detail-info__item">
         <div class="left">
           <label>从哪来</label>
@@ -102,22 +51,6 @@
           <span :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{ info.startAreaName }}</span>
         </div>
       </div>
-      <!-- <div class="detail-info__item">
-        <div class="left">
-          <label>出发地详址</label>
-        </div>
-        <div class="right">
-          <span>{{ info.startAddress }}</span>
-        </div>
-      </div> -->
-      <!-- <div class="detail-info__item">
-        <div class="left">
-          <label>行程描述</label>
-        </div>
-        <div class="right">
-          <span>{{ info.description }}</span>
-        </div>
-      </div> -->
       <div class="detail-info__item">
         <div class="left">
           <label>抵平时间</label>
@@ -143,33 +76,6 @@
         </div>
       </div>
     </div>
-    <!-- <div class="detail-info">
-      <h2>健康状况</h2>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>是否有风险旅居史？</label>
-        </div>
-        <div class="right">
-          <span :style="{ color: info.fromHighRiskArea==1? '#FF4466' : '#42D784'}">{{ info.fromHighRiskArea==1? info.highRiskAreaName: '否' }}</span>
-        </div>
-      </div>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>7天内是否接触新冠确诊或疑似患者？</label>
-        </div>
-        <div class="right">
-          <span :style="{ color: info.contactPatients==1? '#FF4466' : info.contactPatients==2? '': '#42D784'}">{{ $dict.getLabel('epidemicTouchInFourteen', info.contactPatients) }}</span>
-        </div>
-      </div>
-      <div class="detail-info__item">
-        <div class="left">
-          <label>当前健康状况</label>
-        </div>
-        <div class="right">
-          <span :style="{ color: info.abnormalType? '#FF4466' :'#42D784'}">{{ $dict.getLabel('EP_abnormalType',info.abnormalType) || '没有出现症状' }}</span>
-        </div>
-      </div>
-    </div> -->
     <div class="detail-info" v-if="info.companionCount > 0">
       <h2>同行情况</h2>
       <div class="detail-info__item">