diff --git a/src/api/common/index.ts b/src/api/common/index.ts index 17eff369..0e752d68 100644 --- a/src/api/common/index.ts +++ b/src/api/common/index.ts @@ -147,7 +147,7 @@ export function GetFeeCurrencySelectList() { method: 'get' }) } -// 获取币别下拉列表 (Auth) +// 获取结算单位下拉列表 (Auth) export function GetClientListByCode(params) { return request({ url: Api.GetClientListByCode, diff --git a/src/components/CostEntry/components/feeTable.vue b/src/components/CostEntry/components/feeTable.vue index b5f46c4a..3540f12c 100644 --- a/src/components/CostEntry/components/feeTable.vue +++ b/src/components/CostEntry/components/feeTable.vue @@ -6,6 +6,7 @@ diff --git a/src/design/public.less b/src/design/public.less index 26ba00fa..7c911486 100644 --- a/src/design/public.less +++ b/src/design/public.less @@ -105,7 +105,9 @@ color: #262626!important; } } - +.ant-table-cell { + font-size: 12px; +} .ds-approve-mian-action-bar { .ant-btn-link, .ant-checkbox-wrapper { @@ -140,6 +142,7 @@ } .ant-picker { height: 28px; + width: 100%; } .ant-btn { height: 30px; diff --git a/src/store/modules/configOptions.ts b/src/store/modules/configOptions.ts index c723545b..c5a8d19c 100644 --- a/src/store/modules/configOptions.ts +++ b/src/store/modules/configOptions.ts @@ -18,10 +18,11 @@ import { GetClientFrtSelectList, GetServiceSelectList, GetPackageSelectList, - GetTruckClientList + GetTruckClientList, } from '/@/views/operation/seaexport/api/BookingLedger' import { getList } from '/@/views/flowcenter/flowInstances/api' -import { GetFeeCurrencySelectList } from '/@/api/common/index' +import { GetFeeCurrencySelectList, GetClientListByCode } from '/@/api/common/index' +import { getClientBankList } from '/@/views/baseinfo/infoclient/api' export default { // 业务来源 GetClientSourceSelectList: () => { @@ -125,4 +126,16 @@ export default { return res.data }) }, + // 结算单位 + GetClientListByCode: () => { + return GetClientListByCode().then((res) => { + return res.data + }) + }, + // 银行信息 + getClientBankList: () => { + return getClientBankList().then((res) => { + return res.data + }) + }, } diff --git a/src/store/modules/options.ts b/src/store/modules/options.ts index 91c41d68..c9d8c788 100644 --- a/src/store/modules/options.ts +++ b/src/store/modules/options.ts @@ -42,8 +42,12 @@ export const useOptionsStore = defineStore({ GetFeeCurrencySelectList: null, // 用户表 GetUserList: null, - // 币别 + // 车队 GetTruckClientList: null, + // 结算单位/结算对象 + GetClientListByCode: null, + // 银行信息 + getClientBankList: null, }), getters: { // 通过code获取下拉字典(code)就是接口尾部单词 diff --git a/src/views/baseinfo/infoclient/api.ts b/src/views/baseinfo/infoclient/api.ts index 9b1e9135..eaeadd3d 100644 --- a/src/views/baseinfo/infoclient/api.ts +++ b/src/views/baseinfo/infoclient/api.ts @@ -82,7 +82,7 @@ export function getClientBankList(parameter) { queryCondition: JSON.stringify([ { FieldName: 'ClientId', - FieldValue: parameter.clientId, + FieldValue: parameter?.clientId || '', ConditionalType: 1, }, ]), diff --git a/src/views/operation/paidApply/api.ts b/src/views/operation/paidApply/api.ts index b8fa3b86..8b05e8c4 100644 --- a/src/views/operation/paidApply/api.ts +++ b/src/views/operation/paidApply/api.ts @@ -9,7 +9,8 @@ import { DataResult, PageRequest } from '/@/api/model/baseModel' enum Api { list = '/feeApi/PaymentApplication/GetList', edit = '/feeApi/FeeCurrency/EditFeeCurrency', - info = '/feeApi/FeeCurrency/GetFeeCurrencyInfo' + info = '/feeApi/FeeCurrency/GetFeeCurrencyInfo', + GetBizList = '/feeApi/PaymentApplication/GetBizList' } // 列表 (Auth) export function GetList(data: PageRequest) { @@ -35,3 +36,11 @@ export function getFeeCurrencyInfo(query) { params: query }) } +// 获取待付费的业务列表 +export function GetBizList(data: PageRequest) { + return request({ + url: Api.GetBizList, + method: 'post', + data + }) +} diff --git a/src/views/operation/paidApply/columns.tsx b/src/views/operation/paidApply/columns.tsx index 1f3ef911..74d41dde 100644 --- a/src/views/operation/paidApply/columns.tsx +++ b/src/views/operation/paidApply/columns.tsx @@ -303,4 +303,3 @@ export const searchFormSchema: FormSchema[] = [ } }, ] - diff --git a/src/views/operation/paidApply/components/tableActionBar.vue b/src/views/operation/paidApply/components/tableActionBar.vue index c01b51c3..20051147 100644 --- a/src/views/operation/paidApply/components/tableActionBar.vue +++ b/src/views/operation/paidApply/components/tableActionBar.vue @@ -5,7 +5,7 @@ -->