diff --git a/src/views/baseinfo/infoclient/EditColumns.tsx b/src/views/baseinfo/infoclient/EditColumns.tsx index 7526f933..5a0f98d9 100644 --- a/src/views/baseinfo/infoclient/EditColumns.tsx +++ b/src/views/baseinfo/infoclient/EditColumns.tsx @@ -8,6 +8,7 @@ import { getNotifications, getClientSourceSelectList, GetTenantBanks, + GetBankList, } from './api' import { GetUserList, GetAllClientList } from '/@/api/common' import { @@ -18,6 +19,8 @@ import { GetClientSourceSelectList, GetClientSourceDetailSelectList, } from '/@/views/operation/seaexport/api/BookingLedger' +import { useUserStore } from '/@/store/modules/user' +const userStore: any = useUserStore() const sourceDetailId = ref([]) let ClientSourceList = [] const res3: API.DataResult = await getClientSourceSelectList() @@ -60,27 +63,41 @@ if (res13.succeeded) { }) } let rmbAccountData: any = [] -const res14: API.DataResult = await GetTenantBanks({ currency: 'RMB' }) +const res14: API.DataResult = await GetBankList({ + queryCondition: `[{"FieldName":"linkId","FieldValue":"${userStore.getUserInfo.orgId}","ConditionalType":1},{"FieldName":"currency","FieldValue":"RMB","ConditionalType":1}]`, + pageCondition: { pageIndex: 1, pageSize: 9999, sortConditions: [] }, + otherQueryCondition: '', +}) if (res14.succeeded) { rmbAccountData = [] res14.data.forEach((e) => { - rmbAccountData.push({ - label: `${e.bankName}-${e.accountName}-${e.bankAccountNo}`, - value: e.id, - ...e, - }) + console.log(e) + + if (e.accountName && e.id) { + rmbAccountData.push({ + label: `${e.bankName}-${e.accountName}-${e.bankAccountNo}`, + value: e.id, + ...e, + }) + } }) } let usdAccountData: any = [] -const res15: API.DataResult = await GetTenantBanks({ currency: 'USD' }) +const res15: API.DataResult = await GetBankList({ + queryCondition: `[{"FieldName":"linkId","FieldValue":"${userStore.getUserInfo.orgId}","ConditionalType":1},{"FieldName":"currency","FieldValue":"USD","ConditionalType":1}]`, + pageCondition: { pageIndex: 1, pageSize: 9999, sortConditions: [] }, + otherQueryCondition: '', +}) if (res15.succeeded) { usdAccountData = [] res15.data.forEach((e) => { - usdAccountData.push({ - label: `${e.bankName}-${e.accountName}-${e.bankAccountNo}`, - value: e.id, - ...e, - }) + if (e.accountName && e.id) { + usdAccountData.push({ + label: `${e.bankName}-${e.accountName}-${e.bankAccountNo}`, + value: e.id, + ...e, + }) + } }) } export const EditformSchema: FormSchema[] = [ @@ -892,7 +909,7 @@ export const EditformSchema2: FormSchema[] = [ field: 'rmbAccountId', label: '人民币账户', component: 'DEdit', - colProps: { span: 4 }, + colProps: { span: 8 }, defaultValue: '', componentProps: (En) => { return { @@ -936,7 +953,7 @@ export const EditformSchema2: FormSchema[] = [ field: 'usdAccountId', label: '美金账户', component: 'DEdit', - colProps: { span: 4 }, + colProps: { span: 8 }, defaultValue: '', componentProps: (En) => { return { diff --git a/src/views/baseinfo/infoclient/api.ts b/src/views/baseinfo/infoclient/api.ts index 9fceaab3..4efda390 100644 --- a/src/views/baseinfo/infoclient/api.ts +++ b/src/views/baseinfo/infoclient/api.ts @@ -24,6 +24,8 @@ enum Api { CreateSubmit = '/mainApi/ClientStakeholder/CreateSubmit', GetTenantBanks = '/mainApi/ClientAccountDate/GetTenantBanks', + GetBankList = '/mainApi/Bank/GetBankList', + // orgId } // 确定往来单位是否已使用 (Auth) @@ -198,3 +200,11 @@ export function GetTenantBanks(data: PageRequest) { params: data, }) } +// 获取组织机构银行账户列表 (Auth) +export function GetBankList(data: PageRequest) { + return request({ + url: Api.GetBankList, + method: 'post', + data: data, + }) +} diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index a5e43b43..f9317f6a 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -9,6 +9,7 @@ import { getClientCountrySelectList, getNotifications, GetTenantBanks, + GetBankList, } from './api' import { getOrgList, GetFeeCurrencySelectList, GetUserList, GetAllClientList } from '/@/api/common' import { @@ -20,6 +21,8 @@ import { GetVouchingClerkList, GetClientSourceSelectList, } from '/@/views/operation/seaexport/api/BookingLedger' +import { useUserStore } from '/@/store/modules/user' +const userStore: any = useUserStore() const sourceDetailId = ref([]) // exports {} let ClientFrtList = [] @@ -63,7 +66,11 @@ if (res13.succeeded) { }) } let rmbAccountData: any = [] -const res14: API.DataResult = await GetTenantBanks({ currency: 'RMB' }) +const res14: API.DataResult = await GetBankList({ + queryCondition: `[{"FieldName":"linkId","FieldValue":"${userStore.getUserInfo.orgId}","ConditionalType":1},{"FieldName":"currency","FieldValue":"RMB","ConditionalType":1}]`, + pageCondition: { pageIndex: 1, pageSize: 9999, sortConditions: [] }, + otherQueryCondition: '', +}) if (res14.succeeded) { rmbAccountData = [] res14.data.forEach((e) => { @@ -79,7 +86,11 @@ if (res14.succeeded) { }) } let usdAccountData: any = [] -const res15: API.DataResult = await GetTenantBanks({ currency: 'USD' }) +const res15: API.DataResult = await GetBankList({ + queryCondition: `[{"FieldName":"linkId","FieldValue":"${userStore.getUserInfo.orgId}","ConditionalType":1},{"FieldName":"currency","FieldValue":"USD","ConditionalType":1}]`, + pageCondition: { pageIndex: 1, pageSize: 9999, sortConditions: [] }, + otherQueryCondition: '', +}) if (res15.succeeded) { usdAccountData = [] res15.data.forEach((e) => { @@ -1355,7 +1366,7 @@ export const formSchema2: FormSchema[] = [ field: 'rmbAccountId', label: '人民币账户', component: 'Select', - colProps: { span: 4 }, + colProps: { span: 8 }, defaultValue: '', componentProps: (En) => { return { @@ -1397,7 +1408,7 @@ export const formSchema2: FormSchema[] = [ field: 'usdAccountId', label: '美金账户', component: 'Select', - colProps: { span: 4 }, + colProps: { span: 8 }, defaultValue: '', componentProps: (En) => { return {