From 7bea8b41454f4c85996c38b0cb545d0f8934380c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AE=87=E8=88=AA?= <740464440@qq.com>
Date: Wed, 10 Jan 2024 14:42:15 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E5=A4=84=E7=90=86=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2bug=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/MerchantMgm/MerchantInfo/loadable.jsx | 36 ++++++++++++-------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
index ca8811e..2d9ac2a 100644
--- a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
+++ b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
@@ -553,23 +553,23 @@ const MerchantInfo = (props) => {
       var zhiMiniFormValue = {}
       var weiPayFrom2Value = {}
       var weiMiniForm2Value = {}
-      //systemForm的处理
-      // await systemForm.validateFields().then(async (value) => {
-      //   var start = moment(value.last_time[0]?._d).format('YYYY-MM-DD HH:mm:ss')
-      //   var end = moment(value.last_time[1]?._d).format('YYYY-MM-DD HH:mm:ss')
-      //   const { tenantName, tenantCode, tenantType, businessType } = value
-      //   systemFormValue = { tenantCode, tenantName, tenantType, businessType, start, end }
-      // })
-      // //accountForm的处理
-      // await accountForm.validateFields().then(async (value) => {
-      //   const { companyName, city, address, connect_name, connect_phone, email } = value
-      //   accountFormValue = { companyName, city, address, connect_name, connect_phone, email }
-      // })
-      // //businessForm处理
-      // await businessForm.validateFields().then(async (value) => {
-      //   const { bank_name, bank_address, bank_num } = value
-      //   businessFormValue = { bank_name, bank_address, bank_num }
-      // })
+      systemForm的处理
+      await systemForm.validateFields().then(async (value) => {
+        var start = moment(value.last_time[0]?._d).format('YYYY-MM-DD HH:mm:ss')
+        var end = moment(value.last_time[1]?._d).format('YYYY-MM-DD HH:mm:ss')
+        const { tenantName, tenantCode, tenantType, businessType } = value
+        systemFormValue = { tenantCode, tenantName, tenantType, businessType, start, end }
+      })
+      //accountForm的处理
+      await accountForm.validateFields().then(async (value) => {
+        const { companyName, city, address, connect_name, connect_phone, email } = value
+        accountFormValue = { companyName, city, address, connect_name, connect_phone, email }
+      })
+      //businessForm处理
+      await businessForm.validateFields().then(async (value) => {
+        const { bank_name, bank_address, bank_num } = value
+        businessFormValue = { bank_name, bank_address, bank_num }
+      })
       //clearForm处理
       await clearForm.validateFields().then(async (value) => {
         const { pay_type } = value
@@ -750,7 +750,7 @@ const MerchantInfo = (props) => {
             }
           )
           clearForm.setFieldsValue({
-            pay_type: res?.data?.pay_type || ""
+            pay_type: res?.data?.pay_type || null
           })
           if (res?.data?.pay_type == 1) {
             setQingDaoVisible(true)