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

查看bug修复

main
liujun 2023-12-22 17:07:44 +08:00
parent f361d4558e
commit 7e0f9d2264
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/xgf/flow/components/list.vue
View File

@ -7,7 +7,7 @@
<el-input v-model="KEYWORDS" placeholder="请输入用户名"/> <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col v-if="false" :span="6">
<el-form-item label="培训状态"> <el-form-item label="培训状态">
<el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable> <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/> <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>

4
src/views/xgf/flow/components/sendUtil.vue
View File

@ -46,6 +46,10 @@ export default {
beforeClose() { beforeClose() {
}, },
sendMessage(row) { sendMessage(row) {
if (this.value) {
this.$message.error('请选择是否通过')
return
}
requestFN( requestFN(
'/xgf/user/approve', '/xgf/user/approve',
{ {

2
src/views/xgf/flowApply/components/list.vue
View File

@ -7,7 +7,7 @@
<el-input v-model="KEYWORDS" placeholder="请输入用户名"/> <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col v-if="false" :span="6">
<el-form-item label="培训状态"> <el-form-item label="培训状态">
<el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable> <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/> <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>

22
src/views/xgf/flowApply/components/userInfo.vue
View File

@ -200,23 +200,23 @@
<template slot-scope="props"> <template slot-scope="props">
<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 v-if="false" :span="5">
<el-form-item label="属地管理部门"> <el-form-item 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 v-if="false" :span="5">
<el-form-item label="审批人"> <el-form-item 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 v-if="false" :span="5">
<el-form-item label="审批结果"> <el-form-item 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 v-if="false" :span="9">
<el-form-item label="审批意见"> <el-form-item label="审批意见">
<span>{{ props.row.TERRITORIALITY_OPINION }}</span> <span>{{ props.row.TERRITORIALITY_OPINION }}</span>
</el-form-item> </el-form-item>
@ -233,7 +233,7 @@
</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 label="审批结果">
<span v-if="props.row.MANAGER_STATE === 0">不通过</span> <span v-if="props.row.MANAGER_STATE === 0">不通过</span>
<span v-if="props.row.MANAGER_STATE ===1">通过</span> <span v-if="props.row.MANAGER_STATE ===1">通过</span>
</el-form-item> </el-form-item>
@ -255,7 +255,7 @@
</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 label="审批结果">
<span v-if="props.row.SUPERVISION_STATE === 0">不通过</span> <span v-if="props.row.SUPERVISION_STATE === 0">不通过</span>
<span v-if="props.row.SUPERVISION_STATE ===1">通过</span> <span v-if="props.row.SUPERVISION_STATE ===1">通过</span>
</el-form-item> </el-form-item>
@ -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>