diff --git a/pages/application/hotwork/home.vue b/pages/application/hotwork/home.vue index 741b43d..5c004a6 100644 --- a/pages/application/hotwork/home.vue +++ b/pages/application/hotwork/home.vue @@ -61,70 +61,91 @@ 意见 - + {{count.COUNTAUDIT}} + + 接受安全交底人 + 意见 + + + + + + {{count.COUNTAPPROVE}} + + + 作业负责人 + 意见 + + + + + + {{count.COUNTMONITOR}} + + + 所在单位 + 意见 + + + + + + {{count.COUNTACCEPT}} + 安全管理部门 意见 - + - - {{count.COUNTAPPROVE}} + + {{count.COUNTACCEPT}} 动火审批人 意见 - - - - {{count.COUNTMONITOR}} - - - 班长验票 - - - - - - {{count.COUNTACCEPT}} - - - 完工验收 - - - + {{count.COUNTGUARDIAN}} - 监护人 + 当班班长验票 - + {{count.COUNTCONFESS}} - 安全交底人 + 开始进行作业时间 - + {{count.COUNTACCEPTCONFESS}} - 接受交底人 + 结束作业时间 + + + + + + {{count.COUNTACCEPTCONFESS}} + + + 验收归档 diff --git a/pages/application/hotwork/hotwork-list/index.vue b/pages/application/hotwork/hotwork-list/index.vue index 16cb531..023a412 100644 --- a/pages/application/hotwork/hotwork-list/index.vue +++ b/pages/application/hotwork/hotwork-list/index.vue @@ -175,6 +175,42 @@ uni.navigateTo({ url: '/pages/application/hotwork/hotwork-confess/hotwork-confess-detail?HOTWORK_ID='+e }); + }else if(this.flow === '接受安全交底人签字'){ + uni.navigateTo({ + url: '/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail?HOTWORK_ID='+e + }); + }else if(this.flow === '作业负责人签字'){ + uni.navigateTo({ + url: '/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail?HOTWORK_ID='+e + }); + }else if(this.flow === '所在单位签字'){ + uni.navigateTo({ + url: '/pages/application/hotwork/hotwork-leader/hotwork-leader-detail?HOTWORK_ID='+e + }); + }else if(this.flow === '安全管理部门签字'){ + uni.navigateTo({ + url: '/pages/application/hotwork/hotwork-audit/hotwork-audit-detail?HOTWORK_ID='+e + }); + }else if(this.flow === '动火审批人签字'){ + uni.navigateTo({ + url: '/pages/application/hotwork/hotwork-approve/hotwork-approve-detail?HOTWORK_ID='+e + }); + }else if(this.flow === '当班班长验票'){ + uni.navigateTo({ + url: '/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail?HOTWORK_ID='+e + }); + }else if(this.flow === '开始进行作业'){ + uni.navigateTo({ + url: '/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail?HOTWORK_ID='+e + }); + }else if(this.flow === '结束作业'){ + uni.navigateTo({ + url: '/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail?HOTWORK_ID='+e + }); + }else if(this.flow === '验收签字'){ + uni.navigateTo({ + url: '/pages/application/hotwork/hotwork-accept/hotwork-accept-detail?HOTWORK_ID='+e + }); } },