From 8746d1fde8eeb748de316aea14332125e6c55463 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 29 Sep 2022 10:02:39 +0800
Subject: [PATCH 1/4] =?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

---
 .../AppCheckpointRegistration/ManagementHistory.vue          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
index 70774308..a9900cde 100644
--- a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
@@ -130,7 +130,10 @@ export default {
           this.$u.toast('提交成功')
           uni.$emit('updateDetail')
           uni.$emit('updateList')
-          uni.navigateBack({ delta: 2 })
+          setTimeout(() => {
+            uni.navigateBack({ delta: 3 })
+          }, 600)
+          
         }
       }).catch((err) => {
         this.$u.toast(err)

From 3de63b198a4be57b3eb85890b45f389711cb8dcb Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 29 Sep 2022 10:05:17 +0800
Subject: [PATCH 2/4] bug

---
 .../pingchang/AppCheckpointRegistration/RiskContent.vue      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
index 2ae261e7..db8134c1 100644
--- a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
@@ -206,7 +206,8 @@ export default {
   onLoad(option) {
     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').then(() => {
+    this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen', 
+      'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_communityHandleType', 'EP_highRiskIndustries').then(() => {
       this.id = option.id
       this.handleTypeList = this.$dict.getDict('EP_communityHandleType')
       this.getDetail()
@@ -232,6 +233,8 @@ export default {
         return this.$u.toast('请选择隔离策略')
       }
 
+      this.form.homeQuarantineOperation = '2'
+
       this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal`, this.form).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')

From 6a4f11456d65ee1adca57b7e546550b717de1821 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 29 Sep 2022 10:10:47 +0800
Subject: [PATCH 3/4] status

---
 src/project/pingchang/AppCommunityManagement/Add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/project/pingchang/AppCommunityManagement/Add.vue b/src/project/pingchang/AppCommunityManagement/Add.vue
index e1700475..8d121954 100644
--- a/src/project/pingchang/AppCommunityManagement/Add.vue
+++ b/src/project/pingchang/AppCommunityManagement/Add.vue
@@ -104,7 +104,7 @@
     <div class="btn-height"></div>
     <div class="footer">
       <div class="cancel" @click="submit('2')">解除管理</div>
-      <div class="confirm" @click="submit(form.status)">保存</div>
+      <div class="confirm" @click="submit('1')">保存</div>
     </div>
     <u-calendar v-model="showDateSelect" mode="range" min-year="2020" max-date="2050-12-31" @change="dateConfirm"></u-calendar>
     <u-select v-model="showDictSelect" :list="$dict.getDict(selectDictName)" label-name="dictName" value-name="dictValue" @confirm="dictConfirm"></u-select>

From 0cae42df4d22b0230eee1faac651c53d63850e72 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 29 Sep 2022 10:21:41 +0800
Subject: [PATCH 4/4] homeQuarantineOperation

---
 .../pingchang/AppCheckpointRegistration/RiskContent.vue     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
index db8134c1..42cde140 100644
--- a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
@@ -232,10 +232,8 @@ export default {
       if(this.form.communityHandleType == 1 && this.form.quarantineStrategy === '') {
         return this.$u.toast('请选择隔离策略')
       }
-
-      this.form.homeQuarantineOperation = '2'
-
-      this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal`, this.form).then((res) => {
+      
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal?homeQuarantineOperation=2`, this.form).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
           uni.$emit('updateDetail')