Merge branch 'dev-1.1.2' of http://120.26.58.240:8888/r/flexJobAdmin into d...

zhengyiming

2 天以前 ba252a1184011d87078074374019aefb8c8ad2bb

Merge branch 'dev-1.1.2' of http://120.26.58.240:8888/r/flexJobAdmin into dev-1.1.2

 .eslintrc-auto-import.json

@@ -119,6 +119,7 @@
    "EnumWalletTransactionStatusText": true,
    "EnumWeChatPayApplymentBankAccountType": true,
    "EnumWeChatPayApplymentBankAccountTypeText": true,
    "EnumWeChatPayApplymentBankAccountTypeTextForGTH": true,
    "EnumWeChatPayApplymentCertType": true,
    "EnumWeChatPayApplymentCertTypeTextForSHZZ": true,
    "EnumWeChatPayApplymentCertTypeTextForSYDW": true,

 auto-imports.d.ts

@@ -123,6 +123,8 @@
  const EnumWalletTransactionStatusText: typeof import('./src/constants/finance')['EnumWalletTransactionStatusText']
  const EnumWeChatPayApplymentBankAccountType: typeof import('./src/constants/apiEnum')['EnumWeChatPayApplymentBankAccountType']
  const EnumWeChatPayApplymentBankAccountTypeText: typeof import('./src/constants/enterpriseWallet')['EnumWeChatPayApplymentBankAccountTypeText']
  const EnumWeChatPayApplymentBankAccountTypeTextForGTH: typeof import('./src/constants/enterpriseWallet')['EnumWeChatPayApplymentBankAccountTypeTextForGTH']
  const EnumWeChatPayApplymentBankAccountTypeTextNotGTH: typeof import('./src/constants/enterpriseWallet')['EnumWeChatPayApplymentBankAccountTypeTextNotGTH']
  const EnumWeChatPayApplymentCertType: typeof import('./src/constants/apiEnum')['EnumWeChatPayApplymentCertType']
  const EnumWeChatPayApplymentCertTypeTextForSHZZ: typeof import('./src/constants/enterpriseWallet')['EnumWeChatPayApplymentCertTypeTextForSHZZ']
  const EnumWeChatPayApplymentCertTypeTextForSYDW: typeof import('./src/constants/enterpriseWallet')['EnumWeChatPayApplymentCertTypeTextForSYDW']
@@ -464,6 +466,7 @@
    readonly EnumWalletTransactionStatusText: UnwrapRef<typeof import('./src/constants/finance')['EnumWalletTransactionStatusText']>
    readonly EnumWeChatPayApplymentBankAccountType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWeChatPayApplymentBankAccountType']>
    readonly EnumWeChatPayApplymentBankAccountTypeText: UnwrapRef<typeof import('./src/constants/enterpriseWallet')['EnumWeChatPayApplymentBankAccountTypeText']>
    readonly EnumWeChatPayApplymentBankAccountTypeTextForGTH: UnwrapRef<typeof import('./src/constants/enterpriseWallet')['EnumWeChatPayApplymentBankAccountTypeTextForGTH']>
    readonly EnumWeChatPayApplymentCertType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumWeChatPayApplymentCertType']>
    readonly EnumWeChatPayApplymentCertTypeTextForSHZZ: UnwrapRef<typeof import('./src/constants/enterpriseWallet')['EnumWeChatPayApplymentCertTypeTextForSHZZ']>
    readonly EnumWeChatPayApplymentCertTypeTextForSYDW: UnwrapRef<typeof import('./src/constants/enterpriseWallet')['EnumWeChatPayApplymentCertTypeTextForSYDW']>

 src/constants/enterpriseWallet.ts

@@ -92,6 +92,10 @@

export const EnumWeChatPayApplymentBankAccountTypeText = {
  [EnumWeChatPayApplymentBankAccountType.BANK_ACCOUNT_TYPE_CORPORATE]: '对公银行账户',
};

export const EnumWeChatPayApplymentBankAccountTypeTextForGTH = {
  [EnumWeChatPayApplymentBankAccountType.BANK_ACCOUNT_TYPE_CORPORATE]: '对公银行账户',
  [EnumWeChatPayApplymentBankAccountType.BANK_ACCOUNT_TYPE_PERSONAL]:
    '经营者个人银行卡（仅个体户可选择）',
};

 src/views/EnterpriseManage/components/WechatConfigureView.vue

@@ -1027,7 +1027,7 @@
      >
        <ProFormSelect
          v-model="form.bank_account_type"
          :valueEnum="EnumWeChatPayApplymentBankAccountTypeText"
          :valueEnum="bank_account_typeList"
          placeholder="请选择结算银行账户类型"
        >
        </ProFormSelect>
@@ -1122,6 +1122,7 @@
  EnumWeChatPayApplymentSalesScenesType,
  EnumWeChatPayApplymentSalesScenesTypeText,
  EnumWeChatPayApplymentBankAccountTypeText,
  EnumWeChatPayApplymentBankAccountTypeTextForGTH,
  BooleanOptions,
} from '@/constants';
import { convertApi2FormUrlOnlyOne, downloadFileByUrl, format, convertApi2FormUrls } from '@/utils';
@@ -1269,6 +1270,13 @@
  return EnumWeChatPayApplymentIdDocTypeText;
});

const bank_account_typeList = computed(() => {
  if (form.subject_type === EnumWeChatPayApplymentSubjectType.SUBJECT_TYPE_INDIVIDUAL) {
    return EnumWeChatPayApplymentBankAccountTypeTextForGTH;
  }
  return EnumWeChatPayApplymentBankAccountTypeText;
});

const { isLoading, refetch } = useQuery({
  queryKey: [
    'enterpriseWalletServices/getEnterpriseWallet',