From 1813f272e8c21376d6d82b45c4ebf8e45773af35 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 30 Sep 2022 10:14:02 +0800
Subject: [PATCH] bug

---
 .../AppCheckpointRegistration/ManagementHistory.vue   |  9 +--------
 .../AppCheckpointRegistration/RiskContent.vue         | 11 ++++++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
index b2924ba1..84227562 100644
--- a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
@@ -125,17 +125,10 @@ export default {
   },
   methods: {
     submit(status) {
-      if(this.form.handleType == 6) { //移交
+      if([3, 6].includes(this.form.handleType)) { //3居家隔离 //6移交
         this.form.quarantineBeginTime = null
         this.form.quarantineEndTime = null
       }
-      if(this.form.handleType == 3) { //居家隔离
-        this.form.homeStatus = null
-        this.form.quarantineBeginTime = null
-        this.form.quarantineEndTime = null
-        this.form.quarantineStrategy = null
-        this.form.controlMethod = null
-      }
       this.form.homeQuarantineOperation = status
       this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal?homeQuarantineOperation=${this.form.homeQuarantineOperation}`, this.form).then((res) => {
         if (res.code == 0) {
diff --git a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
index f90006b0..2da582c8 100644
--- a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
@@ -152,6 +152,15 @@
             <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
           </div>
         </div>
+        <div class="item solid">
+          <div class="label">
+            <span class="tips">*</span>管控方式
+          </div>
+          <div class="value" @click="dictSelectClick('EP_controlMethod', 'controlMethod')">
+            <span :class="form.controlMethod === '' ? 'color-999' : ''">{{ $dict.getLabel('EP_controlMethod', form.controlMethod) || '请选择'}}</span>
+            <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+          </div>
+        </div>
         <div class="item">
           <div class="label">
             <span class="tips"></span>附件上传
@@ -208,7 +217,7 @@ export default {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
     this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen', 
-      'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_communityHandleType', 'EP_highRiskIndustries').then(() => {
+      'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_controlMethod').then(() => {
       this.id = option.id
       this.handleTypeList = this.$dict.getDict('EP_communityHandleType')
       this.getDetail()