wupengfei
2025-09-23 8fad5b05aa4d6d4a46b3bc04f2ab9614be73ba99
fix: bug
8个文件已修改
124 ■■■■■ 已修改文件
.eslintrc-auto-import.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
auto-imports.d.ts 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/constants/apiEnum.ts 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/hooks/settlement.ts 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/services/api/enterpriseWallet.ts 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/services/api/typings.d.ts 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/services/api/user.ts 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ServiceChargeManage/components/SettleDetailDialog.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.eslintrc-auto-import.json
@@ -229,6 +229,7 @@
    "useCssVars": true,
    "useDictionaryDataSelect": true,
    "useEnterpriseContractTemplateSelect": true,
    "useEnterpriseWalletAccessSelect": true,
    "useGetDictionaryCategorySelect": true,
    "useGlobalEventContext": true,
    "useGlobalEventProvide": true,
auto-imports.d.ts
@@ -217,6 +217,7 @@
  const useCssVars: typeof import('vue')['useCssVars']
  const useDictionaryDataSelect: typeof import('./src/hooks/dic')['useDictionaryDataSelect']
  const useEnterpriseContractTemplateSelect: typeof import('./src/hooks/sign')['useEnterpriseContractTemplateSelect']
  const useEnterpriseWalletAccessSelect: typeof import('./src/hooks/settlement')['useEnterpriseWalletAccessSelect']
  const useGetDictionaryCategorySelect: typeof import('./src/hooks/dic')['useGetDictionaryCategorySelect']
  const useGlobalEventContext: typeof import('./src/hooks/useEvent')['useGlobalEventContext']
  const useGlobalEventProvide: typeof import('./src/hooks/useEvent')['useGlobalEventProvide']
@@ -496,6 +497,7 @@
    readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
    readonly useDictionaryDataSelect: UnwrapRef<typeof import('./src/hooks/dic')['useDictionaryDataSelect']>
    readonly useEnterpriseContractTemplateSelect: UnwrapRef<typeof import('./src/hooks/sign')['useEnterpriseContractTemplateSelect']>
    readonly useEnterpriseWalletAccessSelect: UnwrapRef<typeof import('./src/hooks/settlement')['useEnterpriseWalletAccessSelect']>
    readonly useGetDictionaryCategorySelect: UnwrapRef<typeof import('./src/hooks/dic')['useGetDictionaryCategorySelect']>
    readonly useGlobalEventContext: UnwrapRef<typeof import('./src/hooks/useEvent')['useGlobalEventContext']>
    readonly useGlobalEventProvide: UnwrapRef<typeof import('./src/hooks/useEvent')['useGlobalEventProvide']>
src/constants/apiEnum.ts
@@ -109,6 +109,8 @@
  Alipay = 10,
  /**平安银行 */
  PingAnPay = 20,
  /**微信 */
  WeChatPay = 30,
}
/** 企业钱包代进件单附件类型 */
src/hooks/settlement.ts
@@ -1,5 +1,6 @@
import { useQuery, useQueryClient } from '@tanstack/vue-query';
import * as taskServices from '@/services/api/task';
import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
export function useTaskSelect() {
  const queryClient = useQueryClient();
@@ -21,3 +22,24 @@
  return { taskSelect };
}
export function useEnterpriseWalletAccessSelect() {
  const queryClient = useQueryClient();
  const { data } = useQuery({
    queryKey: ['enterpriseWalletServices/getEnterpriseWalletAccessSelect'],
    queryFn: () => {
      return enterpriseWalletServices.getEnterpriseWalletAccessSelect(
        {},
        {
          showLoading: false,
        }
      );
    },
    placeholderData: () => [] as API.SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption[],
  });
  const enterpriseWalletAccessSelect = computed(() => data.value?.map((x) => x.data));
  return { enterpriseWalletAccessSelect };
}
src/services/api/enterpriseWallet.ts
@@ -239,6 +239,26 @@
  );
}
/** 查询已签约企业钱包通道选择器数据 GET /api/user/enterpriseWallet/getEnterpriseWalletAccessSelect */
export async function getEnterpriseWalletAccessSelect(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
  params: API.APIgetEnterpriseWalletAccessSelectParams,
  options?: API.RequestConfig
) {
  return request<API.SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption[]>(
    '/api/user/enterpriseWallet/getEnterpriseWalletAccessSelect',
    {
      method: 'GET',
      params: {
        ...params,
        request: undefined,
        ...params['request'],
      },
      ...(options || {}),
    }
  );
}
/** 查询支付宝资金二级商户KYB代进件单详情 GET /api/user/enterpriseWallet/getEnterpriseWalletExpandindirectOrder */
export async function getEnterpriseWalletExpandindirectOrder(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
src/services/api/typings.d.ts
@@ -112,6 +112,11 @@
    id?: string;
  }
  interface APIgetEnterpriseWalletAccessSelectParams {
    /** 查询已签约企业钱包通道选择器数据 */
    request?: GetEnterpriseWalletAccessSelectQuery;
  }
  interface APIgetEnterpriseWalletExpandindirectOrderParams {
    /** 企业Id */
    enterpriseId?: string;
@@ -412,6 +417,10 @@
    ids: string[];
  }
  interface DeletePersonalUserBankCardCommand {
    access?: EnumUserBankCardAccess;
  }
  interface DeleteRoleCommand {
    ids: string[];
  }
