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

src/pages/marketingManage/common/constants.tsx

 import React from 'react';
 import { Space, Tooltip, Typography } from 'antd';
 import StatusTag from '@/components/StatusTag';
-import { format } from '@/pages/transaction/common/dateFormat';
 import { QuestionCircleOutlined } from '@ant-design/icons';
+import { format } from '@/constants/dateFormat';
 /** * 活动类型 */
 export enum ACTIVITYTYPE {
   /** 特价促销 */

src/pages/purchaseManage/purchaseAbility/demandBidMgt/offer/index.tsx

@@ -26,7 +26,7 @@ const Offter = () => {
     key: 'purchaseInquiryNo',
     dataIndex: 'purchaseInquiryNo',
     render: (text: any, record: any) => (
-      <EyePreview url={`/purchase/demandBidMgt/demand/detail?id=${record.purchaseInquiryId}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
+      <EyePreview url={`/purchase/demandVouch/demandBidMgt/demand/detail?id=${record.purchaseInquiryId}&number=${record.purchaseInquiryNo}`}>{text}</EyePreview>
     )
   }, {
     title: '需求摘要',
@@ -88,7 +88,7 @@ const Offter = () => {
     key: 'operate',
     dataIndex: 'operate',
     render: (text: any, record: any) => (
-      <Button type='link' onClick={() => history.push(`/purchase/demandBidMgt/offer/preview?id=${record.id}&number=${record.quotedPriceNo}&turn=${record.turn}`)}>查看</Button>
+      <Button type='link' onClick={() => history.push(`/purchase/demandVouch/demandBidMgt/offer/preview?id=${record.id}&number=${record.quotedPriceNo}&turn=${record.turn}`)}>查看</Button>
     )
   }];