fix: bug#10389、10421

This commit is contained in:
JiangQiming 2023-03-16 11:50:12 +08:00
parent 5604c8bd35
commit cf36e34e4f
2 changed files with 16 additions and 14 deletions

View File

@ -25,7 +25,7 @@
<!-- 选择设备 --> <!-- 选择设备 -->
<j-modal <j-modal
title="选择设备" title="选择设备"
width="800px" width="850px"
v-model:visible="visible" v-model:visible="visible"
:maskClosable="false" :maskClosable="false"
:destroyOnClose="true" :destroyOnClose="true"
@ -57,6 +57,7 @@
deviceItem = record; deviceItem = record;
} }
}" }"
:alertRender="false"
:pagination="{ :pagination="{
showSizeChanger: true, showSizeChanger: true,
pageSizeOptions: ['10', '20', '50', '100'], pageSizeOptions: ['10', '20', '50', '100'],
@ -160,6 +161,7 @@ const columns = [
key: 'id', key: 'id',
search: { search: {
type: 'string', type: 'string',
defaultTermType: 'eq',
}, },
}, },
{ {

View File

@ -316,15 +316,10 @@ const getBindUsers = async () => {
* 获取所有用户未绑定的用户 * 获取所有用户未绑定的用户
*/ */
const allUserList = ref([]); const allUserList = ref([]);
const getAllUsers = async () => { const getAllUsers = async (terms?: any) => {
const params = { const params = {
paging: false, paging: false,
terms: [ terms,
{
column: `id$user-third$${props.data.type}_${props.data.provider}$not`,
value: props.data.id,
},
],
}; };
const { result } = await configApi.getPlatformUsers(params); const { result } = await configApi.getPlatformUsers(params);
allUserList.value = result.map((m: any) => ({ allUserList.value = result.map((m: any) => ({
@ -355,11 +350,11 @@ const getTableData = () => {
const bindUser = bindUsers.find( const bindUser = bindUsers.find(
(f: any) => f.thirdPartyUserId === deptUser.id, (f: any) => f.thirdPartyUserId === deptUser.id,
); );
// if (bindUser) { if (bindUser) {
// unBindUser = unBindUsers.find( unBindUser = unBindUsers.find(
// (f: any) => f.id === bindUser.userId, (f: any) => f.id === bindUser.userId,
// ); );
// } }
dataSource.value.push({ dataSource.value.push({
thirdPartyUserId: deptUser.id, thirdPartyUserId: deptUser.id,
thirdPartyUserName: deptUser.name, thirdPartyUserName: deptUser.name,
@ -422,7 +417,12 @@ const handleBind = (row: any) => {
bindVis.value = true; bindVis.value = true;
// formData.value = row; // formData.value = row;
Object.assign(formData.value, row); Object.assign(formData.value, row);
getAllUsers(); getAllUsers([
{
column: `id$user-third$${props.data.type}_${props.data.provider}$not`,
// value: props.data.id,
},
]);
}; };
/** /**