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

查看bug修复

main
liujun 2023-12-22 17:07:43 +08:00
parent 7e6487fe54
commit 2b744d8ff1
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/views/xgf/flow_audit/userInfo.vue
View File

@ -201,23 +201,23 @@
<el-row> <el-row>
<el-form label-position="left" inline class="demo-table-expand"> <el-form label-position="left" inline class="demo-table-expand">
<el-col :span="5"> <el-col :span="5">
<el-form-item label="属地管理部门"> <el-form-item v-if="false" label="属地管理部门">
<span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span> <span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="审批人"> <el-form-item v-if="false" label="审批人">
<span>{{ props.row.TERRITORIALITY_USER_NAME }}</span> <span>{{ props.row.TERRITORIALITY_USER_NAME }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="审批结果"> <el-form-item v-if="false" label="审批结果">
<span v-if="props.row.TERRITORIALITY_STATE === 0">不通过</span> <span v-if="props.row.TERRITORIALITY_STATE === 0">不通过</span>
<span v-if="props.row.TERRITORIALITY_STATE ===1">通过</span> <span v-if="props.row.TERRITORIALITY_STATE ===1">通过</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="审批意见"> <el-form-item v-if="false" label="审批意见">
<span>{{ props.row.TERRITORIALITY_OPINION }}</span> <span>{{ props.row.TERRITORIALITY_OPINION }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -269,9 +269,9 @@
</el-row> </el-row>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/> <el-table-column v-if="false" prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/>
<el-table-column prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/> <el-table-column v-if="false" prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/>
<el-table-column prop="TERRITORIALITY_STATE" label="审批结果" align="center"> <el-table-column v-if="false" prop="TERRITORIALITY_STATE" label="审批结果" align="center">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.TERRITORIALITY_STATE === 0">不通过</span> <span v-if="row.TERRITORIALITY_STATE === 0">不通过</span>
<span v-if="row.TERRITORIALITY_STATE ===1">通过</span> <span v-if="row.TERRITORIALITY_STATE ===1">通过</span>
@ -279,7 +279,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" align="center"/> <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" align="center"/>
<el-table-column prop="MANAGER_USER_NAME" label="审批人" align="center"/> <el-table-column prop="MANAGER_USER_NAME" label="审批人" align="center"/>
<el-table-column prop="MANAGER_STATE" label="审批人" align="center"> <el-table-column prop="MANAGER_STATE" label="审批结果" align="center">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.MANAGER_STATE === 0">不通过</span> <span v-if="row.MANAGER_STATE === 0">不通过</span>
<span v-if="row.MANAGER_STATE ===1">通过</span> <span v-if="row.MANAGER_STATE ===1">通过</span>
@ -287,7 +287,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部门" align="center"/> <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部门" align="center"/>
<el-table-column prop="SUPERVISION_USER_NAME" label="审批人" align="center"/> <el-table-column prop="SUPERVISION_USER_NAME" label="审批人" align="center"/>
<el-table-column prop="SUPERVISION_STATE" label="审批人" align="center"> <el-table-column prop="SUPERVISION_STATE" label="审批结果" align="center">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.SUPERVISION_STATE === 0">不通过</span> <span v-if="row.SUPERVISION_STATE === 0">不通过</span>
<span v-if="row.SUPERVISION_STATE ===1">通过</span> <span v-if="row.SUPERVISION_STATE ===1">通过</span>
@ -341,6 +341,7 @@ export default {
}, },
methods: { methods: {
init(e) { init(e) {
console.log(e)
this.visible = true this.visible = true
this.heirloom = JSON.parse(JSON.stringify(e)) this.heirloom = JSON.parse(JSON.stringify(e))
this.getUserInfoById(this.heirloom) this.getUserInfoById(this.heirloom)

6
src/views/xgf/flow_audit/users.vue
View File

@ -291,6 +291,12 @@ export default {
} }
}, },
comfirm() { comfirm() {
for (let i = 0; i < this.userList.length; i++) {
if ((this.userList[i][this.pd.step] === 9 && this.userList[i].RESULT_STATUS === '1')) {
this.$message.error('还有人员未审批')
return
}
}
this.$confirm('确定提交审批吗？', '提示', { this.$confirm('确定提交审批吗？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',