Commit a4d2e6ea by tdgiang

fix bug

parent e3db9363
...@@ -127,13 +127,32 @@ const SimpleForm = (props) => { ...@@ -127,13 +127,32 @@ const SimpleForm = (props) => {
], ],
}) })
} else { } else {
res = await updateProviderSetting({ console.log('listSetting', listSetting)
idPartner: newValue.idPartner, let flag = true
type: parseInt(type),
reconciliationCycle: newValue?.reconciliationCycle, listSetting.map((e, i) => {
reconciliationTime: newValue?.reconciliationTime, if (e.value == '' && i != 0) {
dataSetting: listSetting, console.log('e.value', e.value)
flag = false
}
}) })
console.log('flag', flag)
if (flag) {
res = await updateProviderSetting({
idPartner: newValue.idPartner,
type: parseInt(type),
reconciliationCycle: newValue?.reconciliationCycle,
reconciliationTime: newValue?.reconciliationTime,
dataSetting: listSetting,
})
} else {
props.hideLoading()
return toast.warning('Bạn vui lòng nhập đủ điều kiện!', {
theme: 'colored',
})
}
} }
props.hideLoading() props.hideLoading()
if (res.data.code == 200) { if (res.data.code == 200) {
......
...@@ -60,7 +60,7 @@ const ToolNotificate = (props) => { ...@@ -60,7 +60,7 @@ const ToolNotificate = (props) => {
date_to: endDate ? convertDate(endDate) : null, date_to: endDate ? convertDate(endDate) : null,
statusReconciliation: 0, statusReconciliation: 0,
payment_gate_code: props?.idPaymentPartner, payment_gate_code: props?.idPaymentPartner,
order_code: searchDebount,
type_payment: type || type, type_payment: type || type,
reconciliation_id: id, reconciliation_id: id,
store_id: store || store, store_id: store || store,
......
...@@ -38,7 +38,7 @@ const columns = [ ...@@ -38,7 +38,7 @@ const columns = [
{ {
id: 'order_code', id: 'order_code',
label: 'Mã hoá đơn', label: 'Mã giao dịch',
align: 'left', align: 'left',
minWidth: 170, minWidth: 170,
}, },
......
...@@ -112,12 +112,12 @@ function CustomerView(props) { ...@@ -112,12 +112,12 @@ function CustomerView(props) {
// }, // },
{ {
name: 'Đang đối soát', name: 'Đang đối soát',
value: 3, value: 2,
id: 3, id: 3,
}, },
{ {
name: 'Đã đối soát', name: 'Đã đối soát',
value: 4, value: 3,
id: 4, id: 4,
}, },
].map((e) => ( ].map((e) => (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment