geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gaoang-2024-11' into 'dev'

Browse Source 
feat: 选人选部门组件组织树仅选择公司层级修改

See merge request itc-framework/ma/2024/front!24
This commit is contained in:
gao yq
2024-11-11 03:59:22 +00:00
parent 44c9eb5cc5 5ba828c205
commit 4cfd0aab5b
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Form/src/components/SelectDepartmentTreeV2.vue
View File

@ -40,6 +40,10 @@ const props = defineProps({
type: String,
default: ''
},
justCompany: {
type: Boolean,
default: false
}
});
const emit = defineEmits(['change-value', 'query-completed', 'select']);
const expandedKeys = ref([]);

6
src/components/Form/src/components/SelectDepartmentV2.vue
View File

@ -12,7 +12,7 @@
<div class="choose-dep-box">
<div class="choose-dep">
<a-spin :spinning="loading" class="loading-box" />
<SelectDepartmentTreeV2 v-if="visible" :multiple="multiple" :isArray="isArray" :parentNode="parentNode" :selectedNodes="selectedNodes" @changeValue="departChange" @queryCompleted="queryCompleted" :defaultDepts="defaultDepts"></SelectDepartmentTreeV2>
<SelectDepartmentTreeV2 v-if="visible" :multiple="multiple" :isArray="isArray" :parentNode="parentNode" :selectedNodes="selectedNodes" @changeValue="departChange" @queryCompleted="queryCompleted" :defaultDepts="defaultDepts" :justCompany="justCompany"></SelectDepartmentTreeV2>
</div>
<div class="choosen-dep">
<div v-for="item in selectedNodes" class="choosen-item">
@ -78,6 +78,10 @@
type: String,
default: ''
},
justCompany: {
type: Boolean,
default: false
}
});
const selectedNodes = ref([]);
const loading = ref(true);

6
src/components/Form/src/components/SelectUserV2.vue
View File

@ -25,7 +25,7 @@
<div class="department-tree">
<a-spin :spinning="treeLoading" class="loading-box" />
<div class="department-tree-box">
<SelectDepartmentTreeV2 v-if="visible && activeKey === 'department'" class="tree-select" @changeValue="departChange" @queryCompleted="departCompleted" :defaultDepts="defaultDepts"></SelectDepartmentTreeV2>
<SelectDepartmentTreeV2 v-if="visible && activeKey === 'department'" class="tree-select" @changeValue="departChange" @queryCompleted="departCompleted" :defaultDepts="defaultDepts" :justCompany="justCompany"></SelectDepartmentTreeV2>
</div>
</div>
<div class="user-select-box">
@ -114,6 +114,10 @@
type: String,
default: ''
},
justCompany: {
type: Boolean,
default: false
}
});
let timeoutId = null;
let resetMemberList = [];