Merge branch 'master' into dev-v1.1

wupengfei

11 小时以前 ce7ff0effee22807c8d29a31d6f5f2713d3bf95c

Merge branch 'master' into dev-v1.1

 .env.development

@@ -12,6 +12,7 @@

# 开发环境后端地址
VITE_PROXY_DOMAIN_REAL = "http://localhost:53780/"
# VITE_PROXY_DOMAIN_REAL = "https://testfj.81812333.com/"
# VITE_PROXY_DOMAIN_REAL = "https://lgdapi.81812333.com"



 .eslintrc-auto-import.json

@@ -44,11 +44,11 @@
    "EnumEnterpriseWalletAccess": true,
    "EnumEnterpriseWalletExpandindirectOrderFileType": true,
    "EnumEnterpriseWalletExpandindirectOrderScene": true,
    "EnumEnterpriseWalletExpandindirectOrderSceneText": true,
    "EnumEnterpriseWalletExpandindirectOrderStatus": true,
    "EnumEnterpriseWalletExpandindirectOrderStatusText": true,
    "EnumEnterpriseWalletSignStatus": true,
    "EnumEnterpriseWalletSignStatusText": true,
    "EnumEnterpriseWalletTransactionStatus": true,
    "EnumEnterpriseWalletTransactionType": true,
    "EnumMenuType": true,
    "EnumMenuVisitLevel": true,
@@ -97,6 +97,8 @@
    "EnumUserStatus": true,
    "EnumUserType": true,
    "EnumUserTypeText": true,
    "EnumUserWalletTransactionType": true,
    "EnumWalletTransactionStatus": true,
    "ExtractDefaultPropTypes": true,
    "ExtractPropTypes": true,
    "ExtractPublicPropTypes": true,

 auto-imports.d.ts

@@ -46,6 +46,7 @@
  const EnumEnterpriseWalletAccess: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletAccess']
  const EnumEnterpriseWalletExpandindirectOrderFileType: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderFileType']
  const EnumEnterpriseWalletExpandindirectOrderScene: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderScene']
  const EnumEnterpriseWalletExpandindirectOrderSceneText: typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletExpandindirectOrderSceneText']
  const EnumEnterpriseWalletExpandindirectOrderStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderStatus']
  const EnumEnterpriseWalletExpandindirectOrderStatusText: typeof import('./src/constants/enterprise')['EnumEnterpriseWalletExpandindirectOrderStatusText']
  const EnumEnterpriseWalletSignStatus: typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']
@@ -99,6 +100,8 @@
  const EnumUserStatus: typeof import('./src/constants/apiEnum')['EnumUserStatus']
  const EnumUserType: typeof import('./src/constants/apiEnum')['EnumUserType']
  const EnumUserTypeText: typeof import('./src/constants/apiEnumText')['EnumUserTypeText']
  const EnumUserWalletTransactionType: typeof import('./src/constants/apiEnum')['EnumUserWalletTransactionType']
  const EnumWalletTransactionStatus: typeof import('./src/constants/apiEnum')['EnumWalletTransactionStatus']
  const FastButtonMap: typeof import('./src/constants/module')['FastButtonMap']
  const FastColumnList: typeof import('./src/constants/module')['FastColumnList']
  const FastDataButtonList: typeof import('./src/constants/module')['FastDataButtonList']
@@ -256,7 +259,7 @@
  export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
  import('vue')
  // @ts-ignore
  export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum'
  export type { EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton, EnumBillingMethod, EnumClientType, EnumCodeUrlScene, EnumContractTemplateStatus, EnumContractTemplateValueRecorder, EnumContractTemplateValueType, EnumDataSource, EnumDbAuditOperate, EnumElectronSignAccess, EnumEnterpriseCostStatus, EnumEnterpriseCostType, EnumEnterpriseRealMethod, EnumEnterpriseWalletAccess, EnumEnterpriseWalletExpandindirectOrderFileType, EnumEnterpriseWalletExpandindirectOrderScene, EnumEnterpriseWalletExpandindirectOrderStatus, EnumEnterpriseWalletSignStatus, EnumEnterpriseWalletTransactionType, EnumMenuType, EnumMenuVisitLevel, EnumOcrAccess, EnumPagedListOrder, EnumPayAccess, EnumPersonalFreeTime, EnumPersonalJobSeekingStatus, EnumPersonalRealMethod, EnumPersonalUserRealStatus, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementOrderStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumTaskUserArrangeStatus, EnumTaskUserHireStatus, EnumTaskUserSignContractStatus, EnumTaskUserSubmitCheckReceiveStatus, EnumUserGender, EnumUserRealMethod, EnumUserStatus, EnumUserType, EnumUserWalletTransactionType, EnumWalletTransactionStatus, GetPersonalApplyTaskInfosQueryStatus, GetPersonalHireTaskInfosQueryStatus, GetTaskInfoQueryResultApplyButton, GetTaskInfoQueryResultHireButton } from './src/constants/apiEnum'
  import('./src/constants/apiEnum')
  // @ts-ignore
  export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
