Browse Source

fix(): 统一电子发票和清分结算对接数据格式

tags/PMS_Frontend_v1.0.6-develop
chenqiang 1 year ago
parent
commit
e52417e0c7
  1. 10
      src/pages/FinancialMgm/Invoice/CreateInvoice/index.scss
  2. 4
      src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx
  3. 6
      src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx
  4. 27
      src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx

10
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;

4
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,
},
};
//

6
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 {

27
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)" }}
/>

Loading…
Cancel
Save