Commit 0e8c6e5d authored by XieZhiXiong's avatar XieZhiXiong

fix: 修复字段取错的问题

parent c6f89914
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-06-28 18:06:53
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-02 11:16:15
* @LastEditTime: 2021-11-30 19:43:45
* @Description: 执行明细
*/
import React, { useRef, } from 'react';
......@@ -10,13 +10,13 @@ import { createFormActions } from '@formily/antd';
import { DatePicker } from '@formily/antd-components';
import { StandardTable } from 'god';
import { ColumnType } from 'antd/lib/table/interface';
import moment from 'moment';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import NiceForm from '@/components/NiceForm';
import MellowCard, { MellowCardProps } from '@/components/MellowCard';
import { querySchema } from './schema';
import moment from 'moment';
import { getMarketingCouponWaiteExecuteDetailPage, getMarketingCouponWaiteExecuteDetailPageCondition } from '@/services/MarketingV2Api';
const formActions = createFormActions();
......@@ -175,19 +175,22 @@ const RunningInfo: React.FC<IProps> = (props) => {
},
{
title: '适用用户',
dataIndex: 'bransuitableMemberTypeNamed',
dataIndex: 'suitableMemberTypeName',
},
{
title: '领(发)放劵时间',
dataIndex: 'createTimeStart',
dataIndex: 'createTime',
render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
},
{
title: '劵有效期起始时间',
dataIndex: 'effectiveTimeStart',
dataIndex: 'validTimeStart',
render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
},
{
title: '券有效期截止时间',
dataIndex: 'effectiveTimeEnd',
dataIndex: 'validTimeEnd',
render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
},
{
title: '关联订单',
......@@ -204,7 +207,7 @@ const RunningInfo: React.FC<IProps> = (props) => {
{
title: '订单金额',
dataIndex: 'amount',
render: (text) => ${text || ''}`,
render: (text) => ${text || '0'}`,
},
{
title: '订单状态',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment