From 29a57d97758999f824de8ece8fc57459e1f884af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AE=87=E8=88=AA?= <740464440@qq.com>
Date: Tue, 19 Dec 2023 01:49:40 +0800
Subject: [PATCH] =?UTF-8?q?fix():=2012=5F19=E5=A4=84=E7=90=86=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E7=A8=8E=E7=8E=87=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/MerchantMgm/InvoiceConf/loadable.jsx  | 12 +++++++-----
 src/pages/MerchantMgm/MerchantInfo/loadable.jsx |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
index e87ffa7..0b427da 100644
--- a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
+++ b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
@@ -61,7 +61,7 @@ function InvoiceConf(props) {
   //含税状态
   const [taxTypeStatus,setTaxTypeStatus]=useState()
   //税率状态
-  const [rateStatus,setRateStatus]=useState("1")
+  const [rateStatus,setRateStatus]=useState("0")
   // 发票平台
   const [InvoicePlatform, setInvoicePlatform] = useState(2);
   const [editId, setEditId] = useState(""); // 编辑是所需要的id
@@ -355,7 +355,7 @@ function InvoiceConf(props) {
       invoice_item: "1",
       order_type: [],
       tax_way: "",
-      tax_rate: "1",
+      tax_rate: "0",
       code:  "",
       auth_code:  "",
       appkey: "",
@@ -391,7 +391,7 @@ function InvoiceConf(props) {
             invoice_item: res?.data?.invoice_item || "1",
             order_type: res?.data?.order_type || [],
             tax_way: res?.data?.tax_way || "",
-            tax_rate: res?.data?.tax_rate || "",
+            tax_rate: res?.data?.tax_rate || "0",
             code: res?.data?.code || "",
             auth_code: res?.data?.auth_code || "",
             appkey: res?.data?.appkey || "",
@@ -494,6 +494,7 @@ function InvoiceConf(props) {
     setCreateVisible(false)
     setCheckVisible(false)
     setEditId("");
+    setRateStatus("0")
   }
   //保存
   const createTenant = async () => {
@@ -577,6 +578,7 @@ function InvoiceConf(props) {
             // setSpecialVisible(false)
             // setQingDaoVisible(false)
             setEditId("")
+            setRateStatus("0")
             let _data = { ...formData, pn: 1, page_size: Number(pageSizeOptions[0])}
             setPageInfo({pn: 1, page_size: Number(pageSizeOptions[0])})
             setFormData(_data)
@@ -852,7 +854,7 @@ function InvoiceConf(props) {
                         <Form
                           form={editForm}
                           initialValues={{
-                            tax_rate:"1"
+                            tax_rate:"0"
                           }}
                         >
                           <Form.Item
@@ -940,7 +942,7 @@ function InvoiceConf(props) {
                                 e=>{setTaxTypeStatus(e)}
                               }
                               disabled={true}
-                              value={parseInt(rateStatus) >= 1?
+                              value={parseInt(rateStatus) > 0 ?
                                 editForm.setFieldsValue({tax_type:"2"}):
                                 editForm.setFieldsValue({tax_type:"1"})}
                             />
diff --git a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
index 3e53841..ab79dc8 100644
--- a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
+++ b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
@@ -949,6 +949,7 @@ const MerchantInfo = (props) => {
                       className="search-group-item"
                       limit={90}
                       showTime={false}
+                      allowClear={false}
                     />
                   </Form.Item>
                   <Form.Item