zhengyiming
4 天以前 7b48aef3fa923377c57b9b0bca18dfef21e562d1
fix: s
3个文件已修改
18 ■■■■ 已修改文件
src/views/Reward/FinancialApproval.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Reward/RewardApplyTradeCheck.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Reward/components/RewardApplyTradeCheckDialog.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Reward/FinancialApproval.vue
@@ -212,7 +212,8 @@
    tradeAmount: row.tradeAmount,
    bountyAmount: row.bountyAmount,
    tradeTime: row.tradeTime,
    auditTime: row.financeAuditTime,
    auditTime: row.auditTime,
    financeAuditTime: row.financeAuditTime,
    payRemark: row.payRemark,
    payFileUrl: convertApi2FormUrlObjectBySeparator(row.payFileUrl),
    title: isCheck ? '详情' : '财务审批',
@@ -244,6 +245,7 @@
    bountyAmount: '' as any as number,
    tradeTime: '',
    auditTime: '',
    financeAuditTime: '',
    payRemark: '',
    payFileUrl: [] as UploadUserFile[],
    title: '',
src/views/Reward/RewardApplyTradeCheck.vue
@@ -209,6 +209,7 @@
    bountyAmount: row.bountyAmount,
    tradeTime: row.tradeTime,
    auditTime: row.auditTime,
    financeAuditTime: row.financeAuditTime,
    payRemark: row.payRemark,
    payFileUrl: convertApi2FormUrlObjectBySeparator(row.payFileUrl),
    title: isCheck ? '详情' : '出账审批',
@@ -240,6 +241,7 @@
    bountyAmount: '' as any as number,
    tradeTime: '',
    auditTime: '',
    financeAuditTime: '',
    payRemark: '',
    payFileUrl: [] as UploadUserFile[],
    title: '',
src/views/Reward/components/RewardApplyTradeCheckDialog.vue
@@ -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>
@@ -157,6 +164,7 @@
  bountyAmount: number;
  tradeTime: string;
  auditTime: string;
  financeAuditTime: string;
  payRemark: string;
  payFileUrl: UploadUserFile[];
@@ -224,7 +232,7 @@
    },
    {
      label: '出账申请日期',
      key: 'creationTime',
      key: 'tradeTime',
      type: 'date',
    },
    props.isApplyTrade