Merge remote-tracking branch 'origin/liujun-2023-12-05-相关方需求变更' into 相关方关联分公司功能
zhaoyu
commit
8d6d5d532d
|
|
@ -33,7 +33,11 @@
|
|||
>
|
||||
<div style="display:flex;justify-content: space-between;align-items: flex-start;">
|
||||
<el-select v-model="form.TERRITORIALITY_USER_ID">
|
||||
<el-option v-for="item in companyUserList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
|
||||
<el-option
|
||||
v-for="item in companyUserList"
|
||||
:key="item.USER_ID"
|
||||
:label="item.NAME"
|
||||
:value="item.USER_ID"/>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
|
@ -67,7 +71,11 @@
|
|||
>
|
||||
<div style="display:flex;justify-content: space-between;align-items: flex-start;">
|
||||
<el-select v-model="form.MANAGER_USER_ID">
|
||||
<el-option v-for="item in managercompanyUserList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
|
||||
<el-option
|
||||
v-for="item in managercompanyUserList"
|
||||
:key="item.USER_ID"
|
||||
:label="item.NAME"
|
||||
:value="item.USER_ID"/>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
|
@ -126,6 +134,7 @@
|
|||
import { requestFN } from '@/utils/request'
|
||||
import Treeselect from '@riophae/vue-treeselect'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
|
||||
export default {
|
||||
components: {
|
||||
Treeselect
|
||||
|
|
@ -179,7 +188,6 @@ export default {
|
|||
* 根据集团单位 找到 对应的 企业id
|
||||
*/
|
||||
await this.getCorpinfo()
|
||||
|
||||
},
|
||||
getCorpinfo() {
|
||||
requestFN(
|
||||
|
|
@ -223,16 +231,8 @@ export default {
|
|||
this.getRegulatoryUserList(this.form.SUPERVISION)
|
||||
this.getmanagerUserList(this.corpinfo.MAIN_DEPARTMENT)
|
||||
}).catch((e) => {
|
||||
console.log(e)
|
||||
})
|
||||
// if(this.corpinfo.MAIN_DEPARTMENT){ fcb67bc02de54a0abd18e91f29dd4690
|
||||
// requestFN(
|
||||
// '/regulatoryApi/department/listTree',
|
||||
// { CORPINFO_ID: this.corpinfo.MAIN_DEPARTMENT }
|
||||
// ).then((data) => {
|
||||
// this.companyTreeData = JSON.parse(data.zTreeNodes)
|
||||
// }).catch((e) => {
|
||||
// })
|
||||
// }
|
||||
|
||||
if (this.jituanDanwei) {
|
||||
requestFN(
|
||||
|
|
@ -272,7 +272,7 @@ export default {
|
|||
requestFN(
|
||||
'/regulatoryApi/user/listAll',
|
||||
{
|
||||
DEPARTMENT_ID: DEPARTMENT_ID,
|
||||
DEPARTMENT_ID: DEPARTMENT_ID
|
||||
}
|
||||
).then((data) => {
|
||||
this.managercompanyUserList = data.userList
|
||||
|
|
|
|||
|
|
@ -26,17 +26,19 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
</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 :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center"/>
|
||||
<el-table-column type="index" label="序号" width="50" align="center"/>
|
||||
<el-table-column prop="USERNAME" label="用户名" align="center"/>
|
||||
<el-table-column prop="NAME" label="姓名" align="center"/>
|
||||
<el-table-column prop="DEPARTMENT_NAME" label="部门" align="center"/>
|
||||
<!-- <el-table-column prop="TRAIN_DATE" label="年份" align="center" >-->
|
||||
<!-- <template slot-scope="{row}">-->
|
||||
<!-- {{ row.TRAIN_DATE ? new Date(row.TRAIN_DATE).getFullYear() : '' }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column prop="STATUS" label="培训状态" align="center">
|
||||
<template slot-scope="{row}">
|
||||
<span v-if="row.STATUS === 0">未培训</span>
|
||||
|
|
@ -55,7 +57,13 @@
|
|||
<el-table-column label="操作" align="center" width="300">
|
||||
<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'" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
|
||||
<el-button
|
||||
v-if="row.STATUS === 2 && row.TRAIN_STATUS === '1'"
|
||||
type="success"
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
@click="getUserInfo(row)">电子合格证
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -152,26 +160,6 @@
|
|||
<th>岗位名称(工种)</th>
|
||||
<td colspan="5">{{ userDetailForm.POST_ID }}</td>
|
||||
</tr>
|
||||
<!-- <tr>-->
|
||||
<!-- <th>是否签订劳动合同</th>-->
|
||||
<!-- <td :colspan="userDetailForm.IS_SIGN_LABOR === '1' ? '' : 5">-->
|
||||
<!-- {{ formatLabel(userDetailForm.IS_SIGN_LABOR) }}-->
|
||||
<!-- </td>-->
|
||||
<!-- <th v-if="userDetailForm.IS_SIGN_LABOR === '1'">劳动合同附件</th>-->
|
||||
<!-- <td v-if="userDetailForm.IS_SIGN_LABOR === '1'" colspan="3">-->
|
||||
<!-- <span>-->
|
||||
<!-- <viewer>-->
|
||||
<!-- <img-->
|
||||
<!-- v-for="item in contractFileList"-->
|
||||
<!-- :src="config.fileUrl + item.FILEPATH"-->
|
||||
<!-- :key="item.IMGFILES_ID"-->
|
||||
<!-- width="40"-->
|
||||
<!-- height="40"-->
|
||||
<!-- style="object-fit: cover;">-->
|
||||
<!-- </viewer>-->
|
||||
<!-- </span>-->
|
||||
<!-- </td>-->
|
||||
<!-- </tr>-->
|
||||
<tr>
|
||||
<th>是否缴纳社保</th>
|
||||
<td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
|
||||
|
|
@ -193,24 +181,6 @@
|
|||
</div>
|
||||
</span>
|
||||
</td>
|
||||
<!-- <th>社会保障号码</th>-->
|
||||
<!-- <td>{{ userDetailForm.SOCIAL_NUMBER }}</td>-->
|
||||
<!-- <th>社保卡照片</th>-->
|
||||
<!-- <td v-if="socialPhotoFile.length>0" colspan="5">-->
|
||||
<!-- <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>
|
||||
|
|
@ -232,48 +202,6 @@
|
|||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<!-- <tr>-->
|
||||
<!-- <th>是否按期缴纳工伤保险</th>-->
|
||||
<!-- <td :colspan="userDetailForm.IS_INJURIES_PAY === '1' ? '':5">{{ formatLabel(userDetailForm.IS_INJURIES_PAY) }}</td>-->
|
||||
<!-- <th v-if="userDetailForm.IS_INJURIES_PAY === '1'">工伤保险有效期</th>-->
|
||||
<!-- <td v-if="userDetailForm.IS_INJURIES_PAY === '1'">{{ userDetailForm.IS_INJURIES_PAY_TIME }}</td>-->
|
||||
<!-- <th v-if="userDetailForm.IS_INJURIES_PAY === '1'">工伤保险凭证</th>-->
|
||||
<!-- <td v-if="userDetailForm.IS_INJURIES_PAY === '1'">-->
|
||||
<!-- <span>-->
|
||||
<!-- <viewer>-->
|
||||
<!-- <img-->
|
||||
<!-- v-for="item in gongshangbaoxianFile"-->
|
||||
<!-- :src="config.fileUrl + item.FILEPATH"-->
|
||||
<!-- :key="item.IMGFILES_ID"-->
|
||||
<!-- width="40"-->
|
||||
<!-- height="40"-->
|
||||
<!-- style="object-fit: cover;">-->
|
||||
<!-- </viewer>-->
|
||||
<!-- </span>-->
|
||||
<!-- </td>-->
|
||||
<!-- </tr>-->
|
||||
<!-- <tr>-->
|
||||
<!-- <th>是否缴纳商业保险</th>-->
|
||||
<!-- <td :colspan="userDetailForm.ISPAY === '1' ? '' : 5">-->
|
||||
<!-- {{ formatLabel(userDetailForm.ISPAY) }}-->
|
||||
<!-- </td>-->
|
||||
<!-- <th v-if="userDetailForm.ISPAY === '1'">商业保险附件</th>-->
|
||||
<!-- <td v-if="userDetailForm.ISPAY === '1'">-->
|
||||
<!-- <span>-->
|
||||
<!-- <viewer>-->
|
||||
<!-- <img-->
|
||||
<!-- v-for="item in insuranceFileList"-->
|
||||
<!-- :src="config.fileUrl + item.FILEPATH"-->
|
||||
<!-- :key="item.IMGFILES_ID"-->
|
||||
<!-- width="40"-->
|
||||
<!-- height="40"-->
|
||||
<!-- style="object-fit: cover;">-->
|
||||
<!-- </viewer>-->
|
||||
<!-- </span>-->
|
||||
<!-- </td>-->
|
||||
<!-- <th v-if="userDetailForm.ISPAY === '1'">商业保险单号</th>-->
|
||||
<!-- <td v-if="userDetailForm.ISPAY === '1'">{{ userDetailForm.ISPAY_NUMBER }}</td>-->
|
||||
<!-- </tr>-->
|
||||
<tr>
|
||||
<th>是否缴纳保险</th>
|
||||
<td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
|
||||
|
|
@ -282,15 +210,17 @@
|
|||
<th>是否流动人员</th>
|
||||
<td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
|
||||
</tr>
|
||||
<!-- <tr>-->
|
||||
<!-- <th>身体状况是否适应本岗位工作</th>-->
|
||||
<!-- <td colspan="5">{{ formatLabel(userDetailForm.IS_BODY_ADAPT) }}</td>-->
|
||||
<!-- </tr>-->
|
||||
</table>
|
||||
<div class="level-title">
|
||||
<h1>培训记录</h1>
|
||||
</div>
|
||||
<el-table :data="trainRecordList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
|
||||
<el-table
|
||||
:data="trainRecordList"
|
||||
: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="CLASS_NAME" label="班级名称" align="center"/>
|
||||
|
|
@ -303,10 +233,6 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- <div v-if="detailForm.STATUS === 2" class="level-title mt-20">-->
|
||||
<!-- <h1>电子入场证</h1>-->
|
||||
<!-- </div>-->
|
||||
<!-- <table v-if="detailForm.STATUS === 2" class="table-ui" style="margin-bottom: 20px;" >-->
|
||||
<div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
|
||||
<h1>特种作业人员信息</h1>
|
||||
</div>
|
||||
|
|
@ -330,24 +256,32 @@
|
|||
<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 v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0" class="level-title mt-20">
|
||||
<div
|
||||
v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
|
||||
class="level-title mt-20">
|
||||
<h1>打回信息</h1>
|
||||
</div>
|
||||
<table v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0" class="table-ui" style="margin-bottom: 20px;" >
|
||||
<table
|
||||
v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
|
||||
class="table-ui"
|
||||
style="margin-bottom: 20px;">
|
||||
<tr>
|
||||
<th>打回人</th>
|
||||
<td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td>
|
||||
<td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_USER_NAME }}</td>
|
||||
<td v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">{{ detailForm.TERRITORIALITY_USER_NAME }}</td>
|
||||
<td
|
||||
v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
|
||||
{{ detailForm.TERRITORIALITY_USER_NAME }}
|
||||
</td>
|
||||
<th>打回原由</th>
|
||||
<td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td>
|
||||
<td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_OPINION }}</td>
|
||||
<td v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">{{ detailForm.TERRITORIALITY_OPINION }}</td>
|
||||
<td
|
||||
v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
|
||||
{{ detailForm.TERRITORIALITY_OPINION }}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
|
|
@ -374,6 +308,7 @@ import vueQr from 'vue-qr'
|
|||
import apply from './apply'
|
||||
import dateformat from '@/utils/dateformat'
|
||||
import user from './user.vue'
|
||||
|
||||
export default {
|
||||
components: { Pagination, apply, vueQr, user },
|
||||
directives: { waves },
|
||||
|
|
@ -406,7 +341,10 @@ export default {
|
|||
total: 0,
|
||||
varList: [],
|
||||
KEYWORDS: '',
|
||||
statusList: [{ value: 0, label: '未培训' }, { value: 1, label: '培训中' }, { value: 2, label: '已培训(合格)' }, { value: 3, label: '已培训(不合格)' }, { value: 9, label: '申请中' }],
|
||||
statusList: [{ value: 0, label: '未培训' }, { value: 1, label: '培训中' }, {
|
||||
value: 2,
|
||||
label: '已培训(合格)'
|
||||
}, { value: 3, label: '已培训(不合格)' }, { value: 9, label: '申请中' }],
|
||||
STATUS: '',
|
||||
add: false, // 新增按钮
|
||||
del: false, // 删除按钮
|
||||
|
|
@ -569,7 +507,9 @@ export default {
|
|||
|
||||
var users = []
|
||||
_selectData.map(item => {
|
||||
if (item.STATUS === 0) { users.push(item.USER_ID) }
|
||||
if (item.STATUS === 0) {
|
||||
users.push(item.USER_ID)
|
||||
}
|
||||
})
|
||||
|
||||
if (users == null || users.length == 0) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue