Browse Source

完成hr系统

main
renguanyu111 3 years ago
parent
commit
f4d09d76fc
  1. 4
      src/views/approvalData/index.vue
  2. 4
      src/views/assessmentProgram/assessmentDimension.vue
  3. 4
      src/views/assessmentProgram/departmentalAssessment copy.vue
  4. 106
      src/views/assessmentProgram/departmentalAssessment.vue
  5. 4
      src/views/assessmentProgram/jobEntry.vue
  6. 4
      src/views/assessmentProgram/project.vue
  7. 4
      src/views/assessmentProgram/qualitativeIndicators copy 2.vue
  8. 4
      src/views/assessmentProgram/qualitativeIndicators copy.vue
  9. 34
      src/views/assessmentProgram/qualitativeIndicators.vue
  10. 4
      src/views/assessmentProgram/quantitativeIndicators.vue
  11. 4
      src/views/assessmentProgram/rules.vue
  12. 4
      src/views/assessmentProgram/subSection.vue
  13. 4
      src/views/basicInfo copy/assessmentDimension.vue
  14. 4
      src/views/basicInfo copy/jobEntry.vue
  15. 4
      src/views/basicInfo copy/project.vue
  16. 4
      src/views/basicInfo copy/qualitativeIndicators.vue
  17. 4
      src/views/basicInfo copy/quantitativeIndicators.vue
  18. 4
      src/views/basicInfo/assessmentDimension.vue
  19. 4
      src/views/basicInfo/assessmentIndicators.vue
  20. 4
      src/views/basicInfo/jobEntry.vue
  21. 4
      src/views/basicInfo/project.vue
  22. 4
      src/views/basicInfo/qualitativeIndicators.vue
  23. 4
      src/views/basicInfo/quantitativeIndicators.vue
  24. 20
      src/views/basicInfo/target.vue
  25. 4
      src/views/echarts/echarts.vue
  26. 6
      src/views/echarts/echarts1.vue
  27. 30
      src/views/echarts/table.vue
  28. 6
      src/views/echarts/total.vue
  29. 184
      src/views/frontPage/index.vue
  30. 4
      src/views/hr/jobTitle.vue
  31. 4
      src/views/hr/organization.vue
  32. 4
      src/views/hr/organizeType.vue
  33. 1675
      src/views/hr/personnel.vue
  34. 4
      src/views/hr/position.vue
  35. 4
      src/views/menuSettings/index.vue
  36. 8
      src/views/mete/index.vue
  37. 4
      src/views/personnel/post/index.vue
  38. 4
      src/views/qualitative/index copy.vue
  39. 20
      src/views/qualitative/index.vue
  40. 4
      src/views/roleSetting/index.vue

4
src/views/approvalData/index.vue

@ -616,8 +616,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/assessmentProgram/assessmentDimension.vue

@ -223,8 +223,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/assessmentProgram/departmentalAssessment copy.vue

@ -1077,8 +1077,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.searchInfo.parentId=this.childInfo.outId this.searchInfo.parentId=this.childInfo.outId
this.getDataList() this.getDataList()
}, },

106
src/views/assessmentProgram/departmentalAssessment.vue

