bug修复

main
liujun 2023-12-20 14:49:01 +08:00
parent d016a52372
commit 0e7c6e0c72
3 changed files with 77 additions and 259 deletions

View File

@ -247,7 +247,6 @@ export default {
}).catch((e) => {
})
},
save() {
this.$refs.form.validate(valid => {
if (valid) {
@ -255,11 +254,14 @@ export default {
this.form.USER_COUNT = this.users.length
this.form.AUDIT_STATUS = 0
this.form.TYPE = 2
const userIds = this.users.map((item) => { return item.XGF_USER_ID })
requestFN(
'/trainingbatch/add',
{
...this.form,
users: this.users.join(',')
users: userIds.join(','),
BELONG_TO_CORP: this.users[0].BELONG_TO_CORP,
BELONG_TO_CORP_NAME: this.users[0].BELONG_TO_CORP_NAME
}
).then((data) => {
this.loading = false
@ -278,6 +280,7 @@ export default {
},
handleClose() {
this.visible = false
this.$emit('refresh', '')
},
closeWindow() {
this.visible = false

View File

@ -1,4 +1,4 @@
<template>
flowTrain/batchList<template>
<div class="app-container">
<el-form label-width="100px">
<el-row>
@ -35,11 +35,11 @@
<el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="RELEVANT_UNIT_NAME" label="相关方单位名称" />
<el-table-column prop="BELONG_TO_CORP_NAME" label="相关方单位名称" />
<el-table-column prop="CREATTIME" label="申请时间" />
<el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部" />
<el-table-column prop="SUPERVISION_USER_NAME" label="安全监督部人员" />
<el-table-column prop="MAIN_DEPARTMENT_NAME" label="主管部门" />
<el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" />
<el-table-column prop="MANAGER_USER_NAME" label="主管部门人员" />
<el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" />
<el-table-column prop="TERRITORIALITY_USER_NAME" label="属地管理部门人员" />
@ -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 === 1 || row.AUDIT_STATUS === 0 ) && (row.MANAGER_USER_ID === USER_ID && row.managerCount !== row.USER_COUNT ) || (row.TERRITORIALITY_USER_ID === USER_ID && row.territorialityCount !== row.USER_COUNT ) " type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row.TRAININGBATCH_ID)"></el-button>
<el-button v-if="judge(row)" type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row.TRAINING_BATCH_ID)"></el-button>
<el-button v-else type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.TRAININGBATCH_ID)"></el-button>
</template>
</el-table-column>
@ -145,6 +145,18 @@ export default {
handleShow(id) {
this.$refs.users.init(id, '0')
},
judge(row) {
if (row.STEP_STATUS === '0') {
return this.USER_ID === row.TERRITORIALITY_USER_ID
}
if (row.STEP_STATUS === '1') {
return this.USER_ID === row.MANAGER_USER_ID
}
if (row.STEP_STATUS === '2') {
return this.USER_ID === row.SUPERVISION_USER_ID
}
return false
}
}
}

View File

@ -22,7 +22,7 @@
<tr>
<th>安全监督部门</th>
<td>{{ pd.SUPERVISION_DEPT_NAME }}</td>
<td>{{ pd.SUPERVISION_DEPARTMENT_NAME }}</td>
<th>审核人员</th>
<td>{{ pd.SUPERVISION_USER_NAME }}</td>
<th>审核时间</th>
@ -30,7 +30,7 @@
</tr>
<tr>
<th>主管部门</th>
<td>{{ pd.MANAGER_DEPT_NAME }}</td>
<td>{{ pd.MANAGER_DEPARTMENT_NAME }}</td>
<th>审核人员</th>
<td>{{ pd.MANAGER_USER_NAME }}</td>
<th>审核时间</th>
@ -38,9 +38,9 @@
</tr>
<tr>
<th>集团单位</th>
<td>{{ pd.ERRITORIALITY_DEPT_NAME }}</td>
<td>{{ pd.TERRITORIALITY_DEPARTMENT_NAME }}</td>
<th>审核人员</th>
<td>{{ pd.ERRITORIALITY_USER_NAME }}</td>
<td>{{ pd.TERRITORIALITY_USER_NAME }}</td>
<th>审核时间</th>
<td>{{ pd.TERRITORIALITY_TIME }}</td>
</tr>
@ -65,8 +65,8 @@
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="USERNAME" label="用户名"/>
<el-table-column prop="NAME" label="姓名"/>
<el-table-column prop="DEPARTMENT_NAME" label="部门"/>
<el-table-column prop="STATUS" label="评审状态">
<el-table-column prop="BELONG_TO_CORP_NAME" label="部门"/>
<el-table-column prop="STUDY_STATUS" label="评审状态">
<template slot-scope="{row}">
<span>{{ getType(row) }}</span>
</template>
@ -74,20 +74,8 @@
<el-table-column label="操作" align="center" width="240">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)"></el-button>
<el-button
v-if="row.STATUS === 2 && row.TRAIN_STATUS === '1' && row.SUPERVISION_STATE == 1 && row.MANAGER_STATE == 1 && row.TERRITORIALITY_STATE==1"
type="success"
icon="el-icon-edit"
size="mini"
@click="getUserInfo(row)">电子合格证
</el-button>
<el-button
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.TERRITORIALITY_USER_ID === USER_ID && row.TERRITORIALITY_STATE === 9 && (row.STEP_STATUS === '0' || !row.STEP_STATUS))) && row.SUPERVISION_STATE != 0 && row.MANAGER_STATE != 0 && row.TERRITORIALITY_STATE != 0"
type="success"
icon="el-icon-edit"
size="mini"
@click="examineShow(row)">审核
</el-button>
<el-button v-if="row.STATUS === 2" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)"></el-button>
<el-button v-if="row[pd.step] === 9" type="success" icon="el-icon-edit" size="mini" @click="examineShow(row)"></el-button>
</template>
</el-table-column>
</el-table>
@ -97,173 +85,9 @@
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="closeWindow"> </el-button>
<el-button type="primary" @click="comfirm"></el-button>
</div>
</el-dialog>
<el-dialog
v-if="userInfoDialog"
:visible.sync="userInfoDialog"
:append-to-body="true"
title="查看"
width="60%">
<table class="table-ui" style="margin-bottom: 20px;">
<div class="level-title">
<h1>人员信息</h1>
</div>
<tr>
<th>照片</th>
<td>
<span v-if="imgUrl != ''">
<div class="img-flex">
<viewer>
<img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
</viewer>
</div>
</span>
<span v-else/>
</td>
<th>姓名</th>
<td>{{ userDetailForm.NAME }}</td>
<th>性别</th>
<td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
</tr>
<tr>
<th>出生年月</th>
<td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
<th>年龄</th>
<td>{{ userDetailForm.AGE }}</td>
<th>手机号</th>
<td>{{ userDetailForm.PHONE }}</td>
</tr>
<tr>
<th>身份证</th>
<td>{{ userDetailForm.CARD_ID }}</td>
<th>身份证照片</th>
<!--if条件不可删除-->
<td v-if="userCardIDPhotoFile.length>0" colspan="3">
<span>
<div class="img-flex">
<viewer>
<img
v-for="item in userCardIDPhotoFile"
:src="config.fileUrl + item.FILEPATH"
:key="item.IMGFILES_ID"
width="40"
height="40"
style="object-fit: cover;">
</viewer>
</div>
</span>
</td>
</tr>
<tr>
<th>民族</th>
<td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
<th>婚姻状况</th>
<td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
<th>政治面貌</th>
<td>{{ userDetailForm.zzName }} {{
userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
}}
</td>
</tr>
<tr>
<th>户口所在地</th>
<td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
<th>现住址</th>
<td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
<th>联系电话</th>
<td>{{ userDetailForm.PHONE }}</td>
</tr>
<tr>
<th>文化程度</th>
<td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
<th>岗位名称(工种)</th>
<td colspan="3">{{ userDetailForm.POST_ID }}</td>
</tr>
<tr>
<th>是否缴纳社保</th>
<td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
<th v-if="userDetailForm.IS_SOCIAL === '1'"></th>
<td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
<th v-if="userDetailForm.IS_SOCIAL === '1'"></th>
<td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
<span>
<div class="img-flex">
<viewer>
<img
v-for="item in socialPhotoFile"
:src="config.fileUrl + item.FILEPATH"
:key="item.IMGFILES_ID"
width="40"
height="40"
style="object-fit: cover;">
</viewer>
</div>
</span>
</td>
</tr>
<tr>
<th>是否参加三级安全培训</th>
<td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
<th v-if="userDetailForm.IS_LEVEL_THREE == 1"></th>
<td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="3">
<span>
<div class="img-flex">
<viewer>
<img
v-for="item in photosOfLevel"
:src="config.fileUrl + item.FILEPATH"
:key="item.IMGFILES_ID"
width="40"
height="40"
style="object-fit: cover;">
</viewer>
</div>
</span>
</td>
</tr>
<tr>
<th>是否缴纳保险</th>
<td>{{ formatLabelBf(userDetailForm.IS_BF) }}</td>
<th>是否特殊工种</th>
<td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
<th>是否流动人员</th>
<td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
</tr>
</table>
<div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
<h1>特种作业人员信息</h1>
</div>
<table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
<tr>
<th style="width: 150px">证书名称</th>
<td style="width: 150px">{{ item.CERTIFICATE }}</td>
<th style="width: 150px">作业类别</th>
<td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
<th style="width: 150px">操作项目</th>
<td>{{ item.OPERATION_TYPE_NAME }}</td>
</tr>
<tr>
<th>特种作业证书编号</th>
<td>{{ item.SPECIAL_NUMBER }}</td>
<th>发证机关</th>
<td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
</tr>
<tr>
<th>复审时间</th>
<td>{{ item.REVIEW_TIME }}</td>
<th>有效期</th>
<td colspan="3">{{ item.VALIDITY_TIME_START }} {{ item.VALIDITY_TIME_END }}</td>
</tr>
</table>
<div slot="footer" class="dialog-footer">
<el-button @click="userInfoDialog = false"> </el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogVisible" title="审核">
<el-form ref="StreetListingForm" :model="form" label-width="110px" style="width: 500px;">
<el-form-item label="审核是否通过" prop="IS_LISTING">
@ -300,13 +124,10 @@ export default {
return {
USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID,
config: config,
userInfoDialog: false,
userDetailForm: {},
imgUrl: '',
wenhuachengduList: [], //
gongshangbaoxianFile: [],
photosOfLevel: [],
postList: [], //
visible: false,
pd: {},
userList: [],
@ -316,13 +137,13 @@ export default {
page: 1,
limit: 20
},
TRAININGBATCH_ID: '',
TRAININ_GBATCH_ID: '',
total: 0,
viewState: '0',
dialogVisible: false,
form: {
TRAININGBATCH_ID: this.TRAININGBATCH_ID,
TRAINUSERS_ID: '', // id
TRAINING_BATCH_ID: this.TRAINING_BATCH_ID,
TRAIN_USERS_ID: '', // id
USER_COUNT: '', //
type: 2,
IS_STATE: 1,
@ -337,15 +158,16 @@ export default {
},
methods: {
init(id, viewState) {
this.form.TRAININGBATCH_ID = this.TRAININGBATCH_ID
this.form.TRAINUSERS_ID = ''
console.log(id, viewState)
this.form.TRAINING_BATCH_ID = this.TRAINING_BATCH_ID
this.form.TRAIN_USERS_ID = ''
this.form.USER_COUNT = ''
this.form.type = '2'
this.form.IS_STATE = 1
this.form.OPINION = ''
this.viewState = viewState
if (id) {
this.TRAININGBATCH_ID = id
this.TRAINING_BATCH_ID = id
this.getDataById(id)
this.getUserList(id)
}
@ -353,31 +175,11 @@ export default {
this.visible = true
this.userList = []
},
/** 根据id 获取数据 **/
formatLabelBf(value) {
if (value) {
var valList = value.split(',')
var label = []
for (let i = 0; i < valList.length; i++) {
if (valList[i] == 0) {
label.push('无')
break
}
if (valList[i] == 1) {
label.push('商业保险')
}
if (valList[i] == 2) {
label.push('工伤保险')
}
}
return label.join(',')
}
},
getDataById(id) {
requestFN(
'/flowTrain/getDetailsById',
{
TRAININGBATCH_ID: id
TRAINING_BATCH_ID: id
}
).then((data) => {
this.pd = data.pd
@ -387,16 +189,6 @@ export default {
getUserInfo(row) {
this.$refs.userInfo.init(row)
},
//
formatLabel(value) {
if (value == '1') {
return '是'
} else if (value == '0') {
return '否'
} else {
return ''
}
},
//
async handleShow(row) {
await this.getUserInfoById(row.USER_ID)
@ -422,16 +214,12 @@ export default {
}
},
examineShow(row) {
this.form.TRAINUSERS_ID = row.TRAINUSERS_ID
this.form.USER_COUNT = this.pd.USER_COUNT
this.form.type = '2'
this.form.USER_ID = row.USER_ID
this.form.STEP_STATUS = row.STEP_STATUS
this.form.TRAIN_USERS_ID = row.TRAIN_USERS_ID
this.dialogVisible = true
},
//
approve() {
this.form.TRAININGBATCH_ID = this.TRAININGBATCH_ID
this.form.TRAINING_BATCH_ID = this.TRAININ_GBATCH_ID
if (!(this.form.IS_STATE === 1 || this.form.IS_STATE === 0)) {
this.$message.error('请先择')
return
@ -445,18 +233,17 @@ export default {
requestFN(
'/flowTrain/approveUser', { ...this.form }
).then((data) => {
if (data.result == 'success') {
if (data.result === 'success') {
this.$message.success('审批成功')
this.init(this.TRAININGBATCH_ID, this.viewState)
} else if (data.result == 'exception') {
// showException('', data.exception)//
this.init(this.TRAINING_BATCH_ID, this.viewState)
} else if (data.result === 'exception') {
this.$message({
message: data.msg,
type: 'success'
})
}
this.getUserList(this.TRAININGBATCH_ID)
this.getDataById(this.TRAININGBATCH_ID)
this.getUserList(this.TRAINING_BATCH_ID)
this.getDataById(this.TRAINING_BATCH_ID)
this.dialogVisible = false
}).catch((e) => {
})
@ -496,7 +283,7 @@ export default {
requestFN(
'/flowTrain/batchUserList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
TRAININGBATCH_ID: id
TRAINING_BATCH_ID: id
}
).then((data) => {
this.userList = data.varList
@ -513,25 +300,41 @@ export default {
this.handleClose()
},
getType(row) {
if (row.SUPERVISION_STATE === 9 && row.MANAGER_STATE === 9 && row.TERRITORIALITY_STATE === 9) {
return '未评审'
if (row.RESULT_STATUS === 1) {
return '批中'
}
if (row.SUPERVISION_STATE === 1 && row.MANAGER_STATE === 1 && row.TERRITORIALITY_STATE === 1) {
return '通过'
if (row.RESULT_STATUS === 2) {
return '审批通过'
}
if (row.SUPERVISION_STATE === 0 || row.MANAGER_STATE === 0 || row.TERRITORIALITY_STATE === 0) {
return '未通过'
}
if ((row.SUPERVISION_STATE === 1 || row.MANAGER_STATE === 1 || row.TERRITORIALITY_STATE === 1) &&
(row.SUPERVISION_STATE === 9 || row.MANAGER_STATE === 9 || row.TERRITORIALITY_STATE === 9) &&
!(row.SUPERVISION_STATE === 0 || row.MANAGER_STATE === 0 || row.TERRITORIALITY_STATE === 0)) {
return '评审中'
if (row.RESULT_STATUS === 3) {
return '审批不通过'
}
},
tableRowClassName({ row, rowIndex }) {
if (row.STEP_STATUS === '3') {
return 'warning-row'
comfirm() {
this.$confirm('确定提交审批吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
requestFN(
'/flowTrain/endApproval',
{
TRAINING_BATCH_ID: this.TRAINING_BATCH_ID
}
).then((data) => {
if (data.result == 'success') {
this.$message.success('提交成功')
this.init(this.TRAINING_BATCH_ID, this.viewState)
} else if (data.result == 'exception') {
this.$message({
message: data.msg,
type: 'success'
})
}
}).catch((e) => {
})
}).catch(() => {
})
}
}
}