kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
yanran200730
2022-08-24 17:56:05 +08:00
parent 883aca74e1
commit 7e52c337c3
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/grid/AppGridBlock/components/add.vue
View File

@@ -17,10 +17,10 @@
<el-input v-model="forms.girdName" placeholder="请输入…" :maxlength="50" show-word-limit clearable/> <el-input v-model="forms.girdName" placeholder="请输入…" :maxlength="50" show-word-limit clearable/>
</el-form-item> </el-form-item>
<el-form-item label="网格长" prop="girdMemberManageList"> <el-form-item label="网格长" prop="girdMemberManageList">
<ai-user-picker :instance="instance" v-model="forms.girdMemberManageList" :props="{label:'name', id: 'id'}"/> <ai-user-selecter isShowUser :instance="instance" v-model="forms.girdMemberManageList" :props="{label:'name', id: 'id'}"/>
</el-form-item> </el-form-item>
<el-form-item label="网格员" prop="girdMemberList"> <el-form-item label="网格员" prop="girdMemberList">
<ai-user-picker :instance="instance" v-model="forms.girdMemberList" :props="{label:'name', id: 'id'}"/> <ai-user-selecter isShowUser :instance="instance" v-model="forms.girdMemberList" :props="{label:'name', id: 'id'}"/>
</el-form-item> </el-form-item>
</template> </template>
</ai-card> </ai-card>
@@ -185,13 +185,15 @@ export default {
girdMemberManageList: res.data.girdMemberManageList ? res.data.girdMemberManageList.map(v => { girdMemberManageList: res.data.girdMemberManageList ? res.data.girdMemberManageList.map(v => {
return { return {
...v, ...v,
id: v.wxUserId id: v.wxUserId,
avatar: v.photo
} }
}) : [], }) : [],
girdMemberList: res.data.girdMemberList ? res.data.girdMemberList.map(v => { girdMemberList: res.data.girdMemberList ? res.data.girdMemberList.map(v => {
return { return {
...v, ...v,
id: v.wxUserId id: v.wxUserId,
avatar: v.photo
} }
}) : [] }) : []
}; };

26
packages/grid/AppGridBlock/components/list.vue
View File

@@ -13,7 +13,6 @@
node-key="id" node-key="id"
ref="tree" ref="tree"
:filter-node-method="filterNode" :filter-node-method="filterNode"
default-expand-all
highlight-current> highlight-current>
<template slot-scope="{node,data}"> <template slot-scope="{node,data}">
<div v-text="node.label"/> <div v-text="node.label"/>
@@ -153,7 +152,7 @@ export default {
treeObj: { treeObj: {
treeList: [], treeList: [],
defaultProps: { defaultProps: {
children: "girdList", children: "children",
label: "girdName", label: "girdName",
}, },
defaultExpandedKeys: [], defaultExpandedKeys: [],
@@ -216,13 +215,28 @@ export default {
this.getList(); this.getList();
}, },
getTreeList() { getTreeList() {
this.instance.post("/app/appgirdinfo/listAllByTop").then(res => { this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
if (res?.data) { if (res?.data) {
this.treeObj.treeList = [res.data]; // this.treeObj.treeList = [res.data];
this.info = res.data // this.info = res.data
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.tree.setCurrentKey(this.info.id) this.$refs.tree.setCurrentKey(res.data.id)
}) })
this.treeObj.treeList = res.data.filter(e => !e.parentGirdId)
const parentGirdId = this.treeObj.treeList[0].id
this.treeObj.treeList.map(p => this.addChild(p, res.data.map(v => {
if (v.id === parentGirdId) {
// this.defaultExpandedKeys.push(v.id)
}
return {
...v
}
}), {
parent: 'parentGirdId'
}))
} }
}); });
}, },