@ -4,14 +4,15 @@
<div class="gva-search-box"> <div class="gva-search-box">
<el-form ref="searchForm" :inline="true" :model="searchVersion"> <el-form ref="searchForm" :inline="true" :model="searchVersion">
<el-form-item label="所属公司"> <el-form-item label="所属公司">
<el-select filterable v-model="searchVersion.group" clearable placeholder="请选择" @change="selectGroup"> <el-cascader filterable clearable v-model="searchVersion.group" :options="companyList" :show-all-levels="false" :props="props1" @change="selectGroup"></el-cascader>
<!-- <el-select filterable v-model="searchVersion.group" clearable placeholder="请选择" @change="selectGroup">
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="所属部门"> <el-form-item label="所属部门">
<el-cascader filterable clearable v-model="searchVersion.deaprtid" :options="departmentList" :show-all-levels="false" :props="props1"></el-cascader> <el-cascader filterable clearable v-model="searchVersion.deaprtid" :options="departmentList" :show-all-levels="false" :props="props1"></el-cascader>
@ -96,69 +97,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <el-table :data="tableData" border :span-method="objectSpanMethod">
<el-table-column prop="parentname" label="部门"></el-table-column>
<el-table-column prop="dimensionname" label="考核维度"></el-table-column>
<el-table-column prop="dimensionweight" label="维度权重"></el-table-column>
<el-table-column prop="targetname" label="考核指标">
<template slot-scope="scope">
<el-link v-if="scope.row.type==1" type="primary" @click="showMethod(scope.row)">{{scope.row.targetname}}</el-link>
<div v-if="scope.row.type==2">{{scope.row.targetname}}</div>
</template>
</el-table-column>
<el-table-column prop="targetweight" label="指标权重"></el-table-column>
<el-table-column prop="unit" label="单位"/>
<el-table-column prop="cycle" label="周期">
<template slot-scope="scope">
<el-tag v-if="scope.row.cycle==1"></el-tag>
<el-tag v-if="scope.row.cycle==2"></el-tag>
<el-tag v-if="scope.row.cycle==3"></el-tag>
<el-tag v-if="scope.row.cycle==4"></el-tag>
<el-tag v-if="scope.row.cycle==5">季度</el-tag>
<el-tag v-if="scope.row.cycle==6"></el-tag>
</template>
</el-table-column>
<el-table-column prop="cycleattr" label="频次">
<template slot-scope="scope">
<div v-if="scope.row.cycle==1">每班{{scope.row.cycleattr}}</div>
<div v-if="scope.row.cycle==2">每天{{scope.row.cycleattr}}</div>
<div v-if="scope.row.cycle==3">每周{{scope.row.cycleattr}}</div>
<div v-if="scope.row.cycle==4">每月{{scope.row.cycleattr}}</div>
<div v-if="scope.row.cycle==5">每季度{{scope.row.cycleattr}}</div>
<div v-if="scope.row.cycle==6">每年{{scope.row.cycleattr}}</div>
</template>
</el-table-column>
<el-table-column prop="userlist" label="执行人">
<template slot-scope="scope">
<el-button
icon="el-icon-view"
size="small"
type="text"
@click="showUserList(scope.row)"
>查看</el-button>
</template>
</el-table-column>
<el-table-column prop="userlist" label="操作">
<template slot-scope="scope">
<el-button
icon="el-icon-delete"
size="small"
type="text"
@click="deldepTarger(scope.row)"
>删除</el-button>
</template>
</el-table-column>
<el-table-column prop="userlist" label="操作">
<template slot-scope="scope">
<el-button
icon="el-icon-delete"
size="small"
type="text"
@click="deldetePartDuty(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table> -->
</div> </div>
<!-- 新增弹框 --> <!-- 新增弹框 -->
<el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" :before-close="closeDialog" title="新增" width="100%"> <el-dialog :close-on-click-modal="false" :visible.sync="dialogFormVisible" :before-close="closeDialog" title="新增" width="100%">
@ -166,14 +105,8 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属公司" prop="title"> <el-form-item label="所属公司" prop="title">
<el-select filterable v-model="form.group" clearable placeholder="请选择" @change="selectGroup"> <el-cascader filterable clearable v-model="form.group" :options="companyList" :show-all-levels="false" :props="props1" @change="selectGroup"></el-cascader>
<el-option
v-for="item in companyList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -335,14 +268,15 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="所属公司" prop="title"> <el-form-item label="所属公司" prop="title">
<el-select filterable v-model="form.group" clearable placeholder="请选择" @change="selectGroup"> <el-cascader filterable clearable v-model="form.group" :options="companyList" :show-all-levels="false" :props="props1" @change="selectGroup"></el-cascader>
<!-- <el-select filterable v-model="form.group" clearable placeholder="请选择" @change="selectGroup">
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -732,7 +666,6 @@ export default {
weiDuCopyList:[], weiDuCopyList:[],
copyForm1:{}, copyForm1:{},
props1: { props1: {
checkStrictly: true, checkStrictly: true,
value: "id", value: "id",
label: "name", label: "name",
@ -897,7 +830,7 @@ export default {
}, },
// //
searchVersion: { searchVersion: {
group: 2, group: 309,
deaprtid:'', deaprtid:'',
year: "", // year: "", //
}, },
@ -1549,6 +1482,8 @@ export default {
const departmentFrom={ const departmentFrom={
id:parseInt(val) id:parseInt(val)
} }
console.log("this.form")
console.log(this.form)
const res = await departmentlist(departmentFrom) const res = await departmentlist(departmentFrom)
this.departmentList=res.data this.departmentList=res.data
} }
@ -1567,14 +1502,11 @@ export default {
}, },
// //
async initialDepartment(){ async initialDepartment(){
const departmentFrom={ const departmentFrom={
id:2 id:309
} }
const res = await departmentlist(departmentFrom) const res = await departmentlist(departmentFrom)
this.departmentList=res.data this.departmentList=res.data
}, },
// //
getEditCheckedfrom(data){ getEditCheckedfrom(data){
@ -1583,7 +1515,10 @@ export default {
}, },
// //
async getSystemadminlist(){ async getSystemadminlist(){
const res = await getgroupuser() const from = {
level:4
}
const res = await getgroupuser(from)
this.grouplistBackup=res.data this.grouplistBackup=res.data
this.grouplistBackup.forEach(item => { this.grouplistBackup.forEach(item => {
if (item.govlist != null) { if (item.govlist != null) {
@ -1623,7 +1558,8 @@ export default {
// //
async getGrouplist(){ async getGrouplist(){
const idFrom = { const idFrom = {
id:1 // id:312
level: 3
} }
const res = await getgroupdepartmap(idFrom) const res = await getgroupdepartmap(idFrom)
this.companyList=res.data this.companyList=res.data
@ -1714,8 +1650,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
// this.page = 1 // this.searchInfo.page = 1
// this.pageSize = 10 // this.searchInfo.pagesize = 10
// this.searchInfo.parentId=this.childInfo.outId // this.searchInfo.parentId=this.childInfo.outId
this.getVersionDataList() this.getVersionDataList()
}, },

4
src/views/assessmentProgram/jobEntry.vue

@ -223,8 +223,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/assessmentProgram/project.vue

@ -375,8 +375,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/assessmentProgram/qualitativeIndicators copy 2.vue

@ -576,8 +576,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.searchInfo.parentId=this.childInfo.outId this.searchInfo.parentId=this.childInfo.outId
this.getDataList() this.getDataList()
}, },

4
src/views/assessmentProgram/qualitativeIndicators copy.vue

@ -565,8 +565,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.searchInfo.parentId=this.childInfo.outId this.searchInfo.parentId=this.childInfo.outId
this.getDataList() this.getDataList()
}, },

34
src/views/assessmentProgram/qualitativeIndicators.vue

@ -179,14 +179,15 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="所属公司" prop="title" v-show="parentidShow"> <el-form-item label="所属公司" prop="title" v-show="parentidShow">
<el-select filterable v-model="form.group" clearable placeholder="请选择"> <el-cascader filterable clearable v-model="form.group" :options="companyList" :show-all-levels="false" :props="props1"></el-cascader>
<!-- <el-select filterable v-model="form.group" clearable placeholder="请选择">
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -538,14 +539,15 @@
<div class="gva-search-box"> <div class="gva-search-box">
<el-form :inline="true" :model="rowZhiData"> <el-form :inline="true" :model="rowZhiData">
<el-form-item label="所属公司"> <el-form-item label="所属公司">
<el-select filterable v-model="methodData.group" clearable placeholder="请选择" @change="selectGroup"> <el-cascader filterable clearable v-model="methodData.group" :options="companyList" :show-all-levels="false" :props="props2" @change="selectGroup"></el-cascader>
<!-- <el-select filterable v-model="methodData.group" clearable placeholder="请选择" @change="selectGroup">
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:key="item.wxId" :key="item.wxId"
:label="item.name" :label="item.name"
:value="item.wxId"> :value="item.wxId">
</el-option> </el-option>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="所属部门"> <el-form-item label="所属部门">
<el-cascader filterable clearable v-model="methodData.departid" :options="searchDepartmentList" :show-all-levels="false" :props="props1"></el-cascader> <el-cascader filterable clearable v-model="methodData.departid" :options="searchDepartmentList" :show-all-levels="false" :props="props1"></el-cascader>
@ -1069,6 +1071,13 @@ export default {
rules: { rules: {
// title: [{ required: true, message: '', trigger: 'blur' }], // title: [{ required: true, message: '', trigger: 'blur' }],
}, },
props2: {
checkStrictly: true,
value: "wxId",
label: "name",
children: "children",
emitPath:false,
},
rowZhiData:{}, rowZhiData:{},
methodList:[], methodList:[],
xizeDataFrom:{}, xizeDataFrom:{},
@ -1323,7 +1332,7 @@ export default {
this.methodList=res.data this.methodList=res.data
} }
console.log("this.methodData")
console.log(this.methodData) console.log(this.methodData)
}, },
// //
@ -1335,6 +1344,8 @@ export default {
dimension: this.rowZhiData.dimension, // dimension: this.rowZhiData.dimension, //
targetid: this.rowZhiData.target, // targetid: this.rowZhiData.target, //
} }
console.log("this.methodData")
console.log(this.methodData)
const res = await lookdutytargetinfo(this.methodData) const res = await lookdutytargetinfo(this.methodData)
if (res.code==0) { if (res.code==0) {
this.methodList=res.data this.methodList=res.data
@ -1640,7 +1651,10 @@ export default {
}, },
// //
async getSystemadminlist(){ async getSystemadminlist(){
const res = await getgroupuser() const from = {
level:4
}
const res = await getgroupuser(from)
this.grouplistBackup=res.data this.grouplistBackup=res.data
this.grouplistBackup.forEach(item => { this.grouplistBackup.forEach(item => {
if (item.govlist != null) { if (item.govlist != null) {
@ -1672,17 +1686,14 @@ export default {
// children西 // children西
// valuelabel, // valuelabel,
// --------------------------线--------------------------------- // --------------------------线---------------------------------
item.govlist=item.child item.govlist=item.child
} }
// //
}, },
// //
async initialDepartment(){ async initialDepartment(){
const departmentFrom={ const departmentFrom={
id:2 // id:2
} }
const res = await departmentlist(departmentFrom) const res = await departmentlist(departmentFrom)
this.searchDepartmentList=res.data this.searchDepartmentList=res.data
@ -1697,7 +1708,8 @@ export default {
// //
async getGrouplist(){ async getGrouplist(){
const idFrom = { const idFrom = {
id:1 // id:1
level:3
} }
const res = await getgroupdepartmap(idFrom) const res = await getgroupdepartmap(idFrom)
this.companyList=res.data this.companyList=res.data

4
src/views/assessmentProgram/quantitativeIndicators.vue

@ -789,8 +789,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.searchInfo.parentId=this.childInfo.outId this.searchInfo.parentId=this.childInfo.outId
this.getDataList() this.getDataList()
}, },

4
src/views/assessmentProgram/rules.vue

@ -298,8 +298,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/assessmentProgram/subSection.vue

@ -267,8 +267,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/basicInfo copy/assessmentDimension.vue

@ -223,8 +223,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/basicInfo copy/jobEntry.vue

@ -223,8 +223,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/basicInfo copy/project.vue

@ -366,8 +366,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/basicInfo copy/qualitativeIndicators.vue

@ -324,8 +324,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.searchInfo.parentId=this.childInfo.outId this.searchInfo.parentId=this.childInfo.outId
this.getDataList() this.getDataList()
}, },

4
src/views/basicInfo copy/quantitativeIndicators.vue

@ -324,8 +324,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.searchInfo.parentId=this.childInfo.outId this.searchInfo.parentId=this.childInfo.outId
this.getDataList() this.getDataList()
}, },

4
src/views/basicInfo/assessmentDimension.vue

@ -230,8 +230,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/basicInfo/assessmentIndicators.vue

@ -231,8 +231,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/basicInfo/jobEntry.vue

@ -223,8 +223,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/basicInfo/project.vue

@ -535,8 +535,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/basicInfo/qualitativeIndicators.vue

@ -330,8 +330,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.searchInfo.parentId=this.childInfo.outId this.searchInfo.parentId=this.childInfo.outId
this.getDataList() this.getDataList()
}, },

4
src/views/basicInfo/quantitativeIndicators.vue

@ -324,8 +324,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.searchInfo.parentId=this.childInfo.outId this.searchInfo.parentId=this.childInfo.outId
this.getDataList() this.getDataList()
}, },

20
src/views/basicInfo/target.vue

@ -85,14 +85,15 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属公司"> <el-form-item label="所属公司">
<el-select filterable v-model="form.group" clearable placeholder="请选择" @change="selectGroup"> <el-cascader filterable clearable v-model="form.group" :options="buMenList" :show-all-levels="false" :props="props1" @change="selectGroup"></el-cascader>
<!-- <el-select filterable v-model="form.group" clearable placeholder="请选择" @change="selectGroup">
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:key="item.wxId" :key="item.wxId"
:label="item.name" :label="item.name"
:value="item.wxId"> :value="item.wxId">
</el-option> </el-option>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -715,7 +716,7 @@ export default {
dutyclasslist:[], dutyclasslist:[],
// //
searchInfo: { searchInfo: {
groupid:2, groupid:309,
}, },
pos:'', pos:'',
@ -837,7 +838,8 @@ export default {
// outid:this.searchInfo.groupid // outid:this.searchInfo.groupid
// } // }
const departmentFrom={ const departmentFrom={
id:2 // id:2
level:3
} }
const res = await departmentlist(departmentFrom) const res = await departmentlist(departmentFrom)
this.buMenList=res.data this.buMenList=res.data
@ -955,7 +957,7 @@ export default {
console.log("shouZhi") console.log("shouZhi")
const methodData={ const methodData={
type: 2, //12 type: 2, //12
group: "2", // group: this.form.group.toString(), //
departmentid: this.form.department.toString(), // departmentid: this.form.department.toString(), //
dimension: this.form.dimension, // dimension: this.form.dimension, //
versionnumber: this.banben, versionnumber: this.banben,
@ -1077,13 +1079,13 @@ export default {
// //
onReset() { onReset() {
this.searchInfo = { this.searchInfo = {
groupid:"3", groupid:"309",
} }
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //
@ -1196,7 +1198,7 @@ export default {
} }
const res = await lookquantitativeconfig(this.searchInfo) const res = await lookquantitativeconfig(this.searchInfo)
this.tableData = res.data this.tableData = res.data
this.searchInfo.groupid="2" this.searchInfo.groupid="309"
// this.searchInfo = { // this.searchInfo = {
// groupid:"2", // groupid:"2",
// departmentid:'' // departmentid:''

4
src/views/echarts/echarts.vue

@ -361,7 +361,7 @@ export default {
// //
async initialDepartment(){ async initialDepartment(){
const departmentFrom={ const departmentFrom={
id:2 // id:2
} }
const res = await departmentlist(departmentFrom) const res = await departmentlist(departmentFrom)
this.departmentList=res.data this.departmentList=res.data
@ -370,7 +370,7 @@ export default {
// //
async getGrouplist(){ async getGrouplist(){
const idFrom = { const idFrom = {
id:1 // id:1
} }
const res = await getgroupdepartmap(idFrom) const res = await getgroupdepartmap(idFrom)
this.companyList=res.data this.companyList=res.data

6
src/views/echarts/echarts1.vue

@ -398,8 +398,8 @@ export default {
methods: { methods: {
// //
onSubmit() { onSubmit() {
// this.page = 1 // this.searchInfo.page = 1
// this.pageSize = 10 // this.searchInfo.pagesize = 10
// this.searchInfo.parentId=this.childInfo.outId // this.searchInfo.parentId=this.childInfo.outId
this.getData() this.getData()
}, },
@ -407,7 +407,7 @@ export default {
async initialDepartment(){ async initialDepartment(){
const departmentFrom={ const departmentFrom={
id:2 // id:2
} }
const res = await departmentlist(departmentFrom) const res = await departmentlist(departmentFrom)
this.departmentList=res.data this.departmentList=res.data

30
src/views/echarts/table.vue

@ -91,14 +91,16 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="所属公司"> <el-form-item label="所属公司">
<el-select filterable v-model="searchVersion.group" clearable placeholder="请选择" @change="selectGroup"> <el-cascader filterable clearable v-model="searchVersion.group" :options="companyList" :show-all-levels="false" :props="props2" @change="selectGroup"></el-cascader>
<!-- <el-select filterable v-model="searchVersion.group" clearable placeholder="请选择" @change="selectGroup">
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="所属部门"> <el-form-item label="所属部门">
<el-cascader filterable clearable v-model="searchVersion.deaprtid" :options="departmentList" :show-all-levels="false" :props="props1"></el-cascader> <el-cascader filterable clearable v-model="searchVersion.deaprtid" :options="departmentList" :show-all-levels="false" :props="props1"></el-cascader>
@ -218,14 +220,15 @@
<div class="gva-search-box"> <div class="gva-search-box">
<el-form ref="searchForm" :inline="true" :model="searchVersion"> <el-form ref="searchForm" :inline="true" :model="searchVersion">
<el-form-item label="所属公司"> <el-form-item label="所属公司">
<el-select filterable v-model="searchVersion.group" clearable placeholder="请选择" @change="selectGroup"> <el-cascader filterable clearable v-model="searchVersion.group" :options="companyList" :show-all-levels="false" :props="props2" @change="selectGroup"></el-cascader>
<!-- <el-select filterable v-model="searchVersion.group" clearable placeholder="请选择" @change="selectGroup">
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="所属部门"> <el-form-item label="所属部门">
<el-cascader filterable clearable v-model="searchVersion.deaprtid" :options="departmentList" :show-all-levels="false" :props="props1"></el-cascader> <el-cascader filterable clearable v-model="searchVersion.deaprtid" :options="departmentList" :show-all-levels="false" :props="props1"></el-cascader>
@ -425,6 +428,13 @@ export default {
name: 'Echarts', name: 'Echarts',
data(){ data(){
return{ return{
props2: {
checkStrictly: true,
value: "wxId",
label: "name",
children: "children",
emitPath:false,
},
lengthList:[], lengthList:[],
props1: { props1: {
checkStrictly: true, checkStrictly: true,
@ -435,7 +445,7 @@ export default {
}, },
// //
searchVersion: { searchVersion: {
group: 2, group: 309,
deaprtid:'', deaprtid:'',
year: "", // year: "", //
class:'', class:'',
@ -587,8 +597,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
// this.page = 1 // this.searchInfo.page = 1
// this.pageSize = 10 // this.searchInfo.pagesize = 10
// this.searchInfo.parentId=this.childInfo.outId // this.searchInfo.parentId=this.childInfo.outId
this.getData() this.getData()
}, },
@ -596,7 +606,7 @@ export default {
async initialDepartment(){ async initialDepartment(){
const departmentFrom={ const departmentFrom={
id:2 id:309
} }
const res = await departmentlist(departmentFrom) const res = await departmentlist(departmentFrom)
this.departmentList=res.data this.departmentList=res.data
@ -605,7 +615,7 @@ export default {
// //
async getGrouplist(){ async getGrouplist(){
const idFrom = { const idFrom = {
id:1 // id:1
} }
const res = await getgroupdepartmap(idFrom) const res = await getgroupdepartmap(idFrom)
this.companyList=res.data this.companyList=res.data
@ -925,7 +935,7 @@ export default {
}) })
console.log("scoreLength") console.log("scoreLength")
console.log(scoreLength) console.log(scoreLength)
this.searchVersion.group=2 this.searchVersion.group=309
// this.searchVersion= { // this.searchVersion= {
// group: 2, // group: 2,
// deaprtid:'', // deaprtid:'',

6
src/views/echarts/total.vue

@ -361,8 +361,8 @@ export default {
methods: { methods: {
// //
onSubmit() { onSubmit() {
// this.page = 1 // this.searchInfo.page = 1
// this.pageSize = 10 // this.searchInfo.pagesize = 10
// this.searchInfo.parentId=this.childInfo.outId // this.searchInfo.parentId=this.childInfo.outId
this.getData() this.getData()
}, },
@ -370,7 +370,7 @@ export default {
async initialDepartment(){ async initialDepartment(){
const departmentFrom={ const departmentFrom={
id:2 // id:2
} }
const res = await departmentlist(departmentFrom) const res = await departmentlist(departmentFrom)
this.departmentList=res.data this.departmentList=res.data

184
src/views/frontPage/index.vue

@ -339,12 +339,14 @@ export default {
"11" "11"
], //ID ], //ID
org: [ org: [
"41", "115",
"42", "282",
"13", "116",
"14", "349",
"15", "354",
"20", "126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -433,12 +435,12 @@ export default {
"11" "11"
], //ID ], //ID
org: [ org: [
"41", "115",
"42", "282",
"13", "116",
"14", "349",
"15", "354",
"20", "126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -523,12 +525,12 @@ export default {
"10" "10"
], //ID ], //ID
org: [ org: [
"41", "115",
"42", "282",
"13", "116",
"14", "349",
"15", "354",
"20", "126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -617,12 +619,12 @@ export default {
"10" "10"
], //ID ], //ID
org: [ org: [
"41", "115",
"42", "282",
"13", "116",
"14", "349",
"15", "354",
"20", "126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -707,12 +709,12 @@ export default {
"8" "8"
], //ID ], //ID
org: [ org: [
"41", "115",
"42", "282",
"13", "116",
"14", "349",
"15", "354",
"20", "126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -801,12 +803,12 @@ export default {
"8" "8"
], //ID ], //ID
org: [ org: [
"41", "115",
"42", "282",
"13", "116",
"14", "349",
"15", "354",
"20", "126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -891,11 +893,12 @@ export default {
"9" "9"
], //ID ], //ID
org: [ org: [
"41", "42", "115",
"13", "282",
"14", "116",
"15", "349",
"20", "354",
"126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -984,11 +987,12 @@ export default {
"9" "9"
], //ID ], //ID
org: [ org: [
"41", "42", "115",
"13", "282",
"14", "116",
"15", "349",
"20", "354",
"126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -1073,11 +1077,12 @@ export default {
"7" "7"
], //ID ], //ID
org: [ org: [
"41", "42", "115",
"13", "282",
"14", "116",
"15", "349",
"20", "354",
"126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -1166,11 +1171,12 @@ export default {
"7" "7"
], //ID ], //ID
org: [ org: [
"41", "42", "115",
"13", "282",
"14", "116",
"15", "349",
"20", "354",
"126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -1255,11 +1261,12 @@ export default {
"85" "85"
], //ID ], //ID
org: [ org: [
"41", "42", "115",
"13", "282",
"14", "116",
"15", "349",
"20", "354",
"126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -1348,11 +1355,12 @@ export default {
"85" "85"
], //ID ], //ID
org: [ org: [
"41", "42", "115",
"13", "282",
"14", "116",
"15", "349",
"20", "354",
"126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -1437,11 +1445,12 @@ export default {
"84" "84"
], //ID ], //ID
org: [ org: [
"41", "42", "115",
"13", "282",
"14", "116",
"15", "349",
"20", "354",
"126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -1530,11 +1539,12 @@ export default {
"84" "84"
], //ID ], //ID
org: [ org: [
"41", "42", "115",
"13", "282",
"14", "116",
"15", "349",
"20", "354",
"126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -1619,11 +1629,12 @@ export default {
"6" "6"
], //ID ], //ID
org: [ org: [
"41", "42", "115",
"13", "282",
"14", "116",
"15", "349",
"20", "354",
"126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {
@ -1712,11 +1723,12 @@ export default {
"6" "6"
], //ID ], //ID
org: [ org: [
"41", "42", "115",
"13", "282",
"14", "116",
"15", "349",
"20", "354",
"126",
], // ], //
year: this.year.map(String), // year: this.year.map(String), //
timeattribute: { timeattribute: {

4
src/views/hr/jobTitle.vue

@ -283,8 +283,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/hr/organization.vue

@ -360,8 +360,8 @@ export default {
}, },
// m // m
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/hr/organizeType.vue

@ -258,8 +258,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

1675
src/views/hr/personnel.vue

File diff suppressed because it is too large

4
src/views/hr/position.vue

@ -227,8 +227,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/menuSettings/index.vue

@ -296,8 +296,8 @@ export default {
}, },
// m // m
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

8
src/views/mete/index.vue

@ -317,7 +317,7 @@ export default {
// //
async getGrouplist(){ async getGrouplist(){
const departmentFrom={ const departmentFrom={
id:2 // id:2
} }
const res = await departmentlist(departmentFrom) const res = await departmentlist(departmentFrom)
this.departmentList=res.data this.departmentList=res.data
@ -343,7 +343,7 @@ export default {
console.log(this.fromData) console.log(this.fromData)
console.log(this.fromData[0].month,) console.log(this.fromData[0].month,)
const from ={ const from ={
groupid: '2', groupid: '309',
departmentid: row.parentid.toString(), departmentid: row.parentid.toString(),
planversionnumber:this.fromData[0].planversionnumber, planversionnumber:this.fromData[0].planversionnumber,
time:this.fromData[0].month, time:this.fromData[0].month,
@ -539,7 +539,7 @@ export default {
const bumen =JSON.parse(JSON.stringify(this.searchInfo.departmentid)) const bumen =JSON.parse(JSON.stringify(this.searchInfo.departmentid))
const from={ const from={
groupid:'2', groupid:'309',
departmentid:'', departmentid:'',
title:'' title:''
} }
@ -554,7 +554,7 @@ export default {
const from={ const from={
groupid:'2', groupid:'309',
} }

4
src/views/personnel/post/index.vue

@ -515,8 +515,8 @@ export default {
}, },
// m // m
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/qualitative/index copy.vue

@ -392,8 +392,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

20
src/views/qualitative/index.vue

@ -24,14 +24,15 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="所属公司"> <el-form-item label="所属公司">
<el-select filterable v-model="searchInfo.group" clearable placeholder="请选择" @change="selectGroup"> <el-cascader filterable clearable v-model="searchInfo.group" :options="companyList" :show-all-levels="false" :props="props1" @change="selectGroup"></el-cascader>
<!-- <el-select filterable v-model="searchInfo.group" clearable placeholder="请选择" @change="selectGroup">
<el-option <el-option
v-for="item in companyList" v-for="item in companyList"
:key="item.wxId" :key="item.wxId"
:label="item.name" :label="item.name"
:value="item.wxId"> :value="item.wxId">
</el-option> </el-option>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="所属部门"> <el-form-item label="所属部门">
<el-cascader filterable clearable v-model="searchInfo.department" :options="departmentList" :show-all-levels="false" :props="props1"></el-cascader> <el-cascader filterable clearable v-model="searchInfo.department" :options="departmentList" :show-all-levels="false" :props="props1"></el-cascader>
@ -582,6 +583,13 @@ export default {
children: "children", children: "children",
emitPath:false, emitPath:false,
}, },
props2: {
checkStrictly: true,
value: "wxId",
label: "name",
children: "children",
emitPath:false,
},
// //
unitDataList:[ unitDataList:[
{ {
@ -855,7 +863,7 @@ export default {
// //
async getGrouplist(){ async getGrouplist(){
const idFrom = { const idFrom = {
id:1 // id:1
} }
const res = await getgroupdepartmap(idFrom) const res = await getgroupdepartmap(idFrom)
this.companyList=res.data this.companyList=res.data
@ -898,7 +906,7 @@ export default {
async initialDepartment(){ async initialDepartment(){
const departmentFrom={ const departmentFrom={
id:2 // id:2
} }
const res = await departmentlist(departmentFrom) const res = await departmentlist(departmentFrom)
this.departmentList=res.data this.departmentList=res.data
@ -1163,8 +1171,8 @@ export default {
}, },
// //
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

4
src/views/roleSetting/index.vue

@ -296,8 +296,8 @@ export default {
}, },
// m // m
onSubmit() { onSubmit() {
this.page = 1 this.searchInfo.page = 1
this.pageSize = 10 this.searchInfo.pagesize = 10
this.getDataList() this.getDataList()
}, },
// //

Loading…
Cancel
Save