@@ -341,11 +344,11 @@
    readonly EnumEnterpriseWalletAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletAccess']>
    readonly EnumEnterpriseWalletExpandindirectOrderFileType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderFileType']>
    readonly EnumEnterpriseWalletExpandindirectOrderScene: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderScene']>
    readonly EnumEnterpriseWalletExpandindirectOrderSceneText: UnwrapRef<typeof import('./src/constants/enterpriseWallet')['EnumEnterpriseWalletExpandindirectOrderSceneText']>
    readonly EnumEnterpriseWalletExpandindirectOrderStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletExpandindirectOrderStatus']>
    readonly EnumEnterpriseWalletExpandindirectOrderStatusText: UnwrapRef<typeof import('./src/constants/enterprise')['EnumEnterpriseWalletExpandindirectOrderStatusText']>
    readonly EnumEnterpriseWalletSignStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletSignStatus']>
    readonly EnumEnterpriseWalletSignStatusText: UnwrapRef<typeof import('./src/constants/enterprise')['EnumEnterpriseWalletSignStatusText']>
    readonly EnumEnterpriseWalletTransactionStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionStatus']>
    readonly EnumEnterpriseWalletTransactionType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumEnterpriseWalletTransactionType']>
    readonly EnumMenuType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuType']>
    readonly EnumMenuVisitLevel: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumMenuVisitLevel']>
@@ -394,6 +397,8 @@
    readonly EnumUserStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserStatus']>
    readonly EnumUserType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserType']>
    readonly EnumUserTypeText: UnwrapRef<typeof import('./src/constants/apiEnumText')['EnumUserTypeText']>
    readonly EnumUserWalletTransactionType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserWalletTransactionType']>
    readonly EnumWalletTransactionStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWalletTransactionStatus']>
    readonly FastButtonMap: UnwrapRef<typeof import('./src/constants/module')['FastButtonMap']>
    readonly FastColumnList: UnwrapRef<typeof import('./src/constants/module')['FastColumnList']>
    readonly FastDataButtonList: UnwrapRef<typeof import('./src/constants/module')['FastDataButtonList']>

 src/constants/apiEnum.ts

@@ -167,22 +167,6 @@
  Stop = 999,
}

/** 企业钱包交易状态 */
export enum EnumEnterpriseWalletTransactionStatus {
  /**待提交 */
  WaitSubmit = 1,
  /**待支付 */
  WaitPay = 10,
  /**处理中 */
  Dealing = 20,
  /**成功 */
  Success = 30,
  /**退票 */
  Refund = 40,
  /**失败 */
  Fail = 50,
}

/** 企业钱包交易类型 */
export enum EnumEnterpriseWalletTransactionType {
  /**充值 */
@@ -275,9 +259,9 @@
export enum EnumPersonalUserRealStatus {
  /**未实名 */
  UnReal = 0,
  /**校验中 */
  /**认证中 */
  Checking = 10,
  /**实名失败 */
  /**认证失败 */
  Fail = 99,
  /**已实名 */
  Real = 100,
@@ -511,6 +495,30 @@
  Operation = 100,
}

/** 用户钱包收支类型 */
export enum EnumUserWalletTransactionType {
  /**收入 */
  Income = 10,
  /**提现 */
  Withdraw = 20,
}

/** 钱包交易状态 */
export enum EnumWalletTransactionStatus {
  /**待提交 */
  WaitSubmit = 1,
  /**待支付 */
  WaitPay = 10,
  /**处理中 */
  Dealing = 20,
  /**成功 */
  Success = 30,
  /**退票 */
  Refund = 40,
  /**失败 */
  Fail = 50,
}

/** 我的报名分页列表-状态 */
export enum GetPersonalApplyTaskInfosQueryStatus {
  /**待确认 */

