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

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

Browse Source 
feat: 选择人员新增单选

See merge request itc-framework/ma/2024/front!20
This commit is contained in:
gao yq
2024-09-26 02:04:42 +00:00
parent 5cccd07068 6c342eb10b
commit 2805a3695f
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Form/src/components/SelectUserListV2.vue
View File

@ -5,7 +5,7 @@
{{ item.name }} {{ item.name }}
</div> </div>
<div class="user-select-item-right"> <div class="user-select-item-right">
<div class="select-circle" :class="item.selected ? 'selected' : ''" v-if="multiple && !viewList"> <div class="select-circle" :class="item.selected ? 'selected' : ''" v-if="!viewList">
<check-outlined v-if="item.selected" /> <check-outlined v-if="item.selected" />
</div> </div>
<div class="delete-circle" v-if="canDel" @click="delItem(item)"> <div class="delete-circle" v-if="canDel" @click="delItem(item)">

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

@ -29,14 +29,14 @@
</div> </div>
</div> </div>
<div class="user-select-box"> <div class="user-select-box">
<SelectUserListV2 :data="searchDepartMemberList" emptyDescription="暂无人员" @selectId="changeDepMemberSelect"></SelectUserListV2> <SelectUserListV2 :multiple="multiple" :data="searchDepartMemberList" emptyDescription="暂无人员" @selectId="changeDepMemberSelect"></SelectUserListV2>
<div v-if="false" class="user-select-pagination"> <div v-if="false" class="user-select-pagination">
<a-pagination v-model:current="searchDepartMemberParams.limit" :pageSize="searchDepartMemberParams.size" :total="searchDepartMemberTotal" /> <a-pagination v-model:current="searchDepartMemberParams.limit" :pageSize="searchDepartMemberParams.size" :total="searchDepartMemberTotal" />
</div> </div>
</div> </div>
</div> </div>
<div v-show="activeKey === 'allPerson'" class="all-user-select-box"> <div v-show="activeKey === 'allPerson'" class="all-user-select-box">
<SelectUserListV2 :data="searchAllMemberList" @selectId="changeMemberSelect"></SelectUserListV2> <SelectUserListV2 :multiple="multiple" :data="searchAllMemberList" @selectId="changeMemberSelect"></SelectUserListV2>
<div v-if="searchAllMemberTotal > 25" class="all-user-select-pagination"> <div v-if="searchAllMemberTotal > 25" class="all-user-select-pagination">
<a-form-item label="" name="pagination"> <a-form-item label="" name="pagination">
<a-pagination <a-pagination
@ -228,7 +228,7 @@
async function getUserList(params) { async function getUserList(params) {
return await getUserPageListNew(params); return await getUserPageListNew(params);
} }
function departCompleted() { function departCompleted() {
treeLoading.value = false; treeLoading.value = false;
} }
@ -251,11 +251,17 @@
item.selected = !!!item.selected; item.selected = !!!item.selected;
selected = item.selected; selected = item.selected;
selectedItem = item; selectedItem = item;
} else if (!props.multiple) {
item.selected = false
} }
}); });
let memberList = selectedMemberList.value; let memberList = selectedMemberList.value;
if (selected) { if (selected) {
memberList.push(selectedItem); if(props.multiple) {
memberList.push(selectedItem);
} else {
memberList = [selectedItem]
}
selectedMemberList.value = memberList; selectedMemberList.value = memberList;
} else { } else {
selectedMemberList.value = memberList.filter((m) => m.id !== id); selectedMemberList.value = memberList.filter((m) => m.id !== id);