Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev

src/pages/commodity/products/viewProducts.tsx

@@ -55,7 +55,7 @@ const viewProducts: React.FC<{}> = () => {
         if(code===1000){
           setPorductDetail(data)
           renderDataByTab(data)
-          constructTableData(data.name, data.unitPriceAndPicList)
+          constructTableData(data, data.unitPriceAndPicList)
           if(data.status===1) setFixStep(0)
           else if(data.status===2) setFixStep(1)
           else if(data.status===3) setFixStep(2)
@@ -239,7 +239,7 @@ const viewProducts: React.FC<{}> = () => {
   }
 
   /* 构建表格数据 */
-  const constructTableData = (productName: string, unitPriceAndPicList: GetProductCommodityGetCommodityResponse["unitPriceAndPicList"]) => {
+  const constructTableData = (product: any, unitPriceAndPicList: GetProductCommodityGetCommodityResponse["unitPriceAndPicList"]) => {
     // 构建列
     // console.log(productName, unitPriceAndPicList, '构建列')
     let _col: any = [];
@@ -272,13 +272,13 @@ const viewProducts: React.FC<{}> = () => {
       }
     }
     _col.push({
-      title: productDetail?.priceType===3?'所需积分':'单价（元）', 
+      title: product?.priceType===3?'所需积分':'单价（元）', 
       dataIndex: '单价',
       key: '单价',
       render: (text, record) => {
         if (JSON.stringify(text)==='{}') return null
         return Object.keys(text).map((v, i) => {
-          return <><span key={i}>{v==='0-0'?'':`${v}:`} <span style={{color:'red'}}>￥{text[v]}</span></span><br /></>
+          return <><span key={i}>{v==='0-0'?'':`${v}:`} <span style={{color:'red'}}>{product?.priceType===3?'':'￥'}{text[v]}</span></span><br /></>
         })
       }
     })
@@ -304,7 +304,7 @@ const viewProducts: React.FC<{}> = () => {
       _attributeArrByImageRender.push(attrWithObj)
       let temp = {
         "索引": index,
-        "商品名称": productName,
+        "商品名称": product.name,
         "对应货品": item.goods?.code+'/'+item.goods?.name+'/'+item.goods?.type,
         ...attrWithObj,
         "单价": item.unitPrice,

src/pages/content/components/FilterTable/Index.tsx

-import FilterTable from './FilterTable';
-import CustomTable from './CustomTable';
-import { FlexRowLayout, FlexColumnLayout } from './FlexLayout';
-
-export {
-  FilterTable,
-  CustomTable,
-  FlexRowLayout,
-  FlexColumnLayout
-}
\ No newline at end of file