From 1628e73535bb78ca8138cec50623db759fa5c225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AE=87=E8=88=AA?= <740464440@qq.com>
Date: Fri, 22 Dec 2023 16:17:24 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E5=A4=84=E7=90=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=AF=E7=94=A8/=E5=81=9C=E7=94=A8?=
 =?UTF-8?q?=E4=BC=A0uid=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/MerchantMgm/InvoiceConf/loadable.jsx |  4 ++--
 src/pages/SystemMgm/SystemLog/loadable.jsx     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
index a79bb93..fd5df55 100644
--- a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
+++ b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
@@ -443,7 +443,7 @@ function InvoiceConf(props) {
 
   //启用/停用
   function stopBtn(record) {
-    ajax.updateInvoiceStatus({ id: record.id,click_status:record.status==1?2:1 }).then(
+    ajax.updateInvoiceStatus({ id: record.id,click_status:record.status==1?2:1, uid }).then(
       res => {
         if (res.status == 20000) {
           getTable({...formData, ...pageInfo})
@@ -1408,7 +1408,7 @@ function InvoiceConf(props) {
                   <div className="left-wrap">
                     <div className="item"><div className="item-title">配置ID：</div>{records.info_id}</div>
                     <div className="item"><div className="item-title">状态：</div>{records.status_name}</div>
-                    <div className="item"><div className="item-title">商户名称：</div>{records.tenantName}</div>
+                    <div className="item"><div className="item-title">商户名称：</div>{records.operatorName}</div>
                     <div className="item"><div className="item-title">发票平台：</div>{records.receipt_type_name}</div>
                   </div>
                   <div className="left-wrap">
diff --git a/src/pages/SystemMgm/SystemLog/loadable.jsx b/src/pages/SystemMgm/SystemLog/loadable.jsx
index 34cbcd1..fe42a69 100644
--- a/src/pages/SystemMgm/SystemLog/loadable.jsx
+++ b/src/pages/SystemMgm/SystemLog/loadable.jsx
@@ -11,8 +11,8 @@ import "./index.scss";
 const SystemLog = () => {
 
   const defaultData = {
-    menu_ids: [], // 子系统id
-    menu_id: "", // 子系统id
+    menu_ids: [], // 功能模块id
+    menu_id: "", // 功能模块id
     operation_type: "", // 操作类型id
     user_name: "", // 操作人
     date_type: "1", // 选项类型 1: 日 2: 周 3: 月
@@ -103,7 +103,7 @@ const SystemLog = () => {
 
   const [formData, setFormData] = useState(defaultData); // 表单数据
   const [sessionData, setSessionData] = useSessionStorageState("systemLog", { value: {} }); // session缓存
-  const [subsystemData, setSubsystemData] = useState([]); // 子系统级联数据
+  const [subsystemData, setSubsystemData] = useState([]); // 功能模块级联数据
   const [operationTypeData, setOperationTypeData] = useState([]); // 操作类型数据
   const [loading, setLoading] = useState(false); // 检索按钮加载状态
 
@@ -181,7 +181,7 @@ const SystemLog = () => {
     $getTableList(temFormData);
   };
 
-  // 获取子系统数据
+  // 获取功能模块数据
   const $subsystemList = () => {
     ajax.getSystemLogMenu().then((res) => {
       if (res.status === 20000 || res.status == 0) {
@@ -254,8 +254,8 @@ const SystemLog = () => {
     let _data = defaultData;
     if (sessionData && Object.values(sessionData).length > 0) {
       _data = {
-        menu_ids: sessionData?.menu_ids || [], // 子系统id
-        menu_id: sessionData?.menu_id || "", // 子系统id
+        menu_ids: sessionData?.menu_ids || [], // 功能模块id
+        menu_id: sessionData?.menu_id || "", // 功能模块id
         operation_type: sessionData?.operation_type || "", // 操作类型id
         user_name: sessionData?.user_name || "", // 操作人
         date_type: sessionData?.date_type || "1", // 选项类型 1: 日 2: 周 3: 月