 src/constants/enterpriseWallet.ts

New file
@@ -0,0 +1,13 @@
import { EnumEnterpriseWalletExpandindirectOrderScene } from './apiEnum';

export const EnumEnterpriseWalletExpandindirectOrderSceneText = {
  [EnumEnterpriseWalletExpandindirectOrderScene.XIANJIN_YINGXIAO]: '现金营销',
  [EnumEnterpriseWalletExpandindirectOrderScene.XINGZHENG_BUTIE]: '行政补贴',
  [EnumEnterpriseWalletExpandindirectOrderScene.BAOXIAN_LIPEI]: '保险理赔',
  [EnumEnterpriseWalletExpandindirectOrderScene.YONGJIN_BAOCHOU]: '佣金报酬',
  [EnumEnterpriseWalletExpandindirectOrderScene.QIYE_PEIFU]: '企业赔付',
  [EnumEnterpriseWalletExpandindirectOrderScene.CAIGOU_HUOKUAN]: '采购货款',
  [EnumEnterpriseWalletExpandindirectOrderScene.ERSHOU_HUISHOU]: '二手回收',
  [EnumEnterpriseWalletExpandindirectOrderScene.GONGYI_BUZHU]: '公益补助',
  [EnumEnterpriseWalletExpandindirectOrderScene.ZHUANZHANG_QITA]: '其他场景',
};

 src/constants/index.ts

@@ -19,3 +19,4 @@
export * from './task';
export * from './enterpriseEmployee';
export * from './electronSign';
export * from './enterpriseWallet';

