From bea08d8e40aca636db9fda3d7f7c0c166b7089c2 Mon Sep 17 00:00:00 2001
From: liuye <yanran200830@163.com>
Date: Fri, 25 Nov 2022 09:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCheckpointRegistration/Edit.vue        | 19 ++++++++++++-------
 .../ManagementContent.vue                     |  2 +-
 .../ManagementHistory.vue                     | 12 ++++++++----
 .../AppCheckpointRegistration/UserInfo.vue    |  2 +-
 .../AppCommunityManagement.vue                |  2 +-
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/project/pingchang/AppCheckpointRegistration/Edit.vue b/src/project/pingchang/AppCheckpointRegistration/Edit.vue
index 6b876046..29fe416e 100644
--- a/src/project/pingchang/AppCheckpointRegistration/Edit.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/Edit.vue
@@ -142,15 +142,15 @@ export default {
   },
   methods: {
     submit() {
-      if(!this.travelType.length) {
-        return this.$u.toast('请选择出行方式')
-      }
       if(!this.form.startTime) {
         return this.$u.toast('请选择出发时间')
       }
       if(!this.form.startAreaId) {
         return this.$u.toast('请选择出发地')
       }
+      if(!this.travelType.length) {
+        return this.$u.toast('请选择出行方式')
+      }
       if(!this.form.arriveTime) {
         return this.$u.toast('请选择抵平时间')
       }
@@ -160,7 +160,7 @@ export default {
 
       this.form.startTime = this.form.startTime + ':00'
       this.form.arriveTime = this.form.arriveTime + ':00'
-      this.form.travelType = this.travelType.join(',')
+      this.travelType = this.travelType.join(',')
       this.$http.post(`/app/appepidemicpreventionregisterinfo/updateForAdmin`, this.form).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
@@ -187,9 +187,14 @@ export default {
       this.$http.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
           this.form = res.data
-          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.travelType = res.data.travelType?.split(',')  || []
+          if(res.data.startTime) {
+            this.form.startTime = res.data.startTime.substring(0, 16)
+          }
+          if(res.data.arriveTime) {
+            this.form.arriveTime = res.data.arriveTime.substring(0, 16)
+          }
+          console.log(this.form)
         }
       })
     },
diff --git a/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue b/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue
index a52aa893..0d57c07b 100644
--- a/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue
@@ -7,7 +7,7 @@
         </div>
       </div>
       <div class="type-select" v-if="haveHomeQuarantineBtn == 1">
-        <div class="type-item" :class="form.handleType == index ? 'active' : ''" v-for="(item, index) in handlerTypeList" :key="index" @click="handleTypeClick(index)" v-if="index > 0">{{item.dictName}}</div>
+        <div class="type-item" :class="form.handleType == item.dictValue ? 'active' : ''" v-for="(item, index) in handlerTypeList" :key="index" @click="handleTypeClick(item.dictValue)" v-if="index > 0">{{item.dictName}}</div>
       </div>
       <div class="type-select" v-else>
         <div class="type-item" :class="form.handleType == index ? 'active' : ''" v-for="(item, index) in handlerTypeList" :key="index" @click="handleTypeClick(index)" v-if="index != 0 && index != 3 && index != 4">{{item.dictName}}</div>
diff --git a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
index 8b2c52b1..ea2be763 100644
--- a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
@@ -110,7 +110,7 @@
       </div>
     </div>
     <AiEmpty v-if="!info.riskDisposalHistoryList.length"></AiEmpty>
-    
+
     <div class="btn-height"></div>
     <div class="footer" v-if="form.handleType == 3">
       <div @click="toChangeUser">放行居家隔离</div>
@@ -144,7 +144,11 @@ export default {
   },
   methods: {
     submit(status) {
-      if([3, 6].includes(this.form.handleType)) { //3居家隔离 //6移交
+      // if([3, 6].includes(this.form.handleType)) { //3居家隔离 //6移交
+      //   this.form.quarantineBeginTime = null
+      //   this.form.quarantineEndTime = null
+      // }
+      if(!this.form.quarantineBeginTime) {
         this.form.quarantineBeginTime = null
         this.form.quarantineEndTime = null
       }
@@ -157,7 +161,7 @@ export default {
           setTimeout(() => {
             uni.navigateBack({ delta: 3 })
           }, 600)
-          
+
         }
       }).catch((err) => {
         this.$u.toast(err)
@@ -202,7 +206,7 @@ export default {
     background-color: #fff;
     padding: 0 32px;
     margin-bottom: 24px;
-    
+
   }
   .item-flex{
     padding: 34px 0;
diff --git a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
index 4f57e713..bac23f8c 100644
--- a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
@@ -40,7 +40,7 @@
       <div class="item-flex">
         <div class="label">出行方式</div>
         <div class="value">
-           <span v-for="(item, index) in info.travelTypeList" :key="index"><span v-if="index>0">;</span>{{$dict.getLabel('EP_travelType',item)}}</span>
+           <span v-for="(item, index) in info.travelTypeList" :key="index"><span v-if="index>0&&item!==''">;</span>{{$dict.getLabel('EP_travelType',item)}}</span>
         </div>
       </div>
       <div class="item-flex border-none" v-if="info.trainNo">
diff --git a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
index 529ce9f5..35b42085 100644
--- a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
+++ b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
@@ -71,7 +71,7 @@
           <p> {{item.idNumberText}}</p>
           <p>{{item.phone}}</p>
           <p>{{item.registerInfo.startAreaName}}-{{item.registerInfo.arriveAreaName}}</p>
-          <p v-if="item.lastRiskDisposal.handleType != 7">处置意见：<span :class="'type-'+item.lastRiskDisposal.handleType">{{$dict.getLabel('EP_handleType', item.lastRiskDisposal.handleType)}}</span></p>
+          <p v-if="item.lastRiskDisposal.handleType != 7 && item.lastRiskDisposal.handleType  != null">处置意见：<span :class="'type-'+item.lastRiskDisposal.handleType">{{$dict.getLabel('EP_handleType', item.lastRiskDisposal.handleType)}}</span></p>
           <div class="btn" v-if="item.status == 0" @click.stop="toEdit(item.registerInfo.id)">管理</div>
           <div class="btn" v-if="item.status == 1" @click.stop="toManage(item.id)">排查</div>
           <img src="./components/img/status-img.png" alt="" class="status-img" v-if="item.status == 2">