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

安全措施表格格式化 

项目负责人待审核修改为项目主管部门待审核
项目负责人审核打回修改为项目主管部门审核打回
20240528Test
WenShiJun 2024-06-17 17:51:22 +08:00
parent c007e133b4
commit 5cb52c147b
3 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
View File

@ -211,7 +211,7 @@
</tr>
<tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6">
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '无' ? '同意' : pd.BELONGING_OPINIONS }}</div>
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : 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">
@ -344,23 +344,23 @@ export default {
this.acceptConfessList.push(item)
}
})
for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
for (let j = 1; j <= 3; j++) {
// 判断字符串是否存在
if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) {
// 给字符串后面添加上需要的数据
PROTECTIVE_MEASURES.splice(
this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1,
0,
data.measuresList[i]['ANSWER' + j]
)
}
}
// 将数组转回字符串
data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
}
// for (let i = 0; i < data.measuresList.length; i++) {
// // 将字符串转成数组
// const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
// for (let j = 1; j <= 3; j++) {
// // 判断字符串是否存在
// if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) {
// // 给字符串后面添加上需要的数据
// PROTECTIVE_MEASURES.splice(
// this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1,
// 0,
// data.measuresList[i]['ANSWER' + j]
// )
// }
// }
// // 将数组转回字符串
// data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
// }
this.measuresList = data.measuresList // 参数map
this.gasList = data.gasList // 参数map
if (this.pd.WORK_LEVEL === '二级') {

4
src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
View File

@ -52,14 +52,14 @@
<template slot-scope="{row}">
<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.5">项目负责人待审核</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==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==8">验收归档</span>
<span v-else-if="row.APPLY_STATUS==-1.5">项目负责人审核打回</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==-5">安全管理部门审核打回</span>

34
src/views/map/dialog/hotworkFirst.vue
View File

@ -73,27 +73,31 @@
<tr>
<td>序号</td>
<td>安全措施</td>
<td style="width: 80px; text-align: center">是否涉及</td>
<td style="width: 80px; text-align: center">确认人</td>
<td style="width: 80px; text-align: center;">是否涉及</td>
<td style="width: 80px; text-align: center;">确认人</td>
</tr>
<tr v-for="(item, index) in measuresList" :key="index">
<td>{{ index + 1 }}</td>
<td style="text-align: center;">{{ index + 1 }}</td>
<td>
{{ item.PROTECTIVE_MEASURES }}
<!-- <template v-if="item.QUESTION1">-->
<!-- {{ item.QUESTION1 }}({{ item.ANSWER1 }})-->
<!-- </template>-->
<!-- <template v-if="item.QUESTION2">-->
<!-- 、{{ item.QUESTION2 }}({{ item.ANSWER2 }}) 、{{ item.QUESTION3 }}({{ item.ANSWER3 }})-->
<!-- </template>-->
<!--
<template v-if="item.QUESTION1">
{{ item.QUESTION1 }}({{ item.ANSWER1 }})
</template>
<template v-if="item.QUESTION2">
、{{ item.QUESTION2 }}({{ item.ANSWER2 }}) 、{{ item.QUESTION3 }}({{ item.ANSWER3 }})
</template>
-->
</td>
<td>
<span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;及</span>
<span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
</td>
<td>
{{ item.CONFIRM_NAME }}
<td style="text-align: center;">
<span v-if="item.STATUS == '1'">
<input type="radio" disabled checked>涉&nbsp;&nbsp;&nbsp;及
</span>
<span v-if="item.STATUS == '-1'">
<input type="radio" disabled checked>不涉及
</span>
</td>
<td style="text-align: center;">{{ item.CONFIRM_NAME }}</td>
</tr>
<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">