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

Merge remote-tracking branch 'origin/liujun-2023-12-05-相关方需求变更' into 相关方关联分公司功能

1212-八项作业迁移
zhaoyu 2023-12-11 18:02:27 +08:00
parent 22aaedeb7c b3e7621d75
commit 8d6d5d532d
3 changed files with 85 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/PersonManager/depart/components/edit.vue
View File

@ -60,8 +60,8 @@
<td>{{ dataForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td> <td>{{ dataForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
<th>政治面貌</th> <th>政治面貌</th>
<td>{{ dataForm.zzName }} {{ <td>{{ dataForm.zzName }} {{
dataForm.zzName == '中共党员' ? '入党时间' + dataForm.POLITICAL_TIME : '' dataForm.zzName == '中共党员' ? '入党时间' + dataForm.POLITICAL_TIME : ''
}} }}
</td> </td>
</tr> </tr>

48
src/views/train/apply/components/apply.vue
View File

@ -33,7 +33,11 @@
> >
<div style="display:flex;justify-content: space-between;align-items: flex-start;"> <div style="display:flex;justify-content: space-between;align-items: flex-start;">
<el-select v-model="form.TERRITORIALITY_USER_ID"> <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> </el-select>
</div> </div>
</el-form-item> </el-form-item>
@ -67,7 +71,11 @@
> >
<div style="display:flex;justify-content: space-between;align-items: flex-start;"> <div style="display:flex;justify-content: space-between;align-items: flex-start;">
<el-select v-model="form.MANAGER_USER_ID"> <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> </el-select>
</div> </div>
</el-form-item> </el-form-item>
@ -109,7 +117,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input :rows="3" v-model="form.DESCR" type="textarea" placeholder="这里输入备注..." /> <el-input :rows="3" v-model="form.DESCR" type="textarea" placeholder="这里输入备注..."/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -126,6 +134,7 @@
import { requestFN } from '@/utils/request' import { requestFN } from '@/utils/request'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default { export default {
components: { components: {
Treeselect Treeselect
@ -142,11 +151,11 @@ export default {
loading: false, loading: false,
treeData: [], treeData: [],
companyTreeData: [], companyTreeData: [],
corpinfo:{}, corpinfo: {},
userList: [], userList: [],
companyUserList: [], companyUserList: [],
managercompanyUserList: [], managercompanyUserList: [],
jituanDanwei : '', jituanDanwei: '',
jituanDanweiTreeData: [], jituanDanweiTreeData: [],
normalizer(node) { normalizer(node) {
return { return {
@ -179,13 +188,12 @@ export default {
* 根据集团单位 找到 对应的 企业id * 根据集团单位 找到 对应的 企业id
*/ */
await this.getCorpinfo() await this.getCorpinfo()
}, },
getCorpinfo(){ getCorpinfo() {
requestFN( requestFN(
'/corpinfo/getDataForEditByCorpInfoId', '/corpinfo/getDataForEditByCorpInfoId',
{ {
CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID, CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
tm: new Date().getTime() tm: new Date().getTime()
} }
).then((data) => { ).then((data) => {
@ -195,16 +203,16 @@ export default {
// 河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5 // 河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5
// 方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2 // 方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2
if (data.pd.CORP_TYPE =='jtdw002'){ if (data.pd.CORP_TYPE == 'jtdw002') {
this.jituanDanwei = '1e6dbbe16004402f8d2c0e52afd9a676' this.jituanDanwei = '1e6dbbe16004402f8d2c0e52afd9a676'
} }
if (data.pd.CORP_TYPE =='jtdw003'){ if (data.pd.CORP_TYPE == 'jtdw003') {
this.jituanDanwei = '3a854eefa7894e06aaa1a2611bca80f6' this.jituanDanwei = '3a854eefa7894e06aaa1a2611bca80f6'
} }
if (data.pd.CORP_TYPE =='jtdw004'){ if (data.pd.CORP_TYPE == 'jtdw004') {
this.jituanDanwei = '020578a4c1f04bc692ee25145c2efbe5' this.jituanDanwei = '020578a4c1f04bc692ee25145c2efbe5'
} }
if (data.pd.CORP_TYPE =='jtdw005'){ if (data.pd.CORP_TYPE == 'jtdw005') {
this.jituanDanwei = '90966974de3c4b83aca6f8fd6432d5c2' this.jituanDanwei = '90966974de3c4b83aca6f8fd6432d5c2'
} }
this.getTreeData() this.getTreeData()
@ -223,18 +231,10 @@ export default {
this.getRegulatoryUserList(this.form.SUPERVISION) this.getRegulatoryUserList(this.form.SUPERVISION)
this.getmanagerUserList(this.corpinfo.MAIN_DEPARTMENT) this.getmanagerUserList(this.corpinfo.MAIN_DEPARTMENT)
}).catch((e) => { }).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){ if (this.jituanDanwei) {
requestFN( requestFN(
'/companyApi/department/listTree', '/companyApi/department/listTree',
{ CORPINFO_ID: this.jituanDanwei } { CORPINFO_ID: this.jituanDanwei }
@ -272,7 +272,7 @@ export default {
requestFN( requestFN(
'/regulatoryApi/user/listAll', '/regulatoryApi/user/listAll',
{ {
DEPARTMENT_ID: DEPARTMENT_ID, DEPARTMENT_ID: DEPARTMENT_ID
} }
).then((data) => { ).then((data) => {
this.managercompanyUserList = data.userList this.managercompanyUserList = data.userList

178
src/views/train/apply/components/list.vue
View File

@ -10,7 +10,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="培训状态"> <el-form-item label="培训状态">
<el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable> <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -26,17 +26,19 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </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
<el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center" /> ref="multipleTable"
<el-table-column type="index" label="序号" width="50" align="center" /> :data="varList"
<el-table-column prop="USERNAME" label="用户名" align="center" /> :header-cell-style="{'font-weight': 'bold','color': '#000'}"
<el-table-column prop="NAME" label="姓名" align="center" /> tooltip-effect="dark"
<el-table-column prop="DEPARTMENT_NAME" label="部门" align="center" /> border
<!-- <el-table-column prop="TRAIN_DATE" label="年份" align="center" >--> fit
<!-- <template slot-scope="{row}">--> highlight-current-row>
<!-- {{ row.TRAIN_DATE ? new Date(row.TRAIN_DATE).getFullYear() : '' }}--> <el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center"/>
<!-- </template>--> <el-table-column type="index" label="序号" width="50" align="center"/>
<!-- </el-table-column>--> <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="STATUS" label="培训状态" align="center"> <el-table-column prop="STATUS" label="培训状态" align="center">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.STATUS === 0">未培训</span> <span v-if="row.STATUS === 0">未培训</span>
@ -55,7 +57,13 @@
<el-table-column label="操作" align="center" width="300"> <el-table-column label="操作" align="center" width="300">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button> <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -64,7 +72,7 @@
<el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">培训申请</el-button> <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">培训申请</el-button>
<el-button type="success" icon="el-icon-finished" plain @click="showRecord">申请记录</el-button> <el-button type="success" icon="el-icon-finished" plain @click="showRecord">申请记录</el-button>
</div> </div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
</div> </div>
<apply ref="apply" :corp-info="SUPERVISE_CORPINFO_ID" @finish="getQuery"/> <apply ref="apply" :corp-info="SUPERVISE_CORPINFO_ID" @finish="getQuery"/>
@ -152,26 +160,6 @@
<th>岗位名称(工种)</th> <th>岗位名称(工种)</th>
<td colspan="5">{{ userDetailForm.POST_ID }}</td> <td colspan="5">{{ userDetailForm.POST_ID }}</td>
</tr> </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> <tr>
<th>是否缴纳社保</th> <th>是否缴纳社保</th>
<td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td> <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
@ -193,24 +181,6 @@
</div> </div>
</span> </span>
</td> </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>
<tr> <tr>
<th>是否参加三级安全培训</th> <th>是否参加三级安全培训</th>
@ -232,67 +202,27 @@
</span> </span>
</td> </td>
</tr> </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> <tr>
<th>是否缴纳保险</th> <th>是否缴纳保险</th>
<td >{{ formatLabel(userDetailForm.IS_BF) }}</td> <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
<th>是否特殊工种</th> <th>是否特殊工种</th>
<td >{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td> <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
<th>是否流动人员</th> <th>是否流动人员</th>
<td >{{ formatLabel(userDetailForm.ISFLOW) }}</td> <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
</tr> </tr>
<!-- <tr>-->
<!-- <th>身体状况是否适应本岗位工作</th>-->
<!-- <td colspan="5">{{ formatLabel(userDetailForm.IS_BODY_ADAPT) }}</td>-->
<!-- </tr>-->
</table> </table>
<div class="level-title"> <div class="level-title">
<h1>培训记录</h1> <h1>培训记录</h1>
</div> </div>
<el-table :data="trainRecordList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row> <el-table
<el-table-column type="selection" width="55" align="center" /> :data="trainRecordList"
<el-table-column type="index" label="序号" width="50" align="center" /> :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"/> <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
<el-table-column prop="OPENING_TIME" label="开班时间" align="center"/> <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
<el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/> <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
@ -303,14 +233,10 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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"> <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
<h1>特种作业人员信息</h1> <h1>特种作业人员信息</h1>
</div> </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> <tr>
<th style="width: 150px">证书名称</th> <th style="width: 150px">证书名称</th>
<td style="width: 150px">{{ item.CERTIFICATE }}</td> <td style="width: 150px">{{ item.CERTIFICATE }}</td>
@ -330,24 +256,32 @@
<td>{{ item.REVIEW_TIME }}</td> <td>{{ item.REVIEW_TIME }}</td>
<th>有效期</th> <th>有效期</th>
<td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td> <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
<!-- &lt;!&ndash; <td v-if="!userEntryForm.TRAIN_AREA">暂无</td>&ndash;&gt;-->
<!-- &lt;!&ndash; <td v-else style="color: #04a9f5; cursor: pointer" @click="showQRCode(userEntryForm.USER_ID)">查看</td>&ndash;&gt;-->
</tr> </tr>
</table> </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> <h1>打回信息</h1>
</div> </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> <tr>
<th>打回人</th> <th>打回人</th>
<td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td> <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.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> <th>打回原由</th>
<td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td> <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.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> </tr>
</table> </table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -356,7 +290,7 @@
</el-dialog> </el-dialog>
<el-dialog :visible.sync="QRCodeDialog" title="查看二维码" width="680px" class="top-dialog"> <el-dialog :visible.sync="QRCodeDialog" title="查看二维码" width="680px" class="top-dialog">
<div class="table-qrcode" style="text-align: center;padding-top: 30px;"> <div class="table-qrcode" style="text-align: center;padding-top: 30px;">
<vue-qr :text="qrcodeStr" :margin="0" :size="300" color-dark="#000" color-light="#fff" /> <vue-qr :text="qrcodeStr" :margin="0" :size="300" color-dark="#000" color-light="#fff"/>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="QRCodeDialog = false">关 闭</el-button> <el-button @click="QRCodeDialog = false">关 闭</el-button>
@ -374,6 +308,7 @@ import vueQr from 'vue-qr'
import apply from './apply' import apply from './apply'
import dateformat from '@/utils/dateformat' import dateformat from '@/utils/dateformat'
import user from './user.vue' import user from './user.vue'
export default { export default {
components: { Pagination, apply, vueQr, user }, components: { Pagination, apply, vueQr, user },
directives: { waves }, directives: { waves },
@ -406,7 +341,10 @@ export default {
total: 0, total: 0,
varList: [], varList: [],
KEYWORDS: '', 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: '', STATUS: '',
add: false, // 新增按钮 add: false, // 新增按钮
del: false, // 删除按钮 del: false, // 删除按钮
@ -569,7 +507,9 @@ export default {
var users = [] var users = []
_selectData.map(item => { _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) { if (users == null || users.length == 0) {