diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue index 79f9018..7f497ec 100644 --- a/src/views/xgf/flowApply/components/userInfo.vue +++ b/src/views/xgf/flowApply/components/userInfo.vue @@ -6,213 +6,303 @@ :visible.sync="visible" :append-to-body="true" title="查看" - width="60%"> - -
-

人员信息

-
- - - - - - - - - - - - - - - - - - - - - - - + width="80%"> +
+ +
照片 - -
- - - -
- - - 		姓名{{ userDetailForm.NAME }}性别{{ userDetailForm.SEX === '0' ? '男' : '女' }}
出生年月{{ userDetailForm.DATE_OF_BIRTH }}年龄{{ userDetailForm.AGE }}手机号{{ userDetailForm.PHONE }}
身份证{{ userDetailForm.CARD_ID }}身份证照片 - -
- - - -
- -
+
+

人员信息

+
+ + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
照片 + +
+ + + +
+ + + 		姓名{{ userDetailForm.NAME }}性别{{ userDetailForm.SEX === '0' ? '男' : '女' }}
出生年月{{ userDetailForm.DATE_OF_BIRTH }}年龄{{ userDetailForm.AGE }}手机号{{ userDetailForm.PHONE }}
身份证{{ userDetailForm.CARD_ID }}身份证照片 + +
+ + + +
+ +
民族{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}婚姻状况{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}政治面貌{{ userDetailForm.zzName }} {{ - userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : '' - }} -
民族{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}婚姻状况{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}政治面貌{{ userDetailForm.zzName }} {{ + userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : '' + }} +
户口所在地{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}现住址{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}联系电话{{ userDetailForm.PHONE }}
文化程度{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}岗位名称(工种){{ userDetailForm.POST_ID }}
是否缴纳社保{{ formatLabel(userDetailForm.IS_SOCIAL) }}社会保障号码{{ userDetailForm.SOCIAL_NUMBER }}社保卡照片 - -
- - - +
户口所在地{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}现住址{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}联系电话{{ userDetailForm.PHONE }}
文化程度{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}岗位名称(工种){{ userDetailForm.POST_ID }}
是否缴纳社保{{ formatLabel(userDetailForm.IS_SOCIAL) }}社会保障号码{{ userDetailForm.SOCIAL_NUMBER }}社保卡照片 + +
+ + + +
+ +
是否参加三级安全培训{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}三级安全培训照片 + +
+ + + +
+ +
是否缴纳保险{{ formatLabel(userDetailForm.IS_BF) }}是否特殊工种{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}是否流动人员{{ formatLabel(userDetailForm.ISFLOW) }}
+
+
+

培训记录

+
+ + + + + + + + + + + +
+

特种作业人员信息

+
+ + + + + + + + + + + + + + + + + + + + + +
证书名称{{ item.CERTIFICATE }}作业类别{{ item.SPECIAL_TYPE_NAME }}操作项目{{ item.OPERATION_TYPE_NAME }}
特种作业证书编号{{ item.SPECIAL_NUMBER }}发证机关{{ item.ISSUING_AUTHORITY }}
复审时间{{ item.REVIEW_TIME }}有效期{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}
+
+

申请信息

+
+ + + + + + + + + + + + + + + + + + + +
+ 关 闭
- - - - - 是否参加三级安全培训 - {{ formatLabel(userDetailForm.IS_LEVEL_THREE) }} - 三级安全培训照片 - - -
- - - -
- - - - - 是否缴纳保险 - {{ formatLabel(userDetailForm.IS_BF) }} - 是否特殊工种 - {{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }} - 是否流动人员 - {{ formatLabel(userDetailForm.ISFLOW) }} - - -
-
-

培训记录

-
- - - - - - - - - - - -
-

特种作业人员信息

-
- - - - - - - - - - - - - - - - - - - - - -
证书名称{{ item.CERTIFICATE }}作业类别{{ item.SPECIAL_TYPE_NAME }}操作项目{{ item.OPERATION_TYPE_NAME }}
特种作业证书编号{{ item.SPECIAL_NUMBER }}发证机关{{ item.ISSUING_AUTHORITY }}
复审时间{{ item.REVIEW_TIME }}有效期{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}
-
-

打回信息

-
- - - - - - - - - - - -
打回人{{ detailForm.SUPERVISION_USER_NAME }}{{ detailForm.MANAGER_USER_NAME }} - {{ detailForm.TERRITORIALITY_USER_NAME }} - 打回原由{{ detailForm.SUPERVISION_OPINION }}{{ detailForm.MANAGER_OPINION }} - {{ detailForm.TERRITORIALITY_OPINION }} -
-
- 关 闭 -
+ +
+
+ + 取 消 + @@ -237,14 +327,13 @@ export default { userDetailForm: {}, userCardIDPhotoFile: [], // 身份证照片 trainRecordList: [], - detailForm: {}, photosOfLevel: [], // 三级教育照片 specialUsersList: {}, insuranceFileList: [], // 保险文件 contractFileList: [], socialPhotoFile: [], gongshangbaoxianFile: [], - userEntryForm: {}, + applyList: [], loading: false, heirloom: {}, config: config @@ -273,40 +362,27 @@ export default { CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a' } ).then((data) => { - Object.assign(this.userDetailForm, data.info) 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) { this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH - }*/ - // this.photosOfLevel = data.photosOfLevel - // this.specialUsersList = data.specialUsers - // this.insuranceFileList = data.insuranceFile - // this.contractFileList = data.contractFile - // this.userCardIDPhotoFile = data.userCardIDPhotoFile - // this.socialPhotoFile = data.socialPhotoFile - // this.gongshangbaoxianFile = data.gongshangbaoxianFile - // qr内容初始化 - // if (row.STATUS === '2') { - // this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID - // } else { - // this.qrCodeStr = '' - // } - - // 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) - // }) + } + this.photosOfLevel = picture.photosOfLevel + this.specialUsersList = picture.specialUsers + this.insuranceFileList = picture.insuranceFile + this.contractFileList = picture.contractFile + this.userCardIDPhotoFile = picture.userCardIDPhotoFile + this.socialPhotoFile = picture.socialPhotoFile + this.gongshangbaoxianFile = picture.gongshangbaoxianFile + if (row.STATUS === '2') { + this.qrCodeStr = config.messageUrl + '?USER_ID=' + row.USER_ID + } else { + this.qrCodeStr = '' + } + this.trainRecordList = data.trainRecordList + this.applyList = data.applyList }).catch((e) => { console.log(e) }) @@ -326,3 +402,8 @@ export default { + diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue index 0205575..d2d3aa5 100644 --- a/src/views/xgf/flow_audit/users.vue +++ b/src/views/xgf/flow_audit/users.vue @@ -107,6 +107,7 @@ + @@ -115,9 +116,11 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次 import { requestFN } from '@/utils/request' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import user from './user.vue' +import UserInfo from '../flowApply/components/userInfo.vue' export default { components: { + UserInfo, Pagination, user }, data() { @@ -192,28 +195,8 @@ export default { this.$refs.userInfo.init(row) }, // 查看 - async handleShow(row) { - await this.getUserInfoById(row.USER_ID) - 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 = '' - } + handleShow(row) { + this.$refs.userInfos.init(row) }, examineShow(row) { this.form.TRAIN_USERS_ID = row.TRAIN_USERS_ID