From 39673b2abd57bb2926904e743e3da1f63e6bfc78 Mon Sep 17 00:00:00 2001
From: yangwenhua <1289978696@qq.com>
Date: Tue, 6 Sep 2022 14:29:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=E6=8A=A5=E8=A1=A8=E3=80=81?=
 =?UTF-8?q?=E9=85=8D=E6=96=B9=E5=88=86=E7=B1=BBBug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/bom/bomtype/components/CreateForm.jsx    | 4 ++--
 src/pages/order/order-revenue-statement/index.jsx  | 6 +++++-
 src/pages/order/order-revenue-statement/service.js | 5 ++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/pages/bom/bomtype/components/CreateForm.jsx b/src/pages/bom/bomtype/components/CreateForm.jsx
index 0808256..1addca7 100644
--- a/src/pages/bom/bomtype/components/CreateForm.jsx
+++ b/src/pages/bom/bomtype/components/CreateForm.jsx
@@ -31,8 +31,8 @@ const CreateForm = (props) => {
           name="pertain"
           label="归属"
           defaultValue={props?.values?.pertain}
-          rules={[{ required: true, message: '请选择类型归宿' }]}  >
-          <Select placeholder="请选择类型归宿">
+          rules={[{ required: true, message: '请选择类型归属' }]}  >
+          <Select placeholder="请选择类型归属">
             <Option value="1">无</Option>
             <Option value="2">TMC </Option>
           </Select>
diff --git a/src/pages/order/order-revenue-statement/index.jsx b/src/pages/order/order-revenue-statement/index.jsx
index 1d325ba..cb0ed7c 100644
--- a/src/pages/order/order-revenue-statement/index.jsx
+++ b/src/pages/order/order-revenue-statement/index.jsx
@@ -115,7 +115,11 @@ export default function Index() {
     //获取营销报表列表
     const onQueryMarketing = async () => {
         setShowLoading(true);
-        const response = await reportAPI.getReportStatisticsMarketing();
+        const response = await reportAPI.getReportStatisticsMarketing({
+            sTime: timeRange[0]._i,
+            eTime: timeRange[1]._i,
+            key: [currentOrg.key || ""]
+        });
         setShowLoading(false);
         if (response.statusCode === 200) {
             setReportActivity(response.data.activity);
diff --git a/src/pages/order/order-revenue-statement/service.js b/src/pages/order/order-revenue-statement/service.js
index a079fa0..cced7c2 100644
--- a/src/pages/order/order-revenue-statement/service.js
+++ b/src/pages/order/order-revenue-statement/service.js
@@ -9,9 +9,12 @@ export default {
     },
 
     //获取营销报表
-    getReportStatisticsMarketing() {
+    getReportStatisticsMarketing(params) {
         return request(`/kitchen/api/report-statistics/marketing`, {
             method: 'POST',
+            data: {
+                ...params
+            }
         });
     }
 };