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

一公司归档管理显示其它状态

20240528Test
limingyu 2024-04-26 15:06:35 +08:00
parent b860054d04
commit 97608821fb
2 changed files with 94 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/views/hotwork_cfd/pigeonhole/components/detail.vue
View File

@ -34,6 +34,12 @@
<td class="bbg">动火人及证书编号</td> <td class="bbg">动火人及证书编号</td>
<td colspan="3">{{ pd.WORK_USER }}</td> <td colspan="3">{{ pd.WORK_USER }}</td>
</tr> </tr>
<tr>
<td class="bbg">动火操作人图片</td>
<td colspan="3">
<img v-viewer v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :src="pd.dongHuoCaoZuoRenPic[index]" :key="index" alt="" width="100" height="100">
</td>
</tr>
<tr> <tr>
<td class="bbg">作业单位</td> <td class="bbg">作业单位</td>
<td>{{ pd.CONFIRM_DEPARTMENT_NAME }}</td> <td>{{ pd.CONFIRM_DEPARTMENT_NAME }}</td>
@ -51,7 +57,7 @@
<tr :key="index"> <tr :key="index">
<td class="bbg">分析结果/%</td> <td class="bbg">分析结果/%</td>
<td>{{ item.ANALYZE_RESULT }}</td> <td>{{ item.ANALYZE_RESULT }}</td>
<td class="bbg">分析人</td> <td class="bbg">气体分析单位负责人</td>
<td>{{ item.ANALYZE_USER }}</td> <td>{{ item.ANALYZE_USER }}</td>
</tr> </tr>
</template> </template>
@ -97,28 +103,33 @@
{{ item.CONFIRM_NAME }} {{ item.CONFIRM_NAME }}
</td> </td>
</tr> </tr>
<tr v-if="pd.CONFIRM_USER_MEASURES || pd.LEADER_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES"> <tr
v-if="pd.SAFETY_USER_MEASURES || pd.CONFIRM_OTHER_CONTENT || pd.BELONGING_USER_MEASURES || pd.GUARDIAN_USER_MEASURES || pd.LEADER_USER_MEASURES|| pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">
<td>{{ measuresList.length + 1 }}</td> <td>{{ measuresList.length + 1 }}</td>
<td colspan="3"> <td colspan="3">
<div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;"> <div v-if="pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span> <span>安全措施确认人：{{ pd.SAFETY_USER_MEASURES }}</span>
<span>编制人：{{ pd.CONFIRM_USER_NAME }}</span>
</div> </div>
<div v-if="pd.CONFIRM_OTHER_CONTENT" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }}</span>
</div>
<div v-if="pd.BELONGING_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>项目责任负责人：{{ pd.BELONGING_USER_MEASURES }}</span>
</div>
<!-- <div v-if="pd.GUARDIAN_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">-->
<!-- <span>属地监管单位：{{ pd.GUARDIAN_USER_MEASURES }}</span>-->
<!-- </div>-->
<div v-if="pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;"> <div v-if="pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span> <span>属地监管单位：{{ pd.LEADER_USER_MEASURES }}</span>
<span>编制人：{{ pd.LEADER_USER_NAME }}</span>
</div> </div>
<div v-if="pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;"> <div v-if="pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span> <span>安全管理部门：{{ pd.AUDIT_USER_MEASURES }}</span>
<span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
</div> </div>
<div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;"> <div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span> <span>动火审批人：{{ pd.APPROVE_USER_MEASURES }}</span>
<span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
</div> </div>
<div v-if="pd.MONITOR_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;"> <div v-if="pd.MONITOR_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.MONITOR_USER_MEASURES }}</span> <span>动火前验票：{{ pd.MONITOR_USER_MEASURES }}</span>
<span>编制人：{{ pd.MONITOR_USER_NAME }}</span>
</div> </div>
</td> </td>
</tr> </tr>
@ -128,10 +139,10 @@
<tr> <tr>
<td class="bbg">安全交底人</td> <td class="bbg">安全交底人</td>
<td colspan="10"> <td colspan="10">
<div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right"> <div v-for="item in confessList" :key="item.USER_ID" style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
<span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span> <span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
</div> </div>
</td> </td>
</tr> </tr>
@ -155,6 +166,16 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr>
<td class="bbg">安全措施确认人</td>
<td colspan="3">
<div v-if="pd.SAFETY_SIGNATURE" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.SAFETY_SIGNATURE" alt="" width="100" height="100">
<span>{{ pd.SAFETY_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.CONFIRM_USER_SIGNER_PATH"> <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div> <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
@ -165,9 +186,19 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6">
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
<span>{{ pd.BELONGING_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH"> <tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>所在单位意见：{{ pd.LEADER_CONTENT }}</div> <div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -197,7 +228,7 @@
</tr> </tr>
<tr v-if="pd.MONITOR_USER_SIGNER_PATH"> <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>动火前，岗位当班班长验票情况：{{ pd.MONITOR_CONTENT }}</div> <div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -242,7 +273,8 @@ export default {
gasList: [], gasList: [],
imgList: [], imgList: [],
imgList1: [], imgList1: [],
otherProtectiveMeasures: [] otherProtectiveMeasures: [],
confessList: []
} }
}, },
created() { created() {
@ -362,6 +394,11 @@ export default {
console.log(this.pd) console.log(this.pd)
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1
data.pd.confessList.forEach(item => {
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
this.confessList.push(item)
}
})
for (let i = 0; i < data.measuresList.length; i++) { for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组 // 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
@ -381,11 +418,29 @@ export default {
} }
this.measuresList = data.measuresList // 参数map this.measuresList = data.measuresList // 参数map
this.gasList = data.gasList // 参数map this.gasList = data.gasList // 参数map
if (this.pd.WORK_LEVEL === '二级') {
this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
} else if (this.pd.WORK_LEVEL === '一级') {
this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.AUDIT_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
} else {
this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.AUDIT_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] this.pd.AUDIT_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
}
const dongHuoCaoZuoRenPic = data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
this.pd.dongHuoCaoZuoRenPic = []
for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH)
}
}
}).catch((e) => { }).catch((e) => {
this.listLoading = false this.listLoading = false
}) })