 src/hooks/electronSign.ts

@@ -3,28 +3,33 @@

type UseEnabledElectronSignSettingsOptions = {
  enterpriseId?: MaybeRef<string>;
  all?: MaybeRef<boolean>;
};

export function useEnabledElectronSignSettings(
  options: UseEnabledElectronSignSettingsOptions = {}
) {
  const { enterpriseId } = options;
  const { enterpriseId, all } = options;

  const queryClient = useQueryClient();

  const { data } = useQuery({
    queryKey: ['electronSignServices/getEnabledElectronSignSettings', enterpriseId],
    queryKey: ['electronSignServices/getEnabledElectronSignSettings', enterpriseId, all],
    queryFn: async () => {
      let res = await electronSignServices.getEnabledElectronSignSettings(
        { enterpriseId: unref(enterpriseId) },
        { enterpriseId: unref(enterpriseId), all: unref(all) },
        { showLoading: false }
      );
      return res;
    },
    select(data) {
      const showDisabledName = !!unref(enterpriseId) && unref(all);
      return data.map((x) => ({
        ...x,
        accessName: EnumElectronSignAccessText[x.access],
        accessName:
          showDisabledName && x.isDisabled
            ? '该通道无法使用'
            : EnumElectronSignAccessText[x.access],
      }));
    },
    placeholderData: () => [] as API.GetEnabledElectronSignSettingsQueryResultItem[],
@@ -32,7 +37,7 @@

  function invalidateQueries() {
    return queryClient.invalidateQueries({
      queryKey: ['electronSignServices/getEnabledElectronSignSettings', enterpriseId],
      queryKey: ['electronSignServices/getEnabledElectronSignSettings'],
    });
  }


 src/services/api/enterpriseWallet.ts

@@ -310,18 +310,3 @@
    }
  );
}

/** 企业钱包转账 POST /api/user/enterpriseWallet/transferEnterpriseWallet */
export async function transferEnterpriseWallet(
  body: API.TransferEnterpriseWalletCommand,
  options?: API.RequestConfig
) {
  return request<string>('/api/user/enterpriseWallet/transferEnterpriseWallet', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}

 src/services/api/typings.d.ts

@@ -76,6 +76,8 @@
  interface APIgetEnabledElectronSignSettingsParams {
    /** 企业Id */
    enterpriseId?: string;
    /** 是否查询全部 */
    all?: boolean;
  }

  interface APIgetEnterpriseContractTemplateSelectParams {
@@ -168,6 +170,11 @@
  interface APIgetPersonalUserRealResultParams {
    /** 查询个人实名结果 */
    request?: GetPersonalUserRealResultQuery;
  }

  interface APIgetPersonalUserTransactionParams {
    /** 收支Id */
    id?: string;
  }

  interface APIgetResourceFieldsParams {
@@ -641,21 +648,6 @@
    Stop = 999,
  }

  enum EnumEnterpriseWalletTransactionStatus {
    /**待提交 */
    WaitSubmit = 1,
    /**待支付 */
    WaitPay = 10,
    /**处理中 */
    Dealing = 20,
    /**成功 */
    Success = 30,
    /**退票 */
    Refund = 40,
    /**失败 */
    Fail = 50,
  }

  enum EnumEnterpriseWalletTransactionType {
    /**充值 */
    Recharge = 10,
@@ -738,9 +730,9 @@
  enum EnumPersonalUserRealStatus {
    /**未实名 */
    UnReal = 0,
    /**校验中 */
    /**认证中 */
    Checking = 10,
    /**实名失败 */
    /**认证失败 */
    Fail = 99,
    /**已实名 */
    Real = 100,
@@ -952,6 +944,28 @@
    Enterprise = 20,
    /**运营 */
    Operation = 100,
  }

  enum EnumUserWalletTransactionType {
    /**收入 */
    Income = 10,
    /**提现 */
    Withdraw = 20,
  }

  enum EnumWalletTransactionStatus {
    /**待提交 */
    WaitSubmit = 1,
    /**待支付 */
    WaitPay = 10,
    /**处理中 */
    Dealing = 20,
    /**成功 */
    Success = 30,
    /**退票 */
    Refund = 40,
    /**失败 */
    Fail = 50,
  }

  interface ExportTaskCheckReceiveTaskUsersCommand {
@@ -1634,6 +1648,42 @@
    /** 错误码 */
    errorCode?: string;
    data?: GetPersonalUserRealResultQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultGetPersonalUserTransactionQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetPersonalUserTransactionQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }

  interface FriendlyResultGetPersonalUserTransactionsQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetPersonalUserTransactionsQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
@@ -2641,6 +2691,7 @@
    date?: string;
    /** 提交时间 */
    createdTime?: string;
    checkReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
    /** 验收照片 */
    files?: string[];
  }
@@ -2945,6 +2996,8 @@

  interface GetEnabledElectronSignSettingsQueryResultItem {
    access?: EnumElectronSignAccess;
    /** 是否禁用 */
    isDisabled?: boolean;
    /** 实名费用 */
    realVerifyCost?: number;
    /** 签约费用 */
@@ -3288,10 +3341,6 @@
    /** 钱包Id */
    id?: string;
    access?: EnumEnterpriseWalletAccess;
    /** 账号 */
    account?: string;
    /** 商户Id */
    merchantId?: string;
    /** 协议号 */
    code?: string;
    /** 通道协议号 */
@@ -3303,6 +3352,21 @@
    /** 协议失效时间 */
    invalidTime?: string;
    signStatus?: EnumEnterpriseWalletSignStatus;
    /** 支付宝姓名 */
    name?: string;
    /** 支付宝登录账号 */
    identity?: string;
    scene?: EnumEnterpriseWalletExpandindirectOrderScene;
    /** 转账场景说明 */
    sceneDirections?: string;
    orderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
    /** 进件单任务完结时间 */
    taskFinishTime?: string;
    /** 进件单审核不通过原因 */
    riskReviewRemark?: string;
    sitesInfo?: GetEnterpriseWalletExpandindirectOrderQueryResultSites;
    /** 附件 */
    files?: GetEnterpriseWalletExpandindirectOrderQueryResultFile[];
    expandindirectOrderStatus?: EnumEnterpriseWalletExpandindirectOrderStatus;
  }

@@ -3318,7 +3382,7 @@
    remark?: string;
    /** 订单支付时间 */
    transDate?: string;
    transactionStatus?: EnumEnterpriseWalletTransactionStatus;
    transactionStatus?: EnumWalletTransactionStatus;
  }

  interface GetExceptionLogsQuery {
@@ -3711,6 +3775,9 @@
    contactPhoneNumber?: string;
    /** 是否实名 */
    isReal?: boolean;
    realStatus?: EnumPersonalUserRealStatus;
    /** 实名失败消息 */
    realFailMessage?: string;
    realMethod?: EnumUserRealMethod;
    /** 我的报名 */
    taskCount?: number;
@@ -3718,6 +3785,8 @@
    hirePassTaskCount?: number;
    /** 已取消 */
    hireRefuseTaskCount?: number;
    /** 余额 */
    balance?: number;
  }

  type GetPersonalUserBankCardQuery = Record<string, any>;
@@ -3901,6 +3970,74 @@
    realFailMessage?: string;
    /** 人脸实名认证地址 */
    faceRealUrl?: string;
  }

