diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue index 4fece0d..7093da1 100644 --- a/src/views/xgf/flow_audit/index.vue +++ b/src/views/xgf/flow_audit/index.vue @@ -7,23 +7,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -78,38 +54,11 @@ 审核中 待培训 已完成 - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -200,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) => { diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue index ba4f78f..1a5cbe0 100644 --- a/src/views/xgf/flow_audit/users.vue +++ b/src/views/xgf/flow_audit/users.vue @@ -9,12 +9,6 @@ width="60%">

申请信息

- - - - - -
@@ -30,7 +24,7 @@ - + @@ -38,7 +32,7 @@ - + @@ -46,7 +40,7 @@ - + @@ -59,42 +53,48 @@

申请人员列表

- - - - - - - - - - - - - - - + + + + + + +
- +
关 闭 @@ -159,7 +159,7 @@
- + @@ -171,9 +171,9 @@ - + - + @@ -209,7 +209,7 @@ - + - + - + - +
安全监督部门 {{ pd.SUPERVISION_DEPT_NAME }} 审核人员{{ pd.SUPERVISION_USER_USERNAME }}{{ pd.SUPERVISION_USER_NAME }} 审核时间 {{ pd.SUPERVISION_TIME }}
主管部门 {{ pd.MANAGER_DEPT_NAME }} 审核人员{{ pd.MANAGER_USER_USERNAME }}{{ pd.MANAGER_USER_NAME }} 审核时间 {{ pd.MANAGER_TIME }}
管理部门 {{ pd.ERRITORIALITY_DEPT_NAME }} 审核人员{{ pd.ERRITORIALITY_USER_USERNAME }}{{ pd.ERRITORIALITY_USER_NAME }} 审核时间 {{ pd.TERRITORIALITY_TIME }}
民族{{ userDetailForm.minzuName? userDetailForm.minzuName:'暂无信息' }}{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }} 婚姻状况 {{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }} 政治面貌
户口所在地{{ userDetailForm.HKLOCAL? userDetailForm.HKLOCAL:'暂无信息' }}{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }} 现住址{{ userDetailForm.ADDRESS? userDetailForm.ADDRESS:'暂无信息' }}{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }} 联系电话 {{ userDetailForm.PHONE }}
是否参加三级安全培训{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }} 三级安全培训照片 @@ -229,17 +229,17 @@
是否缴纳保险{{ formatLabelBf(userDetailForm.IS_BF) }}{{ formatLabelBf(userDetailForm.IS_BF) }} 是否特殊工种{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }} 是否流动人员{{ formatLabel(userDetailForm.ISFLOW) }}{{ formatLabel(userDetailForm.ISFLOW) }}

特种作业人员信息

- +
@@ -259,9 +259,6 @@ - - -
证书名称 {{ item.CERTIFICATE }}{{ item.REVIEW_TIME }} 有效期 {{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}
@@ -278,7 +275,7 @@ - + @@ -297,6 +294,7 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次 import { requestFN } from '@/utils/request' import user from './user.vue' import '@riophae/vue-treeselect/dist/vue-treeselect.css' + export default { components: { Pagination, user @@ -304,6 +302,7 @@ export default { data() { return { config: config, + USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID, userInfoDialog: false, userDetailForm: {}, imgUrl: '', @@ -325,6 +324,7 @@ export default { dialogVisible: false, form: { TRAINUSERS_ID: '', // 培训批次 详情id + TRAININGBATCH_ID: '', USER_COUNT: '', // 批次的人数 type: '', IS_STATE: 1, @@ -421,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() { @@ -519,7 +520,22 @@ export default { !(row.SUPERVISION_STATE === 0 || row.MANAGER_STATE === 0 || row.TERRITORIALITY_STATE === 0)) { return '评审中' } + }, + tableRowClassName({ row, rowIndex }) { + if (row.STEP_STATUS === '3') { + return 'warning-row' + } } } } + + diff --git a/static/config.js b/static/config.js index 3d83370..893aca5 100644 --- a/static/config.js +++ b/static/config.js @@ -1,6 +1,6 @@ const config = { weburl: 'http://192.168.0.45:8082/', // 前台地址 - httpurl: 'http://192.168.151.43:8092/', // 后台地址 + httpurl: 'http://192.168.151.56:8092/', // 后台地址 qyurl: 'http://192.168.0.45:8080/', // 企业前台 fileUrl: 'http://192.168.192.201:8991/file/',// 附件服务器地址 publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',