From e52417e0c7c9092ed70cacee5361d886e263ef94 Mon Sep 17 00:00:00 2001
From: chenqiang <chenqiang@yisa.com>
Date: Fri, 27 Oct 2023 16:31:13 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E7=BB=9F=E4=B8=80=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=92=8C=E6=B8=85=E5=88=86=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinancialMgm/Invoice/CreateInvoice/index.scss  | 10 ++++++++
 .../Invoice/CreateInvoice/loadable.jsx             |  4 ++--
 .../SettleBill/GeneralBusiness/loadable.jsx        |  6 ++---
 .../FinancialMgm/SettleBill/PayRepeat/loadable.jsx | 27 ++++++++++++----------
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/pages/FinancialMgm/Invoice/CreateInvoice/index.scss b/src/pages/FinancialMgm/Invoice/CreateInvoice/index.scss
index 1316070..37f40f0 100644
--- a/src/pages/FinancialMgm/Invoice/CreateInvoice/index.scss
+++ b/src/pages/FinancialMgm/Invoice/CreateInvoice/index.scss
@@ -145,6 +145,16 @@ $color-primary : var(--color-primary);
 }
 
 .modal-invoicerepeat {
+  .ant-form-item-label>label {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+    max-width: 100%;
+    height: 32px;
+    color: hsla(0, 0%, 100%, .85);
+    font-size: 14px;
+  }
+
   .fptext {
     width: 100%;
     display: flex;
diff --git a/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx b/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx
index ea64f36..8d43ea5 100644
--- a/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx
+++ b/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx
@@ -40,10 +40,10 @@ function CreateInvoice() {
   };
   const formlayout = {
     labelCol: {
-      span: 6,
+      span: 7,
     },
     wrapperCol: {
-      span: 18,
+      span: 17,
     },
   };
   //业务类型
diff --git a/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx b/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx
index 3b441d9..d078555 100644
--- a/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx
+++ b/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx
@@ -28,7 +28,7 @@ function GeneralBusiness() {
   //页面检索-重复
   const formdata = {
     channelType: "4", //支付方式id
-    tenantId: "0", //支付商户id
+    tenantId: "", //支付商户id
     start_time: moment().startOf("day").format("YYYY-MM-DD"),
     end_time: moment().endOf("day").format("YYYY-MM-DD"),
     pn: "1",
@@ -254,8 +254,8 @@ function GeneralBusiness() {
       (res) => {
         if (parseInt(res?.status) === 20000) {
           setData({
-            data: res?.data.list || [],
-            total: res.data.total || 0,
+            data: res?.data || [],
+            total: res.total || 0,
           });
           setLoading(true);
         } else {
diff --git a/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx b/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx
index 1a8a2aa..8be8724 100644
--- a/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx
+++ b/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx
@@ -86,6 +86,8 @@ function PayRepeat() {
 
   //选中数据
   const [Selectdata, setSelectdata] = useState([]);
+  //弹框列表数据
+  const [Tabdata, setTabdata] = useState([]);
   //弹框显示？
   const [Open, setOpen] = useState(false);
   //备注
@@ -130,11 +132,11 @@ function PayRepeat() {
                     <div>
                       <a
                         onClick={() => {
-                          if (Selectdata.length) {
-                            setOpen(true);
-                          } else {
-                            setSelectdata([record]);
-                          }
+                          // if (Selectdata.length) {
+                          setOpen(true);
+                          // } else {
+                          setTabdata([record]);
+                          // }
 
                           // setCheckModal({ ...checkModal, visible: true, record });
                         }}
@@ -145,11 +147,11 @@ function PayRepeat() {
                     <div>
                       <a
                         onClick={() => {
-                          if (Selectdata.length) {
-                            setOpen(true);
-                          } else {
-                            setSelectdata([record]);
-                          }
+                          // if (Selectdata.length) {
+                          setOpen(true);
+                          // } else {
+                          setTabdata([record]);
+                          // }
                         }}
                       >
                         退款
@@ -737,6 +739,7 @@ function PayRepeat() {
         footer={null}
         onCancel={() => {
           setOpen(false);
+          setTabdata([]);
         }}
         width={1200}
         className="modal-repeat"
@@ -747,7 +750,7 @@ function PayRepeat() {
           // className="yisa-table"
           columns={columnsa}
           // rowKey={(record) => record.id}
-          dataSource={Selectdata}
+          dataSource={Tabdata}
           pagination={false}
           // scroll={{ y: "calc(100vh - 300px)" }}
         />
@@ -756,7 +759,7 @@ function PayRepeat() {
           // className="yisa-table"
           columns={columnsb}
           // rowKey={(record) => record.id}
-          dataSource={Selectdata}
+          dataSource={Tabdata}
           pagination={false}
           // scroll={{ y: "calc(100vh - 300px)" }}
         />