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

1.八项作业bug修复

pet-人员中台对接-xuyifeng-7.24
guoyuepeng 2024-06-27 20:15:37 +08:00
parent 50dcd9c4be
commit 9eda4f728d
9 changed files with 162 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/dangerousWork/blindboard/components/corpInfo.vue
View File

@ -10,7 +10,7 @@
</div>
</div>
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索222
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
重置

162
src/views/dangerousWork/blindboard/components/detail.vue
View File

@ -5,47 +5,54 @@
<table class="table-ui">
<thead>
<tr>
<td colspan="6" style="border: none">
<td colspan="8" style="border: none">
<div class="level-title mt-20">
<h1>盲板作业票</h1>
<div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
<h1>盲板抽堵安全作业票</h1>
<div class="level-code">编号:{{ pd.CHECK_NO }}</div>
</div>
</td>
</tr>
</thead>
<tr>
<td class="bbg">申请单位</td>
<td>{{ pd.APPLY_DEPARTMENT_NAME }}</td>
<td colspan="2">{{ pd.APPLY_DEPARTMENT_NAME }}</td>
<td class="bbg">作业单位</td>
<td>{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
<td class="bbg">作业负责人</td>
<td>{{ pd.CONSTRUCTION_USER_NAME }}</td>
</tr>
<tr>
<td class="bbg">涉及相关单位（部门）</td>
<td colspan="3">{{ pd.OTHER_DEPT }}</td>
<td class="bbg">监护人</td>
<td colspan="2">{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
<td class="bbg">作业类别</td>
<td>
<div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.GUARDIAN_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.GUARDIAN_USER_SIGNER_TIME }}</span>
</div>
<input :checked="pd.WORK_TYPE=='1'" type="checkbox" disabled>堵盲板
<input :checked="pd.WORK_TYPE=='2'" type="checkbox" disabled>抽盲板
</td>
</tr>
<tr>
<td class="bbg">断路原因</td>
<td colspan="5">{{ pd.WORK_REASON }}</td>
<td rowspan="2" class="bbg">设备、管道名称</td>
<td colspan="3" class="bbg">管道参数</td>
<td colspan="3" class="bbg">盲板参数</td>
<td rowspan="2" class="bbg">实际作业开始时间</td>
</tr>
<tr>
<td class="bbg">关联的其他特殊作业及安全作业票编号</td>
<td colspan="5">{{ pd.SPECIAL_WORK }}</td>
<td class="bbg">介质</td>
<td class="bbg">温度</td>
<td class="bbg">压力</td>
<td class="bbg">材质</td>
<td class="bbg">规格</td>
<td class="bbg">编号</td>
</tr>
<tr v-for="(item,index) in boardList" :key="index">
<td v-if="index == 0" :rowspan="boardList.length">{{ pd.NAME }}</td>
<td v-if="index == 0" :rowspan="boardList.length">{{ pd.MEDIUM }}</td>
<td v-if="index == 0" :rowspan="boardList.length">{{ pd.TEMPERATURE }}</td>
<td v-if="index == 0" :rowspan="boardList.length">{{ pd.PRESSURE }}</td>
<td>{{ item.BOARD_MATERIAL }}</td>
<td>{{ item.BOARD_SPECIFICATION }}</td>
<td>{{ item.BOARD_NO }}</td>
<td v-if="index == 0" :rowspan="boardList.length">{{ pd.BOARD_INSTALL_TIME }}</td>
</tr>
<tr>
<td colspan="6">
<div>断路地段示意图（可另附图）及相关说明：{{ pd.WORK_CONTENT }}</div>
<td colspan="8">
<div>盲板位置图（可另附图）及编号：</div>
<div style="display: flex;justify-content: space-between;margin-top: 20px;">
<img v-viewer :src="config.fileUrl + pd.CONTENT_IMG_PATH" alt="" width="100" height="100">
<img v-viewer :src="config.fileUrl + pd.BOARD_PATH" alt="" width="100" height="100">
<div>
编制人：
<img v-viewer :src="config.fileUrl + pd.APPLY_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -55,15 +62,29 @@
</td>
</tr>
<tr>
<td class="bbg">风险辨识结果</td>
<td colspan="5">{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}</td>
<td colspan="2" class="bbg">作业负责人</td>
<td colspan="2">{{ pd.CONSTRUCTION_USER_NAME }}</td>
<td class="bbg">作业人</td>
<td>{{ pd.WORK_USER }}</td>
<td class="bbg">监护人</td>
<td v-if="pd.GUARDIAN_USER_SIGNER_PATH" colspan="5">
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.GUARDIAN_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.GUARDIAN_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr>
<td class="bbg">作业实施时间</td>
<td colspan="5">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
<td colspan="2" class="bbg">关联的其他特殊作业及安全作业票编号</td>
<td colspan="6">{{ pd.SPECIAL_WORK }}</td>
</tr>
<tr>
<td colspan="6">
<td colspan="2" class="bbg">风险辨识结果</td>
<td colspan="6">{{ pd.BOARD_HARM }}</td>
</tr>
<tr>
<td colspan="8">
<table class="table-ui">
<tr>
<td>序号</td>
@ -82,7 +103,7 @@
{{ item.CONFIRM_NAME }}
</td>
</tr>
<tr v-if="pd.APPLY_USER_MEASURES || pd.CONSTRUCTION_USER_MEASURES || pd.PRODUCTION_USER_MEASURES || pd.SAFETY_USER_MEASURES || pd.LEADER_USER_MEASURES ">
<tr v-if="pd.APPLY_USER_MEASURES || pd.CONSTRUCTION_USER_MEASURES || pd.LEADER_USER_MEASURES">
<td>{{ measuresList.length + 1 }}</td>
<td colspan="3">
<div v-if="pd.APPLY_USER_MEASURES" style="display: flex;justify-content: space-between;">
@ -93,15 +114,7 @@
<span>其他安全措施：{{ pd.CONSTRUCTION_USER_MEASURES }}</span>
<span>编制人：{{ pd.CONSTRUCTION_USER_NAME }}</span>
</div>
<div v-if="pd.PRODUCTION_USER_ID && pd.PRODUCTION_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.PRODUCTION_USER_MEASURES }}</span>
<span>编制人：{{ pd.PRODUCTION_USER_NAME }}</span>
</div>
<div v-if="pd.SAFETY_USER_ID && pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.SAFETY_USER_MEASURES }}</span>
<span>编制人：{{ pd.SAFETY_USER_NAME }}</span>
</div>
<div v-if="pd.LEADER_USER_ID && 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_NAME }}</span>
</div>
@ -131,7 +144,7 @@
</td>
</tr>
<tr v-if="pd.CONSTRUCTION_USER_SIGNER_PATH">
<td colspan="6">
<td colspan="8">
<div>作业负责人意见：{{ pd.CONSTRUCTION_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
@ -140,29 +153,9 @@
</div>
</td>
</tr>
<tr v-if="pd.PRODUCTION_USER_SIGNER_PATH">
<td colspan="6">
<div>所在单位意见：{{ pd.PRODUCTION_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.PRODUCTION_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.PRODUCTION_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.SAFETY_USER_SIGNER_PATH">
<td colspan="6">
<div>消防、安全管理部门意见：{{ pd.SAFETY_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.SAFETY_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.SAFETY_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>审批部门意见：{{ pd.LEADER_CONTENT }}</div>
<td colspan="8">
<div>所在单位意见：{{ pd.LEADER_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -196,23 +189,18 @@ export default {
data() {
return {
config: config,
CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
BLINDBOARD_ID: this.$parent.BLINDBOARD_ID, // 主键ID
pd: [], // 存放字段参数
measuresList: [],
otherProtectiveMeasures: [],
boardList: [],
imgList: [],
imgList1: [],
hazardIdentification: []
measuresList: []
}
},
created() {
this.getData()
},
methods: {
validStr(str) {
if (str != null && str != '' && typeof (str) != 'undefined' && str != 0) { return true }
return false
},
formatTime(date, column) {
if (date) {
return dateformat(date, 'YYYY年MM月DD日HH时mm分')
@ -228,32 +216,31 @@ export default {
}
},
getRowKey(row) {
return row.CUTROAD_ID
return row.BLINDBOARD_ID
},
getData() {
this.listLoading = true
requestFN(
'/dangerousWork/gfcutroad/goEdit',
'/dangerousWork/gfBlindBoard/goEdit',
{
CUTROAD_ID: this.CUTROAD_ID
BLINDBOARD_ID: this.BLINDBOARD_ID
}
).then((data) => {
this.listLoading = false
this.pd = data.pd // 参数map
this.measuresList = data.measuresList // 参数map
this.imgList = data.imgList
this.imgList1 = data.imgList
this.boardList = data.boardList // 参数map
this.measuresList = data.measuresList // 参数map
this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.PRODUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
this.pd.SAFETY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
}).catch((e) => {
this.listLoading = false
})
},
goBack() {
this.$parent.activeName = 'circuit_list'
this.$parent.CUTROAD_ID = ''
this.$parent.activeName = 'Blindboard'
}
}
@ -265,15 +252,14 @@ export default {
padding: 20px 0
span
vertical-align: middle
.bbg
width: 270px
.print-approval-img
width: 200px
height: 97px
display: inline-block
img
width: 100%
height: 100%
.print-approval-img
width: 200px
height: 97px
display: inline-block
img
width: 100%
height: 100%
.level-code
margin-left: auto
</style>

189
src/views/dangerousWork/blindboard/components/list.vue
View File

@ -27,47 +27,43 @@
</el-row>
</el-form>
<el-table v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
<el-table-column :reserve-selection="true" type="selection" width="57" align="center" />
<el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="NAME" label="设备管道名称" show-overflow-tooltip />
<el-table-column prop="CHECK_NO" label="编号" show-overflow-tooltip />
<el-table-column prop="APPLY_USER_NAME" label="填写人" />
<el-table-column prop="CONSTRUCTION_USER_NAME" label="作业负责人" show-overflow-tooltip />
<el-table-column prop="PRODUCTION_USER_NAME" label="所在单位负责人" show-overflow-tooltip >
<el-table-column prop="APPLY_USER_NAME" label="申请人" width="100" />
<el-table-column prop="APPLY_DEPARTMENT_NAME" label="申请部门" />
<el-table-column prop="CONSTRUCTION_USER_NAME" label="作业负责人" show-overflow-tooltip >
<template slot-scope="{row}">
{{ row.PRODUCTION_USER_NAME || ' 已跳过' }}
{{ row.CONSTRUCTION_USER_NAME }}
</template>
</el-table-column>
<el-table-column prop="SAFETY_DEPARTMENT_NAME" label="消防、安全管理部门负责人" show-overflow-tooltip width="200">
<el-table-column prop="LEADER_USER_NAME" label="所在单位负责人" show-overflow-tooltip >
<template slot-scope="{row}">
{{ row.SAFETY_DEPARTMENT_NAME || ' 已跳过' }}
{{ row.LEADER_USER_NAME }}
</template>
</el-table-column>
<el-table-column prop="LEADER_USER_NAME" label="审批部门负责人" show-overflow-tooltip >
<el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip >
<template slot-scope="{row}">
{{ row.LEADER_USER_NAME || ' 已跳过' }}
{{ row.ACCEPT_USER_NAME }}
</template>
</el-table-column>
<el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip />
<el-table-column prop="STATUS" label="审核状态">
<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==2">所在单位待审核</span>
<span v-else-if="row.APPLY_STATUS==3">消防、安全管理部门待审核</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==6">验收归档</span>
<span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-3">所在单位审核打回</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>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="230">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-plus" @click="goChart(row)">流程图</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.CUTROAD_ID)">审批表详情</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.BLINDBOARD_ID)">审批表详情</el-button>
</template>
</el-table-column>
</el-table>
@ -78,92 +74,6 @@
</div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div>
<el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1400px">
<el-steps :active="getStatus()" :process-status="getProcessStatus()" finish-status="success" align-center>
<el-step title="断路安全作业提交">
<template slot="description">
<div>{{ getProcessMessage().title }}</div>
<div>{{ getProcessMessage().USER_NAME }}</div>
<div>{{ getProcessMessage().OPERATTIME }}</div>
</template>
</el-step>
<el-step title="作业负责人意见">
<template slot="description">
<div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
<div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="所在单位意见">
<template slot="description">
<div v-if="getIsPase('PRODUCTION_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.PRODUCTION_USER_NAME }}</div>
<div>{{ pd.PRODUCTION_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="消防、安全管理部门意见" >
<template slot="description">
<div v-if="getIsPase('SAFETY_DEPARTMENT_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.SAFETY_USER_NAME }}</div>
<div>{{ pd.SAFETY_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="审批部门意见" >
<template slot="description">
<div v-if="getIsPase('LEADER_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.LEADER_USER_NAME }}</div>
<div>{{ pd.LEADER_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="完成验收" description="">
<template slot="description">
<div>{{ pd.ACCEPT_USER_NAME }}</div>
<div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="验收归档" description="">
<template slot="description">
<div>{{ pd.ACCEPT_USER_NAME }}</div>
<div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
</template>
</el-step>
</el-steps>
<div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
<div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
<div style="color: #13ce66">
监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
<div style="color: red">
监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
</div>
</div>
<div v-if="pd.CONFESS_USER_SIGNER_TIME">
<div style="color: #13ce66">
安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.CONFESS_USER_SIGNER_TIME">
<div style="color: red">
安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
</div>
</div>
<div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
<div style="color: #13ce66">
接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
<div style="color: red">
接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<!-- <el-button @click="dialogFormShow = false">取 消</el-button>-->
<el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
</div>
</el-dialog>
<div style="height: 60px;"></div>
<div class="ui-foot">
<el-button type="primary" @click="goBack">返 回</el-button>
@ -206,18 +116,14 @@ export default {
dialogFormHuifuShow: false,
statusList: [
{ ID: '', NAME: '请选择' },
{ ID: '0', NAME: '断路安全作业待提交' },
{ ID: '0', NAME: '待提交' },
{ ID: '1', NAME: '作业负责人待审核' },
{ ID: '2', NAME: '所在单位待审核' },
{ ID: '3', NAME: '消防、安全管理部门待审核' },
{ ID: '4', NAME: '审批部门待审核' },
{ ID: '4', NAME: '所在单位领导人待审核' },
{ ID: '5', NAME: '待验收' },
{ ID: '6', NAME: '验收归档' },
{ ID: '-2', NAME: '作业负责人审核打回' },
{ ID: '-3', NAME: '所在单位审核打回' },
{ ID: '-4', NAME: '消防、安全管理部门审核打回' },
{ ID: '-5', NAME: '审批部门审核打回' },
{ ID: '-6', NAME: '验收打回' }
{ ID: '-2', NAME: '作业负责人待审核打回' },
{ ID: '-5', NAME: '所在单位领导人待审核打回' },
{ ID: '-6', NAME: '待验收打回' }
],
STATUS: '',
DEPTIDS: ''
@ -244,36 +150,22 @@ export default {
getList() {
this.listLoading = true
requestFN(
'/gfCutRoad/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
'/dangerousWork/gfBlindBoard/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
CORPINFO_ID: this.$parent.CORPINFO_ID,
ticketType: this.$parent.ticketType
}
).then((data) => {
this.listLoading = false
this.varList = data.varList
this.total = data.page.totalResult
this.hasButton()
}).catch((e) => {
this.listLoading = false
})
},
// 判断按钮权限，用于是否显示按钮
hasButton() {
var keys = 'cutroad:add,cutroad:del,cutroad:edit,toExcel'
requestFN(
'/head/hasButton',
{
keys: keys
}
).then((data) => {
this.add = data.cutroadfhadminadd // 新增权限
this.del = data.cutroadfhadmindel // 删除权限
this.edit = data.cutroadfhadminedit // 修改权限
}).catch((e) => {
this.listLoading = false
})
},
goChart(row) {
this.pd = row
this.dialogFormShow = true
@ -285,20 +177,14 @@ export default {
if (this.pd.APPLY_STATUS == '1') {
return 1
}
if (this.pd.APPLY_STATUS == '2') {
if (this.pd.APPLY_STATUS == '4') {
return 2
}
if (this.pd.APPLY_STATUS == '3') {
if (this.pd.APPLY_STATUS == '5') {
return 3
}
if (this.pd.APPLY_STATUS == '4') {
return 4
}
if (this.pd.APPLY_STATUS == '5') {
return 5
}
if (this.pd.APPLY_STATUS == '6') {
return 7
return 5
}
},
getProcessStatus() {
@ -324,23 +210,9 @@ export default {
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-3') {
obj = {
title: '所在单位审核打回',
USER_NAME: this.pd.PRODUCTION_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-4') {
obj = {
title: '消防、安全管理部门审核打回',
USER_NAME: this.pd.SAFETY_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
}
if (this.pd.APPLY_STATUS == '-5') {
obj = {
title: '审批部门审核打回',
title: '所在单位审核打回',
USER_NAME: this.pd.LEADER_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
@ -361,7 +233,10 @@ export default {
},
goDetail(id) {
this.$parent.activeName = 'Detail'
this.$parent.CUTROAD_ID = id
this.$parent.BLINDBOARD_ID = id
},
goBack(){
this.$parent.activeName = 'CorpInfo'
}
}
}

2
src/views/dangerousWork/blindboard/index.vue
View File

@ -16,7 +16,7 @@ export default {
activeName: 'CorpInfo',
CORPINFO_ID: '',
ticketType: '',
CUTROAD_ID: ''
BLINDBOARD_ID: ''
}
}
}

8
src/views/dangerousWork/breakground/components/corpInfo.vue
View File

@ -33,22 +33,22 @@
<el-table-column prop="CORP_NAME" label="公司名称" />
<el-table-column prop="checkedCount" label="申请总数" align="center" >
<template slot-scope="{row}">
<span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
<span :style="row.applications_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Breakground',row.CORPINFO_ID,'1')">{{ row.applications_num }}</span>
</template>
</el-table-column>
<el-table-column prop="checkedItemCount" label="完成数" align="center" >
<template slot-scope="{row}">
<span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
<span :style="row.completions_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Breakground',row.CORPINFO_ID,'2')">{{ row.completions_num }}</span>
</template>
</el-table-column>
<el-table-column prop="ybCount" label="废除数" align="center" >
<template slot-scope="{row}">
<span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
<span :style="row.abolishments_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Breakground',row.CORPINFO_ID, '3')">{{ row.abolishments_num }}</span>
</template>
</el-table-column>
<el-table-column prop="zdCount" label="进行数" align="center" >
<template slot-scope="{row}">
<span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Blindboard',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
<span :style="row.operations_num > 0 ? {color:'#0c60e1',cursor: 'pointer'} : {color: '#606266'}" @click="goList('Breakground',row.CORPINFO_ID, '4')">{{ row.operations_num }}</span>
</template>
</el-table-column>
</el-table>

44
src/views/dangerousWork/breakground/components/detail.vue
View File

@ -8,7 +8,7 @@
<td colspan="6" style="border: none">
<div class="level-title mt-20">
<h1>动土安全作业票</h1>
<div class="level-code" >编号:{{ pd.CHECK_NO }}</div>
<div class="level-code">编号:{{ pd.CHECK_NO }}</div>
</div>
</td>
</tr>
@ -16,14 +16,18 @@
<tr>
<td class="bbg">申请单位</td>
<td>{{ pd.APPLY_DEPARTMENT_NAME }}</td>
<td class="bbg">作业单位</td>
<td>{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
<td class="bbg">作业负责人</td>
<td>{{ pd.CONSTRUCTION_USER_NAME }}</td>
<td class="bbg" colspan="2">作业申请时间</td>
<td colspan="2">{{ pd.CREATTIME }}</td>
</tr>
<tr>
<td class="bbg">作业单位</td>
<td>{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}</td>
<td class="bbg">作业地点</td>
<td>{{ pd.WORK_PLACE }}</td>
<td class="bbg">作业内容</td>
<td>{{ pd.JOB_CONTENT }}</td>
</tr>
<tr>
<td class="bbg">涉及相关单位（部门）</td>
<td colspan="3">{{ pd.OTHER_DEPT }}</td>
<td class="bbg">监护人</td>
<td>
<div v-if="pd.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
@ -32,10 +36,8 @@
<span>{{ pd.GUARDIAN_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr>
<td class="bbg">断路原因</td>
<td colspan="5">{{ pd.WORK_REASON }}</td>
<td class="bbg" colspan="2">作业负责人</td>
<td colspan="2">{{ pd.CONSTRUCTION_USER_NAME }}</td>
</tr>
<tr>
<td class="bbg">关联的其他特殊作业及安全作业票编号</td>
@ -43,7 +45,7 @@
</tr>
<tr>
<td colspan="6">
<div>断路地段示意图（可另附图）及相关说明：{{ pd.WORK_CONTENT }}</div>
<div>作业内容、范围、方式（包括深度、面积，并附简图）：{{ pd.WORK_CONTENT }}</div>
<div style="display: flex;justify-content: space-between;margin-top: 20px;">
<img v-viewer :src="config.fileUrl + pd.CONTENT_IMG_PATH" alt="" width="100" height="100">
<div>
@ -82,7 +84,7 @@
{{ item.CONFIRM_NAME }}
</td>
</tr>
<tr v-if="pd.APPLY_USER_MEASURES || pd.CONSTRUCTION_USER_MEASURES || pd.PRODUCTION_USER_MEASURES || pd.SAFETY_USER_MEASURES || pd.LEADER_USER_MEASURES ">
<tr v-if="pd.APPLY_USER_MEASURES || pd.CONSTRUCTION_USER_MEASURES || pd.PRODUCTION_USER_MEASURES || pd.SAFETY_USER_MEASURES || pd.LEADER_USER_MEASURES">
<td>{{ measuresList.length + 1 }}</td>
<td colspan="3">
<div v-if="pd.APPLY_USER_MEASURES" style="display: flex;justify-content: space-between;">
@ -152,7 +154,7 @@
</tr>
<tr v-if="pd.SAFETY_USER_SIGNER_PATH">
<td colspan="6">
<div>消防、安全管理部门意见：{{ pd.SAFETY_CONTENT }}</div>
<div>有关水、电、汽、工艺、设备、消防、安全等部门会签意见：{{ pd.SAFETY_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.SAFETY_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -196,12 +198,12 @@ export default {
data() {
return {
config: config,
CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID
BREAKGROUND_ID: this.$parent.BREAKGROUND_ID, // 主键ID
pd: [], // 存放字段参数
measuresList: [],
otherProtectiveMeasures: [],
imgList: [],
imgList1: [],
otherProtectiveMeasures: [],
hazardIdentification: []
}
},
@ -228,20 +230,21 @@ export default {
}
},
getRowKey(row) {
return row.CUTROAD_ID
return row.BREAKGROUND_ID
},
getData() {
this.listLoading = true
requestFN(
'/gfBreakGround/goEdit',
{
CUTROAD_ID: this.CUTROAD_ID
BREAKGROUND_ID: this.BREAKGROUND_ID
}
).then((data) => {
this.listLoading = false
this.pd = data.pd // 参数map
this.measuresList = data.measuresList // 参数map
this.imgList = data.imgList
this.imgList1 = data.imgList
this.measuresList = data.measuresList // 参数map
this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.PRODUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
@ -252,8 +255,7 @@ export default {
})
},
goBack() {
this.$parent.activeName = 'circuit_list'
this.$parent.CUTROAD_ID = ''
this.$parent.activeName = 'Breakground'
}
}

122
src/views/dangerousWork/breakground/components/list.vue
View File

@ -30,16 +30,18 @@
<el-table-column :reserve-selection="true" type="selection" width="57" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="CHECK_NO" label="编号" show-overflow-tooltip />
<el-table-column prop="APPLY_USER_NAME" label="填写人" />
<el-table-column prop="CONSTRUCTION_DEPARTMENT_NAME" label="施工单位" />
<el-table-column prop="APPLY_USER_NAME" label="申请人" width="100" />
<el-table-column prop="APPLY_DEPARTMENT_NAME" label="申请部门" />
<el-table-column prop="CONSTRUCTION_USER_NAME" label="作业负责人" show-overflow-tooltip />
<el-table-column prop="PRODUCTION_USER_NAME" label="所在单位负责人" show-overflow-tooltip >
<template slot-scope="{row}">
{{ row.PRODUCTION_USER_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="SAFETY_DEPARTMENT_NAME" label="消防、安全管理部门负责人" show-overflow-tooltip width="200">
<el-table-column prop="SAFETY_USER_NAME" label="有关部门负责人" show-overflow-tooltip >
<template slot-scope="{row}">
{{ row.SAFETY_DEPARTMENT_NAME || ' 已跳过' }}
{{ row.SAFETY_USER_NAME || ' 已跳过' }}
</template>
</el-table-column>
<el-table-column prop="LEADER_USER_NAME" label="审批部门负责人" show-overflow-tooltip >
@ -50,16 +52,16 @@
<el-table-column prop="ACCEPT_USER_NAME" label="验收部门负责人" show-overflow-tooltip />
<el-table-column prop="STATUS" label="审核状态">
<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==2">所在单位待审核</span>
<span v-else-if="row.APPLY_STATUS==3">消防、安全管理部门待审核</span>
<span v-else-if="row.APPLY_STATUS==3">有关部门待审核</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==-2">作业负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-3">所在单位审核打回</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==-6">验收打回</span>
</template>
@ -67,7 +69,7 @@
<el-table-column label="操作" align="center" width="230">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-plus" @click="goChart(row)">流程图</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.CUTROAD_ID)">审批表详情</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.BREAKGROUND_ID)">审批表详情</el-button>
</template>
</el-table-column>
</el-table>
@ -78,92 +80,6 @@
</div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div>
<el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1400px">
<el-steps :active="getStatus()" :process-status="getProcessStatus()" finish-status="success" align-center>
<el-step title="断路安全作业提交">
<template slot="description">
<div>{{ getProcessMessage().title }}</div>
<div>{{ getProcessMessage().USER_NAME }}</div>
<div>{{ getProcessMessage().OPERATTIME }}</div>
</template>
</el-step>
<el-step title="作业负责人意见">
<template slot="description">
<div>{{ pd.CONSTRUCTION_USER_NAME }}</div>
<div>{{ pd.CONSTRUCTION_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="所在单位意见">
<template slot="description">
<div v-if="getIsPase('PRODUCTION_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.PRODUCTION_USER_NAME }}</div>
<div>{{ pd.PRODUCTION_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="消防、安全管理部门意见" >
<template slot="description">
<div v-if="getIsPase('SAFETY_DEPARTMENT_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.SAFETY_USER_NAME }}</div>
<div>{{ pd.SAFETY_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="审批部门意见" >
<template slot="description">
<div v-if="getIsPase('LEADER_USER_NAME')">{{ '已跳过' }}</div>
<div v-else>{{ pd.LEADER_USER_NAME }}</div>
<div>{{ pd.LEADER_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="完成验收" description="">
<template slot="description">
<div>{{ pd.ACCEPT_USER_NAME }}</div>
<div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="验收归档" description="">
<template slot="description">
<div>{{ pd.ACCEPT_USER_NAME }}</div>
<div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
</template>
</el-step>
</el-steps>
<div style="margin: 60px 60px 0 60px;display: flex;justify-content: space-between">
<div v-if="pd.GUARDIAN_USER_SIGNER_TIME">
<div style="color: #13ce66">
监护人：{{ pd.GUARDIAN_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.GUARDIAN_USER_SIGNER_TIME">
<div style="color: red">
监护人：{{ pd.GUARDIAN_USER_NAME }}未签字
</div>
</div>
<div v-if="pd.CONFESS_USER_SIGNER_TIME">
<div style="color: #13ce66">
安全交底人：{{ pd.CONFESS_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.CONFESS_USER_SIGNER_TIME">
<div style="color: red">
安全交底人：{{ pd.CONFESS_USER_NAME }}未签字
</div>
</div>
<div v-if="pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
<div style="color: #13ce66">
接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字
</div>
</div>
<div v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_TIME">
<div style="color: red">
接受交底人：{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<!-- <el-button @click="dialogFormShow = false">取 消</el-button>-->
<el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
</div>
</el-dialog>
<div style="height: 60px;"></div>
<div class="ui-foot">
<el-button type="primary" @click="goBack">返 回</el-button>
@ -206,16 +122,16 @@ export default {
dialogFormHuifuShow: false,
statusList: [
{ ID: '', NAME: '请选择' },
{ ID: '0', NAME: '断路安全作业待提交' },
{ ID: '0', NAME: '动土作业待提交' },
{ ID: '1', NAME: '作业负责人待审核' },
{ ID: '2', NAME: '所在单位待审核' },
{ ID: '3', NAME: '消防、安全管理部门待审核' },
{ ID: '3', NAME: '有关部门待审核' },
{ ID: '4', NAME: '审批部门待审核' },
{ ID: '5', NAME: '待验收' },
{ ID: '6', NAME: '验收归档' },
{ ID: '-2', NAME: '作业负责人审核打回' },
{ ID: '-3', NAME: '所在单位审核打回' },
{ ID: '-4', NAME: '消防、安全管理部门审核打回' },
{ ID: '-4', NAME: '有关部门审核打回' },
{ ID: '-5', NAME: '审批部门审核打回' },
{ ID: '-6', NAME: '验收打回' }
],
@ -247,7 +163,9 @@ export default {
'/gfBreakGround/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
CORPINFO_ID: this.$parent.CORPINFO_ID,
ticketType: this.$parent.ticketType
}
).then((data) => {
this.listLoading = false
@ -258,7 +176,7 @@ export default {
this.listLoading = false
})
},
goChart(row) {
this.pd = row
this.dialogFormShow = true
@ -318,7 +236,7 @@ export default {
}
if (this.pd.APPLY_STATUS == '-4') {
obj = {
title: '消防、安全管理部门审核打回',
title: '有关部门审核打回',
USER_NAME: this.pd.SAFETY_USER_NAME,
OPERATTIME: this.pd.OPERATTIME
}
@ -346,7 +264,11 @@ export default {
},
goDetail(id) {
this.$parent.activeName = 'Detail'
this.$parent.CUTROAD_ID = id
this.$parent.BREAKGROUND_ID = id
},
goBack(){
this.$parent.activeName = 'CorpInfo'
this.$parent.BREAKGROUND_ID = ''
}
}
}

8
src/views/dangerousWork/breakground/index.vue
View File

@ -1,22 +1,22 @@
<template>
<div>
<CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
<Blindboard v-if="activeName=='Blindboard'"/>
<Breakground v-if="activeName=='Breakground'"/>
<Detail v-if="activeName=='Detail'"/>
</div>
</template>
<script>
import CorpInfo from './components/corpInfo'
import Blindboard from './components/list'
import Breakground from './components/list'
import Detail from './components/detail'
export default {
components: { CorpInfo, Blindboard,Detail },
components: { CorpInfo, Breakground,Detail },
data() {
return {
activeName: 'CorpInfo',
CORPINFO_ID: '',
ticketType: '',
CUTROAD_ID: ''
BREAKGROUND_ID: ''
}
}
}

2
src/views/dangerousWork/circuit/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
<circuitList v-show="activeName=='circuit_list'"/>
<circuitList v-if="activeName=='circuit_list'"/>
<Detail v-if="activeName=='Detail'"/>
</div>
</template>