diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 00b7c09cd..62c117226 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -487,7 +487,7 @@
v-model.trim="peoForm.manageScopes"
:options="orgOptions"
:props="orgOptionProps"
- :show-all-levels="true"
+ :show-all-levels="true"
clearable>
@@ -611,7 +611,7 @@
v-model.trim="peoForm.manageScopes"
:options="orgOptions"
:props="orgOptionProps"
- :show-all-levels="false"
+ :show-all-levels="true"
clearable>
@@ -1330,10 +1330,15 @@ export default {
orgOptionProps :{
multiple: true,
emitPath: true,
- value: 'agencyId',
- label: 'agencyName',
- children: 'subAgencyList',
- checkStrictly: true
+ value: 'id',
+ label: 'label',
+ children: 'children',
+ checkStrictly: true,
+ lazy: true,
+ lazyLoad: (node, resolve) => {
+ this.loadOptions(node, resolve)
+ },
+
},
dialogVisiblePeoAgency:false,//通过组织添加
peoFormAgency:{
@@ -1401,12 +1406,11 @@ export default {
methods: {
getOrgTreeList () {
this.$http
- .post('/gov/org/customeragency/agencygridtree', {})
+ .get('/actual/base/communityBuilding/tree/initTree', {})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
- console.log('获取组织树成功', res.data)
this.orgOptions = []
this.orgOptions.push(res.data)
}
@@ -1415,10 +1419,29 @@ export default {
return this.$message.error('网络错误')
})
},
+ async loadOptions(node, resolve) {
+ let data1 =node.data;
+ if (data1.level == 'district') {
+ resolve(this.orgOptions);
+
+ } else {
+ if(data1.level !== "building"){
+ const url = "/actual/base/communityBuilding/tree/nextTreeNode";
+ let params = {
+ level:data1.level,
+ id:data1.id
+ };
+ const { data, code, msg } =await requestGet(url, params);
+ data1.children=data
+ resolve(data);
+ }else{
+ return resolve()
+ }
+ }
+ },
// 点击后获取id
handleChangeTransferCascader (e) {
- console.log("*********************");
function findItem (valueArr, coll) {
console.log("--------------------");
console.log(valueArr);
@@ -1656,14 +1679,13 @@ export default {
// 添加人员
async submitPeoDo () {
const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]);
-
+
// 用于存储提取结果的 Set 对象
const result = new Set();
// 调用递归函数提取 level 与 agencyId 组合成的字符串
this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
-
- // 将 Set 对象转换为数组
+
const manageScopeArray = Array.from(result);
const url = "/gov/org/staff/addstaffv2";
const {
@@ -1721,20 +1743,15 @@ export default {
},
// 人员修改
async updatePeoDo () {
-
const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]);
-
// 用于存储提取结果的 Set 对象
const result = new Set();
-
+ console.log(this.orgOptions[0],targetAgencyIds,'11111112');
// 调用递归函数提取 level 与 agencyId 组合成的字符串
this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
-
// 将 Set 对象转换为数组
const manageScopeArray = Array.from(result);
-
const url = "/gov/org/staff/editstaff";
-
let params = {
staffId: this.userStaffId,
name: this.peoForm.name,
@@ -1768,12 +1785,14 @@ export default {
// 递归函数，遍历 JSON 对象提取所有的 level 与 agencyId 组合成的字符串
extractLevelAndAgencyId(obj, agencyIds, result) {
+
if (obj && typeof obj === 'object') {
- if (obj.level && obj.agencyId && agencyIds.includes(obj.agencyId)) {
- result.add(`${obj.level}:${obj.agencyId}`);
+ console.log(obj,"1111");
+ if (obj.level && obj.id && agencyIds.includes(obj.id)) {
+ result.add(`${obj.level}:${obj.id}`);
}
- if (Array.isArray(obj.subAgencyList)) {
- obj.subAgencyList.forEach(subObj => {
+ if (Array.isArray(obj.children)) {
+ obj.children.forEach(subObj => {
this.extractLevelAndAgencyId(subObj, agencyIds, result);
});
}
diff --git a/src/views/modules/communityService/fuwuzhaoren/personList.vue b/src/views/modules/communityService/fuwuzhaoren/personList.vue
index 5e42e9a37..a918aec3e 100644
--- a/src/views/modules/communityService/fuwuzhaoren/personList.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/personList.vue
@@ -97,6 +97,7 @@
+ 批量删除
公众号消息推送
标记享受服务人员
查询
@@ -283,7 +284,25 @@ export default {
}
},
methods: {
+ onDeleteBatch() {
+ if (this.selectedPersonListIds.length == 0) {
+ this.$message.warning("请先选中至少一项");
+ return;
+ }
+ this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.deleteresiBatch(this.selectedPersonListIds);
+ })
+ .catch((err) => {
+ console.error(err);
+ this.$message.error("删除失败");
+ });
+ },
//编辑
async handelCLickShowCheckPassword(row) {
console.log(row);
@@ -345,7 +364,7 @@ export default {
})
.then(() => {
console.log(row);
- this.deleteresiBatch(row);
+ this.deleteresiBatch([row.id]);
})
.catch((err) => {
if (err == "cancel") {
@@ -355,11 +374,9 @@ export default {
this.$message.warning("请先选择要删除的居民");
}
},
- async deleteresiBatch(row) {
- console.log(row);
- let userIds = row.id;
+ async deleteresiBatch(ids) {
this.$http
- .post("/actual/base/findPersonList/deleteFindPersonByServiceId/"+userIds)
+ .post("/actual/base/findPersonList/deleteFindPersonByServiceId",{ids})
.then(({ data: res }) => {
console.log(res);
if (res.code !== 0) {
diff --git a/src/views/modules/communityService/gangweizhaoren/personList.vue b/src/views/modules/communityService/gangweizhaoren/personList.vue
index 175161460..25fac9c14 100644
--- a/src/views/modules/communityService/gangweizhaoren/personList.vue
+++ b/src/views/modules/communityService/gangweizhaoren/personList.vue
@@ -97,6 +97,7 @@
+ 批量删除
公众号消息推送
标记享受服务人员
查询
@@ -281,6 +282,25 @@ export default {
}
},
methods: {
+ onDeleteBatch() {
+ if (this.selectedPersonListIds.length == 0) {
+ this.$message.warning("请先选中至少一项");
+ return;
+ }
+
+ this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.deleteresiBatch(this.selectedPersonListIds);
+ })
+ .catch((err) => {
+ console.error(err);
+ this.$message.error("删除失败");
+ });
+ },
//编辑
async handelCLickShowCheckPassword(row) {
console.log(row);
@@ -341,7 +361,7 @@ export default {
})
.then(() => {
console.log(row);
- this.deleteresiBatch(row);
+ this.deleteresiBatch([row.id]);
})
.catch((err) => {
if (err == "cancel") {
@@ -351,11 +371,9 @@ export default {
this.$message.warning("请先选择要删除的居民");
}
},
- async deleteresiBatch(row) {
- console.log(row);
- let userIds = row.id;
+ async deleteresiBatch(ids) {
this.$http
- .post("/actual/base/findPersonList/deleteFindPersonByServiceId/"+userIds)
+ .post("/actual/base/findPersonList/deleteFindPersonByServiceId",{ids})
.then(({ data: res }) => {
console.log(res);
if (res.code !== 0) {
diff --git a/src/views/modules/communityService/jinengzhaoren/personList.vue b/src/views/modules/communityService/jinengzhaoren/personList.vue
index 67a049d8e..6a210e4f3 100644
--- a/src/views/modules/communityService/jinengzhaoren/personList.vue
+++ b/src/views/modules/communityService/jinengzhaoren/personList.vue
@@ -97,6 +97,7 @@
+ 批量删除
公众号消息推送
标记享受服务人员
查询
@@ -282,7 +283,25 @@ export default {
}
},
methods: {
+ onDeleteBatch() {
+ if (this.selectedPersonListIds.length == 0) {
+ this.$message.warning("请先选中至少一项");
+ return;
+ }
+ this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.deleteresiBatch(this.selectedPersonListIds);
+ })
+ .catch((err) => {
+ console.error(err);
+ this.$message.error("删除失败");
+ });
+ },
//编辑
async handelCLickShowCheckPassword(row) {
console.log(row);
@@ -343,7 +362,7 @@ export default {
})
.then(() => {
console.log(row);
- this.deleteresiBatch(row);
+ this.deleteresiBatch([row.id]);
})
.catch((err) => {
if (err == "cancel") {
@@ -353,11 +372,9 @@ export default {
this.$message.warning("请先选择要删除的居民");
}
},
- async deleteresiBatch(row) {
- console.log(row);
- let userIds = row.id;
+ async deleteresiBatch(ids) {
this.$http
- .post("/actual/base/findPersonList/deleteFindPersonByServiceId/"+userIds)
+ .post("/actual/base/findPersonList/deleteFindPersonByServiceId",{ids})
.then(({ data: res }) => {
console.log(res);
if (res.code !== 0) {
@@ -616,4 +633,7 @@ export default {
color: #f56c6c;
margin-right: 4px;
}
+/deep/ .el-pagination{
+ text-align: right;
+}
diff --git a/src/views/modules/communityService/policy/personList.vue b/src/views/modules/communityService/policy/personList.vue
index 1d5d6d8aa..69e67aaa5 100644
--- a/src/views/modules/communityService/policy/personList.vue
+++ b/src/views/modules/communityService/policy/personList.vue
@@ -122,6 +122,8 @@
+ 批量删除
+
{
+ this.deleteresiBatch(this.selectedPersonListIds);
+ })
+ .catch((err) => {
+ console.error(err);
+ this.$message.error("删除失败");
+ });
+ },
//编辑
async handelCLickShowCheckPassword(row) {
console.log(row);
@@ -347,7 +368,7 @@ export default {
})
.then(() => {
console.log(row);
- this.deleteresiBatch(row);
+ this.deleteresiBatch([row.id]);
})
.catch((err) => {
if (err == "cancel") {
@@ -357,11 +378,9 @@ export default {
this.$message.warning("请先选择要删除的居民");
}
},
- async deleteresiBatch(row) {
- console.log(row);
- let userIds = row.id;
+ async deleteresiBatch(ids) {
this.$http
- .post("/actual/base/findPersonList/deleteFindPersonByPolicyId/"+userIds)
+ .post("/actual/base/findPersonList/deleteFindPersonByPolicyId",{ids})
.then(({ data: res }) => {
console.log(res);
if (res.code !== 0) {
diff --git a/src/views/modules/communityService/wennuanzhaoren/personList.vue b/src/views/modules/communityService/wennuanzhaoren/personList.vue
index 827b35e6c..409a92d34 100644
--- a/src/views/modules/communityService/wennuanzhaoren/personList.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/personList.vue
@@ -100,6 +100,7 @@
+ 批量删除
公众号消息推送
标记享受服务人员
查询
@@ -289,6 +290,25 @@ export default {
}
},
methods: {
+ onDeleteBatch() {
+ if (this.selectedPersonListIds.length == 0) {
+ this.$message.warning("请先选中至少一项");
+ return;
+ }
+
+ this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.deleteresiBatch(this.selectedPersonListIds);
+ })
+ .catch((err) => {
+ console.error(err);
+ this.$message.error("删除失败");
+ });
+ },
//编辑
async handelCLickShowCheckPassword(row) {
console.log(row);
@@ -349,8 +369,7 @@ export default {
type: "warning",
})
.then(() => {
- console.log(row);
- this.deleteresiBatch(row);
+ this.deleteresiBatch([row.id]);
})
.catch((err) => {
if (err == "cancel") {
@@ -360,11 +379,9 @@ export default {
this.$message.warning("请先选择要删除的居民");
}
},
- async deleteresiBatch(row) {
- console.log(row);
- let userIds = row.id;
+ async deleteresiBatch(ids) {
this.$http
- .post("/actual/base/findPersonList/deleteFindPersonByServiceId/"+userIds)
+ .post("/actual/base/findPersonList/deleteFindPersonByServiceId",{ids})
.then(({ data: res }) => {
console.log(res);
if (res.code !== 0) {
@@ -610,8 +627,9 @@ export default {
console.log("获取导出情失败", err);
return this.$message.error("网络错误");
});
- },
- },
+ }
+},
+
props: {
serviceId: {
type: String,
@@ -627,7 +645,6 @@ export default {
}
},
-
}