26
src/views/hotwork_cfd/pigeonhole/components/list.vue
View File

@ -25,9 +25,9 @@
<el-table-column prop="CHECK_NO" label="编号" /> <el-table-column prop="CHECK_NO" label="编号" />
<el-table-column prop="WORK_LEVEL" label="作业级别" /> <el-table-column prop="WORK_LEVEL" label="作业级别" />
<el-table-column prop="APPLY_USER_NAME" label="申请人" /> <el-table-column prop="APPLY_USER_NAME" label="申请人" />
<el-table-column prop="ANALYZE_USER_NAME" label="分析人" /> <el-table-column prop="ANALYZE_USER_NAME" label="气体分析单位负责人" />
<el-table-column prop="CONFIRM_USER_NAME" label="作业单位负责人" /> <el-table-column prop="CONFIRM_USER_NAME" label="作业单位负责人" />
<el-table-column prop="LEADER_USER_NAME" label="所在单位负责人" /> <el-table-column prop="LEADER_USER_NAME" label="属地监管单位负责人" />
<el-table-column prop="AUDIT_USER_NAME" label="安全管理部门负责人" show-overflow-tooltip > <el-table-column prop="AUDIT_USER_NAME" label="安全管理部门负责人" show-overflow-tooltip >
<template slot-scope="{row}"> <template slot-scope="{row}">
{{ row.AUDIT_USER_NAME || ' 已跳过' }} {{ row.AUDIT_USER_NAME || ' 已跳过' }}
@ -42,20 +42,24 @@
<el-table-column prop="ACCEPT_USER_NAME" label="验收人" /> <el-table-column prop="ACCEPT_USER_NAME" label="验收人" />
<el-table-column prop="STATUS" label="审核状态"> <el-table-column prop="STATUS" label="审核状态">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.APPLY_STATUS==0">待提交</span> <span v-if="row.APPLY_STATUS==0">动火作业待提交</span>
<span v-else-if="row.APPLY_STATUS==1">作业负责人待确认</span> <span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==2">所在单位待确认</span> <span v-else-if="row.APPLY_STATUS==1.5">项目负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==2">属地监管单位待审核</span>
<span v-else-if="row.APPLY_STATUS==4">安全管理部门待审核</span> <span v-else-if="row.APPLY_STATUS==4">安全管理部门待审核</span>
<span v-else-if="row.APPLY_STATUS==5">待审批</span> <span v-else-if="row.APPLY_STATUS==5">动火审批人待审核</span>
<span v-else-if="row.APPLY_STATUS==6">班长待验票</span> <span v-else-if="row.APPLY_STATUS==6">班长待验票</span>
<span v-else-if="row.APPLY_STATUS==7">待验收</span> <span v-else-if="row.APPLY_STATUS==7">待验收</span>
<span v-else-if="row.APPLY_STATUS==8">已归档</span> <span v-else-if="row.APPLY_STATUS==8">验收归档</span>
<span v-else-if="row.APPLY_STATUS==-2">作业负责人确认打回</span> <span v-else-if="row.APPLY_STATUS==-1.5">项目负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-4">所在单位打回</span> <span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-5">安全管理部门打回</span> <span v-else-if="row.APPLY_STATUS==-4">属地监管单位审核打回</span>
<span v-else-if="row.APPLY_STATUS==-6">审批打回</span> <span v-else-if="row.APPLY_STATUS==-5">安全管理部门审核打回</span>
<span v-else-if="row.APPLY_STATUS==-6">动火审批人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-7">班长验票打回</span> <span v-else-if="row.APPLY_STATUS==-7">班长验票打回</span>
<span v-else-if="row.APPLY_STATUS==-8">验收打回</span> <span v-else-if="row.APPLY_STATUS==-8">验收打回</span>
<span v-else-if="row.APPLY_STATUS==-99">已作废（班长未验票）</span>
<span v-else-if="row.APPLY_STATUS==-98">已作废（未进行气体检测）</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="130"> <el-table-column label="操作" align="center" width="130">