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

相关方查看详情统一格式

main
liujun 2023-12-21 13:58:55 +08:00
parent 40422a8628
commit 25b9ee7959
2 changed files with 322 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,9 @@
:visible.sync="visible" :visible.sync="visible"
:append-to-body="true" :append-to-body="true"
title="查看" title="查看"
width="60%"> width="80%">
<div class="information">
<el-scrollbar style="height: 550px;margin-bottom: 10px">
<table class="table-ui" style="margin-bottom: 20px;"> <table class="table-ui" style="margin-bottom: 20px;">
<div class="level-title"> <div class="level-title">
<h1>人员信息</h1> <h1>人员信息</h1>
@ -135,7 +137,7 @@
<td>{{ formatLabel(userDetailForm.ISFLOW) }}</td> <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
</tr> </tr>
</table> </table>
<div v-if="false"> <div>
<div class="level-title"> <div class="level-title">
<h1>培训记录</h1> <h1>培训记录</h1>
</div> </div>
@ -183,36 +185,124 @@
<td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td> <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
</tr> </tr>
</table> </table>
<div <div v-if="applyList.length > 0" class="level-title mt-20">
v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0" <h1>申请信息</h1>
class="level-title mt-20">
<h1>打回信息</h1>
</div> </div>
<table <el-table
v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0" v-if="applyList.length > 0"
class="table-ui" :data="applyList"
style="margin-bottom: 20px;"> :header-cell-style="{'font-weight': 'bold','color': '#000'}"
<tr> tooltip-effect="dark"
<th>打回人</th> border
<td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td> fit
<td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_USER_NAME }}</td> highlight-current-row>
<td <el-table-column type="expand">
v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME"> <template slot-scope="props">
{{ detailForm.TERRITORIALITY_USER_NAME }} <el-row>
</td> <el-form label-position="left" inline class="demo-table-expand">
<th>打回原由</th> <el-col :span="5">
<td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td> <el-form-item label="属地管理部门">
<td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_OPINION }}</td> <span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span>
<td </el-form-item>
v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME"> </el-col>
{{ detailForm.TERRITORIALITY_OPINION }} <el-col :span="5">
</td> <el-form-item label="审批人">
</tr> <span>{{ props.row.TERRITORIALITY_USER_NAME }}</span>
</table> </el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="审批结果">
<span v-if="props.row.TERRITORIALITY_STATE === 0">不通过</span>
<span v-if="props.row.TERRITORIALITY_STATE ===1">通过</span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="审批意见">
<span>{{ props.row.TERRITORIALITY_OPINION }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="主管部门">
<span>{{ props.row.MANAGER_DEPARTMENT_NAME }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="审批人">
<span>{{ props.row.MANAGER_USER_NAME }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="审批人">
<span v-if="props.row.MANAGER_STATE === 0">不通过</span>
<span v-if="props.row.MANAGER_STATE ===1">通过</span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="审批意见">
<span>{{ props.row.MANAGER_OPINION }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="主管部门">
<span>{{ props.row.SUPERVISION_DEPARTMENT_NAME }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="审批人">
<span>{{ props.row.SUPERVISION_USER_NAME }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="审批人">
<span v-if="props.row.SUPERVISION_STATE === 0">不通过</span>
<span v-if="props.row.SUPERVISION_STATE ===1">通过</span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="审批意见">
<span>{{ props.row.SUPERVISION_OPINION }}</span>
</el-form-item>
</el-col>
</el-form>
</el-row>
</template>
</el-table-column>
<el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/>
<el-table-column prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/>
<el-table-column prop="TERRITORIALITY_STATE" label="审批结果" align="center">
<template slot-scope="{row}">
<span v-if="row.TERRITORIALITY_STATE === 0">不通过</span>
<span v-if="row.TERRITORIALITY_STATE ===1">通过</span>
</template>
</el-table-column>
<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_STATE" label="审批人" align="center">
<template slot-scope="{row}">
<span v-if="row.MANAGER_STATE === 0">不通过</span>
<span v-if="row.MANAGER_STATE ===1">通过</span>
</template>
</el-table-column>
<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_STATE" label="审批人" align="center">
<template slot-scope="{row}">
<span v-if="row.SUPERVISION_STATE === 0">不通过</span>
<span v-if="row.SUPERVISION_STATE ===1">通过</span>
</template>
</el-table-column>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="visible = false">关 闭</el-button> <el-button @click="visible = false">关 闭</el-button>
</div> </div>
</el-table>
</div> </div>
</el-scrollbar>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取 消</el-button>
</span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -237,14 +327,13 @@ export default {
userDetailForm: {}, userDetailForm: {},
userCardIDPhotoFile: [], // 身份证照片 userCardIDPhotoFile: [], // 身份证照片
trainRecordList: [], trainRecordList: [],
detailForm: {},
photosOfLevel: [], // 三级教育照片 photosOfLevel: [], // 三级教育照片
specialUsersList: {}, specialUsersList: {},
insuranceFileList: [], // 保险文件 insuranceFileList: [], // 保险文件
contractFileList: [], contractFileList: [],
socialPhotoFile: [], socialPhotoFile: [],
gongshangbaoxianFile: [], gongshangbaoxianFile: [],
userEntryForm: {}, applyList: [],
loading: false, loading: false,
heirloom: {}, heirloom: {},
config: config config: config
@ -273,40 +362,27 @@ export default {
CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a' CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
} }
).then((data) => { ).then((data) => {
Object.assign(this.userDetailForm, data.info)
this.loading = false this.loading = false
/* this.userPhotoFile = data.userPhotoFile Object.assign(this.userDetailForm, data.info)
const picture = data.img
this.userPhotoFile = picture.userPhotoFile
if (this.userPhotoFile.length > 0) { if (this.userPhotoFile.length > 0) {
this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
}*/ }
// this.photosOfLevel = data.photosOfLevel this.photosOfLevel = picture.photosOfLevel
// this.specialUsersList = data.specialUsers this.specialUsersList = picture.specialUsers
// this.insuranceFileList = data.insuranceFile this.insuranceFileList = picture.insuranceFile
// this.contractFileList = data.contractFile this.contractFileList = picture.contractFile
// this.userCardIDPhotoFile = data.userCardIDPhotoFile this.userCardIDPhotoFile = picture.userCardIDPhotoFile
// this.socialPhotoFile = data.socialPhotoFile this.socialPhotoFile = picture.socialPhotoFile
// this.gongshangbaoxianFile = data.gongshangbaoxianFile this.gongshangbaoxianFile = picture.gongshangbaoxianFile
// qr内容初始化 if (row.STATUS === '2') {
// if (row.STATUS === '2') { this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID
// this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID } else {
// } else { this.qrCodeStr = ''
// this.qrCodeStr = '' }
// } this.trainRecordList = data.trainRecordList
this.applyList = data.applyList
// requestFN(
// '/user/getFloatPersonDetailById',
// {
// USER_ID: row.USER_ID,
// CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
// }
// ).then((data) => {
// this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
// this.detailForm = Object.assign(this.detailForm, data.userDetail)
// this.trainRecordList = data.recordList
// this.loading = false
// }).catch((e) => {
// console.log(e)
// })
}).catch((e) => { }).catch((e) => {
console.log(e) console.log(e)
}) })
@ -326,3 +402,8 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>
<style scoped>
.information >>> .el-scrollbar__wrap {
overflow-x: hidden;
}
</style>

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

@ -107,6 +107,7 @@
</span> </span>
</el-dialog> </el-dialog>
<user ref="userInfo" append-to-body/> <user ref="userInfo" append-to-body/>
<user-info ref="userInfos" append-to-body/>
</div> </div>
</template> </template>
@ -115,9 +116,11 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次
import { requestFN } from '@/utils/request' import { requestFN } from '@/utils/request'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import user from './user.vue' import user from './user.vue'
import UserInfo from '../flowApply/components/userInfo.vue'
export default { export default {
components: { components: {
UserInfo,
Pagination, user Pagination, user
}, },
data() { data() {
@ -192,28 +195,8 @@ export default {
this.$refs.userInfo.init(row) this.$refs.userInfo.init(row)
}, },
// 查看 // 查看
async handleShow(row) { handleShow(row) {
await this.getUserInfoById(row.USER_ID) this.$refs.userInfos.init(row)
this.userInfoDialog = true
this.heirloom = row
console.log(row.SUPERVISION_STATE, row.MANAGER_STATE, row.TERRITORIALITY_STATE)
if (row.SUPERVISION_STATE === 0 || row.MANAGER_STATE === 0 || row.TERRITORIALITY_STATE === 0) {
if (row.SUPERVISION_STATE === 0) {
this.message = row.SUPERVISION_OPINION
this.operator = row.SUPERVISION_USER_NAME
}
if (row.MANAGER_STATE === 0) {
this.message = row.MANAGER_OPINION
this.operator = row.MANAGER_USER_NAME
}
if (row.TERRITORIALITY_STATE === 0) {
this.message = row.TERRITORIALITY_OPINION
this.operator = row.TERRITORIALITY_USER_NAME
}
} else {
this.message = ''
this.operator = ''
}
}, },
examineShow(row) { examineShow(row) {
this.form.TRAIN_USERS_ID = row.TRAIN_USERS_ID this.form.TRAIN_USERS_ID = row.TRAIN_USERS_ID