Merge remote-tracking branch 'origin/dev' into dev

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)

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()
@@ -231,8 +232,8 @@ export default {
       if(this.form.communityHandleType == 1 && this.form.quarantineStrategy === '') {
         return this.$u.toast('请选择隔离策略')
       }
-
-      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')

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>