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

src/pages/transaction/purchaseAbility/components/detail/components/bidDetailLayout/index.tsx

@@ -37,6 +37,7 @@ const BidDetailLayout: React.FC<BidDetailLayoutProps> = (props: any) => {
     const columns: ColumnType<any>[] = [
         {
             title: '物料编号/名称',
+            key: 'number',
             dataIndex: 'number',
             render: (text: any, record: any) => (
                 <Space direction='vertical'>
@@ -45,12 +46,13 @@ const BidDetailLayout: React.FC<BidDetailLayoutProps> = (props: any) => {
                 </Space>
             )
         },
-        { title: '规格型号', dataIndex: 'model', },
-        { title: '品类', dataIndex: 'category', },
-        { title: '品牌', dataIndex: 'brand', },
+        { title: '规格型号',key: 'model', dataIndex: 'model', },
+        { title: '品类',key: 'category', dataIndex: 'category', },
+        { title: '品牌',key: 'brand', dataIndex: 'brand', },
         {
             title: '采购数量/单位',
             dataIndex: 'unit',
+            key: 'unit',
             render: (text: any, record: any) => (
                 <Space direction='vertical'>
                     <Text type='secondary' key={'unit_1'} >{record.purchaseCount}</Text>
@@ -61,6 +63,7 @@ const BidDetailLayout: React.FC<BidDetailLayoutProps> = (props: any) => {
         {
             title: '含税/税率',
             dataIndex: 'isTax',
+            key: 'isTax',
             render: (text: any, record: any) => (
                 <Space direction='vertical'>
                     <Text type='secondary' key={'isTax_1'} >{transforType[text]}</Text>
@@ -70,12 +73,14 @@ const BidDetailLayout: React.FC<BidDetailLayoutProps> = (props: any) => {
         },
         {
             title: '单价(含税)',
-            dataIndex: 'price',
+            dataIndex: 'unitPrice',
+            key: 'unitPrice',
             render: (text: any, record: any) => <Text type='secondary'>¥{priceFormat(text)}</Text>
         },
         {
             title: '金额(含税)',
             dataIndex: 'price',
+            key: 'price',
             render: (text: any, record: any) => <Text type='secondary'>¥{priceFormat(text)}</Text>
         },
     ]

src/pages/transaction/purchaseAbility/components/detail/components/lowestQuotationRecordLayout/index.tsx

@@ -114,7 +114,7 @@ const LowestQuotationRecord: React.FC<TableCommonLayoutProps> = (props: any) =>
             </div>
             <div className={selfStyles.baseItem}>
                 <h5 className={selfStyles.label}>报价总额(含税)： </h5>
-                <h5 className={selfStyles.content}>{effect?.reportPrice ? priceFormat(effect?.reportPrice) :  '-'}</h5>
+                <h5 className={selfStyles.content}>{effect?.reportPrice ? `¥ ${priceFormat(effect?.reportPrice)}` :  '-'}</h5>
             </div>
             <StandardTable
                 currentRef={currentRef}

src/pages/transaction/purchaseAbility/onlineBid/detail/index.tsx

@@ -113,7 +113,7 @@ const SearchDetail = () => {
         setResultEffect([
             {
                 col: [
-                    { label: '中标金额(含税)', extra: data?.sumAwardPrice ? priceFormat(data?.sumAwardPrice) : '-', type: 'text' },
+                    { label: '中标金额(含税)', extra: data?.sumAwardPrice ? `¥ ${priceFormat(data?.sumAwardPrice)}` : '-', type: 'text' },
                     { label: '中标理由', extra: '价格最低', type: 'text' },
                 ]
             },