Browse Source

修改部门角色联动

master
yangzhou-cyber 3 years ago
parent
commit
cf9093d777
18 changed files with 28 additions and 52 deletions
  1. +0
    -2
      src/api/assessingTarget/basicTarget.js
  2. +0
    -1
      src/api/assessingTarget/commonquotatask.js
  3. +0
    -1
      src/api/assessingTarget/reward.js
  4. +0
    -1
      src/api/basicTable/category.js
  5. +0
    -1
      src/config/setting.js
  6. +0
    -1
      src/store/modules/user.js
  7. +0
    -2
      src/views/assessingTarget/basicTarget.vue
  8. +0
    -1
      src/views/assessingTarget/commonquotatask.vue
  9. +0
    -2
      src/views/assessingTarget/constraint.vue
  10. +1
    -3
      src/views/assessingTarget/reward.vue
  11. +1
    -1
      src/views/assessingTarget/search.vue
  12. +0
    -1
      src/views/basicTable/category.vue
  13. +0
    -1
      src/views/basicTable/conventional.vue
  14. +0
    -1
      src/views/basicTable/search.vue
  15. +10
    -10
      src/views/summary/basicTarget.vue
  16. +6
    -7
      src/views/summary/constraint.vue
  17. +7
    -8
      src/views/summary/reward.vue
  18. +3
    -8
      src/views/system/user/index.vue

+ 0
- 2
src/api/assessingTarget/basicTarget.js View File

import axios from "@/config/axios" import axios from "@/config/axios"
export default{ export default{
getList(params){ getList(params){
console.log(params)
return axios.get("/basictask/index",{params}) return axios.get("/basictask/index",{params})
}, },
updatePoints(params){ updatePoints(params){
return axios.post('/basictask/updateExpectedPoints',params) return axios.post('/basictask/updateExpectedPoints',params)
}, },
updateLeaderDept(params){ updateLeaderDept(params){
console.log(params)
return axios.post('/basictask/updateLeaderDept',params) return axios.post('/basictask/updateLeaderDept',params)
} }
} }

+ 0
- 1
src/api/assessingTarget/commonquotatask.js View File

import axios from "@/config/axios" import axios from "@/config/axios"
export default{ export default{
getList(params){ getList(params){
console.log(params)
return axios.get("/commonquotatask/index",{params}) return axios.get("/commonquotatask/index",{params})
} }
} }

+ 0
- 1
src/api/assessingTarget/reward.js View File

import axios from "@/config/axios" import axios from "@/config/axios"
export default { export default {
getList(params) { getList(params) {
console.log(params)
return axios.get("/specialpower/index", { params }) return axios.get("/specialpower/index", { params })
}, },
updatePoints(params) { updatePoints(params) {

+ 0
- 1
src/api/basicTable/category.js View File



export default { export default {
add(params) { add(params) {
console.log(params)
return axios.post('/category/add', params) return axios.post('/category/add', params)
}, },
getList(params) { getList(params) {

+ 0
- 1
src/config/setting.js View File

export default { export default {
version: '1.0', version: '1.0',
name: 'JNDZ考核管理系统', // 项目名称 name: 'JNDZ考核管理系统', // 项目名称
baseURL: 'http://47.98.157.120:9031/api/', // 接口地址 baseURL: 'http://47.98.157.120:9031/api/', // 接口地址
// baseURL: 'http://127.0.0.1:9031/api/', // 接口地址 // baseURL: 'http://127.0.0.1:9031/api/', // 接口地址
whiteList: ['/login', '/forget'], // 路由白名单(不需要登录的) whiteList: ['/login', '/forget'], // 路由白名单(不需要登录的)

+ 0
- 1
src/store/modules/user.js View File

}); });
} }
}); });
console.log(route)
return route; return route;
} }

