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

历史bug修复

main
liujun 2023-12-07 15:02:00 +08:00
parent 97e824fcf4
commit 745788de65
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/xgf/flow_audit/index.vue
View File

@ -58,7 +58,7 @@
</el-table-column>
<el-table-column label="操作" align="center" width="200">
<template slot-scope="{row}">
<el-button v-if="(row.AUDIT_STATUS === 0 || row.AUDIT_STATUS === -2) && (row.SUPERVISION_USER_ID === USER_ID && row.supervisionCount !== row.USER_COUNT ) " type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row)">审核</el-button>
<el-button v-if="(row.AUDIT_STATUS === 0 || row.AUDIT_STATUS === -2) && (row.supervisionCount !== row.USER_COUNT ) " type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row)">审核</el-button>
<el-button v-else type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">查看</el-button>
</template>
</el-table-column>
@ -149,7 +149,6 @@ export default {
ENDTIME: this.dates[1],
TRAIN_CORP_DEPTS: this.TRAIN_CORP_DEPTS.join(','),
AUDIT_STATUS: this.AUDIT_STATUS,
TYPE: 2,
USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
}
).then((data) => {

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

@ -24,7 +24,7 @@
<th>安全监督部门</th>
<td>{{ pd.SUPERVISION_DEPT_NAME }}</td>
<th>审核人员</th>
<td>{{ pd.SUPERVISION_USER_USERNAME }}</td>
<td>{{ pd.SUPERVISION_USER_NAME }}</td>
<th>审核时间</th>
<td>{{ pd.SUPERVISION_TIME }}</td>
</tr>
@ -32,7 +32,7 @@
<th>主管部门</th>
<td>{{ pd.MANAGER_DEPT_NAME }}</td>
<th>审核人员</th>
<td>{{ pd.MANAGER_USER_USERNAME }}</td>
<td>{{ pd.MANAGER_USER_NAME }}</td>
<th>审核时间</th>
<td>{{ pd.MANAGER_TIME }}</td>
</tr>
@ -40,7 +40,7 @@
<th>管理部门</th>
<td>{{ pd.ERRITORIALITY_DEPT_NAME }}</td>
<th>审核人员</th>
<td>{{ pd.ERRITORIALITY_USER_USERNAME }}</td>
<td>{{ pd.ERRITORIALITY_USER_NAME }}</td>
<th>审核时间</th>
<td>{{ pd.TERRITORIALITY_TIME }}</td>
</tr>
@ -83,7 +83,7 @@
@click="getUserInfo(row)">电子合格证
</el-button>
<el-button
v-if="(row.STATUS === 0 ||row.STATUS === 1 )&& viewState ==='1' && row.SUPERVISION_STATE === 9 && row.STEP_STATUS === '2'"
v-if="(row.STATUS === 0 ||row.STATUS === 1 )&& viewState ==='1' && ((row.MANAGER_USER_ID === USER_ID && row.MANAGER_STATE === 9 && row.STEP_STATUS === '1' ) || (row.SUPERVISION_USER_ID === USER_ID && row.SUPERVISION_STATE === 9 && row.STEP_STATUS === '2') || (row.TERRITORIALITY_USER_ID === USER_ID && row.TERRITORIALITY_STATE === 9 && (row.STEP_STATUS === '0' || !row.STEP_STATUS)))"
type="success"
icon="el-icon-edit"
size="mini"
@ -302,6 +302,7 @@ export default {
data() {
return {
config: config,
USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID,
userInfoDialog: false,
userDetailForm: {},
imgUrl: '',
@ -323,6 +324,7 @@ export default {
dialogVisible: false,
form: {
TRAINUSERS_ID: '', // 培训批次 详情id
TRAININGBATCH_ID: '',
USER_COUNT: '', // 批次的人数
type: '',
IS_STATE: 1,
@ -419,6 +421,7 @@ export default {
this.form.type = '1'
this.form.USER_ID = row.USER_ID
this.dialogVisible = true
this.form.TRAININGBATCH_ID = this.TRAININGBATCH_ID
},
// 提交审批意见
approve() {