From 481c24d51271464c4a4c6d38f6c73b8cbadbcf6a Mon Sep 17 00:00:00 2001 From: "li.yuetong" Date: Thu, 1 Dec 2022 17:24:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E4=B8=9A=E7=BC=96=E7=A0=81=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=E5=8C=BB=E7=96=97=E7=AD=89=E7=BA=A7=E5=92=8C=E5=BC=80?= =?UTF-8?q?=E9=97=A8=E7=BA=A2=E4=B8=9A=E7=BB=A9=E6=9F=A5=E8=AF=A2=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=B9=B4=E4=BB=BD=E7=AD=9B=E9=80=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebiz/occipation/data/occupation.js | 71 ++++++++++++++++++- .../ebiz/goodStart/PerformanceReport.vue | 21 +++--- 2 files changed, 81 insertions(+), 11 deletions(-) diff --git a/src/components/ebiz/occipation/data/occupation.js b/src/components/ebiz/occipation/data/occupation.js index 9bfaf52d2..dbf884820 100644 --- a/src/components/ebiz/occipation/data/occupation.js +++ b/src/components/ebiz/occipation/data/occupation.js @@ -568,6 +568,18 @@ let occupationList = [ lifeGrade: '2', healthGrade: '1' }, + { + code: '2022312', + name: '园林绿化工程技术人员（一般道路）', + lifeGrade: '4', + healthGrade: '4' + }, + { + code: '2022313', + name: '园林绿化工程技术人员（高速公路）', + lifeGrade: '5', + healthGrade: '5' + }, { code: '2022401', name: '水资源勘测工程技术人员', lifeGrade: '3', healthGrade: '1' }, { code: '2022402', @@ -2818,6 +2830,18 @@ let occupationList = [ lifeGrade: '2', healthGrade: '1' }, + { + code: '4070202', + name: '保安员', + lifeGrade: '3', + healthGrade: '3' + }, + { + code: '4070203', + name: '水电维修人员', + lifeGrade: '3', + healthGrade: '3' + }, { code: '4070301', name: '工业及饮用水净化处理人员', lifeGrade: '2', healthGrade: '1' }, { code: '4070302', @@ -2875,6 +2899,7 @@ let occupationList = [ healthGrade: '2' }, { code: '4070317', name: '液化气送货员', lifeGrade: '4', healthGrade: '2' }, + { code: '4070318', name: '煤气管线装修（高空作业）', lifeGrade: '5', healthGrade: '5' }, { code: '4070401', name: '美容师', @@ -2987,6 +3012,8 @@ let occupationList = [ healthGrade: '1' }, { code: '4071305', name: '高楼外部清洁工、烟囱清洁工', lifeGrade: '5', healthGrade: '2' }, + { code: '4071306', name: '垃圾清运工（城市道路，不含城市快速路）', lifeGrade: '4', healthGrade: '4' }, + { code: '4071307', name: '垃圾清运工（高速公路、国道、省道、城市快速路等）', lifeGrade: '5', healthGrade: '5' }, { code: '4071401', name: '殡仪服务员', @@ -3127,6 +3154,8 @@ let occupationList = [ healthGrade: '1' }, { code: '4071534', name: '电商店主（网店管理）', lifeGrade: '3', healthGrade: '1' }, + { code: '4071535', name: '其他销售人员（非危险品）', lifeGrade: '2', healthGrade: '2' }, + { code: '4071536', name: '其他销售人员（危险品）', lifeGrade: '4', healthGrade: '4' }, { code: '4071601', name: '负责人', @@ -3147,7 +3176,9 @@ let occupationList = [ lifeGrade: '2', healthGrade: '1' }, - { code: '4071702', name: '售货商', lifeGrade: '3', healthGrade: '1' } + { code: '4071702', name: '售货商', lifeGrade: '3', healthGrade: '1' }, + { code: '4071801', name: '中央空调安装人员（5米以下高空作业）', lifeGrade: '4', healthGrade: '4' }, + { code: '4071802', name: '一般空调安装人员（5米以上高空作业）', lifeGrade: '6', healthGrade: '6' } ] }, { @@ -3252,7 +3283,10 @@ let occupationList = [ lifeGrade: '1', healthGrade: '1' }, - { code: '4990029', name: '快递投送人员', lifeGrade: '4', healthGrade: '1' } + { code: '4990029', name: '快递投送人员', lifeGrade: '4', healthGrade: '1' }, + { code: '4990030', name: '外卖配送员', lifeGrade: '5', healthGrade: '5' }, + { code: '4990031', name: '一般货物搬运人员', lifeGrade: '4', healthGrade: '4' }, + { code: '4990032', name: '特殊货物搬运人员（重型、大型、危险品等货物搬运）', lifeGrade: '6', healthGrade: '6' }, ] } ] @@ -7216,6 +7250,24 @@ let occupationList = [ lifeGrade: '4', healthGrade: '1' }, + { + code: '6231008', + name: '电梯、升降机修理及维护工人(高空作业)', + lifeGrade: '7', + healthGrade: '7' + }, + { + code: '6231009', + name: '弱电工程安装人员', + lifeGrade: '3', + healthGrade: '3' + }, + { + code: '6231010', + name: '弱电工程安装人员（五米以上高空作业）', + lifeGrade: '5', + healthGrade: '5' + }, { code: '6239901', name: '中小型施工机械操作工', lifeGrade: '4', healthGrade: '1' }, { code: '6239902', @@ -7264,7 +7316,19 @@ let occupationList = [ name: '工地推车工', lifeGrade: '4', healthGrade: '1' - } + }, + { + code: '6239915', + name: '钢结构安装工', + lifeGrade: '5', + healthGrade: '5' + }, + { + code: '6239916', + name: '工地杂工', + lifeGrade: '4', + healthGrade: '4' + }, ] }, { @@ -7475,6 +7539,7 @@ let occupationList = [ healthGrade: '1' }, { code: '6240505', name: '索道运输机械操作工', lifeGrade: '3', healthGrade: '1' }, + { code: '6240506', name: '信号工', lifeGrade: '4', healthGrade: '4' }, { code: '6249901', name: '电梯、升降机操作员(不含矿场使用者)', diff --git a/src/views/ebiz/goodStart/PerformanceReport.vue b/src/views/ebiz/goodStart/PerformanceReport.vue index 9aeb17610..36d832baa 100644 --- a/src/views/ebiz/goodStart/PerformanceReport.vue +++ b/src/views/ebiz/goodStart/PerformanceReport.vue @@ -120,7 +120,7 @@ export default { }, timeType: 0, // 最小查询日期 - minDate: new Date(2021, 11, 12), + minDate: new Date(2022, 11, 1), // 最大查询日期 maxDate: currentDate, // 日期筛选条件 @@ -203,13 +203,13 @@ export default { this.isGeneralAgent = manageLv == 9?'0':'1' //是否为普通代理人 // 初始化年份筛选数据 const currentYear = new Date().getFullYear() - if(currentYear == '2022'){ + if(currentYear == '2023'){ const startYear = currentYear + 1 for (let year = currentYear; year <= startYear; year++) { this.years.push(year) } - }else if(currentYear == '2021'){ - this.years.push('2021') + }else if(currentYear == '2022'){ + this.years.push('2022') } if(manageLv == '1' || manageLv == '2' || manageLv == '3' || manageLv == '4'|| manageLv == '5'){ this.initData() //内勤 @@ -458,10 +458,15 @@ export default { await this.getSetDate() }, async onYearConditionConfirm(value) { - if(value == '2021'){ - this.yearCondition = new Date('2021-12-12') - }else if(value == '2022'){ - this.yearCondition = new Date('2022-01-01') + // if(value == '2021'){ + // this.yearCondition = new Date('2021-12-12') + // }else if(value == '2022'){ + // this.yearCondition = new Date('2022-01-01') + // } + if(value == '2022'){ + this.yearCondition = new Date('2022-12-01') + }else if(value == '2023'){ + this.yearCondition = new Date('2023-01-01') } this.isYearConditionShow = false this.timeType = 2