guoyuepeng
/
qa-prevention-gwj-first-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

15007 在审批过程中 流程图显示不正确 安全交底人已经签字了 显示没有签字 申请列表的没有问题 参考申请列表的流程图

limingyu-20240419-一公司危险作业更新
liujun 2024-04-09 14:28:19 +08:00
parent 2a624f47a4
commit 3b8fbfb61e
12 changed files with 245 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue
View File

@ -124,14 +124,14 @@
监   护    人：{{GUARDIAN_USER_NAME}}未签字 监   护    人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: red">
接受交底人：{{ACCEPT_CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="!ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="!ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -227,7 +227,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -366,6 +368,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {

14
pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue
View File

@ -136,14 +136,14 @@
监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字 监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
安全交底人：{{CONFESS_USER_NAME}}未签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -243,7 +243,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -377,6 +379,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {

14
pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue
View File

@ -124,14 +124,14 @@
监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字 监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
安全交底人：{{CONFESS_USER_NAME}}未签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -232,7 +232,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -372,6 +374,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {

14
pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue
View File

@ -124,14 +124,14 @@
监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字 监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
安全交底人：{{CONFESS_USER_NAME}}未签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -232,7 +232,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -372,6 +374,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {

14
pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue
View File

@ -136,14 +136,14 @@
监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字 监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
安全交底人：{{CONFESS_USER_NAME}}未签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -243,7 +243,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -377,6 +379,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {

14
pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue
View File

@ -133,14 +133,14 @@
监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字 监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
安全交底人：{{CONFESS_USER_NAME}}未签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -241,7 +241,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -389,6 +391,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {

14
pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue
View File

@ -123,14 +123,14 @@
监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字 监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
安全交底人：{{CONFESS_USER_NAME}}未签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -231,7 +231,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -360,6 +362,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {

14
pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue
View File

@ -136,14 +136,14 @@
监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字 监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
安全交底人：{{CONFESS_USER_NAME}}未签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -243,7 +243,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -377,6 +379,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {

14
pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue
View File

@ -124,14 +124,14 @@
监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字 监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
安全交底人：{{CONFESS_USER_NAME}}未签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -232,7 +232,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -372,6 +374,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {

14
pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue
View File

@ -124,14 +124,14 @@
监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字 监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
安全交底人：{{CONFESS_USER_NAME}}未签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -233,7 +233,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -389,6 +391,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {

14
pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
View File

@ -124,14 +124,14 @@
监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字 监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
安全交底人：{{CONFESS_USER_NAME}}未签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -232,7 +232,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -366,6 +368,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {

14
pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue
View File

@ -124,14 +124,14 @@
监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字 监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
</view> </view>
</view> </view>
<view v-if="CONFESS_USER_SIGNER_TIME"> <view v-if="confessStatus === '1'">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
安全交底人：{{CONFESS_USER_NAME}}已签字 安全交底人：{{confessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!CONFESS_USER_SIGNER_TIME"> <view v-if="!confessStatus !== '1'">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
安全交底人：{{CONFESS_USER_NAME}}未签字 安全交底人：{{confessUserNames}}未签字
</view> </view>
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
@ -232,7 +232,9 @@
CONFESS_USER_SIGNER_TIME: '', CONFESS_USER_SIGNER_TIME: '',
CONFESS_USER_NAME: '', CONFESS_USER_NAME: '',
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '' ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '',
confessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -371,6 +373,8 @@
this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -2 && step.id == 0) { if (this.showStatus == -2 && step.id == 0) {