  interface GetPersonalUserTransactionQueryResult {
    /** 收支Id */
    id?: string;
    type?: EnumUserWalletTransactionType;
    /** 订单号 */
    code?: string;
    /** 企业名称 */
    enterpriseName?: string;
    /** 结算日期 */
    settlementTime?: string;
    /** 结算金额 */
    settlementAmount?: number;
    /** 实发金额/提现金额 */
    amount?: number;
    /** 收款人姓名 */
    receiveName?: string;
    /** 收款账户 */
    receiveAccount?: string;
    /** 服务费 */
    serviceFee?: number;
    /** 实际到账 */
    actualAmount?: number;
    /** 预计到账时间 */
    arrivalTimeEnd?: string;
    /** 订单支付时间 */
    transDate?: string;
    /** 创建时间 */
    createdTime?: string;
    /** 失败原因 */
    failReason?: string;
  }

  interface GetPersonalUserTransactionsQuery {
    /** 创建时间-起始 */
    createdTimeStart?: string;
    /** 创建时间-截止 */
    createdTimeEnd?: string;
    type?: EnumUserWalletTransactionType;
    pageModel?: PagedListQueryPageModel;
  }

  interface GetPersonalUserTransactionsQueryResult {
    objectData?: GetPersonalUserTransactionsQueryResultObjectData;
    pageModel?: PagedListQueryResultPageModel;
    /** 数据 */
    data?: GetPersonalUserTransactionsQueryResultItem[];
  }

  interface GetPersonalUserTransactionsQueryResultItem {
    /** 收支Id */
    id?: string;
    /** 标题 */
    title?: string;
    /** 创建时间 */
    createdTime?: string;
    /** 金额 */
    amount?: number;
    /** 余额 */
    balance?: number;
  }

  interface GetPersonalUserTransactionsQueryResultObjectData {
    /** 总收入 */
    sumIncome?: number;
    /** 总提现 */
    sumWithdraw?: number;
  }

  interface GetResourceFieldsQueryResultItem {
@@ -4124,6 +4261,7 @@
  }

  interface GetSettlementTaskUsersQueryResult {
    detail?: GetSettlementTaskQueryResult;
    /** 结算名单 */
    data?: GetSettlementTaskUsersQueryResultItem[];
    /** 错误信息 */
@@ -4787,10 +4925,6 @@
    /** 企业Id */
    enterpriseId?: string;
    access?: EnumEnterpriseWalletAccess;
    /** 账号 */
    account?: string;
    /** 商户Id */
    merchantId?: string;
  }

  interface OpenEnterpriseWalletCommandResult {
@@ -5367,6 +5501,8 @@
  interface SendInviteElectronSignSmsCommand {
    /** Id */
    ids?: string[];
    /** 合同模板Id */
    contractTemplateId?: string;
  }

  interface SendLoginOrRegisterVerifyCodeCommand {
@@ -5646,14 +5782,6 @@
    industrialParkIds?: string[];
    status?: EnumUserStatus;
    /** 备注 */
    remark?: string;
  }

  interface TransferEnterpriseWalletCommand {
    access?: EnumEnterpriseWalletAccess;
    /** 金额 */
    amount?: number;
    /** 充值备注 */
    remark?: string;
  }


