From a8683a2125a709db14ed3311f816d9147da8f865 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 30 Jul 2024 14:48:41 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9Eexcel=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=202=E3=80=81=E4=BF=AE=E6=94=B9=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BCbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xgf/personStrucManage/components/list.vue | 66 +++++++++----------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/src/views/xgf/personStrucManage/components/list.vue b/src/views/xgf/personStrucManage/components/list.vue
index fa94697..b7d519b 100644
--- a/src/views/xgf/personStrucManage/components/list.vue
+++ b/src/views/xgf/personStrucManage/components/list.vue
@@ -44,8 +44,7 @@
       stripe
       highlight-current-row
       @selection-change="selectionChange"
-      @select-all="selectAll"
-      @row-click="rowClick">
+      @select-all="selectAll">
       <!-- 固定列 -->
       <el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" fixed align="center" />
 
@@ -99,42 +98,42 @@
 
       <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="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 v-if="showColumn('personEducation')" prop="personEducation" label="人员学历" align="center">
+        <el-table-column v-if="showColumn('BELOW_HIGH_SCHOOL')" prop="BELOW_HIGH_SCHOOL" label="高中以下" align="center" width="120"/>
+        <el-table-column v-if="showColumn('HIGH_SCHOOL')" prop="HIGH_SCHOOL" label="高中" align="center" width="120"/>
+        <el-table-column v-if="showColumn('TECHNICAL_SCHOOL')" prop="TECHNICAL_SCHOOL" label="技工" align="center" width="120"/>
+        <el-table-column v-if="showColumn('TECHNICAL_SECONDARY_SCHOOL')" prop="TECHNICAL_SECONDARY_SCHOOL" label="中专或中等技术学校" align="center" width="130"/>
+        <el-table-column v-if="showColumn('JUNIOR_COLLEGE')" prop="JUNIOR_COLLEGE" label="大学专科或专科院校" align="center" width="130"/>
+        <el-table-column v-if="showColumn('UNDERGRADUATE')" prop="UNDERGRADUATE" label="大学本科" align="center" width="120"/>
+        <el-table-column v-if="showColumn('ABOVE_UNDERGRADUATE')" prop="ABOVE_UNDERGRADUATE" label="大学本科以上" align="center" width="120"/>
       </el-table-column>
 
-      <el-table-column prop="man" label="男职工" align="center">
-        <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 v-if="showColumn('man')" prop="man" label="男职工" align="center">
+        <el-table-column v-if="showColumn('MAN_COUNT')" prop="MAN_COUNT" label="人数" align="center" width="120"/>
+        <el-table-column v-if="showColumn('MAN_PERCENT')" prop="MAN_PERCENT" label="占比" align="center" width="120"/>
       </el-table-column>
 
-      <el-table-column prop="woman" label="女职工" align="center">
-        <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 v-if="showColumn('woman')" prop="woman" label="女职工" align="center">
+        <el-table-column v-if="showColumn('WOMAN_COUNT')" prop="WOMAN_COUNT" label="人数" align="center" width="120"/>
+        <el-table-column v-if="showColumn('WOMAN_PERCENT')" prop="WOMAN_PERCENT" label="占比" align="center" width="120"/>
       </el-table-column>
 
-      <el-table-column prop="insurance" label="保险相关" align="center">
-        <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 v-if="showColumn('insurance')" prop="insurance" label="保险相关" align="center">
+        <el-table-column v-if="showColumn('SOCIAL')" prop="SOCIAL" label="有社保人数" align="center" width="120"/>
+        <el-table-column v-if="showColumn('OCCUPATIONAL_INJURY')" prop="OCCUPATIONAL_INJURY" label="有工伤保险人数" align="center" width="120"/>
+        <el-table-column v-if="showColumn('COMMERCIAL_INSURANCE')" prop="COMMERCIAL_INSURANCE" label="有商业保险人数" align="center" width="120"/>
+        <el-table-column v-if="showColumn('OTHER_INSURANCE')" prop="OTHER_INSURANCE" label="其他保险人数" align="center" width="120"/>
+        <el-table-column v-if="showColumn('NO_INSURANCE')" prop="NO_INSURANCE" label="无保险人数" align="center" width="120"/>
       </el-table-column>
 
-      <el-table-column prop="numOfSpecialOperation" label="取得特种作业证书人数" align="center">
-        <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 v-if="showColumn('numOfSpecialOperation')" prop="numOfSpecialOperation" label="取得特种作业证书人数" align="center">
+        <el-table-column v-if="showColumn('SPECIAL_TOTAL')" prop="SPECIAL_TOTAL" label="总人数" align="center" width="120"/>
+        <el-table-column v-if="showColumn('ELECTRICIAN')" prop="ELECTRICIAN" label="电工作业" align="center" width="120"/>
+        <el-table-column v-if="showColumn('WELDING')" prop="WELDING" label="焊接与热切割作业" align="center" width="120"/>
+        <el-table-column v-if="showColumn('HIGH_WORK')" prop="HIGH_WORK" label="高处作业" align="center" width="120"/>
+        <el-table-column v-if="showColumn('CRANE_OPERATION')" prop="CRANE_OPERATION" label="起重机械作业" align="center" width="120"/>
+        <el-table-column v-if="showColumn('MOTOR_VEHICLE')" prop="MOTOR_VEHICLE" label="企业内机动车辆作业" align="center" width="130"/>
+        <el-table-column v-if="showColumn('OTHER_SPECIAL')" prop="OTHER_SPECIAL" label="其他特种作业" align="center" width="120"/>
       </el-table-column>
 
     </el-table>
@@ -152,8 +151,8 @@
 import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves'
-import axios from 'axios'
-import moment from 'moment'
+// import axios from 'axios'
+// import moment from 'moment'
 
 export default {
   components: { Pagination },
@@ -592,9 +591,6 @@ export default {
     selectAll(selection) {
       this.selectionSelected = selection
     },
-    rowClick(row, column, event) {
-      console.log('row :>> ', row)
-    },
     handleExportBtn() {
       const ids = this.selectionSelected
         .map(item => {