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 @@
-
+
+
@@ -96,69 +97,7 @@
-
+
@@ -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 @@
-
+
+
@@ -1069,6 +1071,13 @@ export default {
rules: {
// title: [{ required: true, message: '请输入名称', trigger: 'blur' }],
},
+ props2: {
+ checkStrictly: true,
+ value: "wxId",
+ label: "name",
+ children: "children",
+ emitPath:false,
+ },
rowZhiData:{},
methodList:[],
xizeDataFrom:{},
@@ -1323,7 +1332,7 @@ export default {
this.methodList=res.data
}
-
+ console.log("this.methodData")
console.log(this.methodData)
},
// 获取子栏目列表
@@ -1335,6 +1344,8 @@ export default {
dimension: this.rowZhiData.dimension, //维度
targetid: this.rowZhiData.target, //考核指标
}
+ console.log("this.methodData")
+ console.log(this.methodData)
const res = await lookdutytargetinfo(this.methodData)
if (res.code==0) {
this.methodList=res.data
@@ -1640,7 +1651,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) {
@@ -1672,17 +1686,14 @@ export default {
// 这里就是判断,如果我这一层的children下面没有东西的时候该做什么操作
// 要添加value和label,否则会看不到标签名字和值
// --------------------------分割线---------------------------------
-
item.govlist=item.child
-
}
// 到这里为止,不能在这里打印数据,不然数据就是个断层的,因为在这里打印的数据是当前循环的这一层的数据,如果想看完整数据效果,那么就需要在递归方法第一次调用的地方打印需要递归的值,即上一个方法中。
},
// 初始化部门
async initialDepartment(){
-
const departmentFrom={
- id:2
+ // id:2
}
const res = await departmentlist(departmentFrom)
this.searchDepartmentList=res.data
@@ -1697,7 +1708,8 @@ export default {
// 获取公司
async getGrouplist(){
const idFrom = {
- id:1
+ // id:1
+ level:3
}
const res = await getgroupdepartmap(idFrom)
this.companyList=res.data
diff --git a/src/views/assessmentProgram/quantitativeIndicators.vue b/src/views/assessmentProgram/quantitativeIndicators.vue
index 8dc1c1d..71219cd 100644
--- a/src/views/assessmentProgram/quantitativeIndicators.vue
+++ b/src/views/assessmentProgram/quantitativeIndicators.vue
@@ -789,8 +789,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/rules.vue b/src/views/assessmentProgram/rules.vue
index 4da0eba..aa11e28 100644
--- a/src/views/assessmentProgram/rules.vue
+++ b/src/views/assessmentProgram/rules.vue
@@ -298,8 +298,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/subSection.vue b/src/views/assessmentProgram/subSection.vue
index a77f1cb..598bc22 100644
--- a/src/views/assessmentProgram/subSection.vue
+++ b/src/views/assessmentProgram/subSection.vue
@@ -267,8 +267,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/basicInfo copy/assessmentDimension.vue b/src/views/basicInfo copy/assessmentDimension.vue
index 1a533b4..71aa535 100644
--- a/src/views/basicInfo copy/assessmentDimension.vue
+++ b/src/views/basicInfo copy/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/basicInfo copy/jobEntry.vue b/src/views/basicInfo copy/jobEntry.vue
index 29cea70..61b2b20 100644
--- a/src/views/basicInfo copy/jobEntry.vue
+++ b/src/views/basicInfo copy/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/basicInfo copy/project.vue b/src/views/basicInfo copy/project.vue
index b498343..8dfd883 100644
--- a/src/views/basicInfo copy/project.vue
+++ b/src/views/basicInfo copy/project.vue
@@ -366,8 +366,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/basicInfo copy/qualitativeIndicators.vue b/src/views/basicInfo copy/qualitativeIndicators.vue
index 220ae4d..e5a347f 100644
--- a/src/views/basicInfo copy/qualitativeIndicators.vue
+++ b/src/views/basicInfo copy/qualitativeIndicators.vue
@@ -324,8 +324,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/basicInfo copy/quantitativeIndicators.vue b/src/views/basicInfo copy/quantitativeIndicators.vue
index 5010b74..cfd288b 100644
--- a/src/views/basicInfo copy/quantitativeIndicators.vue
+++ b/src/views/basicInfo copy/quantitativeIndicators.vue
@@ -324,8 +324,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/basicInfo/assessmentDimension.vue b/src/views/basicInfo/assessmentDimension.vue
index 577ce6a..447be78 100644
--- a/src/views/basicInfo/assessmentDimension.vue
+++ b/src/views/basicInfo/assessmentDimension.vue
@@ -230,8 +230,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/basicInfo/assessmentIndicators.vue b/src/views/basicInfo/assessmentIndicators.vue
index 7fb3d73..2a19a7e 100644
--- a/src/views/basicInfo/assessmentIndicators.vue
+++ b/src/views/basicInfo/assessmentIndicators.vue
@@ -231,8 +231,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/basicInfo/jobEntry.vue b/src/views/basicInfo/jobEntry.vue
index 29cea70..61b2b20 100644
--- a/src/views/basicInfo/jobEntry.vue
+++ b/src/views/basicInfo/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/basicInfo/project.vue b/src/views/basicInfo/project.vue
index 968d163..eb3356b 100644
--- a/src/views/basicInfo/project.vue
+++ b/src/views/basicInfo/project.vue
@@ -535,8 +535,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/basicInfo/qualitativeIndicators.vue b/src/views/basicInfo/qualitativeIndicators.vue
index 98ddfc6..c90e546 100644
--- a/src/views/basicInfo/qualitativeIndicators.vue
+++ b/src/views/basicInfo/qualitativeIndicators.vue
@@ -330,8 +330,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/basicInfo/quantitativeIndicators.vue b/src/views/basicInfo/quantitativeIndicators.vue
index 5010b74..cfd288b 100644
--- a/src/views/basicInfo/quantitativeIndicators.vue
+++ b/src/views/basicInfo/quantitativeIndicators.vue
@@ -324,8 +324,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/basicInfo/target.vue b/src/views/basicInfo/target.vue
index 8216cbd..952abb4 100644
--- a/src/views/basicInfo/target.vue
+++ b/src/views/basicInfo/target.vue
@@ -85,14 +85,15 @@
-
+
+
@@ -715,7 +716,7 @@ export default {
dutyclasslist:[],
// 条件查询变量
searchInfo: {
- groupid:2,
+ groupid:309,
},
pos:'',
@@ -837,7 +838,8 @@ export default {
// outid:this.searchInfo.groupid
// }
const departmentFrom={
- id:2
+ // id:2
+ level:3
}
const res = await departmentlist(departmentFrom)
this.buMenList=res.data
@@ -955,7 +957,7 @@ export default {
console.log("shouZhi")
const methodData={
type: 2, //1:定性考核;2:定量考核
- group: "2", //归属集团
+ group: this.form.group.toString(), //归属集团
departmentid: this.form.department.toString(), //被考核部门
dimension: this.form.dimension, //维度
versionnumber: this.banben,
@@ -1077,13 +1079,13 @@ export default {
// 重置搜索条件
onReset() {
this.searchInfo = {
- groupid:"3",
+ groupid:"309",
}
},
// 条件搜索
onSubmit() {
- this.page = 1
- this.pageSize = 10
+ this.searchInfo.page = 1
+ this.searchInfo.pagesize = 10
this.getDataList()
},
// 日期时间戳转日期格式
@@ -1196,7 +1198,7 @@ export default {
}
const res = await lookquantitativeconfig(this.searchInfo)
this.tableData = res.data
- this.searchInfo.groupid="2"
+ this.searchInfo.groupid="309"
// this.searchInfo = {
// groupid:"2",
// departmentid:''
diff --git a/src/views/echarts/echarts.vue b/src/views/echarts/echarts.vue
index 990cc07..517948e 100644
--- a/src/views/echarts/echarts.vue
+++ b/src/views/echarts/echarts.vue
@@ -361,7 +361,7 @@ export default {
// 初始化部门
async initialDepartment(){
const departmentFrom={
- id:2
+ // id:2
}
const res = await departmentlist(departmentFrom)
this.departmentList=res.data
@@ -370,7 +370,7 @@ export default {
// 获取公司
async getGrouplist(){
const idFrom = {
- id:1
+ // id:1
}
const res = await getgroupdepartmap(idFrom)
this.companyList=res.data
diff --git a/src/views/echarts/echarts1.vue b/src/views/echarts/echarts1.vue
index 875d478..416ce51 100644
--- a/src/views/echarts/echarts1.vue
+++ b/src/views/echarts/echarts1.vue
@@ -398,8 +398,8 @@ export default {
methods: {
// 条件搜索
onSubmit() {
- // this.page = 1
- // this.pageSize = 10
+ // this.searchInfo.page = 1
+ // this.searchInfo.pagesize = 10
// this.searchInfo.parentId=this.childInfo.outId
this.getData()
},
@@ -407,7 +407,7 @@ export default {
async initialDepartment(){
const departmentFrom={
- id:2
+ // id:2
}
const res = await departmentlist(departmentFrom)
this.departmentList=res.data
diff --git a/src/views/echarts/table.vue b/src/views/echarts/table.vue
index 4de967f..7df62be 100644
--- a/src/views/echarts/table.vue
+++ b/src/views/echarts/table.vue
@@ -91,14 +91,16 @@
-->
-
+
+
@@ -218,14 +220,15 @@
-
+
+
@@ -425,6 +428,13 @@ export default {
name: 'Echarts',
data(){
return{
+ props2: {
+ checkStrictly: true,
+ value: "wxId",
+ label: "name",
+ children: "children",
+ emitPath:false,
+ },
lengthList:[],
props1: {
checkStrictly: true,
@@ -435,7 +445,7 @@ export default {
},
// 新条件查询变量
searchVersion: {
- group: 2,
+ group: 309,
deaprtid:'',
year: "", //年
class:'',
@@ -587,8 +597,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.getData()
},
@@ -596,7 +606,7 @@ export default {
async initialDepartment(){
const departmentFrom={
- id:2
+ id:309
}
const res = await departmentlist(departmentFrom)
this.departmentList=res.data
@@ -605,7 +615,7 @@ export default {
// 获取公司
async getGrouplist(){
const idFrom = {
- id:1
+ // id:1
}
const res = await getgroupdepartmap(idFrom)
this.companyList=res.data
@@ -925,7 +935,7 @@ export default {
})
console.log("scoreLength")
console.log(scoreLength)
- this.searchVersion.group=2
+ this.searchVersion.group=309
// this.searchVersion= {
// group: 2,
// deaprtid:'',
diff --git a/src/views/echarts/total.vue b/src/views/echarts/total.vue
index 4cbcc23..1652ae1 100644
--- a/src/views/echarts/total.vue
+++ b/src/views/echarts/total.vue
@@ -361,8 +361,8 @@ export default {
methods: {
// 条件搜索
onSubmit() {
- // this.page = 1
- // this.pageSize = 10
+ // this.searchInfo.page = 1
+ // this.searchInfo.pagesize = 10
// this.searchInfo.parentId=this.childInfo.outId
this.getData()
},
@@ -370,7 +370,7 @@ export default {
async initialDepartment(){
const departmentFrom={
- id:2
+ // id:2
}
const res = await departmentlist(departmentFrom)
this.departmentList=res.data
diff --git a/src/views/frontPage/index.vue b/src/views/frontPage/index.vue
index 8b389bf..efa77bc 100644
--- a/src/views/frontPage/index.vue
+++ b/src/views/frontPage/index.vue
@@ -339,12 +339,14 @@ export default {
"11"
], //指标ID
org: [
- "41",
- "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
+
+
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -433,12 +435,12 @@ export default {
"11"
], //指标ID
org: [
- "41",
- "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -523,12 +525,12 @@ export default {
"10"
], //指标ID
org: [
- "41",
- "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -617,12 +619,12 @@ export default {
"10"
], //指标ID
org: [
- "41",
- "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -707,12 +709,12 @@ export default {
"8"
], //指标ID
org: [
- "41",
- "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -801,12 +803,12 @@ export default {
"8"
], //指标ID
org: [
- "41",
- "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -891,11 +893,12 @@ export default {
"9"
], //指标ID
org: [
- "41", "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -984,11 +987,12 @@ export default {
"9"
], //指标ID
org: [
- "41", "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -1073,11 +1077,12 @@ export default {
"7"
], //指标ID
org: [
- "41", "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -1166,11 +1171,12 @@ export default {
"7"
], //指标ID
org: [
- "41", "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -1255,11 +1261,12 @@ export default {
"85"
], //指标ID
org: [
- "41", "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -1348,11 +1355,12 @@ export default {
"85"
], //指标ID
org: [
- "41", "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -1437,11 +1445,12 @@ export default {
"84"
], //指标ID
org: [
- "41", "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -1530,11 +1539,12 @@ export default {
"84"
], //指标ID
org: [
- "41", "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -1619,11 +1629,12 @@ export default {
"6"
], //指标ID
org: [
- "41", "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
@@ -1712,11 +1723,12 @@ export default {
"6"
], //指标ID
org: [
- "41", "42",
- "13",
- "14",
- "15",
- "20",
+ "115",
+ "282",
+ "116",
+ "349",
+ "354",
+ "126",
], //行政单位
year: this.year.map(String), //年度
timeattribute: {
diff --git a/src/views/hr/jobTitle.vue b/src/views/hr/jobTitle.vue
index e40c314..2a957da 100644
--- a/src/views/hr/jobTitle.vue
+++ b/src/views/hr/jobTitle.vue
@@ -283,8 +283,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/hr/organization.vue b/src/views/hr/organization.vue
index 1615662..5642c8e 100644
--- a/src/views/hr/organization.vue
+++ b/src/views/hr/organization.vue
@@ -360,8 +360,8 @@ export default {
},
// 条件搜索m
onSubmit() {
- this.page = 1
- this.pageSize = 10
+ this.searchInfo.page = 1
+ this.searchInfo.pagesize = 10
this.getDataList()
},
// 日期时间戳转日期格式
diff --git a/src/views/hr/organizeType.vue b/src/views/hr/organizeType.vue
index 1fc2769..e8f3815 100644
--- a/src/views/hr/organizeType.vue
+++ b/src/views/hr/organizeType.vue
@@ -258,8 +258,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/hr/personnel.vue b/src/views/hr/personnel.vue
index 86dc2ef..aaf5a48 100644
--- a/src/views/hr/personnel.vue
+++ b/src/views/hr/personnel.vue
@@ -1,27 +1,48 @@
-
+
+
+
+
+
查询
- 重置
+
-
-->
+
新增
@@ -45,6 +66,18 @@
type="text"
@click="showDetails(scope.row)"
>查看详情
+
编辑基础信息
+
编辑表格信息
-
+
+
+
+
+ 工号
+
+
+
+
+ 姓名
+
+
+
+ 用工关系
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 照片
+
+
+
+
+
+ 分厂(部室)
+
+
+
+ 岗位
+
+
+
+
+
+
+ 职位
+ {{staffInfo.positionname}}
+
+
+
+ 职务
+
+
+
+
+
+
+ 部门
+ {{staffInfo.deparment}}
+
+
+ 性别
+
+
+
+
+
+
+ 民族
+
+
+
+
+ 手机号码
+
+
+
+ 生日
+
+
+
+
+ 电子邮件
+ {{staffInfo.email}}
+
+
+ 国际区号
+
+
+
+
+ 护照号码
+
+
+
+ 身份证号
+
+
+
+ 籍贯
+
+
+
+ 健康状况
+
+
+
+
+
+
+
+ 婚姻状况
+
+
+
+
+
+
+ 身份证有效期开始
+ {{staffInfo.idcardstarttimedata}}
+
+
+ 身份证有效期结束
+ {{staffInfo.idcardendtimedata}}
+
+
+ 身份证地址
+ {{staffInfo.idcardaddress}}
+
+
+
+ 签发机关
+ {{staffInfo.idcardIssued}}
+
+
+ 现居地址
+
+
+
+ 内线电话
+
+
+
+ 星座
+
+
+
+
+
+
+
+ 政治面貌
+
+
+
+
+
+
+ 参加工作日期
+
+
+
+
+ 入职日期
+
+
+
+
+ 试用期
+
+
+
+
+ 预计转正日期
+
+
+
+
+ 是否为退役军人
+
+
+
+
+
+
+ 退役证编号
+
+
+
+ 是否为双职工
+ 是
+ 否
+
+
@@ -232,12 +509,25 @@
-->
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
-
-
-
-
diff --git a/src/views/hr/position.vue b/src/views/hr/position.vue
index eee316d..cc1e687 100644
--- a/src/views/hr/position.vue
+++ b/src/views/hr/position.vue
@@ -227,8 +227,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/menuSettings/index.vue b/src/views/menuSettings/index.vue
index 85029a4..2cd67ca 100644
--- a/src/views/menuSettings/index.vue
+++ b/src/views/menuSettings/index.vue
@@ -296,8 +296,8 @@ export default {
},
// 条件搜索m
onSubmit() {
- this.page = 1
- this.pageSize = 10
+ this.searchInfo.page = 1
+ this.searchInfo.pagesize = 10
this.getDataList()
},
// 日期时间戳转日期格式
diff --git a/src/views/mete/index.vue b/src/views/mete/index.vue
index 4316743..6929cff 100644
--- a/src/views/mete/index.vue
+++ b/src/views/mete/index.vue
@@ -317,7 +317,7 @@ export default {
// 获取部门
async getGrouplist(){
const departmentFrom={
- id:2
+ // id:2
}
const res = await departmentlist(departmentFrom)
this.departmentList=res.data
@@ -343,7 +343,7 @@ export default {
console.log(this.fromData)
console.log(this.fromData[0].month,)
const from ={
- groupid: '2',
+ groupid: '309',
departmentid: row.parentid.toString(),
planversionnumber:this.fromData[0].planversionnumber,
time:this.fromData[0].month,
@@ -539,7 +539,7 @@ export default {
const bumen =JSON.parse(JSON.stringify(this.searchInfo.departmentid))
const from={
- groupid:'2',
+ groupid:'309',
departmentid:'',
title:''
}
@@ -554,7 +554,7 @@ export default {
const from={
- groupid:'2',
+ groupid:'309',
}
diff --git a/src/views/personnel/post/index.vue b/src/views/personnel/post/index.vue
index e5af8b0..75ad35d 100644
--- a/src/views/personnel/post/index.vue
+++ b/src/views/personnel/post/index.vue
@@ -515,8 +515,8 @@ export default {
},
// 条件搜索m
onSubmit() {
- this.page = 1
- this.pageSize = 10
+ this.searchInfo.page = 1
+ this.searchInfo.pagesize = 10
this.getDataList()
},
// 日期时间戳转日期格式
diff --git a/src/views/qualitative/index copy.vue b/src/views/qualitative/index copy.vue
index a6c20e7..accf023 100644
--- a/src/views/qualitative/index copy.vue
+++ b/src/views/qualitative/index copy.vue
@@ -392,8 +392,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/qualitative/index.vue b/src/views/qualitative/index.vue
index daad3c8..425833c 100644
--- a/src/views/qualitative/index.vue
+++ b/src/views/qualitative/index.vue
@@ -24,14 +24,15 @@
-->
-
+
+
@@ -582,6 +583,13 @@ export default {
children: "children",
emitPath:false,
},
+ props2: {
+ checkStrictly: true,
+ value: "wxId",
+ label: "name",
+ children: "children",
+ emitPath:false,
+ },
//单位
unitDataList:[
{
@@ -855,7 +863,7 @@ export default {
// 获取公司
async getGrouplist(){
const idFrom = {
- id:1
+ // id:1
}
const res = await getgroupdepartmap(idFrom)
this.companyList=res.data
@@ -898,7 +906,7 @@ export default {
async initialDepartment(){
const departmentFrom={
- id:2
+ // id:2
}
const res = await departmentlist(departmentFrom)
this.departmentList=res.data
@@ -1163,8 +1171,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/roleSetting/index.vue b/src/views/roleSetting/index.vue
index e148df5..3ff4348 100644
--- a/src/views/roleSetting/index.vue
+++ b/src/views/roleSetting/index.vue
@@ -296,8 +296,8 @@ export default {
},
// 条件搜索m
onSubmit() {
- this.page = 1
- this.pageSize = 10
+ this.searchInfo.page = 1
+ this.searchInfo.pagesize = 10
this.getDataList()
},
// 日期时间戳转日期格式