From d5ff5c0e2c9424a92105e1ad48621bf7a4e5360a Mon Sep 17 00:00:00 2001
From: yangwenhua <1289978696@qq.com>
Date: Tue, 5 Jul 2022 15:48:47 +0800
Subject: [PATCH] =?UTF-8?q?ID=E8=BD=AC=E6=8D=A2=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/cost-of-sales/index.jsx      |  9 +++++++++
 src/pages/order/sales-gross-profit/index.jsx | 13 +++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/pages/order/cost-of-sales/index.jsx b/src/pages/order/cost-of-sales/index.jsx
index 332b3ef..bcfce3c 100644
--- a/src/pages/order/cost-of-sales/index.jsx
+++ b/src/pages/order/cost-of-sales/index.jsx
@@ -51,6 +51,15 @@ export default function Index() {
             title: '门店名称',
             dataIndex: 'storeId',
             key: 'storeId',
+            render: (text) => {
+                const findGoods = storeSelect.find(item => item.id === text);
+                if (findGoods) {
+                    return <span>{findGoods.name}</span>
+                } else {
+                    return <span>暂无门店名称</span>
+                }
+
+            },
         },
         {
             title: '商品名称',
diff --git a/src/pages/order/sales-gross-profit/index.jsx b/src/pages/order/sales-gross-profit/index.jsx
index df4703d..4eb682b 100644
--- a/src/pages/order/sales-gross-profit/index.jsx
+++ b/src/pages/order/sales-gross-profit/index.jsx
@@ -31,7 +31,7 @@ export default function Index() {
         moment(moment(new Date(Date.now())).format('YYYY-MM-DD 23:59:59')),
     ]);	//日期选择器
     //门店
-    const [storeIdArray, setStoreIdArray] = useState([]);
+    const [storeIdArray, setStoreIdArray] = useState("");
     const [storeSelect, setStoreSelect] = useState([]);
     //商品
     const [goodsIdArray, setGoodsIdArray] = useState([]);
@@ -45,6 +45,15 @@ export default function Index() {
             title: '门店名称',
             dataIndex: 'storeId',
             key: 'storeId',
+            render: (text) => {
+                const findGoods = storeSelect.find(item => item.id === text);
+                if (findGoods) {
+                    return <span>{findGoods.name}</span>
+                } else {
+                    return <span>暂无门店名称</span>
+                }
+    
+            },
         },
         {
             title: '商品名称',
@@ -61,7 +70,7 @@ export default function Index() {
             },
         },
         {
-            title: '毛利率',
+            title: '毛利率（%）',
             dataIndex: 'marginRatio',
             key: 'marginRatio',
         }