diff --git a/packages/grid/AppGridBlock/components/add.vue b/packages/grid/AppGridBlock/components/add.vue index df0d1511..f186a2a0 100644 --- a/packages/grid/AppGridBlock/components/add.vue +++ b/packages/grid/AppGridBlock/components/add.vue @@ -161,7 +161,9 @@ export default { this.instance.post(`/app/appgirdinfo/addOrUpdate`, { ...this.forms, girdMemberManageList: girdMemberManageList?.map(v => ({wxUserId: v.id})) || [], - girdMemberList: girdMemberList?.map(v => ({wxUserId: v.id})) || [] + girdMemberList: girdMemberList?.map(v => ({wxUserId: v.id})) || [], + isCoordination: this.forms.currIndex, + coordinationId: this.forms.currIndex == 1 ? this.forms.parentGirdId : null }).then((res) => { if (res.code == 0) { this.cancel(true) diff --git a/packages/grid/AppGridBlock/components/list.vue b/packages/grid/AppGridBlock/components/list.vue index 3d5417f0..d5d52358 100644 --- a/packages/grid/AppGridBlock/components/list.vue +++ b/packages/grid/AppGridBlock/components/list.vue @@ -85,6 +85,9 @@ 初始化 + + + v === '1' ? '网格员' : '网格长'} - ] + ], + currIndex: 0, + tabs: [{label: '子网格'}, {label: '协同部门'}], }; }, created() { @@ -202,12 +207,16 @@ export default { } }, methods: { + tabChange() { + this.page.current = 1 + this.getList() + }, handleNodeClick(val) { this.info = this.$copy(val); this.getList(); }, getTreeList() { - this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => { + this.instance.post(`/app/appgirdinfo/listAll4`).then((res) => { if (res?.data) { this.treeObj.treeList = res.data.filter(e => !e.parentGirdId) @@ -274,7 +283,8 @@ export default { }).catch(() => 0); }, getList() { - this.instance.post("/app/appgirdinfo/list", null, { + var url = this.currIndex == 1 ? `/app/appgirdinfo/listCoordination` : `/app/appgirdinfo/list?isCoordination=0` + this.instance.post(url, null, { params: { ...this.searchObj, ...this.page, @@ -301,7 +311,7 @@ export default { toAdd() { let {id: parentGirdId, girdName: parentGirdName} = this.info this.$router.push({ - hash: "#add", query: {parentGirdId, parentGirdName} + hash: "#add", query: {parentGirdId, parentGirdName, currIndex: this.currIndex} }) }, goBack() {