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

zhengyiming

4 天以前 5eb708efd67798bb5b0dccd45d932b98b85462d3

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

 src/views/EnterpriseManage/components/WechatConfigureView.vue

@@ -570,12 +570,12 @@
        <ProFormItemV2
          label="线下场所省市编码:"
          prop="biz_address_code"
          :checkRules="[{ message: '请输入线下场所省市编码' }]"
          :checkRules="[{ message: '请输入线下场所省市编码', type: 'number' }]"
        >
          <ProFormInputNumber
            v-model.trim="form.biz_address_code"
            placeholder="请输入线下场所省市编码"
          />
          <ProFormText v-model.trim="form.biz_address_code" placeholder="请输入线下场所省市编码" />
          <el-button type="primary" link @click="downloadAddressCodeTemplate"
            >省市编码模板</el-button
          >
        </ProFormItemV2>
        <ProFormItemV2
          label="线下场所地址:"
@@ -892,6 +892,14 @@
        <ProFormText v-model.trim="form.account_bank" placeholder="请输入开户银行" />
      </ProFormItemV2>
      <ProFormItemV2
        label="开户银行省市编码:"
        prop="bank_address_code"
        :checkRules="[{ message: '请输入开户银行省市编码' }]"
      >
        <ProFormText v-model.trim="form.bank_address_code" placeholder="请输入开户银行省市编码" />
        <el-button type="primary" link @click="downloadAddressCodeTemplate">省市编码模板</el-button>
      </ProFormItemV2>
      <ProFormItemV2
        label="开户银行银行号:"
        prop="bank_branch_id"
        :checkRules="[{ message: '请输入开户银行银行号' }]"
@@ -952,14 +960,7 @@
  EnumWeChatPayApplymentSalesScenesTypeText,
  EnumWeChatPayApplymentBankAccountTypeText,
} from '@/constants';
import {
  convertApi2FormUrl,
  convertApi2FormUrlOnlyOne,
  convertWalletApiToFiles,
  convertWalletFilesToApi,
  downloadFileByUrl,
  format,
} from '@/utils';
import { convertApi2FormUrl, convertApi2FormUrlOnlyOne, downloadFileByUrl, format } from '@/utils';
import { Message } from '@bole-core/core';

