|
@ -115,6 +115,7 @@ const MerchantInfo = (props) => { |
|
|
const [clearAccount, setClearAccount] = useState({}); // 清结算模块 |
|
|
const [clearAccount, setClearAccount] = useState({}); // 清结算模块 |
|
|
const [clearAccountOpen, setClearAccountOpen] = useState({modalOpen: false, data: {}}); // 清结算模块查看modal |
|
|
const [clearAccountOpen, setClearAccountOpen] = useState({modalOpen: false, data: {}}); // 清结算模块查看modal |
|
|
const [addEdit,setAddEdit] = useState("待配置") // 清结算模块新增编辑 按钮待配置和编辑 |
|
|
const [addEdit,setAddEdit] = useState("待配置") // 清结算模块新增编辑 按钮待配置和编辑 |
|
|
|
|
|
const [beforeName, setBeforeName] = useState(""); // 编辑前商户名称信息 |
|
|
//表头 |
|
|
//表头 |
|
|
const columns = [ |
|
|
const columns = [ |
|
|
{ |
|
|
{ |
|
@ -677,7 +678,7 @@ const MerchantInfo = (props) => { |
|
|
} |
|
|
} |
|
|
const data = editId ? {...systemFormValue, ...accountFormValue, ...businessFormValue,...clearFormValue, |
|
|
const data = editId ? {...systemFormValue, ...accountFormValue, ...businessFormValue,...clearFormValue, |
|
|
...qingdaoFormValue, ...weiPayFromValue, ...zhiPayFormValue, ...weiMiniFormValue, |
|
|
...qingdaoFormValue, ...weiPayFromValue, ...zhiPayFormValue, ...weiMiniFormValue, |
|
|
...zhiMiniFormValue, ...weiPayFrom2Value, ...weiMiniForm2Value, business_license: imgList, id: editId, uid} |
|
|
|
|
|
|
|
|
...zhiMiniFormValue, ...weiPayFrom2Value, ...weiMiniForm2Value, business_license: imgList, id: editId, uid, before_name: beforeName} |
|
|
: {...systemFormValue, ...accountFormValue, ...businessFormValue,...clearFormValue, |
|
|
: {...systemFormValue, ...accountFormValue, ...businessFormValue,...clearFormValue, |
|
|
...qingdaoFormValue, ...weiPayFromValue, ...zhiPayFormValue, ...weiMiniFormValue, |
|
|
...qingdaoFormValue, ...weiPayFromValue, ...zhiPayFormValue, ...weiMiniFormValue, |
|
|
...zhiMiniFormValue, ...weiPayFrom2Value, ...weiMiniForm2Value, business_license: imgList} |
|
|
...zhiMiniFormValue, ...weiPayFrom2Value, ...weiMiniForm2Value, business_license: imgList} |
|
@ -735,7 +736,7 @@ const MerchantInfo = (props) => { |
|
|
) |
|
|
) |
|
|
accountForm.setFieldsValue( |
|
|
accountForm.setFieldsValue( |
|
|
{ |
|
|
{ |
|
|
companyName: res?.data?.tenantName || "", |
|
|
|
|
|
|
|
|
companyName: res?.data?.companyName || "", |
|
|
city: res?.data?.city || [], |
|
|
city: res?.data?.city || [], |
|
|
address: res?.data?.address || "", |
|
|
address: res?.data?.address || "", |
|
|
connect_name: res?.data?.connect_name ||"", |
|
|
connect_name: res?.data?.connect_name ||"", |
|
@ -754,6 +755,7 @@ const MerchantInfo = (props) => { |
|
|
clearForm.setFieldsValue({ |
|
|
clearForm.setFieldsValue({ |
|
|
pay_type: res?.data?.pay_type || null |
|
|
pay_type: res?.data?.pay_type || null |
|
|
}) |
|
|
}) |
|
|
|
|
|
setBeforeName(res?.data?.tenantName) |
|
|
if (res?.data?.pay_type == 1) { |
|
|
if (res?.data?.pay_type == 1) { |
|
|
setQingDaoVisible(true) |
|
|
setQingDaoVisible(true) |
|
|
setSpecialVisible(false) |
|
|
setSpecialVisible(false) |
|
|