Merge branch 'liujun-2023-12-05-相关方需求变更' into 重点工程定位需求
zhaoyu
commit
8e8baa2f6d
|
|
@ -7,23 +7,6 @@
|
|||
<el-input v-model="XGF_NAME" placeholder="相关方名称"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="6">-->
|
||||
<!-- <el-form-item-->
|
||||
<!-- label="培训部门"-->
|
||||
<!-- >-->
|
||||
<!-- <Treeselect-->
|
||||
<!-- :options="treeData"-->
|
||||
<!-- :normalizer="normalizer"-->
|
||||
<!-- v-model="TRAIN_CORP_DEPTS"-->
|
||||
<!-- :multiple="true"-->
|
||||
<!-- :limit="1"-->
|
||||
<!-- placeholder="请选择部门"-->
|
||||
<!-- no-options-text="暂无数据"-->
|
||||
<!-- no-children-text="暂无数据"-->
|
||||
<!-- style="width: 100%;"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<el-col :span="6">
|
||||
<el-form-item label="申请时间">
|
||||
<el-date-picker
|
||||
|
|
@ -37,13 +20,6 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="4">-->
|
||||
<!-- <el-form-item label="申请状态">-->
|
||||
<!-- <el-select v-model="AUDIT_STATUS" placeholder="请选择申请状态" clearable >-->
|
||||
<!-- <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<el-col :span="3">
|
||||
<el-form-item label-width="10px">
|
||||
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
|
||||
|
|
@ -78,38 +54,11 @@
|
|||
<span v-if="row.AUDIT_STATUS === 1">审核中</span>
|
||||
<span v-if="row.AUDIT_STATUS === 2">待培训</span>
|
||||
<span v-if="row.AUDIT_STATUS === 3">已完成</span>
|
||||
<!-- <span v-if="row.AUDIT_STATUS === 0 && row.supervisionCount != row.USER_COUNT && row.territorialityCount == row.USER_COUNT || row.managerCount == row.USER_COUNT ">待审核</span>-->
|
||||
<!-- <span v-if="row.AUDIT_STATUS === 0 && (row.supervisionCount == row.USER_COUNT && row.territorialityCount != row.USER_COUNT || row.managerCount != row.USER_COUNT )">审核中</span>-->
|
||||
<!-- <span v-if="row.AUDIT_STATUS === 0 && (row.supervisionCount == row.USER_COUNT && row.territorialityCount == row.USER_COUNT && row.managerCount == row.USER_COUNT )">已完成</span>-->
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- <el-table-column prop="corpTypeName" label="集团单位" />-->
|
||||
<!-- <el-table-column prop="AUDIT_DEPARTMENT_NAME" label="委托部门" />-->
|
||||
<!-- <el-table-column prop="ENTRUST_TIME" label="委托时间" />-->
|
||||
<!-- <el-table-column prop="RELEVANT_UNIT_NAME" label="相关方单位" />-->
|
||||
<!-- <el-table-column prop="MAIN_DEPARTMENT_NAME" label="股份主管部门" align="center" width="120px"/>-->
|
||||
<!-- <el-table-column prop="SUPERVISE_CORPINFO_NAME" label="基层单位主管公司" align="center" width="120px"/>-->
|
||||
<!-- <el-table-column prop="SUPERVISE_DEPARTMENT_NAME" label="基层单位主管部门" align="center" width="120px"/>-->
|
||||
<!-- <el-table-column prop="CREATTIME" label="申请时间" />-->
|
||||
<!-- <el-table-column prop="CREATOR_NAME" label="申请人员" />-->
|
||||
<!-- <el-table-column prop="TRAIN_AREA_NAME" label="流动范围" />-->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
<!-- <el-table-column prop="AUDIT_STATUS" label="申请状态" >-->
|
||||
<!-- <template slot-scope="{row}">-->
|
||||
<!-- <span v-if="row.AUDIT_STATUS === 0">股份公司待审核</span>-->
|
||||
<!-- <span v-if="row.AUDIT_STATUS === 1">分公司待审核</span>-->
|
||||
<!-- <span v-if="row.AUDIT_STATUS === 2">培训中</span>-->
|
||||
<!-- <span v-if="row.AUDIT_STATUS === 3">培训完成</span>-->
|
||||
<!-- <span v-if="row.AUDIT_STATUS === -1">股份公司审核未通过</span>-->
|
||||
<!-- <span v-if="row.AUDIT_STATUS === -2">分公司审核未通过</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column prop="USER_COUNT" label="批次人数" />-->
|
||||
<el-table-column label="操作" align="center" width="200">
|
||||
<template slot-scope="{row}">
|
||||
<el-button v-if="(row.AUDIT_STATUS === 0 || row.AUDIT_STATUS === -2) && (row.SUPERVISION_USER_ID == USER_ID && row.supervisionCount != row.USER_COUNT ) " type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row)">审核</el-button>
|
||||
<el-button v-if="(row.AUDIT_STATUS === 0 || row.AUDIT_STATUS === -2) && (row.supervisionCount !== row.USER_COUNT ) " type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row)">审核</el-button>
|
||||
<el-button v-else type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">查看</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -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) => {
|
||||
|
|
|
|||
|
|
@ -9,12 +9,6 @@
|
|||
width="60%">
|
||||
<div class="level-title mt-20" style="display: flex;justify-content: space-between;">
|
||||
<h1>申请信息</h1>
|
||||
<!-- <span v-if="pd.AUDIT_STATUS === 0">股份公司待审核</span>-->
|
||||
<!-- <span v-if="pd.AUDIT_STATUS === 1">分公司待审核</span>-->
|
||||
<!-- <span v-if="pd.AUDIT_STATUS === 2">培训中</span>-->
|
||||
<!-- <span v-if="pd.AUDIT_STATUS === 3">培训完成</span>-->
|
||||
<!-- <span v-if="pd.AUDIT_STATUS === -1">股份公司审核未通过</span>-->
|
||||
<!-- <span v-if="pd.AUDIT_STATUS === -2">分公司审核未通过</span>-->
|
||||
</div>
|
||||
<table class="table-ui" style="margin-bottom: 20px;">
|
||||
<tr>
|
||||
|
|
@ -30,7 +24,7 @@
|
|||
<th>安全监督部门</th>
|
||||
<td>{{ pd.SUPERVISION_DEPT_NAME }}</td>
|
||||
<th>审核人员</th>
|
||||
<td>{{ pd.SUPERVISION_USER_USERNAME }}</td>
|
||||
<td>{{ pd.SUPERVISION_USER_NAME }}</td>
|
||||
<th>审核时间</th>
|
||||
<td>{{ pd.SUPERVISION_TIME }}</td>
|
||||
</tr>
|
||||
|
|
@ -38,7 +32,7 @@
|
|||
<th>主管部门</th>
|
||||
<td>{{ pd.MANAGER_DEPT_NAME }}</td>
|
||||
<th>审核人员</th>
|
||||
<td>{{ pd.MANAGER_USER_USERNAME }}</td>
|
||||
<td>{{ pd.MANAGER_USER_NAME }}</td>
|
||||
<th>审核时间</th>
|
||||
<td>{{ pd.MANAGER_TIME }}</td>
|
||||
</tr>
|
||||
|
|
@ -46,7 +40,7 @@
|
|||
<th>管理部门</th>
|
||||
<td>{{ pd.ERRITORIALITY_DEPT_NAME }}</td>
|
||||
<th>审核人员</th>
|
||||
<td>{{ pd.ERRITORIALITY_USER_USERNAME }}</td>
|
||||
<td>{{ pd.ERRITORIALITY_USER_NAME }}</td>
|
||||
<th>审核时间</th>
|
||||
<td>{{ pd.TERRITORIALITY_TIME }}</td>
|
||||
</tr>
|
||||
|
|
@ -59,42 +53,48 @@
|
|||
<div class="level-title">
|
||||
<h1>申请人员列表</h1>
|
||||
</div>
|
||||
<el-table ref="multipleTable" :data="userList" :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="USERNAME" label="用户名" />
|
||||
<el-table-column prop="NAME" label="姓名" />
|
||||
<el-table-column prop="DEPARTMENT_NAME" label="部门" />
|
||||
<!-- <el-table-column prop="STATUS" label="培训状态" >-->
|
||||
<!-- <template slot-scope="{row}">-->
|
||||
<!-- <span v-if="row.STATUS === 0">未培训</span>-->
|
||||
<!-- <span v-if="row.STATUS === 1">培训中</span>-->
|
||||
<!-- <span v-if="row.STATUS === 2">已培训</span>-->
|
||||
<!-- <span v-if="row.STATUS === -1">培训未通过</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column prop="STATUS" label="评审状态" >
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="userList"
|
||||
:header-cell-style="{'font-weight': 'bold','color': '#000'}"
|
||||
:row-class-name="tableRowClassName"
|
||||
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="USERNAME" label="用户名"/>
|
||||
<el-table-column prop="NAME" label="姓名"/>
|
||||
<el-table-column prop="DEPARTMENT_NAME" label="部门"/>
|
||||
<el-table-column prop="STATUS" label="评审状态">
|
||||
<template slot-scope="{row}">
|
||||
<span >{{ getType(row) }}</span>
|
||||
<span>{{ getType(row) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<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"
|
||||
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.SUPERVISION_STATE === 9" type="success" icon="el-icon-edit" size="mini" @click="examineShow(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.SUPERVISION_USER_ID === USER_ID && row.SUPERVISION_STATE === 9 && row.STEP_STATUS === '2') || (row.TERRITORIALITY_USER_ID === USER_ID && row.TERRITORIALITY_STATE === 9 && (row.STEP_STATUS === '0' || !row.STEP_STATUS)))"
|
||||
type="success"
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
@click="examineShow(row)">审核
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="page-btn-group">
|
||||
<div/>
|
||||
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getUserList" />
|
||||
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getUserList"/>
|
||||
</div>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="closeWindow">关 闭</el-button>
|
||||
|
|
@ -159,7 +159,7 @@
|
|||
|
||||
<tr>
|
||||
<th>民族</th>
|
||||
<td>{{ userDetailForm.minzuName? userDetailForm.minzuName:'暂无信息' }}</td>
|
||||
<td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
|
||||
<th>婚姻状况</th>
|
||||
<td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
|
||||
<th>政治面貌</th>
|
||||
|
|
@ -171,9 +171,9 @@
|
|||
|
||||
<tr>
|
||||
<th>户口所在地</th>
|
||||
<td>{{ userDetailForm.HKLOCAL? userDetailForm.HKLOCAL:'暂无信息' }}</td>
|
||||
<td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
|
||||
<th>现住址</th>
|
||||
<td>{{ userDetailForm.ADDRESS? userDetailForm.ADDRESS:'暂无信息' }}</td>
|
||||
<td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
|
||||
<th>联系电话</th>
|
||||
<td>{{ userDetailForm.PHONE }}</td>
|
||||
</tr>
|
||||
|
|
@ -209,7 +209,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<th>是否参加三级安全培训</th>
|
||||
<td >{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
|
||||
<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>
|
||||
|
|
@ -229,17 +229,17 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<th>是否缴纳保险</th>
|
||||
<td >{{ formatLabelBf(userDetailForm.IS_BF) }}</td>
|
||||
<td>{{ formatLabelBf(userDetailForm.IS_BF) }}</td>
|
||||
<th>是否特殊工种</th>
|
||||
<td >{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
|
||||
<td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
|
||||
<th>是否流动人员</th>
|
||||
<td >{{ formatLabel(userDetailForm.ISFLOW) }}</td>
|
||||
<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;" >
|
||||
<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>
|
||||
|
|
@ -259,9 +259,6 @@
|
|||
<td>{{ item.REVIEW_TIME }}</td>
|
||||
<th>有效期</th>
|
||||
<td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
|
||||
|
||||
<!-- <!– <td v-if="!userEntryForm.TRAIN_AREA">暂无</td>–>-->
|
||||
<!-- <!– <td v-else style="color: #04a9f5; cursor: pointer" @click="showQRCode(userEntryForm.USER_ID)">查看</td>–>-->
|
||||
</tr>
|
||||
</table>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
|
|
@ -278,7 +275,7 @@
|
|||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.IS_STATE===0" required label="审批意见">
|
||||
<el-input v-model="form.OPINION" placeholder="这里输入审批意见..." />
|
||||
<el-input v-model="form.OPINION" placeholder="这里输入审批意见..."/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
|
@ -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'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.el-table .warning-row {
|
||||
background: oldlace;
|
||||
}
|
||||
|
||||
.el-table .success-row {
|
||||
background: #f0f9eb;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
Loading…
Reference in New Issue