Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/locales/en-US/balance.ts

@@ -48,7 +48,7 @@ export default {
   'balance.accountsReceivable.invoice.exportBtn':'Export',
   'balance.accountsReceivable.invoice.invoiceCreate.title':'Issuing an invoice',
 
-  'balance.accountsReceivable.invoice.schema.orderNo':'Search order number',
+  'balance.accountsReceivable.invoice.schema.orderNo':'Search Doc number',
   'balance.accountsReceivable.invoice.schema.orderAbstract':'Document Summary',
   'balance.accountsReceivable.invoice.schema.orderStartTime':'Order time (start time)',
   'balance.accountsReceivable.invoice.schema.orderEndTime':'Order time (end time)',

src/locales/ko-KR/balance.ts

@@ -48,7 +48,7 @@ export default {
   'balance.accountsReceivable.invoice.exportBtn': '내보내기',
   'balance.accountsReceivable.invoice.invoiceCreate.title': '영수증을 발급하다',
 
-  'balance.accountsReceivable.invoice.schema.orderNo': '주문 번호 검색',
+  'balance.accountsReceivable.invoice.schema.orderNo': '영수증 번호 검색',
   'balance.accountsReceivable.invoice.schema.orderAbstract': '증빙서류 요약',
   'balance.accountsReceivable.invoice.schema.orderStartTime': '주문 시간(시작 시간)',
   'balance.accountsReceivable.invoice.schema.orderEndTime': '주문 시간(종료 시간)',

src/locales/zh-CN/balance.ts

@@ -48,7 +48,7 @@ export default {
   'balance.accountsReceivable.invoice.exportBtn': '导出',
   'balance.accountsReceivable.invoice.invoiceCreate.title': '开具发票',
 
-  'balance.accountsReceivable.invoice.schema.orderNo': '搜索订单号',
+  'balance.accountsReceivable.invoice.schema.orderNo': '搜索单据号',
   'balance.accountsReceivable.invoice.schema.orderAbstract': '单据摘要',
   'balance.accountsReceivable.invoice.schema.orderStartTime': '下单时间（开始时间）',
   'balance.accountsReceivable.invoice.schema.orderEndTime': '下单时间（结束时间）',

src/pages/balance/accountsPayable/settlementList/hooks/useHandleSettlementList.tsx

@@ -17,12 +17,12 @@ import { message } from 'antd';
 import { getAuth } from '@/utils/auth';
 const intl = getIntl();
 const format = "YYYY-MM-DD HH:mm:ss"
-const URL_MAP = {
-  [PRODUCT_NOTICE_SETTLEMENT_DETAIL]: "productNoticeSettlementDetail",
-  [LOGISTICS_DETAIL]: "logisticsDetail",
-  [ORDER_DETAIL]: "orderDetail",
-  [CONTRACT_FUND_BILL]: '',
-}
+// const URL_MAP = {
+//   [PRODUCT_NOTICE_SETTLEMENT_DETAIL]: "productNoticeSettlementDetail",
+//   [LOGISTICS_DETAIL]: "logisticsDetail",
+//   [ORDER_DETAIL]: "orderDetail",
+//   [CONTRACT_FUND_BILL]: '',
+// }
 
 const STATUS_COLOR = ["default", "warning", "primary", "danger", "success"];
 
@@ -149,22 +149,22 @@ function useHandleSettlementList() {
       title: intl.formatMessage({id: 'balance.jiesuandanhao'}),
       dataIndex: 'settlementNo',
       render: (text, record) => {
-        const prefix = `/memberCenter/balance/accountsPayable/settlementList/` ;
-        const url = URL_MAP[record.orderType];
-        let fullUrl = `${prefix}${url}?id=${record.id}`;
+        // const prefix = `/memberCenter/balance/accountsPayable/settlementList/` ;
+        // const url = URL_MAP[record.orderType];
+        let fullUrl = ``;
         switch (record.orderType) {
           // 生产单
           case 1:
-            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/productNoticeSettlementDetail?id=${record.orderId}`;
+            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/productNoticeSettlementDetail?id=${record.id}`;
             break;
           // 物流单
           case 2:
-            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/logisticsDetail?id=${record.orderId}`;
+            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/logisticsDetail?id=${record.id}`;
             break;
           // 订单
           case 3:
           case 4:
-            fullUrl = `/memberCenter/tranactionAbility/saleOrder/orderList/preview?orderNo=${record.orderNo}`;
+            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/orderDetail?id=${record.id}`;
             break;
           // 退货
           case 5:
@@ -175,9 +175,6 @@ function useHandleSettlementList() {
           case 7:
             fullUrl = `/memberCenter/balance/businessRequestFunds/search/preview?id=${record.orderId}&no=${record.orderNo}`;
             break;
-          // case 7:
-          //   window.open(`/memberCenter/balance/businessReconciliation/search/preview?id=${record.dataId}&no=${record.orderNo}`)
-          //   break;
           default:
             break;
         }

src/pages/balance/accountsReceivable/settlementList/hooks/useHandleSettlementList.tsx

@@ -14,12 +14,12 @@ import { ColumnsType } from 'antd/lib/table';
 import { getIntl } from 'umi';
 const intl = getIntl();
 const format = "YYYY-MM-DD HH:mm:ss"
-const URL_MAP = {
-  [PRODUCT_NOTICE_SETTLEMENT_DETAIL]: "productNoticeSettlementDetail",
-  [LOGISTICS_DETAIL]: "logisticsDetail",
-  [ORDER_DETAIL]: "orderDetail",
-  [CONTRACT_FUND_BILL]: '',
-}
+// const URL_MAP = {
+//   [PRODUCT_NOTICE_SETTLEMENT_DETAIL]: "productNoticeSettlementDetail",
+//   [LOGISTICS_DETAIL]: "logisticsDetail",
+//   [ORDER_DETAIL]: "orderDetail",
+//   [CONTRACT_FUND_BILL]: '',
+// }
 
 const KEY_MAP_TEXT = {
   [TO_BE_RECONCILED]: intl.formatMessage({id: 'balance.querenduizhangwancheng'}),
@@ -85,22 +85,22 @@ function useHandleSettlementList() {
       title: intl.formatMessage({id: 'balance.jiesuandanhao'}),
       dataIndex: 'settlementNo',
       render: (text, record) => {
-        const prefix = '/memberCenter/balance/accountsReceivable/settlementList/';
-        const url = URL_MAP[record.orderType];
-        let fullUrl = `${prefix}${url}?id=${record.id}`;
+        // const prefix = '/memberCenter/balance/accountsReceivable/settlementList/';
+        // const url = URL_MAP[record.orderType];
+        let fullUrl = ``;
         switch (record.orderType) {
           // 生产单
           case 1:
-            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/productNoticeSettlementDetail?id=${record.orderId}`;
+            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/productNoticeSettlementDetail?id=${record.id}`;
             break;
           // 物流单
           case 2:
-            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/logisticsDetail?id=${record.orderId}`;
+            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/logisticsDetail?id=${record.id}`;
             break;
           // 订单
           case 3:
           case 4:
-            fullUrl = `/memberCenter/tranactionAbility/saleOrder/orderList/preview?orderNo=${record.orderNo}`;
+            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/orderDetail?id=${record.id}`
             break;
           // 退货
           case 5:
@@ -111,9 +111,6 @@ function useHandleSettlementList() {
           case 7:
             fullUrl = `/memberCenter/balance/businessRequestFundsCollaboration/search/preview?id=${record.orderId}&no=${record.orderNo}`;
             break;
-          // case 7:
-          //   window.open(`/memberCenter/balance/businessReconciliation/search/preview?id=${record.dataId}&no=${record.orderNo}`)
-          //   break;
           default:
             break;
         }

src/pages/balance/accountsReceivable/settlementList/schema/index.tsx

@@ -53,6 +53,30 @@ export const schema: ISchema = {
                 }
               }
             },
+            /** 预计付款时间 */
+            // "[startTime, endTime]": {
+            //   type: 'object',
+            //   "x-component": 'RangePicker',
+            //   'x-component-props': {
+            //     allowClear: true,
+            //     placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.startTime'}), intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.endTime'})],
+            //     style: {
+            //       minWidth: "320px"
+            //     }
+            //   }
+            // },
+            /** 实际付款时间 */
+            // "[startTime, endTime]": {
+            //   type: 'object',
+            //   "x-component": 'RangePicker',
+            //   'x-component-props': {
+            //     allowClear: true,
+            //     placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.startTime'}), intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.endTime'})],
+            //     style: {
+            //       minWidth: "320px"
+            //     }
+            //   }
+            // },
             status: {
               type: 'string',
               enum: [],

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Toolbar/index.tsx

@@ -6,6 +6,7 @@ import { Modal } from 'antd';
 import { useIntl} from 'umi'
 import Color from './color';
 import { changeProps, SelectedInfoType, STATE_PROPS, useSelector } from '@linkseeks/design-react';
+import { usePageStatus } from '@/hooks/usePageStatus';
 
 interface Iprops {
   extra?: React.ReactNode,
@@ -18,6 +19,7 @@ type SettingPanelType = {
 
 const Toolbar: React.FC<Iprops> = (props: Iprops) => {
   const { pageConfig } = useSelector<SettingPanelType, STATE_PROPS>(['pageConfig']);
+  const { id } = usePageStatus();
   const color = pageConfig?.[0]?.props?.backgroundColor;
 
   const intl = useIntl();
@@ -26,7 +28,8 @@ const Toolbar: React.FC<Iprops> = (props: Iprops) => {
     Modal.confirm({
       title: intl.formatMessage({ id: 'activityPage.confirmLeaveDecoratePage' }),
       onOk: () => {
-        history.goBack()
+        // history.goBack()
+        history.push(`/memberCenter/marketingAbility/activityPages/management/edit?id=${id}`)
       },
     })
   };