 src/services/api/user.ts

@@ -70,6 +70,42 @@
  );
}

/** 查询个人用户收支明细详情 GET /api/user/user/getPersonalUserTransaction */
export async function getPersonalUserTransaction(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
  params: API.APIgetPersonalUserTransactionParams,
  options?: API.RequestConfig
) {
  return request<API.GetPersonalUserTransactionQueryResult>(
    '/api/user/user/getPersonalUserTransaction',
    {
      method: 'GET',
      params: {
        ...params,
      },
      ...(options || {}),
    }
  );
}

/** 查询个人用户收支明细分页列表数据 POST /api/user/user/getPersonalUserTransactions */
export async function getPersonalUserTransactions(
  body: API.GetPersonalUserTransactionsQuery,
  options?: API.RequestConfig
) {
  return request<API.GetPersonalUserTransactionsQueryResult>(
    '/api/user/user/getPersonalUserTransactions',
    {
      method: 'POST',
      headers: {
        'Content-Type': 'application/json-patch+json',
      },
      data: body,
      ...(options || {}),
    }
  );
}

/** 查询用户角色列表 GET /api/user/user/getUserInfoRoles */
export async function getUserInfoRoles(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)

 src/utils/enterpriseWallet.ts

New file
@@ -0,0 +1,19 @@
import { UploadUserFile } from '@bole-core/components';
import { convertApi2FormUrl } from './common';

export function convertWalletFilesToApi(
  files: UploadUserFile[],
  type: EnumEnterpriseWalletExpandindirectOrderFileType
) {
  return files.map(
    (item) =>
      ({ file: item.path, type: type } as API.EnterpriseWalletExpandindirectCreateCommandFile)
  );
}

export function convertWalletApiToFiles(
  files: API.GetEnterpriseWalletExpandindirectOrderQueryResultFile[],
  type: EnumEnterpriseWalletExpandindirectOrderFileType
) {
  return files.filter((item) => item.type === type).map((item) => convertApi2FormUrl(item.file));
}

 src/utils/index.ts

@@ -5,3 +5,4 @@
export * from './module';
export * from './theme';
export * from './validator';
export * from './enterpriseWallet';

 src/views/EnterpriseManage/EnterpriseManageList.vue

@@ -60,6 +60,7 @@
import { Message } from '@bole-core/core';
import * as enterpriseServices from '@/services/api/enterprise';
import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
import { convertWalletApiToFiles, convertWalletFilesToApi } from '@/utils';

defineOptions({
  name: 'EnterpriseManageList',
@@ -172,12 +173,22 @@
        ),
        smsAccess: smsSetting.smsAccess,
        smsCost: smsSetting.smsCost,
        alipayAccount: alipayWallet.account,
        alipayMerchantId: alipayWallet.merchantId,
        alipayAccount: alipayWallet.identity,
        alipayMerchantId: alipayWallet.code,
        signStatus: alipayWallet.signStatus,
        expandindirectOrderStatus: alipayWallet.expandindirectOrderStatus,

        url: [] as UploadUserFile[],
        name: alipayWallet.name,
        scene: alipayWallet.scene || EnumEnterpriseWalletExpandindirectOrderScene.YONGJIN_BAOCHOU,
        sceneDirections: alipayWallet.sceneDirections,
        sceneFiles: convertWalletApiToFiles(
          alipayWallet.files,
          EnumEnterpriseWalletExpandindirectOrderFileType.Scene
        ),
        sceneQualificationFiles: convertWalletApiToFiles(
          alipayWallet.files,
          EnumEnterpriseWalletExpandindirectOrderFileType.SceneQualification
        ),
      });
    } else {
      handleAdd({
@@ -200,7 +211,13 @@
    signStatus: '' as any as EnumEnterpriseWalletSignStatus,
    expandindirectOrderStatus: '' as any as EnumEnterpriseWalletExpandindirectOrderStatus,

    url: [] as UploadUserFile[],
    name: '',
    scene: '' as any as EnumEnterpriseWalletExpandindirectOrderScene,
    sceneDirections: '',
    /**转账场景截图 */
    sceneFiles: [] as UploadUserFile[],
    /**商户行业资质图片或协议文本 */
    sceneQualificationFiles: [] as UploadUserFile[],
  },
});