@@ -620,6 +629,8 @@
    Alipay = 10,
    /**平安银行 */
    PingAnPay = 20,
    /**微信 */
    WeChatPay = 30,
  }
  enum EnumEnterpriseWalletExpandindirectOrderFileType {
@@ -2374,6 +2385,25 @@
    timestamp?: number;
  }
  interface FriendlyResultListSelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    /** 数据 */
    data?: SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption[];
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }
  interface FriendlyResultListSelectOptionGuidGetTaskSelectQueryOption {
    /** 跟踪Id */
    traceId?: string;
@@ -3404,6 +3434,14 @@
    industryTypeContent?: string;
    /** 是否已配置 */
    isConfigured?: boolean;
  }
  type GetEnterpriseWalletAccessSelectQuery = Record<string, any>;
  interface GetEnterpriseWalletAccessSelectQueryOption {
    /** Id */
    id?: string;
    access?: EnumEnterpriseWalletAccess;
  }
  interface GetEnterpriseWalletExpandindirectOrderQueryResult {
@@ -4498,6 +4536,8 @@
  interface GetSettlementTaskUsersQueryResultItem {
    /** 结算名单Id */
    id?: string;
    /** 用户信息Id */
    userId?: string;
    /** 姓名 */
    name?: string;
    /** 身份证号 */
@@ -5760,6 +5800,14 @@
    data?: GetEnterpriseContractTemplateSelectQueryOption;
  }
  interface SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption {
    /** 值 */
    value?: string;
    /** 标签 */
    label?: string;
    data?: GetEnterpriseWalletAccessSelectQueryOption;
  }
  interface SelectOptionGuidGetTaskSelectQueryOption {
    /** 值 */
    value?: string;
src/services/api/user.ts
@@ -2,6 +2,21 @@
// @ts-ignore
import { request } from '@/utils/request';
/** 删除用户银行卡信息 DELETE /api/user/user/deletePersonalUserBankCard */
export async function deletePersonalUserBankCard(
  body: API.DeletePersonalUserBankCardCommand,
  options?: API.RequestConfig
) {
  return request<number>('/api/user/user/deletePersonalUserBankCard', {
    method: 'DELETE',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}
/** 查询运营端用户分页列表数据 POST /api/user/user/getOperationUserInfos */
export async function getOperationUserInfos(
  body: API.GetOperationUserInfosQuery,
src/views/ServiceChargeManage/components/SettleDetailDialog.vue
@@ -26,10 +26,7 @@
        prop="settlementAccess"
        :check-rules="[{ message: '请选择结算方式' }]"
      >
        <ProFormSelect
          v-model="form.settlementAccess"
          :valueEnum="EnumEnterpriseWalletAccessTextForSettle"
        >
        <ProFormSelect v-model="form.settlementAccess" :valueEnum="settlementAccessList">
        </ProFormSelect>
      </ProFormItemV2>
    </ProForm>
@@ -68,6 +65,15 @@
  settlementAccess: EnumEnterpriseWalletAccess;
};
const { enterpriseWalletAccessSelect } = useEnterpriseWalletAccessSelect();
const settlementAccessList = computed(() => {
  return enterpriseWalletAccessSelect.value.map((x) => ({
    label: EnumEnterpriseWalletAccessTextForSettle[x.access],
    value: x.access,
  }));
});
const visible = defineModel({ type: Boolean });
const form = defineModel<Form>('form');