kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
aixianling
2022-09-29 10:39:51 +08:00
parent aeef2bb31a 0cae42df4d
commit f6d9af9a85
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
View File

@@ -130,7 +130,10 @@ export default {
this.$u.toast('提交成功') this.$u.toast('提交成功')
uni.$emit('updateDetail') uni.$emit('updateDetail')
uni.$emit('updateList') uni.$emit('updateList')
uni.navigateBack({ delta: 2 }) setTimeout(() => {
uni.navigateBack({ delta: 3 })
}, 600)
} }
}).catch((err) => { }).catch((err) => {
this.$u.toast(err) this.$u.toast(err)

5
src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
View File

@@ -206,7 +206,8 @@ export default {
onLoad(option) { onLoad(option) {
this.areaId = this.user.areaId this.areaId = this.user.areaId
this.areaName = this.user.areaName 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.id = option.id
this.handleTypeList = this.$dict.getDict('EP_communityHandleType') this.handleTypeList = this.$dict.getDict('EP_communityHandleType')
this.getDetail() this.getDetail()
@@ -232,7 +233,7 @@ export default {
return this.$u.toast('请选择隔离策略') 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) { if (res.code == 0) {
this.$u.toast('提交成功') this.$u.toast('提交成功')
uni.$emit('updateDetail') uni.$emit('updateDetail')

2
src/project/pingchang/AppCommunityManagement/Add.vue
View File

@@ -104,7 +104,7 @@
<div class="btn-height"></div> <div class="btn-height"></div>
<div class="footer"> <div class="footer">
<div class="cancel" @click="submit('2')">解除管理</div> <div class="cancel" @click="submit('2')">解除管理</div>
<div class="confirm" @click="submit(form.status)">保存</div> <div class="confirm" @click="submit('1')">保存</div>
</div> </div>
<u-calendar v-model="showDateSelect" mode="range" min-year="2020" max-date="2050-12-31" @change="dateConfirm"></u-calendar> <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> <u-select v-model="showDictSelect" :list="$dict.getDict(selectDictName)" label-name="dictName" value-name="dictValue" @confirm="dictConfirm"></u-select>