fix: 修改结算column dataIndex

config/routes/balanceRoute.ts

@@ -114,6 +114,21 @@ const BalancedRoute = {
           component: '@/pages/balance/platformSettlement/integral/info',
           hideInMenu: true,
         },
+        // 平台结算管理 -> 优惠券管理
+        {
+          path: '/memberCenter/balance/platformSettlement/coupon',
+          name: 'coupon',
+          icon: 'smile',
+          component: '@/pages/balance/platformSettlement/couponSettlement',
+        },
+        // 平台结算管理 -> 优惠券管理详情页
+        {
+          path: '/memberCenter/balance/platformSettlement/coupon/detail',
+          name: 'couponInfo',
+          icon: 'smile',
+          component: '@/pages/balance/platformSettlement/couponSettlement/info',
+          hideInMenu: true,
+        },
       ],
     },
     // 应付账款管理

config/routes/index.ts

@@ -16,6 +16,7 @@ import CommodityRoute from './commodityRoute' // 商品能力路由
 // import HandlingRoute from './handlingRoute'; // 加工能力
 // import DealAbilityRoute from './dealAbilityRoute'; //
 // import marketingRoute from './marketingRoute';
+// import BalancedRoute from './balanceRoute';
 import asyncRoutes from '../router.config.json';
 // import ProcurementRoute from './procurementRoute';
 // import { callForBidsRoute } from './procurementRoute/callForBids';
@@ -23,7 +24,6 @@ import asyncRoutes from '../router.config.json';
 // import contracRoute from './contracRoute';
 // export const routes = [CommodityRoute, MemberRoute, ShopRoute, ChannelRoute, TranactionRoute, AfterService, PayandSettleRoute, LogisticsRoute, AuthConfigRoute, HandlingRoute, BalaceRoute]
 
-/**  process.env.NODE_ENV === "development"  */
 const isDev = false;
 const homeRoute = {
   path: `/memberCenter/home`,
@@ -32,8 +32,8 @@ const homeRoute = {
   key: 'home',
   component: '@/pages/home',
 };
-// const routes = isDev ? [ homeRoute, marketingRoute, MemberRoute ] : asyncRoutes;
-const routes = isDev ? [ CommodityRoute ] : asyncRoutes;
+const routes = isDev ? [ homeRoute ] : asyncRoutes;
+// const routes = isDev ? [ CommodityRoute ] : asyncRoutes;
 
 const memberCenterRoute = {
   path: '/memberCenter',

src/pages/balance/accountsPayable/settlementList/orderDetail.tsx

@@ -18,7 +18,7 @@ import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { detailSchema } from './schema'
 import { usePageStatus } from '@/hooks/usePageStatus';
 // import StatusTag from '../../components/StatusTag'
-import { productNoticecolumns } from '../../common/columns';
+import { orderColumns, productNoticecolumns } from '../../common/columns';
 import { priceFormat } from '@/utils/numberFomat';
 import useFetchBillData from '../../hooks/useFetchBillData';
 import useBalanceInfo from '../../hooks/useBalanceInfo';
@@ -49,7 +49,7 @@ const OrderDetail: React.FC = () => {
           tableProps={{
             rowKey: 'orderNo',
           }}
-          columns={productNoticecolumns}
+          columns={orderColumns}
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(getSettleAccountsMemberSettlementPagePayableOrderSettlement, { settlementId: id, ...params })}
           controlRender={

src/pages/balance/accountsReceivable/settlementList/orderDetail.tsx

@@ -13,10 +13,9 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { createFormActions } from '@formily/antd';
 import StandardTable from '@/components/StandardTable';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
-import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { detailSchema } from './schema'
 import { usePageStatus } from '@/hooks/usePageStatus';
-import { productNoticecolumns } from '../../common/columns';
+import { orderColumns, productNoticecolumns } from '../../common/columns';
 import { priceFormat } from '@/utils/numberFomat';
 import useFetchBillData from '../../hooks/useFetchBillData';
 import useBalanceInfo from '../../hooks/useBalanceInfo';
@@ -47,7 +46,7 @@ const OrderDetail: React.FC = () => {
           tableProps={{
             rowKey: 'orderNo',
           }}
-          columns={productNoticecolumns}
+          columns={orderColumns}
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(getSettleAccountsMemberSettlementPagePayableOrderSettlement, { settlementId: id, ...params })}
           controlRender={

src/pages/balance/common/columns.tsx

@@ -104,10 +104,10 @@ export const orderColumns = [
       return record.isHasTax ? `${record.isHasTaxName}/${record.taxRate}` : intl.formatMessage({ id: 'balance.common.columns.orderColumns.tax.none' });
     }
   },
-  { title: intl.formatMessage({ id: 'balance.common.columns.orderColumns.batch' }), dataIndex: 'batch' },
+  { title: intl.formatMessage({ id: 'balance.common.columns.orderColumns.batch' }), dataIndex: 'payCount' },
   {
     title: intl.formatMessage({ id: 'balance.common.columns.orderColumns.amount' }),
-    dataIndex: 'amount',
+    dataIndex: 'payAmount',
     render: (text) => {
       return (
         <div style={{ display: "flex", flexDirection: "row", alignItems: 'center' }}>
@@ -121,7 +121,7 @@ export const orderColumns = [
       )
     }
   },
-  { title: intl.formatMessage({ id: 'balance.common.columns.orderColumns.payTime' }), dataIndex: intl.formatMessage({ id: 'balance.common.columns.orderColumns.payTime' }) },
+  { title: intl.formatMessage({ id: 'balance.common.columns.orderColumns.payTime' }), dataIndex: 'payTime' },
   {
     title: intl.formatMessage({ id: 'balance.common.columns.orderColumns.settlementAmount' }),
     dataIndex: 'settlementAmount',