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:41:28 +08:00
parent b8d812284a
commit 045793c5fd
3 changed files with 166 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,77 @@
</div> </div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div> </div>
<el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1200px">
<el-steps :active="getStatus()" :process-status="getProcessStatus()" align-center finish-status="success" >
<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 description="" title="所在单位意见">
<template slot="description">
<div>{{ pd.LEADER_USER_NAME }}</div>
<div>{{ pd.LEADER_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="完成验收">
<template slot="description">
<div>{{ pd.ACCEPT_USER_NAME }}</div>
<div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="验收归档">
<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 style="height: 60px;"></div>
<div class="ui-foot"> <div class="ui-foot">
<el-button type="primary" @click="goBack">返 回</el-button> <el-button type="primary" @click="goBack">返 回</el-button>

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

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<div id="printTest" class="app-container print-work"> <div id="printTest" class="app-container print-work">
<el-page-header content="审批表详情" class="no-print" @back="goBack"/> <el-page-header content="审批表详情" class="no-print" @back="goBack()"/>
<table class="table-ui"> <table class="table-ui">
<thead> <thead>
<tr> <tr>
@ -186,7 +186,7 @@
</div> </div>
<div style="padding-top: 100px"/> <div style="padding-top: 100px"/>
<div class="ui-foot"> <div class="ui-foot">
<el-button icon="el-icon-arrow-left" @click="goBack">返 回</el-button> <el-button icon="el-icon-arrow-left" @click="goBack()">返 回</el-button>
</div> </div>
</div> </div>
</template> </template>
@ -208,6 +208,7 @@ export default {
} }
}, },
created() { created() {
console.info()
this.getData() this.getData()
}, },
methods: { methods: {
@ -257,8 +258,9 @@ export default {
goBack() { goBack() {
this.$parent.activeName = 'Breakground' this.$parent.activeName = 'Breakground'
} }
} }
} }
</script> </script>

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

@ -28,7 +28,7 @@
</el-form> </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 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="57" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号222" width="50" align="center" />
<el-table-column prop="CHECK_NO" label="编号" show-overflow-tooltip /> <el-table-column prop="CHECK_NO" label="编号" show-overflow-tooltip />
<el-table-column prop="CONSTRUCTION_DEPARTMENT_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_USER_NAME" label="申请人" width="100" />
@ -80,6 +80,93 @@
</div> </div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div> </div>
<el-dialog :visible.sync="dialogFormShow " :title="dialogType==='add'?'查看流程图':'新增'" width="1350px">
<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_USER_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="完成验收">
<template slot="description">
<div>{{ pd.ACCEPT_USER_NAME }}</div>
<div>{{ pd.ACCEPT_USER_SIGNER_TIME }}</div>
</template>
</el-step>
<el-step title="验收归档">
<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 style="height: 60px;"></div>
<div class="ui-foot"> <div class="ui-foot">
<el-button type="primary" @click="goBack">返 回</el-button> <el-button type="primary" @click="goBack">返 回</el-button>
@ -263,6 +350,8 @@ export default {
} }
}, },
goDetail(id) { goDetail(id) {
console.info('222222222222222222222 ')
console.info(id)
this.$parent.activeName = 'Detail' this.$parent.activeName = 'Detail'
this.$parent.BREAKGROUND_ID = id this.$parent.BREAKGROUND_ID = id
}, },