+ 0
- 2
src/views/assessingTarget/basicTarget.vue View File

}, },
showLeaderDept(data) { showLeaderDept(data) {
this.showDep = true; this.showDep = true;
console.log(data);
data.leaderDept = (data.leaderDept && data.leaderDept.split(",")) || []; data.leaderDept = (data.leaderDept && data.leaderDept.split(",")) || [];
this.updateData = data; this.updateData = data;
}, },
}); });
}, },
showText(index, bool) { showText(index, bool) {
console.log(index);
let data = this.dataList; let data = this.dataList;
data[index].focus = bool; data[index].focus = bool;
this.dataList = data; this.dataList = data;

+ 0
- 1
src/views/assessingTarget/commonquotatask.vue View File

api api
.getList( this.page ) .getList( this.page )
.then((res) => { .then((res) => {
console.log(res.data);
this.loading = false; this.loading = false;
let data = res.data.data let data = res.data.data
this.dataList = data; this.dataList = data;

+ 0
- 2
src/views/assessingTarget/constraint.vue View File

}, },
showLeaderDept(data) { showLeaderDept(data) {
this.showDep = true; this.showDep = true;
console.log(data);
data.leaderDept = (data.leaderDept && data.leaderDept.split(",")) || []; data.leaderDept = (data.leaderDept && data.leaderDept.split(",")) || [];
this.updateData = data; this.updateData = data;
}, },
}); });
}, },
showText(index, bool) { showText(index, bool) {
console.log(index);
let data = this.dataList; let data = this.dataList;
data[index].focus = bool; data[index].focus = bool;
this.dataList = data; this.dataList = data;

+ 1
- 3
src/views/assessingTarget/reward.vue View File

}, },
showLeaderDept(data) { showLeaderDept(data) {
this.showDep = true; this.showDep = true;
console.log(data);
data.leaderDept = (data.leaderDept && data.leaderDept.split(",")) || []; data.leaderDept = (data.leaderDept && data.leaderDept.split(",")) || [];
this.updateData = data; this.updateData = data;
}, },
}); });
}, },
showText(index, bool) { showText(index, bool) {
console.log(index);
let data = this.dataList; let data = this.dataList;
data[index].focus = bool; data[index].focus = bool;
this.dataList = data; this.dataList = data;
}, },
getDataList(params) {
getDataList() {
this.loading = true; this.loading = true;
api api
.getList(Object.assign({},this.type, this.searchParams, this.page)) .getList(Object.assign({},this.type, this.searchParams, this.page))

+ 1
- 1
src/views/assessingTarget/search.vue View File

<template> <template>
<div class="search"> <div class="search">
<el-form :inline="true" :model="searchParams" size="small">
<el-form :inline="true" :model="searchParams" size="mini">
<template v-if="type == 1 || type == 2"> <template v-if="type == 1 || type == 2">
<el-form-item label="一级指标:"> <el-form-item label="一级指标:">
<el-select <el-select

+ 0
- 1
src/views/basicTable/category.vue View File

this.ischecked = 'add' this.ischecked = 'add'
}, },
look(row) { look(row) {
console.log(row);
this.form = Object.assign({}, row) this.form = Object.assign({}, row)
this.dialogTitle = '查看表' this.dialogTitle = '查看表'
this.showAdd = true this.showAdd = true

+ 0
- 1
src/views/basicTable/conventional.vue View File

.getList(Object.assign({}, this.searchParams, this.page)) .getList(Object.assign({}, this.searchParams, this.page))
.then((res) => { .then((res) => {
this.loading = false; this.loading = false;
console.log(res.data.data.records);
let data = res.data.data.records; let data = res.data.data.records;
data = data.map((item) => { data = data.map((item) => {
item.year = item.year + ""; item.year = item.year + "";

+ 0
- 1
src/views/basicTable/search.vue View File

}, },
watch: { watch: {
"searchParams.year"(val) { "searchParams.year"(val) {
console.log(val);
if (!val) { if (!val) {
this.$set(this.searchParams, "code", ""); this.$set(this.searchParams, "code", "");
this.codeList = []; this.codeList = [];

+ 10
- 10
src/views/summary/basicTarget.vue View File

></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="一级指标" label="一级指标"
min-width="150"
min-width="80"
align="center" align="center"
prop="quota1" prop="quota1"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="二级指标" label="二级指标"
min-width="150"
min-width="120"
align="center" align="center"
prop="quota2" prop="quota2"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="考核内容和计分规则" label="考核内容和计分规则"
min-width="80"
min-width="300"
align="center" align="center"
prop="content" prop="content"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="分值" label="分值"
min-width="100"
min-width="60"
align="center" align="center"
prop="points" prop="points"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="预计得分" label="预计得分"
min-width="100"
min-width="60"
align="center" align="center"
prop="expectedPoints" prop="expectedPoints"
></el-table-column> ></el-table-column>
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="责任领导" label="责任领导"
min-width="100"
min-width="80"
align="center" align="center"
prop="leaderPrincipal"
prop="leaderPrincipalList"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="得分说明" label="得分说明"
min-width="80"
min-width="120"
align="center" align="center"
prop="note" prop="note"
></el-table-column> ></el-table-column>
components: { components: {
search, search,
}, },
created() {
// mixins: [assessing],
created() {
this.getDataList(); this.getDataList();
this.$store.dispatch('base/getQuota1List',1) this.$store.dispatch('base/getQuota1List',1)
}, },
}); });
this.dataList = data; this.dataList = data;
this.count = res.data.data.total; this.count = res.data.data.total;
console.log(res.data);
}) })
.catch(() => { .catch(() => {
this.loading=false this.loading=false

+ 6
- 7
src/views/summary/constraint.vue View File

></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="考核指标" label="考核指标"
min-width="150"
min-width="80"
align="center" align="center"
prop="quota" prop="quota"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="考核内容和计分规则" label="考核内容和计分规则"
min-width="80"
min-width="400"
align="center" align="center"
prop="content" prop="content"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="预计扣分" label="预计扣分"
min-width="100"
min-width="50"
align="center" align="center"
prop="expectedPoints" prop="expectedPoints"
></el-table-column> ></el-table-column>
label="牵头部门" label="牵头部门"
min-width="80" min-width="80"
align="center" align="center"
prop="leaderDept"
prop="leaderDeptList"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="责任领导" label="责任领导"
min-width="100" min-width="100"
align="center" align="center"
prop="leaderPrincipal"
prop="leaderPrincipalList"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="扣分说明" label="扣分说明"
components: { components: {
search, search,
}, },
created() {
created() {
this.getDataList(); this.getDataList();
this.$store.dispatch('base/getQuota1List',1) this.$store.dispatch('base/getQuota1List',1)
}, },
}); });
this.dataList = data; this.dataList = data;
this.count = res.data.data.total; this.count = res.data.data.total;
console.log(res.data);
}) })
.catch(() => { .catch(() => {
this.loading=false this.loading=false

+ 7
- 8
src/views/summary/reward.vue View File

></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="一级指标" label="一级指标"
min-width="150"
min-width="100"
align="center" align="center"
prop="quota1" prop="quota1"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="二级指标" label="二级指标"
min-width="150"
min-width="100"
align="center" align="center"
prop="quota2" prop="quota2"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="考核内容和计分规则" label="考核内容和计分规则"
min-width="80"
min-width="200"
align="center" align="center"
prop="content" prop="content"
></el-table-column> ></el-table-column>
label="牵头部门" label="牵头部门"
min-width="80" min-width="80"
align="center" align="center"
prop="leaderDept"
prop="leaderDeptList"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="责任领导" label="责任领导"
min-width="100" min-width="100"
align="center" align="center"
prop="leaderPrincipal"
prop="leaderPrincipalList"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="得分说明" label="得分说明"
min-width="80"
min-width="120"
align="center" align="center"
prop="note" prop="note"
></el-table-column> ></el-table-column>
components: { components: {
search, search,
}, },
created() {
created() {
this.getDataList(); this.getDataList();
this.$store.dispatch('base/getQuota1List',1) this.$store.dispatch('base/getQuota1List',1)
}, },
}); });
this.dataList = data; this.dataList = data;
this.count = res.data.data.total; this.count = res.data.data.total;
console.log(res.data);
}) })
.catch(() => { .catch(() => {
this.loading=false this.loading=false

+ 3
- 8
src/views/system/user/index.vue View File

<el-option label="女" :value="2"/> <el-option label="女" :value="2"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="职级" prop="levelId" :rules="{
required: true, message: '所属职级不能为空', trigger: 'change'
}">
<el-form-item label="职级" prop="levelId">
<el-select filterable clearable v-model="editForm.levelId" size="small" placeholder="-请选择职级-"> <el-select filterable clearable v-model="editForm.levelId" size="small" placeholder="-请选择职级-">
<el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id"/> <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="部门:" prop="roleIds"> <el-form-item label="部门:" prop="roleIds">
<el-select v-model="editForm.roleIds" placeholder="请选择部门" class="ele-block" clearable multiple>
<el-select v-model="editForm.deptId" placeholder="请选择部门" class="ele-block" clearable multiple>
<el-option v-for="(item,index) in departmentsList" :key="index" :label="item.name" :value="item.id"/> <el-option v-for="(item,index) in departmentsList" :key="index" :label="item.name" :value="item.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="个人简介:"> <el-form-item label="个人简介:">
<el-input v-model="editForm.intro" placeholder="请输入个人简介" clearable/> <el-input v-model="editForm.intro" placeholder="请输入个人简介" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="岗位" prop="positionId" :rules="{
required: true, message: '所属岗位不能为空', trigger: 'change'
}">
<el-form-item label="岗位" prop="positionId">
<el-select filterable clearable v-model="editForm.positionId" size="small" placeholder="-请选择岗位-"> <el-select filterable clearable v-model="editForm.positionId" size="small" placeholder="-请选择岗位-">
<el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id"/> <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select> </el-select>
this.$http.get('/dept/getDeptList/1').then(res => { this.$http.get('/dept/getDeptList/1').then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
this.departmentsList = res.data.data; this.departmentsList = res.data.data;
console.log(this.departmentsList);
} else { } else {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
} }

Loading…
Cancel
Save