diff --git a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue
index 6764f9df..451b3290 100644
--- a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue
@@ -32,26 +32,37 @@
-
-
{{gatewayName || '卡口选择'}}
-
+
+
{{gatewayName || '卡口选择'}}
+
+
卡口选择
-
-
-
{{item.name}}{{ $dict.getLabel('EP_riskLevel', item.riskLevel) }}
-
{{item.idNumber}}
-
{{item.startAreaName}}
-
{{item.arriveAreaName}}
-
{{item.arriveTime}}
-
![]()
+
+
+
+
{{item.name}}{{ $dict.getLabel('EP_riskLevel', item.riskLevel) }}
+
{{item.idNumber}}
+
{{item.startAreaName}}
+
{{item.arriveAreaName}}
+
{{item.arriveTime}}
+
![]()
+
+
+
处置人：{{item.handleUserName}}
+
-
管控人：{{item.handleUserName}}
-
+
@@ -85,13 +96,21 @@ export default {
require('./components/img/status4.png'),
require('./components/img/status5.png'),
require('./components/img/status6.png'),
+ ],
+ options: [
+ {
+ text: '删除',
+ style: {
+ backgroundColor: '#dd524d'
+ }
+ }
]
}
},
computed: { ...mapState(['user']) },
created() {
- // this.areaId = this.user.areaId
- // this.areaName = this.user.areaName
+ this.areaId = this.user.areaId
+ this.areaName = this.user.areaName
this.getGatewayList()
this.$dict.load(['EP_handleType', 'EP_riskLevel']).then(() => {
this.getList()
@@ -111,7 +130,7 @@ export default {
this.getList()
},
getList() {
- this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0¤t=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&startAreaId=${this.areaId}`)
+ this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0¤t=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&arriveAreaId=${this.areaId}`)
.then((res) => {
if (res.code == 0) {
res.data.records.map((item) => {
@@ -121,6 +140,20 @@ export default {
}
})
},
+ del(id) {
+ this.$confirm(`确认删除该数据`).then(() => {
+ this.$http.post(`/app/appepidemicpreventionregisterinfo/delete?id=${id}`).then((res) => {
+ if (res.code == 0) {
+ this.$u.toast('删除成功')
+ this.getListInit()
+ }else {
+ this.$u.toast(res.msg)
+ }
+ }).catch((err) => {
+ this.$u.toast(err)
+ })
+ })
+ },
getTotal() {
this.$http.post(`/app/appepidemicpreventionregisterinfo/listStatistics?areaId=${this.areaId}`).then((res) => {
if (res.code == 0) {
@@ -132,6 +165,7 @@ export default {
this.$http.post(`/app/appepidemicpreventiongateway/list?size=300&status=0`).then((res) => {
if (res.code == 0) {
this.gateList = res.data.records
+ this.gateList.unshift({name: '全部', id: ''})
}
})
},
@@ -154,6 +188,22 @@ export default {
toUser(row) {
uni.navigateTo({url: `./UserInfo?id=${row.id}`})
},
+ clearGateway() {
+ this.gatewayName = ''
+ this.gatewayId = ''
+ this.getListInit()
+ },
+ onClick(index) {
+ this.del(this.list[index].id)
+ },
+ onOpen(index) {
+ this.list[index].show = true
+ this.list.map((val, i) => {
+ if(index != i) {
+ this.list[i].show = false
+ }
+ })
+ },
},
onReachBottom() {
this.current ++
@@ -261,7 +311,6 @@ export default {
padding: 32px 32px 0;
.item{
background-color: #fff;
- margin-bottom: 24px;
border-radius: 16px;
.top {
padding: 32px 32px 24px;
@@ -352,5 +401,23 @@ export default {
}
}
}
+ .gateway-name {
+ width: calc(100% - 48px);
+ word-break: break-all;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ font-family: PingFangSC-Medium;
+ font-weight: 500;
+ font-size: 28px;
+ color: #666;
+ line-height: 40px;
+ }
+ .gateway-type {
+ display: flex;
+ justify-content: center;
+ }
}
diff --git a/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue b/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue
index ed447e7e..c9d631e0 100644
--- a/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue
@@ -86,7 +86,17 @@
备注
+
+
+
+
@@ -112,7 +122,7 @@
*交接人姓名
-
+
@@ -120,7 +130,7 @@
手机号码
-
+
@@ -128,7 +138,7 @@
*交接图片
-
@@ -223,13 +233,19 @@ export default {
}
if(this.form.handleType == 1 || this.form.handleType == 4 || this.form.handleType == 5) {
- 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()
- }
+ this.$confirm(`确认`+this.$dict.getLabel('EP_handleType', this.form.handleType)+`操作`).then(() => {
+ this.form.quarantineBeginTime = null
+ this.form.quarantineEndTime = null
+ 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()
+ }
+ }).catch((err) => {
+ this.$u.toast(err)
+ })
})
}else {
uni.setStorageSync('checkPointContent', this.form)
diff --git a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
index c4fb02d3..70774308 100644
--- a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
@@ -42,10 +42,16 @@
管控方式
{{ $dict.getLabel('EP_controlMethod', item.controlMethod) }}
-
+
{{item.remarks}}
+
+
+
![]()
+
@@ -114,6 +120,10 @@ export default {
},
methods: {
submit(status) {
+ if(this.form.handleType == 6) {
+ this.form.quarantineBeginTime = null
+ this.form.quarantineEndTime = null
+ }
this.form.homeQuarantineOperation = status
this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal?homeQuarantineOperation=${this.form.homeQuarantineOperation}`, this.form).then((res) => {
if (res.code == 0) {
@@ -122,6 +132,8 @@ export default {
uni.$emit('updateList')
uni.navigateBack({ delta: 2 })
}
+ }).catch((err) => {
+ this.$u.toast(err)
})
},
getDetail() {
diff --git a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
index 31be7062..a9b785c9 100644
--- a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
@@ -30,6 +30,10 @@
人员类别
{{$dict.getLabel('EP_registerPersonType', info.type)}}
+
高危行业
+
{{$dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)}}
+
@@ -61,15 +65,15 @@
{{info.description}}
-
抵达时间
+
抵平时间
{{info.arriveTime.substring(0, 16)}}
-
返乡地区
+
到达地区
{{info.arriveAreaName}}
-
返乡地址
+
到达地址
{{info.arriveAddress}}
+
@@ -236,6 +240,8 @@ export default {
uni.$emit('updateList')
uni.navigateBack()
}
+ }).catch((err) => {
+ this.$u.toast(err)
})
},
diff --git a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
index acacb5f5..85fce126 100644
--- a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
@@ -29,6 +29,10 @@
人员类别
{{$dict.getLabel('EP_registerPersonType', info.type)}}
+
+
高危行业
+
{{$dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)}}
+
@@ -45,7 +49,7 @@
{{info.trainNo}}
出发时间
-
{{info.startTime.substring(0, 16)}}
+
{{info.startTime.substring(0, 16)}}
出发地区
@@ -60,15 +64,15 @@
{{info.description}}
-
抵达时间
-
{{info.arriveTime.substring(0, 16)}}
+
抵平时间
+
{{info.arriveTime.substring(0, 16)}}
-
返乡地区
+
到达地区
{{info.arriveAreaName}}
-
返乡地址
+
到达地址
{{info.arriveAddress}}
健康状况
是否有风险旅居史
-
{{$dict.getLabel('yesOrNo', info.fromHighRiskArea)}}
+
否
+
{{info.highRiskAreaName}}
7天内是否接触新冠确诊或疑似患者
@@ -105,6 +110,89 @@
+
+
+
处置意见
+
+
+
处置意见
+
{{ $dict.getLabel('EP_handleType', item.handleType) }}
+
+
+
+
集中隔离地
+
{{ $dict.getLabel('EP_quarantineAddress', item.quarantineAddress) }}
+
+
+
隔离时间
+
{{item.quarantineBeginTime}}至{{item.quarantineEndTime}}
+
+
+
隔离策略
+
{{ $dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy) }}
+
+
+
+
+
+
居家状态
+
{{ $dict.getLabel('EP_homeStatus', item.homeStatus) }}
+
+
+
隔离时间
+
{{item.quarantineBeginTime}}至{{item.quarantineEndTime}}
+
+
+
隔离策略
+
{{ $dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy) }}
+
+
+
管控方式
+
{{ $dict.getLabel('EP_controlMethod', item.controlMethod) }}
+
+
+
{{item.remarks}}
+
+
+
![]()
+
+
+
+
+
+
移交对象
+
{{ $dict.getLabel('EP_handoverObject', item.handoverObject) }}
+
+
+
移交方式
+
{{ $dict.getLabel('EP_handoverMethod', item.handoverMethod) }}
+
+
+
交接人姓名
+
{{item.handoverPersonName}}
+
+
+
手机号
+
+
![]()
+ {{item.handoverPersonPhone}}
+
+
+
+
![]()
+
+
+
+
-
+
+ {{ form.controllerList[0].name }}
+ 请选择
+
+
+
@@ -92,7 +97,7 @@
*图片
-
@@ -120,7 +125,8 @@ export default {
form: {
homeStatus: '',
quarantineBeginTime: '',
- quarantineStrategy: ''
+ quarantineStrategy: '',
+ controllerList: []
},
showDateSelect: false,
showDictSelect: false,
@@ -164,6 +170,12 @@ export default {
if( !this.form.fileList.length) {
return this.$u.toast('请上传图片')
}
+
+ this.$confirm(status == 2 ? '确认解除管理该记录' : '确认保存该记录').then(() => {
+ this.confirmSubmit(status)
+ })
+ },
+ confirmSubmit(status) {
this.form.status = status
this.form.id = this.id
@@ -175,13 +187,23 @@ export default {
uni.navigateBack()
}
})
-
-
},
getDetail() {
this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
if (res.code == 0) {
- this.form = res.data
+ this.form = {...res.data}
+ this.form.controllerList = []
+ if(!this.form.controllerUserName) {
+ this.form.controllerUserName = this.user.name
+ this.form.controllerUserId = this.user.id
+ this.form.controllerUserPhone = this.user.phone
+ }
+ var info = {
+ name: this.form.controllerUserName,
+ id: this.form.controllerUserId,
+ mobile: this.form.controllerUserPhone
+ }
+ this.form.controllerList.push(info)
if(this.form.homeStatus === null) {
this.form.homeStatus = ''
}
@@ -203,6 +225,12 @@ export default {
areaSelect(e) {
this.form.areaId = e
},
+ handleSelectUser(e) {
+ console.log(e)
+ this.form.controllerUserPhone = e[0].mobile
+ this.form.controllerUserName = e[0].name
+ this.form.controllerUserId = e[0].id
+ }
},
}
@@ -211,6 +239,7 @@ export default {
.Add {
background-color: #F3F6F9;
padding-top: 16px;
+ overflow-x: hidden;
.item {
width: 100%;
background-color: #fff;
diff --git a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
index c8b30f99..f0b9766b 100644
--- a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
+++ b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
@@ -49,7 +49,7 @@
-
+
@@ -87,7 +87,8 @@ export default {
activeStyle: {
'font-weight' : '400',
},
- list: []
+ list: [],
+ registerTypeList: []
}
},
computed: {
@@ -97,6 +98,8 @@ export default {
this.areaId = this.user.areaId
this.areaName = this.user.areaName
this.$dict.load('EP_CM_status', 'EP_registerInfoType').then(() => {
+ this.registerTypeList = this.$dict.getDict('EP_registerInfoType')
+ this.registerTypeList.unshift({dictValue: '', dictName: '全部'})
this.getListInit()
})
uni.$on('updateList', () => {
@@ -193,6 +196,7 @@ export default {
width: 100%;
background: #FFF;
border-radius: 16px;
+ margin-bottom: 24px;
.top {
padding: 32px 32px 24px 32px;
position: relative;
diff --git a/src/project/pingchang/AppCommunityManagement/Detail.vue b/src/project/pingchang/AppCommunityManagement/Detail.vue
index 8ae421cc..9b3a8393 100644
--- a/src/project/pingchang/AppCommunityManagement/Detail.vue
+++ b/src/project/pingchang/AppCommunityManagement/Detail.vue
@@ -26,28 +26,40 @@
隔离时间
-
{{info.quarantineBeginTime.substring(0, 10)}} 至 {{info.quarantineEndTime.substring(0, 10)}}
+
{{info.quarantineBeginTime.substring(0, 10)}} 至 {{info.quarantineEndTime.substring(0, 10)}}
隔离策略
{{$dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}
+
+
管控人
+
{{info.controllerUserName}}
+
+
联系方式
+
{{info.controllerUserPhone}}
+
-
-
管控内容
+
+
+
+
{{info.controllerContent}}
-
{{info.controllerContent}}
-
-
-
![]()
+
+
+
+
![]()
+
-
-
@@ -59,6 +59,7 @@ export default {
return {
id: '',
info: {},
+ isHideBtn: 0
}
},
computed: { ...mapState(['user']) },
@@ -73,6 +74,7 @@ export default {
uni.$on('updateDetail', () => {
this.getDetail()
})
+ this.isHideBtn = option.isHideBtn || 0
},
methods: {
getDetail() {