Merge branch 'mengfanliang-0726-businessPerson_table' of http://47.92.113.182:3000/guoyuepeng/qa-prevention-xgf-vue into mengfanliang-0726-businessPerson_table
commit
21f9d00727
|
@ -10,12 +10,12 @@
|
|||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="集团单位">
|
||||
<el-input v-model="searchParmas.groupUnit" placeholder="请输入集团单位" />
|
||||
<el-input v-model="searchParmas.groupUnit" placeholder="请输入集团单位"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="股份主管部门" style="margin-right: 20px;">
|
||||
<el-input v-model="searchParmas.shareSuperdepart" placeholder="请输入股份主管部门" />
|
||||
<el-input v-model="searchParmas.shareSuperdepart" placeholder="请输入股份主管部门"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
|
@ -33,7 +33,7 @@
|
|||
|
||||
<!-- 多级表格 -->
|
||||
<el-table
|
||||
v-loading="strucManageListLoading"
|
||||
v-loading="loading"
|
||||
ref="multipleTable"
|
||||
:data="varList"
|
||||
:header-cell-style="{ 'font-weight': 'bold', 'color': '#000' }"
|
||||
|
@ -47,7 +47,7 @@
|
|||
@select-all="selectAll"
|
||||
@row-click="rowClick"
|
||||
>
|
||||
<el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" fixed align="center" />
|
||||
<el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" fixed align="center"/>
|
||||
<el-table-column type="index" label="序号" align="center" width="90">
|
||||
<template slot="header">
|
||||
<el-popover
|
||||
|
@ -58,11 +58,11 @@
|
|||
>
|
||||
<span slot="reference" style="cursor: pointer;" @click="openPopover">
|
||||
操作
|
||||
<i class="el-icon-finished" style="font-weight: bold;" />
|
||||
<i class="el-icon-finished" style="font-weight: bold;"/>
|
||||
</span>
|
||||
<div class="popoverCheckBoxArea">
|
||||
<el-checkbox :indeterminate="isIndeterminate" @change="handleCheckAllChange">全选</el-checkbox>
|
||||
<div style="margin: 10px 0;" />
|
||||
<div style="margin: 10px 0;"/>
|
||||
<el-tree
|
||||
ref="treeRef"
|
||||
:data="optionsColumns"
|
||||
|
@ -82,60 +82,60 @@
|
|||
</el-popover>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="enterpriseName" label="企业名称" align="center" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="groupUnit" label="集团单位" show-overflow-tooltip align="center" width="120" />
|
||||
<el-table-column prop="shareSuperdepart" label="股份主管部门" align="center" width="120" />
|
||||
<el-table-column prop="scale" label="企业规模" align="center" width="120" />
|
||||
<el-table-column prop="mainerPerson" label="主要负责人" align="center" width="120" />
|
||||
<el-table-column prop="mainerPersonPhone" label="主要负责人联系电话" align="center" width="120" />
|
||||
<el-table-column prop="enrollment" label="注册人数" align="center" width="120" />
|
||||
<el-table-column prop="numQualiTrain" label="培训合格人数" align="center" width="120" />
|
||||
<el-table-column prop="RELEVANT_UNIT_NAME" label="企业名称" align="center" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="CORP_TYPE_NAME" label="集团单位" show-overflow-tooltip align="center" width="120"/>
|
||||
<el-table-column prop="MAIN_DEPARTMENT_NAME" label="股份主管部门" align="center" width="120"/>
|
||||
<el-table-column prop="CORP_SIZE_NAME" label="企业规模" align="center" width="120"/>
|
||||
<el-table-column prop="CONTACT_PERSON" label="主要负责人" align="center" width="120"/>
|
||||
<el-table-column prop="CONTACT_TEL" label="主要负责人联系电话" align="center" width="120"/>
|
||||
<el-table-column prop="REGISTER_COUNT" label="注册人数" align="center" width="120"/>
|
||||
<el-table-column prop="PASS_COUNT" label="培训合格人数" align="center" width="120"/>
|
||||
|
||||
<el-table-column prop="personAgeStruc" label="人员年龄结构" align="center">
|
||||
<el-table-column prop="averageAge" label="平均年龄" align="center" width="120" />
|
||||
<el-table-column prop="ageUpperSixty" label="大于60岁人数" align="center" width="120" />
|
||||
<el-table-column prop="fiftyFiveAndSixty" label="55-60岁人数" align="center" width="120" />
|
||||
<el-table-column prop="ageUnderFiftyFive" label="55岁以下人数" align="center" width="120" />
|
||||
<el-table-column prop="AVG_AGE" label="平均年龄" align="center" width="120"/>
|
||||
<el-table-column prop="MORE_THAN_60_COUNT" label="大于60岁人数" align="center" width="120"/>
|
||||
<el-table-column prop="BETWEEN_55_AND_60_COUNT" label="55-60岁人数" align="center" width="120"/>
|
||||
<el-table-column prop="LESS_THAN_55_COUNT" label="55岁以下人数" align="center" width="120"/>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="workExprien" label="在港工作经历(年)" align="center" width="120" />
|
||||
<el-table-column v-if="false" prop="workExprien" label="在港工作经历(年)" align="center" width="120"/>
|
||||
|
||||
<el-table-column prop="personEdcaton" label="人员学历" align="center">
|
||||
<el-table-column prop="belowHigh" label="高中以下" align="center" width="120" />
|
||||
<el-table-column prop="high" label="高中" align="center" width="120" />
|
||||
<el-table-column prop="mechanic" label="技工" align="center" width="120" />
|
||||
<el-table-column prop="technicalOrSecondary" label="中专或中等技术学校" align="center" width="130" />
|
||||
<el-table-column prop="collegeOrCollege" label="大学专科或专科院校" align="center" width="130" />
|
||||
<el-table-column prop="graduateCollege" label="大学本科" align="center" width="120" />
|
||||
<el-table-column prop="undergraduateCollege" label="大学本科以上" align="center" width="120" />
|
||||
<el-table-column prop="BELOW_HIGH_SCHOOL" label="高中以下" align="center" width="120"/>
|
||||
<el-table-column prop="HIGH_SCHOOL" label="高中" align="center" width="120"/>
|
||||
<el-table-column prop="TECHNICAL_SCHOOL" label="技工" align="center" width="120"/>
|
||||
<el-table-column prop="TECHNICAL_SECONDARY_SCHOOL" label="中专或中等技术学校" align="center" width="130"/>
|
||||
<el-table-column prop="JUNIOR_COLLEGE" label="大学专科或专科院校" align="center" width="130"/>
|
||||
<el-table-column prop="UNDERGRADUATE" label="大学本科" align="center" width="120"/>
|
||||
<el-table-column prop="ABOVE_UNDERGRADUATE" label="大学本科以上" align="center" width="120"/>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="man" label="男职工" align="center">
|
||||
<el-table-column prop="manpersonNum" label="人数" align="center" width="120" />
|
||||
<el-table-column prop="manRatio" label="占比" align="center" width="120" />
|
||||
<el-table-column prop="MAN_COUNT" label="人数" align="center" width="120"/>
|
||||
<el-table-column prop="MAN_PERCENT" label="占比" align="center" width="120"/>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="woman" label="女职工" align="center">
|
||||
<el-table-column prop="womanPersonNum" label="人数" align="center" width="120" />
|
||||
<el-table-column prop="womanRatio" label="占比" align="center" width="120" />
|
||||
<el-table-column prop="WOMAN_COUNT" label="人数" align="center" width="120"/>
|
||||
<el-table-column prop="WOMAN_PERCENT" label="占比" align="center" width="120"/>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="insurance" label="保险相关" align="center">
|
||||
<el-table-column prop="numOfSecure" label="有社保人数" align="center" width="120" />
|
||||
<el-table-column prop="numOfworkRelated" label="有工伤保险人数" align="center" width="120" />
|
||||
<el-table-column prop="numOfCommercial" label="有商业保险人数" align="center" width="120" />
|
||||
<el-table-column prop="numOfOther" label="其他保险人数" align="center" width="120" />
|
||||
<el-table-column prop="numOfNone" label="无保险人数" align="center" width="120" />
|
||||
<el-table-column prop="SOCIAL" label="有社保人数" align="center" width="120"/>
|
||||
<el-table-column prop="OCCUPATIONAL_INJURY" label="有工伤保险人数" align="center" width="120"/>
|
||||
<el-table-column prop="COMMERCIAL_INSURANCE" label="有商业保险人数" align="center" width="120"/>
|
||||
<el-table-column prop="OTHER_INSURANCE" label="其他保险人数" align="center" width="120"/>
|
||||
<el-table-column prop="NO_INSURANCE" label="无保险人数" align="center" width="120"/>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="numOfSpecialOperation" label="取得特种作业证书人数" align="center">
|
||||
<el-table-column prop="totalPerson" label="总人数" align="center" width="120" />
|
||||
<el-table-column prop="electricianWork" label="电工作业" align="center" width="120" />
|
||||
<el-table-column prop="weldingAndHotCuttingWork" label="焊接与热切割作业" align="center" width="120" />
|
||||
<el-table-column prop="heightsWork" label="高处作业" align="center" width="120" />
|
||||
<el-table-column prop="hoistingMachineryWork" label="起重机械作业" align="center" width="120" />
|
||||
<el-table-column prop="motorVehiclesWork" label="企业内机动车辆作业" align="center" width="130" />
|
||||
<el-table-column prop="otherSpecialWork" label="其他特种作业" align="center" width="120" />
|
||||
<el-table-column prop="SPECIAL_TOTAL" label="总人数" align="center" width="120"/>
|
||||
<el-table-column prop="ELECTRICIAN" label="电工作业" align="center" width="120"/>
|
||||
<el-table-column prop="WELDING" label="焊接与热切割作业" align="center" width="120"/>
|
||||
<el-table-column prop="HIGH_WORK" label="高处作业" align="center" width="120"/>
|
||||
<el-table-column prop="CRANE_OPERATION" label="起重机械作业" align="center" width="120"/>
|
||||
<el-table-column prop="MOTOR_VEHICLE" label="企业内机动车辆作业" align="center" width="130"/>
|
||||
<el-table-column prop="OTHER_SPECIAL" label="其他特种作业" align="center" width="120"/>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
|
@ -150,10 +150,12 @@
|
|||
|
||||
<script>
|
||||
import Pagination from '@/components/Pagination'
|
||||
import { mockVarList } from './../mock/dataSource'
|
||||
import { requestFN } from '@/utils/request'
|
||||
import waves from '@/directive/waves'
|
||||
|
||||
export default {
|
||||
components: { Pagination },
|
||||
directives: { waves },
|
||||
data() {
|
||||
return {
|
||||
searchParmas: {
|
||||
|
@ -161,11 +163,11 @@ export default {
|
|||
groupUnit: '',
|
||||
shareSuperdepart: ''
|
||||
},
|
||||
varList: mockVarList,
|
||||
varList: [],
|
||||
// el-table表格的动态高度值
|
||||
tableMaxHeight: 0,
|
||||
// 列表加载态
|
||||
strucManageListLoading: false,
|
||||
loading: false,
|
||||
// 列表表格分页参数
|
||||
listQuery: {
|
||||
page: 1,
|
||||
|
@ -177,14 +179,14 @@ export default {
|
|||
{
|
||||
id: '1',
|
||||
label: '企业名称',
|
||||
value: 'enterpriseName',
|
||||
value: 'RELEVANT_UNIT_NAME',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '2',
|
||||
label: '集团单位',
|
||||
value: 'groupUnit',
|
||||
value: 'CORP_TYPE_NAME',
|
||||
show: true,
|
||||
children: []
|
||||
|
||||
|
@ -192,14 +194,14 @@ export default {
|
|||
{
|
||||
id: '3',
|
||||
label: '股份主管部门',
|
||||
value: 'shareSuperdepart',
|
||||
value: 'MAIN_DEPARTMENT_NAME',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '4',
|
||||
label: '企业规模',
|
||||
value: 'scale',
|
||||
value: 'CORP_SIZE_NAME',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
|
@ -213,55 +215,55 @@ export default {
|
|||
{
|
||||
id: '6',
|
||||
label: '主要负责人',
|
||||
value: 'mainerPerson',
|
||||
value: 'CONTACT_PERSON',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '7',
|
||||
label: '注册人数',
|
||||
value: 'enrollment',
|
||||
value: 'REGISTER_COUNT',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '8',
|
||||
label: '培训合格人数',
|
||||
value: 'numQualiTrain',
|
||||
value: 'PASS_COUNT',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '9',
|
||||
label: '人员年龄结构',
|
||||
value: 'personAgeStruc',
|
||||
value: 'personAgeStruct',
|
||||
show: true,
|
||||
children: [
|
||||
{
|
||||
id: '9-1',
|
||||
label: '平均年龄',
|
||||
value: 'averageAge',
|
||||
value: 'AVG_AGE',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '9-2',
|
||||
label: '大于60岁人数',
|
||||
value: 'ageUpperSixty',
|
||||
value: 'MORE_THAN_60_COUNT',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '9-3',
|
||||
label: '55-60岁人数:',
|
||||
value: 'fiftyFiveAndSixty',
|
||||
value: 'BETWEEN_55_AND_60_COUNT',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '9-4',
|
||||
label: '55岁以下人数',
|
||||
value: 'ageUnderFiftyFive',
|
||||
value: 'LESS_THAN_55_COUNT',
|
||||
show: true,
|
||||
children: []
|
||||
}
|
||||
|
@ -277,55 +279,55 @@ export default {
|
|||
{
|
||||
id: '11',
|
||||
label: '人员学历',
|
||||
value: 'personEdcaton',
|
||||
value: 'personEducation',
|
||||
show: true,
|
||||
children: [
|
||||
{
|
||||
id: '11-1',
|
||||
label: '高中以下',
|
||||
value: 'belowHigh',
|
||||
value: 'BELOW_HIGH_SCHOOL',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '11-2',
|
||||
label: '高中',
|
||||
value: 'high',
|
||||
value: 'HIGH_SCHOOL',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '11-3',
|
||||
label: '技工',
|
||||
value: 'mechanic',
|
||||
value: 'TECHNICAL_SCHOOL',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '11-4',
|
||||
label: '中专或中等技术学校',
|
||||
value: 'technicalOrSecondary',
|
||||
value: 'TECHNICAL_SECONDARY_SCHOOL',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '11-5',
|
||||
label: '大学专科或专科院校',
|
||||
value: 'collegeOrCollege',
|
||||
value: 'JUNIOR_COLLEGE',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '11-6',
|
||||
label: '大学本科',
|
||||
value: 'graduateCollege',
|
||||
value: 'UNDERGRADUATE',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '11-7',
|
||||
label: '大学本科以上',
|
||||
value: 'undergraduateCollege',
|
||||
value: 'ABOVE_UNDERGRADUATE',
|
||||
show: true,
|
||||
children: []
|
||||
}
|
||||
|
@ -340,14 +342,14 @@ export default {
|
|||
{
|
||||
id: '12-1',
|
||||
label: '人数',
|
||||
value: 'manpersonNum',
|
||||
value: 'MAN_COUNT',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '12-2',
|
||||
label: '占比',
|
||||
value: 'manRatio',
|
||||
value: 'MAN_PERCENT',
|
||||
show: true,
|
||||
children: []
|
||||
}
|
||||
|
@ -362,14 +364,14 @@ export default {
|
|||
{
|
||||
id: '13-1',
|
||||
label: '人数',
|
||||
value: 'womanPersonNum',
|
||||
value: 'WOMAN_COUNT',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '13-2',
|
||||
label: '占比',
|
||||
value: 'womanRatio',
|
||||
value: 'WOMAN_PERCENT',
|
||||
show: true,
|
||||
children: []
|
||||
}
|
||||
|
@ -384,35 +386,35 @@ export default {
|
|||
{
|
||||
id: '14-1',
|
||||
label: '有社保人数',
|
||||
value: 'numOfSecure',
|
||||
value: 'SOCIAL',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '14-2',
|
||||
label: '有工伤保险人数',
|
||||
value: 'numOfworkRelated',
|
||||
value: 'OCCUPATIONAL_INJURY',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '14-3',
|
||||
label: '有商业保险人数',
|
||||
value: 'numOfCommercial',
|
||||
value: 'COMMERCIAL_INSURANCE',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '14-4',
|
||||
label: '其他保险人数',
|
||||
value: 'numOfOther',
|
||||
value: 'OTHER_INSURANCE',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '14-5',
|
||||
label: '无保险人数',
|
||||
value: 'numOfNone',
|
||||
value: 'NO_INSURANCE',
|
||||
show: true,
|
||||
children: []
|
||||
}
|
||||
|
@ -427,49 +429,49 @@ export default {
|
|||
{
|
||||
id: '15-1',
|
||||
label: '总人数',
|
||||
value: 'totalPerson',
|
||||
value: 'SPECIAL_TOTAL',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '15-2',
|
||||
label: '电工作业',
|
||||
value: 'electricianWork',
|
||||
value: 'ELECTRICIAN',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '15-3',
|
||||
label: '焊接与热切割作业',
|
||||
value: 'weldingAndHotCuttingWork',
|
||||
value: 'WELDING',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '15-4',
|
||||
label: '高处作业',
|
||||
value: 'heightsWork',
|
||||
value: 'HIGH_WORK',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '15-5',
|
||||
label: '起重机械作业',
|
||||
value: 'hoistingMachineryWork',
|
||||
value: 'CRANE_OPERATION',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '15-6',
|
||||
label: '企业内机动车辆作业',
|
||||
value: 'motorVehiclesWork',
|
||||
value: 'MOTOR_VEHICLE',
|
||||
show: true,
|
||||
children: []
|
||||
},
|
||||
{
|
||||
id: '15-7',
|
||||
label: '其他特种作业',
|
||||
value: 'otherSpecialWork',
|
||||
value: 'OTHER_SPECIAL',
|
||||
show: true,
|
||||
children: []
|
||||
}
|
||||
|
@ -531,7 +533,18 @@ export default {
|
|||
this.getQuery()
|
||||
},
|
||||
getList() {
|
||||
console.log('this.searchParmas :>> ', this.searchParmas)
|
||||
this.loading = true
|
||||
requestFN(
|
||||
'/openApi/user/statistics?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
||||
{ KEYWORDS: this.KEYWORDS, ISSMALL: '2' }
|
||||
).then((data) => {
|
||||
this.loading = false
|
||||
this.varList = data.list
|
||||
this.total = data.page.totalResult
|
||||
}).catch((e) => {
|
||||
console.log(e)
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
selectionChange(row) {
|
||||
console.log('row :>> ', row)
|
||||
|
@ -573,7 +586,7 @@ export default {
|
|||
},
|
||||
// 处理多选框发生改变
|
||||
handleCheckChange(currentRow, selfCheck, subCheck) {
|
||||
// console.log('currentRow :>> ', currentRow)
|
||||
console.log('currentRow :>> ', currentRow)
|
||||
},
|
||||
// 弹出框确认
|
||||
confirmPopover() {
|
||||
|
|
Loading…
Reference in New Issue