diff --git a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue index 6c486329..31be7062 100644 --- a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue +++ b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue @@ -46,7 +46,7 @@

{{info.trainNo}}

出发时间
- +
{{info.startTime.substring(0, 16)}}
出发地区
@@ -62,7 +62,7 @@
抵达时间
- +
{{info.arriveTime.substring(0, 16)}}
返乡地区
@@ -82,7 +82,7 @@
7天内是否接触新冠确诊或疑似患者
-
{{$dict.getLabel('yesOrNo', info.contactPatients)}}
+
{{$dict.getLabel('epidemicTouchInFourteen', info.contactPatients)}}
当前健康状况
@@ -115,27 +115,26 @@
-
原路劝返
-
原路劝返
-
原路劝返
+
{{item.dictName}}
-
+
*居家状态
-
- 请选择 - -
+
+ {{ $dict.getLabel('EP_homeStatus2', form.homeStatus) || '请选择'}} + +
*隔离时间
-
- 请选择 +
+ 请选择 + {{form.quarantineBeginTime}}至{{form.quarantineEndTime}}
@@ -143,29 +142,33 @@
*隔离策略
-
- 请选择 +
+ {{ $dict.getLabel('EP_quarantineStrategy', form.quarantineStrategy) || '请选择'}}
- *附件上传 + 附件上传
- +
- *备注 + 备注
- +
+ +
-
提交
+
提交
+ +
@@ -175,26 +178,97 @@ import { mapState } from 'vuex' export default { data() { return { - areaId: '', - areaName: '', - files: [], - info: {} + id: '', + info: {}, + form: { + communityHandleType: '', + homeStatus: '', + quarantineBeginTime: '', + quarantineEndTime: '', + quarantineStrategy: '', + fileList: [], + remarks: '' + }, + handleTypeList: [], + showDateSelect: false, + showDictSelect: false, + selectDictName: '', + selectFormName: '', } }, computed: { ...mapState(['user']), }, - onLoad() { + 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.id = option.id + this.handleTypeList = this.$dict.getDict('EP_communityHandleType') + this.id = '5ba23169ca3f46fe86c17a7e0af366b9' + this.getDetail() + }) + }, onShow() { document.title = '风险处置' }, methods: { - areaSelect(e) { - this.areaId = e + submit() { + if(this.form.communityHandleType === '') { + return this.$u.toast('请选择处置意见') + } + + if(this.form.communityHandleType == 1 && this.form.homeStatus === '') { + return this.$u.toast('请选择居家状态') + } + if(this.form.communityHandleType == 1 && !this.form.quarantineBeginTime) { + return this.$u.toast('请选择隔离时间') + } + if(this.form.communityHandleType == 1 && this.form.quarantineStrategy === '') { + return this.$u.toast('请选择隔离策略') + } + + this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal`, this.form).then((res) => { + if (res.code == 0) { + this.$u.toast('提交成功') + uni.$emit('updateDetail') + uni.$emit('updateList') + uni.navigateBack() + } + }) + }, + handleTypeClick(status) { + this.form.communityHandleType = status + }, + getDetail() { + this.$http.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${this.id}`).then((res) => { + if (res.code == 0) { + this.info = res.data + this.info.travelTypeList = this.info.travelType.split(',') + this.info.idNumberText = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2") + + if(res.data.riskDisposalList && res.data.riskDisposalList.length) { + this.form = {...res.data.riskDisposalList[0]} + this.form.quarantineBeginTime = res.data.riskDisposalList[0].quarantineBeginTime.substring(0, 10) + this.form.quarantineEndTime = res.data.riskDisposalList[0].quarantineEndTime.substring(0, 10) + } + } + }) + }, + dateConfirm(e) { + this.form.quarantineBeginTime = e.startDate + this.form.quarantineEndTime = e.endDate + }, + dictSelectClick(dictName, formName) { + this.selectDictName = dictName + this.selectFormName = formName + this.showDictSelect = true + }, + dictConfirm(e) { + this.form[this.selectFormName] = e[0].value + } }, } @@ -385,10 +459,13 @@ export default { color: #333; } } + .item-textarea { + width: calc(100% - 32px); + } .type-select { - display: flex; .type-item { - width: 218px; + display: inline-block; + width: calc(50% - 16px); height: 80px; line-height: 80px; text-align: center; @@ -399,9 +476,7 @@ export default { font-size: 28px; color: #333; margin: 0 16px 16px 0; - } - .type-item:nth-of-type(3n) { - margin-right: 0; + box-sizing: border-box; } .active { background: #4181FF; diff --git a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue index 16480f75..acacb5f5 100644 --- a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue +++ b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue @@ -81,7 +81,7 @@
7天内是否接触新冠确诊或疑似患者
-
{{$dict.getLabel('yesOrNo', info.contactPatients)}}
+
{{$dict.getLabel('epidemicTouchInFourteen', info.contactPatients)}}
当前健康状况
@@ -126,7 +126,7 @@ export default { document.title = '卡口登记详情' }, onLoad(option) { - this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType').then(() => { + this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen').then(() => { this.id = option.id // this.haveHomeQuarantineBtn = option.operation == 'reDisposal' ? true : false this.getDetail() diff --git a/src/project/pingchang/AppCommunityManagement/Add.vue b/src/project/pingchang/AppCommunityManagement/Add.vue index 7eb97d55..2650c267 100644 --- a/src/project/pingchang/AppCommunityManagement/Add.vue +++ b/src/project/pingchang/AppCommunityManagement/Add.vue @@ -83,7 +83,7 @@
- +