@@ -216,6 +233,9 @@
    if (editForm.enterpriseConfigureType === EnterpriseConfigureType.ShortMessage) {
      res = await createOrEditFlexEnterpriseMessageSetting();
    }
    if (editForm.enterpriseConfigureType === EnterpriseConfigureType.AliPay) {
      res = await enterpriseWalletExpandindirectCreate();
    }
    if (res) {
      Message.successMessage('操作成功');
      getList(paginationState.pageIndex);
@@ -224,6 +244,30 @@
  } catch (error) {}
}

async function enterpriseWalletExpandindirectCreate() {
  try {
    let params: API.EnterpriseWalletExpandindirectCreateCommand = {
      enterpriseId: editForm.id,
      identity: editForm.alipayAccount,
      name: editForm.name,
      scene: editForm.scene,
      sceneDirections: editForm.sceneDirections,
      sitesInfo: null,
      files: [
        ...convertWalletFilesToApi(
          editForm.sceneFiles,
          EnumEnterpriseWalletExpandindirectOrderFileType.Scene
        ),
        ...convertWalletFilesToApi(
          editForm.sceneQualificationFiles,
          EnumEnterpriseWalletExpandindirectOrderFileType.SceneQualification
        ),
      ],
    };
    return await enterpriseWalletServices.enterpriseWalletExpandindirectCreate(params);
  } catch (error) {}
}

// async function createOrEditFlexEnterpriseBankSetting() {
//   try {
//     let params: API.CreateOrEditFlexEnterpriseBankInput = {

 src/views/EnterpriseManage/components/ConfigureDialog.vue

@@ -49,35 +49,66 @@
          <div style="display: flex; width: 100%">
            <ProFormText v-model.trim="form.alipayAccount" placeholder="请输入支付宝账号">
            </ProFormText>
            <el-button
              style="margin-left: 10px"
              type="primary"
              link
              @click="handleOpenEnterpriseWallet"
            <el-button style="margin-left: 10px" type="primary" link @click="openEnterpriseWallet"
              >获取签约链接</el-button
            >
          </div>
        </ProFormItemV2>
        <ProFormItemV2
          label="支付宝姓名:"
          prop="name"
          :checkRules="[{ message: '请输入支付宝姓名' }]"
        >
          <ProFormText v-model.trim="form.name" placeholder="请输入支付宝姓名" />
        </ProFormItemV2>
        <ProFormItemV2
          label="商户ID:"
          prop="alipayMerchantId"
          :checkRules="[{ message: '请输入商户ID' }]"
        >
          <ProFormText v-model.trim="form.alipayMerchantId" placeholder="请输入商户ID" />
          <ProFormText v-model.trim="form.alipayMerchantId" placeholder="请输入商户ID" disabled />
        </ProFormItemV2>
        <ProFormItemV2 label="业务场景:" prop="scene" :checkRules="[{ message: '请选择业务场景' }]">
          <ProFormSelect
            v-model="form.scene"
            :valueEnum="EnumEnterpriseWalletExpandindirectOrderSceneText"
            placeholder="请选择业务场景"
          >
          </ProFormSelect>
        </ProFormItemV2>
        <ProFormItemV2
          label="图片:"
          prop="url"
          :check-rules="[{ type: 'upload', message: '请上传图片' }]"
          label="场景描述:"
          prop="sceneDirections"
          :checkRules="[{ message: '请输入场景描述' }]"
        >
          <ProFormImageUpload v-model:file-url="form.url" :limitFileCount="1"></ProFormImageUpload>
          <ProFormText
            v-model.trim="form.sceneDirections"
            placeholder="谁/通过什么媒介（APP/web/小程序)/主要为谁提供什么服务/用于在什么场景给什么人群转账"
          />
        </ProFormItemV2>
        <ProFormItemV2
          label="图片:"
          prop="url"
          :check-rules="[{ type: 'upload', message: '请上传图片' }]"
          label="转账场景截图:"
          prop="sceneFiles"
          :check-rules="[{ type: 'upload', message: '请上传转账场景截图' }]"
        >
          <ProFormImageUpload v-model:file-url="form.url" :limitFileCount="1"></ProFormImageUpload>
          <ProFormUpload
            v-model:file-url="form.sceneFiles"
            :limit="5"
            :limitFileSize="10"
            accept="png,jpg,jpeg,pdf"
          ></ProFormUpload>
        </ProFormItemV2>
        <ProFormItemV2
          label="资质文件:"
          prop="sceneQualificationFiles"
          :check-rules="[{ type: 'upload', message: '请上传资质文件' }]"
        >
          <ProFormUpload
            v-model:file-url="form.sceneQualificationFiles"
            :limit="5"
            :limitFileSize="10"
            accept="png,jpg,jpeg,pdf"
          ></ProFormUpload>
        </ProFormItemV2>
        <ProFormItemV2 label="签约状态:" prop="signStatus" required>
          <span>{{ EnumEnterpriseWalletSignStatusText[form.signStatus] }}</span>
