Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CmsPetrolPay
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
11
Issues
11
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Giang Tran
CmsPetrolPay
Commits
a4d2e6ea
Commit
a4d2e6ea
authored
Oct 02, 2024
by
tdgiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
e3db9363
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
4 deletions
+23
-4
Update.js
src/app/views/Reconciliation/Setting/Update.js
+19
-0
Index.js
src/app/views/Reconciliation/Sheet/Dialog/Index.js
+1
-1
Table.js
src/app/views/Reconciliation/Sheet/Dialog/Table.js
+1
-1
View.js
src/app/views/Reconciliation/Sheet/View.js
+2
-2
No files found.
src/app/views/Reconciliation/Setting/Update.js
View file @
a4d2e6ea
...
...
@@ -127,6 +127,19 @@ const SimpleForm = (props) => {
],
})
}
else
{
console
.
log
(
'listSetting'
,
listSetting
)
let
flag
=
true
listSetting
.
map
((
e
,
i
)
=>
{
if
(
e
.
value
==
''
&&
i
!=
0
)
{
console
.
log
(
'e.value'
,
e
.
value
)
flag
=
false
}
})
console
.
log
(
'flag'
,
flag
)
if
(
flag
)
{
res
=
await
updateProviderSetting
({
idPartner
:
newValue
.
idPartner
,
type
:
parseInt
(
type
),
...
...
@@ -134,6 +147,12 @@ const SimpleForm = (props) => {
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
()
if
(
res
.
data
.
code
==
200
)
{
...
...
src/app/views/Reconciliation/Sheet/Dialog/Index.js
View file @
a4d2e6ea
...
...
@@ -60,7 +60,7 @@ const ToolNotificate = (props) => {
date_to
:
endDate
?
convertDate
(
endDate
)
:
null
,
statusReconciliation
:
0
,
payment_gate_code
:
props
?.
idPaymentPartner
,
order_code
:
searchDebount
,
type_payment
:
type
||
type
,
reconciliation_id
:
id
,
store_id
:
store
||
store
,
...
...
src/app/views/Reconciliation/Sheet/Dialog/Table.js
View file @
a4d2e6ea
...
...
@@ -38,7 +38,7 @@ const columns = [
{
id
:
'order_code'
,
label
:
'Mã
hoá đơn
'
,
label
:
'Mã
giao dịch
'
,
align
:
'left'
,
minWidth
:
170
,
},
...
...
src/app/views/Reconciliation/Sheet/View.js
View file @
a4d2e6ea
...
...
@@ -112,12 +112,12 @@ function CustomerView(props) {
// },
{
name
:
'Đang đối soát'
,
value
:
3
,
value
:
2
,
id
:
3
,
},
{
name
:
'Đã đối soát'
,
value
:
4
,
value
:
3
,
id
:
4
,
},
].
map
((
e
)
=>
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment