From f4d09d76fcab36ad62993401b7a630407fb4ad05 Mon Sep 17 00:00:00 2001 From: renguanyu111 <80379958+renguanyu111@users.noreply.github.com> Date: Thu, 14 Jul 2022 08:15:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90hr=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/approvalData/index.vue | 4 +- .../assessmentProgram/assessmentDimension.vue | 4 +- .../departmentalAssessment copy.vue | 4 +- .../departmentalAssessment.vue | 106 +- src/views/assessmentProgram/jobEntry.vue | 4 +- src/views/assessmentProgram/project.vue | 4 +- .../qualitativeIndicators copy 2.vue | 4 +- .../qualitativeIndicators copy.vue | 4 +- .../qualitativeIndicators.vue | 34 +- .../quantitativeIndicators.vue | 4 +- src/views/assessmentProgram/rules.vue | 4 +- src/views/assessmentProgram/subSection.vue | 4 +- .../basicInfo copy/assessmentDimension.vue | 4 +- src/views/basicInfo copy/jobEntry.vue | 4 +- src/views/basicInfo copy/project.vue | 4 +- .../basicInfo copy/qualitativeIndicators.vue | 4 +- .../basicInfo copy/quantitativeIndicators.vue | 4 +- src/views/basicInfo/assessmentDimension.vue | 4 +- src/views/basicInfo/assessmentIndicators.vue | 4 +- src/views/basicInfo/jobEntry.vue | 4 +- src/views/basicInfo/project.vue | 4 +- src/views/basicInfo/qualitativeIndicators.vue | 4 +- .../basicInfo/quantitativeIndicators.vue | 4 +- src/views/basicInfo/target.vue | 20 +- src/views/echarts/echarts.vue | 4 +- src/views/echarts/echarts1.vue | 6 +- src/views/echarts/table.vue | 30 +- src/views/echarts/total.vue | 6 +- src/views/frontPage/index.vue | 184 +- src/views/hr/jobTitle.vue | 4 +- src/views/hr/organization.vue | 4 +- src/views/hr/organizeType.vue | 4 +- src/views/hr/personnel.vue | 1481 ++++++++++++++++- src/views/hr/position.vue | 4 +- src/views/menuSettings/index.vue | 4 +- src/views/mete/index.vue | 8 +- src/views/personnel/post/index.vue | 4 +- src/views/qualitative/index copy.vue | 4 +- src/views/qualitative/index.vue | 20 +- src/views/roleSetting/index.vue | 4 +- 40 files changed, 1709 insertions(+), 306 deletions(-) diff --git a/src/views/approvalData/index.vue b/src/views/approvalData/index.vue index 21279a7..a95fc65 100644 --- a/src/views/approvalData/index.vue +++ b/src/views/approvalData/index.vue @@ -616,8 +616,8 @@ export default { }, // 条件搜索 onSubmit() { - this.page = 1 - this.pageSize = 10 + this.searchInfo.page = 1 + this.searchInfo.pagesize = 10 this.getDataList() }, // 日期时间戳转日期格式 diff --git a/src/views/assessmentProgram/assessmentDimension.vue b/src/views/assessmentProgram/assessmentDimension.vue index d05f809..2f1bb73 100644 --- a/src/views/assessmentProgram/assessmentDimension.vue +++ b/src/views/assessmentProgram/assessmentDimension.vue @@ -223,8 +223,8 @@ export default { }, // 条件搜索 onSubmit() { - this.page = 1 - this.pageSize = 10 + this.searchInfo.page = 1 + this.searchInfo.pagesize = 10 this.getDataList() }, // 日期时间戳转日期格式 diff --git a/src/views/assessmentProgram/departmentalAssessment copy.vue b/src/views/assessmentProgram/departmentalAssessment copy.vue index d735a45..838bcc9 100644 --- a/src/views/assessmentProgram/departmentalAssessment copy.vue +++ b/src/views/assessmentProgram/departmentalAssessment copy.vue @@ -1077,8 +1077,8 @@ export default { }, // 条件搜索 onSubmit() { - this.page = 1 - this.pageSize = 10 + this.searchInfo.page = 1 + this.searchInfo.pagesize = 10 this.searchInfo.parentId=this.childInfo.outId this.getDataList() }, diff --git a/src/views/assessmentProgram/departmentalAssessment.vue b/src/views/assessmentProgram/departmentalAssessment.vue index 0bbdbd9..57f3239 100644 --- a/src/views/assessmentProgram/departmentalAssessment.vue +++ b/src/views/assessmentProgram/departmentalAssessment.vue @@ -4,14 +4,15 @@ @@ -166,14 +105,8 @@ - - - - + + @@ -335,14 +268,15 @@ - + + @@ -732,7 +666,6 @@ export default { weiDuCopyList:[], copyForm1:{}, props1: { - checkStrictly: true, value: "id", label: "name", @@ -897,7 +830,7 @@ export default { }, // 新条件查询变量 searchVersion: { - group: 2, + group: 309, deaprtid:'', year: "", //年 }, @@ -1549,6 +1482,8 @@ export default { const departmentFrom={ id:parseInt(val) } + console.log("this.form") + console.log(this.form) const res = await departmentlist(departmentFrom) this.departmentList=res.data } @@ -1567,14 +1502,11 @@ export default { }, // 初始化部门 async initialDepartment(){ - const departmentFrom={ - id:2 + id:309 } const res = await departmentlist(departmentFrom) this.departmentList=res.data - - }, // 编辑获取选中组件值 getEditCheckedfrom(data){ @@ -1583,7 +1515,10 @@ export default { }, // 获取员工列表 async getSystemadminlist(){ - const res = await getgroupuser() + const from = { + level:4 + } + const res = await getgroupuser(from) this.grouplistBackup=res.data this.grouplistBackup.forEach(item => { if (item.govlist != null) { @@ -1623,7 +1558,8 @@ export default { // 获取公司 async getGrouplist(){ const idFrom = { - id:1 + // id:312 + level: 3 } const res = await getgroupdepartmap(idFrom) this.companyList=res.data @@ -1714,8 +1650,8 @@ export default { }, // 条件搜索 onSubmit() { - // this.page = 1 - // this.pageSize = 10 + // this.searchInfo.page = 1 + // this.searchInfo.pagesize = 10 // this.searchInfo.parentId=this.childInfo.outId this.getVersionDataList() }, diff --git a/src/views/assessmentProgram/jobEntry.vue b/src/views/assessmentProgram/jobEntry.vue index 29cea70..61b2b20 100644 --- a/src/views/assessmentProgram/jobEntry.vue +++ b/src/views/assessmentProgram/jobEntry.vue @@ -223,8 +223,8 @@ export default { }, // 条件搜索 onSubmit() { - this.page = 1 - this.pageSize = 10 + this.searchInfo.page = 1 + this.searchInfo.pagesize = 10 this.getDataList() }, // 日期时间戳转日期格式 diff --git a/src/views/assessmentProgram/project.vue b/src/views/assessmentProgram/project.vue index c354cd0..49e0ab0 100644 --- a/src/views/assessmentProgram/project.vue +++ b/src/views/assessmentProgram/project.vue @@ -375,8 +375,8 @@ export default { }, // 条件搜索 onSubmit() { - this.page = 1 - this.pageSize = 10 + this.searchInfo.page = 1 + this.searchInfo.pagesize = 10 this.getDataList() }, // 日期时间戳转日期格式 diff --git a/src/views/assessmentProgram/qualitativeIndicators copy 2.vue b/src/views/assessmentProgram/qualitativeIndicators copy 2.vue index a345a22..db4a71e 100644 --- a/src/views/assessmentProgram/qualitativeIndicators copy 2.vue +++ b/src/views/assessmentProgram/qualitativeIndicators copy 2.vue @@ -576,8 +576,8 @@ export default { }, // 条件搜索 onSubmit() { - this.page = 1 - this.pageSize = 10 + this.searchInfo.page = 1 + this.searchInfo.pagesize = 10 this.searchInfo.parentId=this.childInfo.outId this.getDataList() }, diff --git a/src/views/assessmentProgram/qualitativeIndicators copy.vue b/src/views/assessmentProgram/qualitativeIndicators copy.vue index dfa0bd8..971b1cd 100644 --- a/src/views/assessmentProgram/qualitativeIndicators copy.vue +++ b/src/views/assessmentProgram/qualitativeIndicators copy.vue @@ -565,8 +565,8 @@ export default { }, // 条件搜索 onSubmit() { - this.page = 1 - this.pageSize = 10 + this.searchInfo.page = 1 + this.searchInfo.pagesize = 10 this.searchInfo.parentId=this.childInfo.outId this.getDataList() }, diff --git a/src/views/assessmentProgram/qualitativeIndicators.vue b/src/views/assessmentProgram/qualitativeIndicators.vue index 8814b22..782168a 100644 --- a/src/views/assessmentProgram/qualitativeIndicators.vue +++ b/src/views/assessmentProgram/qualitativeIndicators.vue @@ -179,14 +179,15 @@ - + + @@ -538,14 +539,15 @@