diff --git a/src/api/tenant/talents.js b/src/api/tenant/talents.js
index 745206d..a9317dc 100644
--- a/src/api/tenant/talents.js
+++ b/src/api/tenant/talents.js
@@ -49,11 +49,11 @@ export const detail =
/*获取分组*/
export const getDept =
- () => {
+ (params = {}) => {
return request({
url: '/api/jobslink-api/tenant/talents/group/listAll',
method: 'get',
- params: {}
+ params
})
}
diff --git a/src/views/tenant/main/label/index.vue b/src/views/tenant/main/label/index.vue
index 83c9d5a..0553cb3 100644
--- a/src/views/tenant/main/label/index.vue
+++ b/src/views/tenant/main/label/index.vue
@@ -31,7 +31,7 @@
size="mini" @click="() => updateGroups('edit', data)">
removeGroups(data)">
@@ -43,6 +43,7 @@
新建分组
@@ -251,14 +252,8 @@ export default {
return {
addBtn: this.vaildData(this.permission.tenant_main_label_index_add, false),
viewBtn: true,
- delBtn: this.vaildData(
- this.permission.tenant_main_label_index_edit,
- false
- ),
- editBtn: this.vaildData(
- this.permission.tenant_main_label_index_edit,
- false
- ),
+ delBtn: this.vaildData(this.permission.tenant_main_label_index_del, false),
+ editBtn: this.vaildData(this.permission.tenant_main_label_index_edit, false),
};
},
ids() {
diff --git a/src/views/tenant/main/policy/index.vue b/src/views/tenant/main/policy/index.vue
index ccce405..47c50ca 100644
--- a/src/views/tenant/main/policy/index.vue
+++ b/src/views/tenant/main/policy/index.vue
@@ -26,16 +26,20 @@
- updateGroups('edit', data)">
+ updateGroups('edit', data)">
- removeGroups(data)">
+ removeGroups(data)"
+ v-if="vaildData(permission.tenant_main_policy_index_groupdel, false)">
@@ -136,9 +140,9 @@
转移分组
+ @click="handleTransfer" v-show="vaildData(permission.tenant_main_policy_transfergroup, false)">转移分组
+ :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_main_policy_index_del, false)">
删除
@@ -279,16 +283,10 @@ export default {
...mapGetters(["permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
+ addBtn: this.vaildData(this.permission.tenant_main_policy_index_add, false),
viewBtn: true,
- delBtn: this.vaildData(
- this.permission.tenant_talents_groupdelete,
- false
- ),
- editBtn: this.vaildData(
- this.permission.tenant_talents_groupedit,
- false
- ),
+ delBtn: this.vaildData(this.permission.tenant_main_policy_index_del, false),
+ editBtn: this.vaildData(this.permission.tenant_main_policy_index_edit, false),
};
},
ids() {
diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue
index f078803..a1aab39 100644
--- a/src/views/tenant/main/serve/index.vue
+++ b/src/views/tenant/main/serve/index.vue
@@ -20,15 +20,21 @@
({{ data.sumNum }}个)
- updateGroups('edit', data)">
+ updateGroups('edit', data)">
- removeGroups(data)">
+ removeGroups(data)">
@@ -99,7 +105,8 @@
- { $refs.crud.rowAdd(); selectPolicyTree = []}">
+ { $refs.crud.rowAdd(); selectPolicyTree = []}"
+ v-if="vaildData(permission.tenant_main_serve_index_add, false)">
新增
@@ -122,6 +129,7 @@
推送服务
启用
关闭
@@ -472,16 +482,10 @@ export default {
...mapGetters(["permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
+ addBtn: this.vaildData(this.permission.tenant_main_serve_index_add, false),
viewBtn: true,
- delBtn: this.vaildData(
- this.permission.tenant_talents_groupdelete,
- false
- ),
- editBtn: this.vaildData(
- this.permission.tenant_talents_groupedit,
- false
- ),
+ delBtn: this.vaildData(this.permission.tenant_main_serve_index_del,false),
+ editBtn: this.vaildData(this.permission.tenant_main_serve_index_edit, false ),
};
},
ids() {
diff --git a/src/views/tenant/main/talents/certain/index.vue b/src/views/tenant/main/talents/certain/index.vue
index 6678ff8..451e7fa 100644
--- a/src/views/tenant/main/talents/certain/index.vue
+++ b/src/views/tenant/main/talents/certain/index.vue
@@ -26,16 +26,22 @@
- updateGroups('edit', data)">
+ updateGroups('edit', data)">
- removeGroups(data)">
+ removeGroups(data)">
@@ -94,9 +100,9 @@
导入
转移分组
+ @click="handleTransfer" v-show="vaildData(permission.tenant_main_talents_certain_index_transfergroup, false)">转移分组
+ :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_main_talents_certain_index_transfergroup, false)">
删除
@@ -203,17 +209,10 @@ export default {
...mapGetters(["permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
+ addBtn: this.vaildData(this.permission.tenant_main_talents_certain_index_add, false),
viewBtn: true,
- delBtn: this.vaildData(
- this.permission.tenant_talents_groupdelete,
- false
- ),
- editBtn: this.vaildData(
- this.permission.tenant_talents_groupedit,
- false
- ),
- };
+ delBtn: this.vaildData( this.permission.tenant_main_talents_certain_index_delete, false),
+ editBtn: this.vaildData( this.permission.tenant_main_talents_certain_index_edit,false)};
},
ids() {
let ids = [];
@@ -494,7 +493,7 @@ export default {
},
/*加载分组*/
initDept(groupId) {
- getDept().then((res) => {
+ getDept({groupType: 1}).then((res) => {
const data = res.data.data.list;
this.treeData = data;
let treeDataOne = {
@@ -894,11 +893,16 @@ export default {
},
/*加载人才列表 */
onLoad(page, params = {}) {
+ const paramsd = {
+ ...params,
+ ...this.query,
+ groupType: 0
+ }
this.loading = true;
getList(
page.currentPage,
page.pageSize,
- Object.assign(params, this.query),
+ paramsd,
this.tenantId
).then((res) => {
res.data.data.records.forEach(item => {
diff --git a/src/views/tenant/main/talents/latent/index.vue b/src/views/tenant/main/talents/latent/index.vue
index 6678ff8..5c6295f 100644
--- a/src/views/tenant/main/talents/latent/index.vue
+++ b/src/views/tenant/main/talents/latent/index.vue
@@ -26,16 +26,22 @@
- updateGroups('edit', data)">
+ updateGroups('edit', data)">
- removeGroups(data)">
+ removeGroups(data)">
@@ -94,9 +100,9 @@
导入
转移分组
+ @click="handleTransfer" v-show="vaildData(permission.tenant_main_talents_latent_index_tansfergroup, false)">转移分组
+ :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_main_talents_latent_index_tansfergroup, false)">
删除
@@ -203,16 +209,10 @@ export default {
...mapGetters(["permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
+ addBtn: this.vaildData(this.permission.tenant_main_talents_latent_index_add, false),
viewBtn: true,
- delBtn: this.vaildData(
- this.permission.tenant_talents_groupdelete,
- false
- ),
- editBtn: this.vaildData(
- this.permission.tenant_talents_groupedit,
- false
- ),
+ delBtn: this.vaildData( this.permission.tenant_main_talents_latent_index_del, false),
+ editBtn: this.vaildData(this.permission.tenant_main_talents_latent_index_edit, false),
};
},
ids() {
@@ -494,7 +494,7 @@ export default {
},
/*加载分组*/
initDept(groupId) {
- getDept().then((res) => {
+ getDept({groupType: 0}).then((res) => {
const data = res.data.data.list;
this.treeData = data;
let treeDataOne = {
@@ -894,11 +894,16 @@ export default {
},
/*加载人才列表 */
onLoad(page, params = {}) {
+ const paramsd = {
+ ...params,
+ ...this.query,
+ groupType: 0
+ }
this.loading = true;
getList(
page.currentPage,
page.pageSize,
- Object.assign(params, this.query),
+ paramsd,
this.tenantId
).then((res) => {
res.data.data.records.forEach(item => {
diff --git a/src/views/util/post-view.vue b/src/views/util/post-view.vue
index 51103ac..c3fb56d 100644
--- a/src/views/util/post-view.vue
+++ b/src/views/util/post-view.vue
@@ -122,7 +122,7 @@
{{
- model.companyName
+ model.jobCompanyName
}}
diff --git a/vue.config.js b/vue.config.js
index daacde0..90ff354 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,7 +23,7 @@ module.exports = {
port: 1888,
proxy: {
"/api": {
- target: 'http://10.165.0.173:8000',
+ target: 'http://localhost:8000',
ws: true,
changeOrigin: true,
pathRewrite: {