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

Compare commits

base: guoyuepeng:0b18e15bc2eb25fd8950ae25154b78d193f1c046
Branches Tags
guoyuepeng:2023年12月27日V01.00.50
guoyuepeng:bug优化0603
guoyuepeng:dev
guoyuepeng:dev-2024年1月8日
guoyuepeng:limingyu-20240419-一公司危险作业更新
guoyuepeng:main
guoyuepeng:pet
guoyuepeng:zy20231108
..
compare: guoyuepeng:093f2ef2537ccbc1db73a8f6796afb4a88897742
Branches Tags
guoyuepeng:2023年12月27日V01.00.50
guoyuepeng:bug优化0603
guoyuepeng:dev
guoyuepeng:dev-2024年1月8日
guoyuepeng:limingyu-20240419-一公司危险作业更新
guoyuepeng:main
guoyuepeng:pet
guoyuepeng:zy20231108

5 Commits
0b18e15bc2 ... 093f2ef253

Author SHA1 Message Date
liujun 093f2ef253 15050 监护人签字列表 字段缺少数据 2024-04-10 17:31:48 +08:00
liujun e3715f75a9 15050 监护人签字列表 字段缺少数据 2024-04-10 16:43:35 +08:00
liujun f58d3c0400 15061 动火前验票确认前 接受交底人必须签字 现在没有限制 接受交底人现在不签字也能走完流程了 2024-04-10 13:09:57 +08:00
liujun 06f76ab905 15062 还是会有这种显示不全的地方 2024-04-10 11:40:56 +08:00
liujun 0c1e44ccf5 一公司app显示修改 2024-04-10 11:18:58 +08:00
19 changed files with 310 additions and 97 deletions
Show Stats Expand all files Collapse all files

12
pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
View File

@ -154,8 +154,8 @@
</view>
<view v-if="pd.CONFIRM_CONTENT" class="ty-group">
<text class="title">
作业单位：</text>
<text>{{ pd.CONFIRM_CONTENT}}</text>
作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
@ -164,22 +164,22 @@
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
动火点属地监管单位负责人：</text>
属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
车间：</text>
安全管理部门：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title">
安全管理部门：</text>
动火审批人：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title">
审批人：</text>
动火前验票：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">

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

@ -52,7 +52,8 @@
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text>
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
<template v-else-if="item.APPLY_STATUS==1">作业负责人待审核</template>
@ -418,7 +419,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {

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

@ -61,7 +61,8 @@
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" style="height: 34upx;" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<text>
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
<template v-else-if="item.APPLY_STATUS==1">作业负责人待审核</template>
@ -429,7 +430,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {

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

@ -60,7 +60,8 @@
<text>动火前验票负责人：{{item.MONITOR_USER_NAME}}</text>
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" style="height: 34upx;" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<view class="dy-subtitle-flex" style="height: 34upx;" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
@ -434,7 +435,7 @@
if (step.id == 0){
step.STATE = '待提交'
}
console.log(this.showStatus)
if (this.showStatus == 8) {
if(step.USER_NAME == "已跳过"){
step.STATE = '审核'
@ -442,7 +443,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {

62
pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
View File

@ -154,27 +154,49 @@
<view class="cu-form-title">其他安全措施：</view>
<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea>
</view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title">
作业单位：</text>
<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
动火点属地监管单位负责人：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
车间：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title">
安全管理部门：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
</view>
<view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group">
<text class="title">
安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title">
作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
安全管理部门：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title">
动火前验票：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title">
动火审批人：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view>
<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view>
<text class="title">气体分析单位负责人：</text>

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

@ -52,6 +52,7 @@
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
@ -424,7 +425,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {

57
pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
View File

@ -178,21 +178,48 @@
<view class="cu-form-title">其他安全措施：</view>
<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea>
</view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title">
作业单位：</text>
<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
动火点属地监管单位负责人：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
所在车间意见：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group">
<text class="title">
安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title">
作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
动火前验票：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title">
安全管理部门：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title">
动火审批人：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view>
</view>
<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view>

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

@ -52,7 +52,8 @@
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text>
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
<template v-else-if="item.APPLY_STATUS==1">作业负责人待审核</template>
@ -424,7 +425,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {

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

@ -61,7 +61,8 @@
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" style="height: 34upx;" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<text>
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
<template v-else-if="item.APPLY_STATUS==1">作业负责人待审核</template>
@ -429,7 +430,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {

42
pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
View File

@ -147,6 +147,48 @@
<view class="title">其他安全措施：</view>
<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input>
</view>
<view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group">
<text class="title">
安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title">
作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
动火前验票：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title">
安全管理部门：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title">
动火审批人：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view>
<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=-99">
<view>
<text class="title">气体分析单位负责人：</text>

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

@ -61,7 +61,8 @@
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text>
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
<template v-else-if="item.APPLY_STATUS==1">作业负责人待审核</template>
@ -441,7 +442,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {

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

@ -61,7 +61,8 @@
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" style="height: 34upx;" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<text>
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
<template v-else-if="item.APPLY_STATUS==1">作业负责人待审核</template>
@ -429,7 +430,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {

42
pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
View File

@ -149,6 +149,48 @@
<view class="cu-form-title">其他安全措施：</view>
<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea>
</view>
<view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group">
<text class="title">
安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title">
作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
动火前验票：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title">
安全管理部门：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title">
动火审批人：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title">
作业单位：</text>

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

@ -52,7 +52,8 @@
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text>
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
<template v-else-if="item.APPLY_STATUS==1">作业负责人待审核</template>
@ -424,7 +425,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {

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

@ -154,31 +154,48 @@
<view class="cu-form-title">其他安全措施：</view>
<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea>
</view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title">
作业单位：</text>
<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
动火点属地监管单位负责人：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
车间：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title">
安全管理部门：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title">
审批部门：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group">
<text class="title">
安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title">
作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
安全管理部门：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title">
动火审批人：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title">
动火前验票：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view>
</view>
<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view>
@ -554,13 +571,22 @@
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon: 'none',
title: '保存成功',
duration: 2000
});
_this.goback()
this.buttonloading = false
let info = JSON.parse(res.data)
if (info.code == '9999') {
uni.showToast({
icon: 'none',
title: info.errorMessage,
duration: 2000
});
} else {
uni.showToast({
icon: 'none',
title: '保存成功',
duration: 2000
});
_this.goback()
this.buttonloading = false
}
},
fail: (err) => {
uni.hideLoading();

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

@ -52,7 +52,8 @@
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text>
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
<template v-else-if="item.APPLY_STATUS==1">作业负责人待审核</template>
@ -441,7 +442,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {

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

@ -52,7 +52,8 @@
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text>
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
<template v-else-if="item.APPLY_STATUS==1">作业负责人待审核</template>
@ -418,7 +419,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {

42
pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
View File

@ -152,6 +152,48 @@
<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT"
placeholder="请输入其他防护措施..."></textarea>
</view>
<view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group">
<text class="title">
安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title">
作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
动火前验票：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title">
安全管理部门：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title">
动火审批人：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title">
作业单位：

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

@ -52,7 +52,8 @@
<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text>
<text>项目主管部门负责人：{{item.BELONGING_USER_NAME}}</text>
<text>
审核状态：
<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
<template v-else-if="item.APPLY_STATUS==1">作业负责人待审核</template>
@ -423,7 +424,7 @@
if (step.name == '动火作业提交') {
step.STATE = '已提交'
}
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见' || step.name == '项目主管部门意见') {
step.STATE = '已审核'
}
if (step.name == '动火前验票') {