@@ -155,6 +186,7 @@
  useFormDialog,
  UploadUserFile,
  ProFormImageUpload,
  ProFormUpload,
} from '@bole-core/components';
import { BoleRegExp } from '@bole-core/core';
import {
@@ -166,6 +198,7 @@
  EnumElectronSignAccess,
  EnumEnterpriseWalletSignStatusText,
  EnumEnterpriseWalletExpandindirectOrderStatusText,
  EnumEnterpriseWalletExpandindirectOrderSceneText,
} from '@/constants';
import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
import AlipayWalletOpen from './AlipayWalletOpen.vue';
@@ -190,7 +223,13 @@
  signStatus: EnumEnterpriseWalletSignStatus;
  expandindirectOrderStatus: EnumEnterpriseWalletExpandindirectOrderStatus;

  url: UploadUserFile[];
  name: string;
  scene: EnumEnterpriseWalletExpandindirectOrderScene;
  sceneDirections: string;
  /**转账场景截图 */
  sceneFiles: UploadUserFile[];
  /**商户行业资质图片或协议文本 */
  sceneQualificationFiles: UploadUserFile[];
};

const form = defineModel<Form>('form');
@@ -203,7 +242,9 @@

const dialogForm = ref<FormInstance>();

const { enabledElectronSignSettings } = useEnabledElectronSignSettings();
const { enabledElectronSignSettings } = useEnabledElectronSignSettings({
  all: true,
});

async function handleCheckBankAccount() {
  try {
@@ -214,6 +255,17 @@
    if (alipayWallet) {
      form.value.signStatus = alipayWallet.signStatus;
      form.value.expandindirectOrderStatus = alipayWallet.expandindirectOrderStatus;
    }
  } catch (error) {}
}

async function getEnterpriseWalletExpandindirectOrder() {
  try {
    let res = await enterpriseWalletServices.getEnterpriseWalletExpandindirectOrder({
      enterpriseId: form.value.id,
    });
    if (res) {
      form.value.expandindirectOrderStatus = res.orderStatus;
    }
  } catch (error) {}
}
@@ -240,23 +292,21 @@
  },
});

async function handleOpenEnterpriseWallet() {
  try {
    if (!dialogForm.value) return;
    const valid = await dialogForm.value.validateField(['alipayAccount', 'alipayMerchantId']);
    if (valid) {
      openEnterpriseWallet();
    }
  } catch (error) {}
}
// async function handleOpenEnterpriseWallet() {
//   try {
//     if (!dialogForm.value) return;
//     const valid = await dialogForm.value.validateField(['alipayAccount', 'alipayMerchantId']);
//     if (valid) {
//       openEnterpriseWallet();
//     }
//   } catch (error) {}
// }

async function openEnterpriseWallet() {
  try {
    let params: API.OpenEnterpriseWalletCommand = {
      access: EnumEnterpriseWalletAccess.Alipay,
      enterpriseId: form.value.id,
      account: form.value.alipayAccount,
      merchantId: form.value.alipayMerchantId,
    };
    let res = await enterpriseWalletServices.openEnterpriseWallet(params);
    if (res) {

 src/views/ProtocolManage/components/AddOrEditTemplateDialog.vue

@@ -105,6 +105,7 @@

const { enabledElectronSignSettings } = useEnabledElectronSignSettings({
  enterpriseId: computed(() => form.value.enterpriseId),
  all: true,
});

const dialogForm = ref<FormInstance>();