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() {