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

查看bug修复

main
liujun 2023-12-21 14:31:20 +08:00
parent 19bfb0baff
commit 69701c7e78
2 changed files with 25 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/train/training_record/index.vue
View File

@ -21,11 +21,11 @@
</el-form> </el-form>
<el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row> <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="selection" width="55" align="center" />
<el-table-column prop="RELEVANT_UNIT_NAME" fixed="left" width="150" label="相关方单位名称" /> <el-table-column prop="BELONG_TO_CORP_NAME" fixed="left" width="150" label="相关方单位名称" />
<el-table-column prop="CREATTIME" width="150" label="申请时间" /> <el-table-column prop="CREATTIME" width="150" label="申请时间" />
<el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部" width="150" /> <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部" width="150" />
<el-table-column prop="SUPERVISION_USER_NAME" label="安全监督部人员" width="150" /> <el-table-column prop="SUPERVISION_USER_NAME" label="安全监督部人员" width="150" />
<el-table-column prop="MANAGER_DEPT_NAME" label="主管部门" width="150" /> <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" width="150" />
<el-table-column prop="MANAGER_USER_NAME" label="主管部门人员" width="150" /> <el-table-column prop="MANAGER_USER_NAME" label="主管部门人员" width="150" />
<el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" width="150" /> <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" width="150" />
<el-table-column prop="TERRITORIALITY_USER_NAME" label="属地管理部门人员" width="150" /> <el-table-column prop="TERRITORIALITY_USER_NAME" label="属地管理部门人员" width="150" />
@ -34,7 +34,7 @@
{{ new Date(row.CREATTIME).getFullYear() }} {{ new Date(row.CREATTIME).getFullYear() }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请通过人数" width="120"> <el-table-column v-if="false" label="申请通过人数" width="120">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.PASS_COUNT">{{ row.PASS_COUNT }}</span> <span v-if="row.PASS_COUNT">{{ row.PASS_COUNT }}</span>
<span v-else>0</span> <span v-else>0</span>
@ -109,7 +109,7 @@ export default {
getList() { getList() {
this.listLoading = true this.listLoading = true
requestFN( requestFN(
'/flowTrain/trainList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, '/flowTrain/batchList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{ {
VERIFY_START_TIME: this.dates[0], VERIFY_START_TIME: this.dates[0],
VERIFY_END_TIME: this.dates[1], VERIFY_END_TIME: this.dates[1],

199
src/views/train/training_record/users.vue
View File

@ -29,7 +29,7 @@
</tr> </tr>
<tr> <tr>
<th>主管部门</th> <th>主管部门</th>
<td>{{ pd.MAIN_DEPARTMENT_NAME }}</td> <td>{{ pd.MANAGER_DEPARTMENT_NAME }}</td>
<th>审核人员</th> <th>审核人员</th>
<td>{{ pd.MANAGER_USER_NAME }}</td> <td>{{ pd.MANAGER_USER_NAME }}</td>
<th>审核时间</th> <th>审核时间</th>
@ -62,18 +62,16 @@
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="USERNAME" label="用户名" /> <el-table-column prop="USERNAME" label="用户名" />
<el-table-column prop="NAME" label="姓名" /> <el-table-column prop="NAME" label="姓名" />
<el-table-column prop="DEPARTMENT_NAME" label="部门" /> <el-table-column prop="BELONG_TO_CORP_NAME" label="部门" />
<el-table-column prop="STATE" label="审核状态" align="center" > <el-table-column prop="STATE" label="审核状态" align="center" >
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-tag v-if="row.MANAGER_STATE === 0 || row.SUPERVISION_STATE === 0 || row.TERRITORIALITY_STATE === 0" type="danger">审核不通过</el-tag> <span>{{ getType(row) }}</span>
<el-tag v-else-if="row.MANAGER_STATE === 1 && row.SUPERVISION_STATE === 1 && row.TERRITORIALITY_STATE === 1" type="success">审核通过</el-tag>
<el-tag v-else type="success">待审核</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="220"> <el-table-column label="操作" align="center" width="220">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.USER_ID)">查看</el-button> <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.USER_ID)">查看</el-button>
<el-button v-if="row.MANAGER_STATE === 1 && row.SUPERVISION_STATE === 1 && row.TERRITORIALITY_STATE === 1 && row.AUDIT_STATUS === 3" type="primary" icon="el-icon-edit" size="mini" @click="handleCardShow(row.TRAINUSERS_ID)">电子工牌</el-button> <el-button v-if="row.STATUS === 2" type="primary" icon="el-icon-edit" size="mini" @click="handleCardShow(row.TRAINUSERS_ID)">电子工牌</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -85,177 +83,9 @@
<el-button @click="closeWindow">关 闭</el-button> <el-button @click="closeWindow">关 闭</el-button>
</div> </div>
</el-dialog> </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 >{{ formatLabel(userDetailForm.IS_BF) }}</td>
<th>是否特殊工种</th>
<td >{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
<th>是否流动人员</th>
<td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
</tr>
<tr v-if="message != ''">
<th>打回人</th>
<td>{{ operator }}</td>
<th>打回原因</th>
<td :colspan="3">{{ message }}</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>
<card ref="card"/> <card ref="card"/>
<User ref="user"/> <User ref="user"/>
<user-info ref="userInfos"/>
</div> </div>
</template> </template>
@ -265,8 +95,10 @@ import { requestFN } from '@/utils/request'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import card from './card' import card from './card'
import User from './user' import User from './user'
import UserInfo from '../../xgf/flow_audit/userInfo.vue'
export default { export default {
components: { components: {
UserInfo,
User, User,
Pagination, Pagination,
card card
@ -317,9 +149,8 @@ export default {
}) })
}, },
// 查看 // 查看
async handleShow(USER_ID) { handleShow(USER_ID) {
await this.getUserInfoById(USER_ID) this.$refs.userInfos.init({ XGF_USER_ID: USER_ID })
this.userInfoDialog = true
}, },
getUserInfoById(id) { getUserInfoById(id) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -376,6 +207,18 @@ export default {
handleCardShow(TRAINUSERS_ID) { handleCardShow(TRAINUSERS_ID) {
// this.$refs.card.init(USER_ID, this.pd.TRAIN_AREA_NAME) // this.$refs.card.init(USER_ID, this.pd.TRAIN_AREA_NAME)
this.$refs.user.init({ TRAINUSERS_ID: TRAINUSERS_ID }) this.$refs.user.init({ TRAINUSERS_ID: TRAINUSERS_ID })
},
getType(row) {
console.log(row)
if (row.RESULT_STATUS === '1') {
return '审批中'
}
if (row.RESULT_STATUS === '2') {
return '审批通过'
}
if (row.RESULT_STATUS === '3') {
return '审批不通过'
}
} }
} }
} }