Merge branch 'master' of http://120.26.58.240:8888/r/12333GovernmentWeb

zhengyiming

3 天以前 a430dc39516a0d33f02ef902159b23a53b0c92ea

 src/views/Reward/components/RewardApplyTradeCheckDialog.vue

@@ -6,7 +6,7 @@
    destroy-on-close
    draggable
  >
    <PortraitTableWithAttachment v-bind="portraitTableWithAttachmentProps">
    <PortraitTableWithAttachment v-bind="portraitTableWithAttachmentProps" labelWidth="100px">
      <template #title>
        <el-row class="portrait-table-with-attachment-title">
          <el-text style="color: #333333">打款信息</el-text>
@@ -37,8 +37,15 @@
      </ProFormCol>
      <ProFormCol v-if="form.isCheck">
        <ProFormColItem :span="12">
          <ProFormItemV2 label="审核日期:" prop="auditTime">
          <ProFormItemV2 label="审核日期:" prop="auditTime" v-if="isApplyTrade">
            <ProFormDatePicker v-model="form.auditTime" type="date" format="YYYY-MM-DD HH:mm" />
          </ProFormItemV2>
          <ProFormItemV2 label="审核日期:" prop="financeAuditTime" v-else>
            <ProFormDatePicker
              v-model="form.financeAuditTime"
              type="date"
              format="YYYY-MM-DD HH:mm"
            />
          </ProFormItemV2>
        </ProFormColItem>
      </ProFormCol>
@@ -47,12 +54,15 @@
          <ProFormItemV2
            label="上传凭证:"
            prop="payAuditFileUrl"
            :check-rules="[
              {
                message: '请上传凭证',
                type: 'upload',
              },
            ]"
            :required="!isApplyTrade"
            :check-rules="
              !isApplyTrade && [
                {
                  message: '请上传凭证',
                  type: 'upload',
                },
              ]
            "
          >
            <ProFormUpload
              v-model:file-url="form.payAuditFileUrl"
@@ -116,7 +126,7 @@
  UploadUserFile,
} from '@bole-core/components';
import { usePortraitTableWithAttachment } from '@/hooks';
import { copyTextToClipboard } from '@/utils';
import { copyTextToClipboard, StringUtils } from '@/utils';
import {
  EnumParkBountyTradeDetailAuditStatus,
  EnumParkBountyTradeDetailAuditStatusTextForAdudit,
@@ -124,12 +134,15 @@
} from '@/constants';

defineOptions({
  name: 'WithdrawalApprovalAuditDialog',
  name: 'RewardApplyTradeCheckDialog',
});

// type Props = {};
type Props = {
  //true 出账审批 false 财务审批
  isApplyTrade?: boolean;
};

// const props = withDefaults(defineProps<Props>(), {});
const props = withDefaults(defineProps<Props>(), {});

const visible = defineModel({ type: Boolean });

@@ -148,11 +161,19 @@
  parkName: string;
  parkTypeName: string;
  tradeAmount: number;
  remianAmount: number;
  bountyAmount: number;
  tradeTime: string;
  auditTime: string;
  financeAuditTime: string;
  payRemark: string;
  payFileUrl: UploadUserFile[];

  incomeCompanyName: string;
  insureBillNo: string;
  incomeBankAccount: string;
  incomeBankCardNumber: string;
  incomeBankName: string;
  creationTime: string;
};

const form = defineModel<Form>('form');
@@ -168,23 +189,35 @@
  columns: [
    {
      label: '进账单位',
      key: 'enterpriseName',
      formatter: () => '太平财产保险有限公司抚州中心支公司',
      key: 'incomeCompanyName',
      formatter: (row) =>
        row.id === '52febfa5-1df6-23d6-21fd-3a1cfdef4222'
          ? '中国大地财产保险股份有限公司深圳分公司'
          : row.incomeCompanyName ?? '太平财产保险有限公司抚州中心支公司',
    },
    {
      label: '开户名称',
      key: 'societyCreditCode',
      formatter: () => '太平财产保险有限公司抚州中心支公司',
      key: 'incomeBankAccount',
      formatter: (row) =>
        row.id === '52febfa5-1df6-23d6-21fd-3a1cfdef4222'
          ? '中国大地财产保险股份有限公司深圳分公司'
          : row.incomeBankAccount ?? '太平财产保险有限公司抚州中心支公司',
    },
    {
      label: '开户银行',
      key: 'contactPhone',
      formatter: () => '中国工商银行股份有限公司抚州赣东支行',
      key: 'incomeBankName',
      formatter: (row) =>
        row.id === '52febfa5-1df6-23d6-21fd-3a1cfdef4222'
          ? '中国工商银行股份有限公司深圳喜年支行'
          : row.incomeBankName ?? '中国工商银行股份有限公司抚州赣东支行',
    },
    {
      label: '开户账号',
      key: 'userName',
      formatter: () => '1511 2001 2920 0156 069',
      key: 'incomeBankCardNumber',
      formatter: (row) =>
        row.id === '52febfa5-1df6-23d6-21fd-3a1cfdef4222'
          ? StringUtils.insertSpaces('4000032419200171762')
          : StringUtils.insertSpaces(row.incomeBankCardNumber ?? '1511200129200156069'),
    },
    // {
    //   label: '企业类型',
@@ -205,10 +238,23 @@
      key: 'payRemark',
    },
    {
      label: '出账审核日期',
      label: '保单号',
      key: 'insureBillNo',
    },
    {
      label: '出账申请日期',
      key: 'tradeTime',
      type: 'date',
    },
    props.isApplyTrade
      ? {
          label: '',
        }
      : {
          label: '出账审核日期',
          key: 'auditTime',
          type: 'date',
        },
    {
      label: '出账金额',
      key: 'tradeAmount',
@@ -216,7 +262,7 @@
    },
    {
      label: '资金余额',
      key: 'remianAmount',
      key: 'bountyAmount',
      type: 'money',
    },
  ],