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

14921 所有的“所在单位”和“所在单位负责人”修改为“属地监管单位”和“属地监管单位负责人”功能涉及所有页面 注意地图中的详情、归档页面详情、监管端详情

limingyu-20240419-一公司危险作业更新
liujun 2024-04-01 18:07:10 +08:00
parent 80de716078
commit fafd59c8ea
15 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/application/hotwork_cfd/home.vue
View File

@ -78,7 +78,7 @@
<view v-if="count.COUNTMONITOR" class="cu-tag badge">{{count.COUNTMONITOR}}</view>
</view>
<view class="text-semi" style="text-align: center;">
<view>班长验票</view>
<view>动火前验票</view>
</view>
</navigator>
<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list">

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

@ -67,7 +67,7 @@
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -182,7 +182,7 @@
{id:'-4',name:'车间负责人打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -339,7 +339,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -388,7 +388,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -411,7 +411,7 @@
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -436,7 +436,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -463,7 +463,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){

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

@ -76,7 +76,7 @@
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS<=0"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -198,7 +198,7 @@
{id:'-4',name:'属地监管单位确认打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -350,7 +350,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -399,7 +399,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -422,7 +422,7 @@
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -447,7 +447,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -474,7 +474,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){

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

@ -77,7 +77,7 @@
<template v-else-if="item.APPLY_STATUS==-4">所在单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
<template v-else-if="item.APPLY_STATUS==-98">已作废(未进行气体检测)</template>
<template v-else-if="item.APPLY_STATUS==-99">已作废（班长未验票）</template>
@ -202,7 +202,7 @@
{id:'-4',name:'所在单位确认打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'},
{id:'-98',name:'已作废(未进行气体检测)'},
@ -357,7 +357,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -407,7 +407,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -436,7 +436,7 @@
if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -461,7 +461,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -488,7 +488,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){

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

@ -67,7 +67,7 @@
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -187,7 +187,7 @@
{id:'-4',name:'车间负责人打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -345,7 +345,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -394,7 +394,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -417,7 +417,7 @@
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -442,7 +442,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -469,7 +469,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){

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

@ -67,7 +67,7 @@
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -187,7 +187,7 @@
{id:'-4',name:'车间负责人打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -345,7 +345,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -394,7 +394,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -417,7 +417,7 @@
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -442,7 +442,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -469,7 +469,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){

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

@ -76,7 +76,7 @@
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS <= 0"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -198,7 +198,7 @@
{id:'-4',name:'属地监管单位确认打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -350,7 +350,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -399,7 +399,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -422,7 +422,7 @@
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -447,7 +447,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -474,7 +474,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){

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

@ -76,7 +76,7 @@
<template v-else-if="item.APPLY_STATUS==-4">所在单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -196,7 +196,7 @@
{id:'-4',name:'车间负责人打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -362,7 +362,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -411,7 +411,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -434,7 +434,7 @@
if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -459,7 +459,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -486,7 +486,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){

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

@ -66,7 +66,7 @@
<template v-else-if="item.APPLY_STATUS==-4">车间负责人打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门打回</template>
<template v-else-if="item.APPLY_STATUS==-6">审批打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS<=0"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -186,7 +186,7 @@
{id:'-4',name:'车间负责人打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -331,7 +331,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
STATE: '已验票',
TIME: STATUS.MONITOR_USER_SIGNER_TIME
@ -374,7 +374,7 @@
step.msg = '动火审批人审核打回'
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
}
if (this.showStatus == -8 && step.id == 0) {
step.msg = '验收打回'

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

@ -76,7 +76,7 @@
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS<=0"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -198,7 +198,7 @@
{id:'-4',name:'属地监管单位确认打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -350,7 +350,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -399,7 +399,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -422,7 +422,7 @@
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -447,7 +447,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -474,7 +474,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){

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

@ -67,7 +67,7 @@
<template v-else-if="item.APPLY_STATUS==-4">所在单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -187,7 +187,7 @@
{id:'-4',name:'车间负责人打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -345,7 +345,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -394,7 +394,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -417,7 +417,7 @@
if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -442,7 +442,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -469,7 +469,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){

2
pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
View File

@ -2,7 +2,7 @@
<view >
<cu-custom bgColor="bg-gradual-blueness" :isBack="true" >
<block slot="backText">返回</block>
<block slot="content">班长验票</block>
<block slot="content">动火前验票</block>
</cu-custom>
<scroll-view scroll-y="false" >
<view class="form">

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

@ -2,7 +2,7 @@
<view>
<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
<block slot="backText">返回</block>
<block slot="content">班长验票</block>
<block slot="content">动火前验票</block>
</cu-custom>
<view class="select-fixed top-fixed">
<view class="cu-bar search bg-white">
@ -67,7 +67,7 @@
<template v-else-if="item.APPLY_STATUS==-4">所在单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -187,7 +187,7 @@
{id:'-4',name:'车间负责人打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -362,7 +362,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -411,7 +411,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -434,7 +434,7 @@
if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -459,7 +459,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -486,7 +486,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){

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

@ -67,7 +67,7 @@
<template v-else-if="item.APPLY_STATUS==-4">所在单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS<=0"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -187,7 +187,7 @@
{id:'-4',name:'车间负责人打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -339,7 +339,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -388,7 +388,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -411,7 +411,7 @@
if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -436,7 +436,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -463,7 +463,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){

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

@ -67,7 +67,7 @@
<template v-else-if="item.APPLY_STATUS==-4">所在单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
<template v-else-if="item.APPLY_STATUS==-7">动火前验票打回</template>
<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
</text>
<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
@ -187,7 +187,7 @@
{id:'-4',name:'车间负责人打回'},
{id:'-5',name:'安全管理部门打回'},
{id:'-6',name:'审批打回'},
{id:'-7',name:'班长验票打回'},
{id:'-7',name:'动火前验票打回'},
{id:'-8',name:'验收打回'}
],
sindex:-1,
@ -344,7 +344,7 @@
},
{
id: '6',
name: '班长验票',
name: '动火前验票',
USER_NAME: STATUS.MONITOR_USER_NAME,
TIME: STATUS.MONITOR_USER_SIGNER_TIME
},
@ -393,7 +393,7 @@
step.REPULSE = step.REPULSE
}
if (this.showStatus == -7 && step.id == 0) {
step.msg = '班长验票打回'
step.msg = '动火前验票打回'
step.STATE = '待提交'
step.REPULSE = step.REPULSE
}
@ -416,7 +416,7 @@
if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
step.STATE = '已审核'
}
if (step.name == '班长验票') {
if (step.name == '动火前验票') {
step.STATE = '已验票'
}
if (step.name == '完成验收') {
@ -441,7 +441,7 @@
if(step.name == '动火审批人意见'){
step.STATE = '待审核'
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '待验票'
}
if(step.name == '完成验收'){
@ -468,7 +468,7 @@
step.STATE = '已审核'
}
}
if(step.name == '班长验票'){
if(step.name == '动火前验票'){
step.STATE = '已验票'
}
if(step.name == '完成验收'){