diff --git a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue index 9e0b734b..550c79b8 100644 --- a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue +++ b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue @@ -50,7 +50,7 @@
-
管控人：{{item.handleUserName}}
+
处置人：{{item.handleUserName}}
diff --git a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue index ad868ba9..1707a06a 100644 --- a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue +++ b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue @@ -49,7 +49,7 @@

{{info.trainNo}}

出发时间
-
{{info.startTime.substring(0, 16)}}
+
{{info.startTime.substring(0, 16)}}
出发地区
@@ -65,7 +65,7 @@
抵平时间
-
{{info.arriveTime.substring(0, 16)}}
+
{{info.arriveTime.substring(0, 16)}}
到达地区
@@ -110,6 +110,91 @@
+
+
+
处置意见
+
+
+
+
处置意见
+
{{ $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_handleType', item.handleType) }}
+
+
+
居家状态
+
{{ $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_handleType', item.handleType) }}
+
+
+
移交对象
+
{{ $dict.getLabel('EP_handoverObject', item.handoverObject) }}
+
+
+
移交方式
+
{{ $dict.getLabel('EP_handoverMethod', item.handoverMethod) }}
+
+
+
交接人姓名
+
{{item.handoverPersonName}}
+
+
+
手机号
+
+ + {{item.handoverPersonPhone}}
+
+
+
交接图片
+
+
+ +
+
+
+
+ + +
风险处置
diff --git a/src/project/pingchang/AppCommunityManagement/Detail.vue b/src/project/pingchang/AppCommunityManagement/Detail.vue index 8ae421cc..2543e5ee 100644 --- a/src/project/pingchang/AppCommunityManagement/Detail.vue +++ b/src/project/pingchang/AppCommunityManagement/Detail.vue @@ -26,7 +26,7 @@
隔离时间
-
{{info.quarantineBeginTime.substring(0, 10)}} 至 {{info.quarantineEndTime.substring(0, 10)}}
+
{{info.quarantineBeginTime.substring(0, 10)}} 至 {{info.quarantineEndTime.substring(0, 10)}}
隔离策略
@@ -34,20 +34,24 @@
-
-
-
管控内容
+
+
+
+
管控内容
+
+

{{info.controllerContent}}

-

{{info.controllerContent}}

-
-
图片
-
-
- +
+
+
图片
+
+
+ +
-
-
+
+
编辑
解除管理
@@ -109,7 +113,7 @@ export default { uni.navigateTo({url: `./Add?id=${this.id}`}) }, toNucleAcidDetail() { - uni.navigateTo({url: `../AppNucleicAcidSampling/Detail?id=${this.id}`}) + uni.navigateTo({url: `../AppNucleicAcidSampling/Detail?id=${this.id}&isHideBtn=1`}) }, }, } diff --git a/src/project/pingchang/AppNucleicAcidSampling/Add.vue b/src/project/pingchang/AppNucleicAcidSampling/Add.vue index 0a46ba2a..a7ea8c5b 100644 --- a/src/project/pingchang/AppNucleicAcidSampling/Add.vue +++ b/src/project/pingchang/AppNucleicAcidSampling/Add.vue @@ -36,7 +36,7 @@
*隔离时间
-
{{info.quarantineBeginTime.substring(0, 10)}}至{{info.quarantineEndTime.substring(0, 10)}}
+
{{info.quarantineBeginTime.substring(0, 10)}}至{{info.quarantineEndTime.substring(0, 10)}}
@@ -106,14 +106,13 @@ export default { this.id = option.id this.getDetail() }) - var myDate = new Date(); - var month = myDate.getMonth()+1 - if(month < 10) { - month = '0'+`${month}` - } + this.form.createUserName = this.user.name this.form.createUserPhone = this.user.phone - this.form.createTime = `${myDate.getFullYear()}-${month}-${myDate.getDate()} ${myDate.getHours()}:${myDate.getMinutes()}:${myDate.getSeconds()}` + + var myDate = new Date(); + this.form.createTime = `${myDate.getFullYear()}-${this.isNum(myDate.getMonth()+1)}-${this.isNum(myDate.getDate())} + ${this.isNum(myDate.getHours())}:${this.isNum(myDate.getMinutes())}:${this.isNum(myDate.getSeconds())}` }, onShow() { document.title = '核酸采样' @@ -157,6 +156,12 @@ export default { } }) }, + isNum(num) { + if(num < 10) { + num = '0'+`${num}` + } + return num + }, }, } diff --git a/src/project/pingchang/AppNucleicAcidSampling/Detail.vue b/src/project/pingchang/AppNucleicAcidSampling/Detail.vue index e293a117..50ac1173 100644 --- a/src/project/pingchang/AppNucleicAcidSampling/Detail.vue +++ b/src/project/pingchang/AppNucleicAcidSampling/Detail.vue @@ -47,7 +47,7 @@
-
采样
+
采样
@@ -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() {