defineOptions({
@@ -1025,7 +1026,7 @@
  service_phone: '',
  sales_scenes_type: [] as any as EnumWeChatPayApplymentSalesScenesType[],
  biz_store_name: '',
  biz_address_code: null as Number,
  biz_address_code: '',
  biz_store_address: '',
  store_entrance_pic: [] as UploadUserFile[],
  indoor_pic: [] as UploadUserFile[],
@@ -1048,6 +1049,7 @@
  bank_account_type: '' as any as EnumWeChatPayApplymentBankAccountType,
  account_name: '',
  account_bank: '',
  bank_address_code: '',
  bank_branch_id: '',
  bank_name: '',
  account_number: '',
@@ -1134,6 +1136,109 @@
      format(data.subject_info?.certificate_info?.period_begin, 'YYYY-MM-DD'),
      format(data.subject_info?.certificate_info?.period_end, 'YYYY-MM-DD'),
    ];
    form.id_holder_type = data.subject_info?.identity_info?.id_holder_type;
    form.id_doc_type = data.subject_info?.identity_info?.id_doc_type;
    form.authorize_letter_copy = convertApi2FormUrlOnlyOne(
      data.subject_info?.identity_info?.authorize_letter_copy ?? ''
    );
    form.id_card_copy = convertApi2FormUrlOnlyOne(
      data.subject_info?.identity_info?.id_card_info?.id_card_copy ?? ''
    );
    form.id_card_national = convertApi2FormUrlOnlyOne(
      data.subject_info?.identity_info?.id_card_info?.id_card_national ?? ''
    );
    form.id_card_name = data.subject_info?.identity_info?.id_card_info?.id_card_name ?? '';
    form.id_doc_number = data.subject_info?.identity_info?.id_doc_info?.id_doc_number ?? '';
    form.id_doc_period = [
      format(data.subject_info?.identity_info?.id_doc_info?.doc_period_begin, 'YYYY-MM-DD'),
      format(data.subject_info?.identity_info?.id_doc_info?.doc_period_end, 'YYYY-MM-DD'),
    ];
    form.ubo_info_list =
      data.subject_info?.ubo_info_list?.length > 0
        ? data.subject_info?.ubo_info_list.map((x) => ({
            ubo_id_doc_type: x.ubo_id_doc_type,
            ubo_id_doc_copy: convertApi2FormUrlOnlyOne(x.ubo_id_doc_copy ?? ''),
            ubo_id_doc_name: x.ubo_id_doc_name,
            ubo_id_doc_number: x.ubo_id_doc_number,
            ubo_id_doc_address: x.ubo_id_doc_address,
            ubo_period: [
              format(x.ubo_period_begin, 'YYYY-MM-DD'),
              format(x.ubo_period_end, 'YYYY-MM-DD'),
            ],
          }))
        : [
            {
              ubo_id_doc_type: '' as any as EnumWeChatPayApplymentIdDocType,
              ubo_id_doc_copy: [],
              ubo_id_doc_name: '',
              ubo_id_doc_number: '',
              ubo_id_doc_address: '',
              ubo_period: [],
            },
          ];
    form.merchant_shortname = data.business_info?.merchant_shortname ?? '';
    form.service_phone = data.business_info?.service_phone ?? '';
    form.sales_scenes_type = data.business_info?.sales_info?.sales_scenes_type ?? [];
    form.biz_store_name = data.business_info?.sales_info?.biz_store_info?.biz_store_name ?? '';
    form.biz_address_code = data.business_info?.sales_info?.biz_store_info?.biz_address_code;
    form.biz_store_address =
      data.business_info?.sales_info?.biz_store_info?.biz_store_address ?? '';
    form.store_entrance_pic =
      data.business_info?.sales_info?.biz_store_info?.store_entrance_pic.length > 0
        ? data.business_info?.sales_info?.biz_store_info?.store_entrance_pic.map((x) =>
            convertApi2FormUrl(x)
          )
        : [];
    form.indoor_pic =
      data.business_info?.sales_info?.biz_store_info?.indoor_pic.length > 0
        ? data.business_info?.sales_info?.biz_store_info?.indoor_pic.map((x) =>
            convertApi2FormUrl(x)
          )
        : [];
    form.mp_appid = data.business_info?.sales_info?.mp_info?.mp_appid ?? '';
    form.mp_sub_appid = data.business_info?.sales_info?.mp_info?.mp_sub_appid ?? '';
    form.mp_pics =
      data.business_info?.sales_info?.mp_info?.mp_pics.length > 0
        ? data.business_info?.sales_info?.mp_info?.mp_pics.map((x) => convertApi2FormUrl(x))
        : [];
    form.mini_program_appid =
      data.business_info?.sales_info?.mini_program_info?.mini_program_appid ?? '';
    form.mini_program_sub_appid =
      data.business_info?.sales_info?.mini_program_info?.mini_program_sub_appid ?? '';
    form.mini_program_pics =
      data.business_info?.sales_info?.mini_program_info?.mini_program_pics.length > 0
        ? data.business_info?.sales_info?.mini_program_info?.mini_program_pics.map((x) =>
            convertApi2FormUrl(x)
          )
        : [];
    form.app_appid = data.business_info?.sales_info?.app_info?.app_appid ?? '';
    form.app_sub_appid = data.business_info?.sales_info?.app_info?.app_sub_appid ?? '';
    form.app_pics =
      data.business_info?.sales_info?.app_info?.app_pics.length > 0
        ? data.business_info?.sales_info?.app_info?.app_pics.map((x) => convertApi2FormUrl(x))
        : [];
    form.domain = data.business_info?.sales_info?.web_info?.domain ?? '';
    form.web_authorisation = convertApi2FormUrlOnlyOne(
      data.business_info?.sales_info?.web_info?.web_authorisation ?? ''
    );
    form.sub_corp_id = data.business_info?.sales_info?.wework_info?.sub_corp_id ?? '';
    form.wework_pics =
      data.business_info?.sales_info?.wework_info?.wework_pics.length > 0
        ? data.business_info?.sales_info?.wework_info?.wework_pics.map((x) => convertApi2FormUrl(x))
        : [];
    form.settlement_id = data.settlement_info?.settlement_id ?? '';
    form.qualification_type = data.settlement_info?.qualification_type ?? '';
    form.qualifications =
      data.settlement_info?.qualifications?.length > 0
        ? data.settlement_info?.qualifications.map((x) => convertApi2FormUrl(x))
        : [];
    form.bank_account_type = data.bank_account_info?.bank_account_type;
    form.account_name = data.bank_account_info?.account_name ?? '';
    form.account_bank = data.bank_account_info?.account_bank ?? '';
    form.bank_address_code = data.bank_account_info?.bank_address_code ?? '';
    form.bank_branch_id = data.bank_account_info?.bank_branch_id ?? '';
    form.bank_name = data.bank_account_info?.bank_name ?? '';
    form.account_number = data.bank_account_info?.account_number ?? '';
  },
});

@@ -1153,6 +1258,10 @@
}

function deleteUboInfo(index: number) {
  if (form.ubo_info_list.length <= 1) {
    Message.errorMessage('至少保留一个受益人');
    return;
  }
  form.ubo_info_list.splice(index, 1);
}

@@ -1220,6 +1329,12 @@
    '网站授权函'
  );
}
function downloadAddressCodeTemplate() {
  downloadFileByUrl(
    'https://parkmanagement.oss-cn-hangzhou.aliyuncs.com/FlexJob/temp/%E3%80%8A%E7%9C%81%E5%B8%82%E5%8C%BA%E7%BC%96%E5%8F%B7%E5%AF%B9%E7%85%A7%E8%A1%A8%E3%80%8B.xlsx',
    '省市编码模版'
  );
}

defineExpose({
  onConfirm: enterpriseWalletExpandindirectCreate,