Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
黄庭坚
jinfa-platform
Commits
b5c766a9
Commit
b5c766a9
authored
Oct 28, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev
parents
8c0beaf4
3f2a2597
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
15 deletions
+16
-15
enquiryGoods.tsx
...on/goodsOffer/addEnquiryOrder/components/enquiryGoods.tsx
+1
-0
index.tsx
src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx
+1
-1
index.tsx
src/utils/index.tsx
+14
-14
No files found.
src/pages/transaction/goodsOffer/addEnquiryOrder/components/enquiryGoods.tsx
View file @
b5c766a9
...
...
@@ -48,6 +48,7 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
})
setgoodsList
(
arr
)
getGoodsList
(
arr
)
})
}
const
handleCancelAddMember
=
()
=>
{
...
...
src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx
View file @
b5c766a9
...
...
@@ -76,7 +76,7 @@ const PendingSubmit: React.FC<{}> = () => {
title
:
'操作'
,
key
:
'options'
,
dataIndex
:
'options'
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
Button
type=
'link'
disabled=
{
record
.
interiorState
!==
1
||
record
.
interiorState
!==
3
}
onClick=
{
()
=>
{
setId
(
record
.
id
);
setvisible
(
true
)}
}
>
提交报价单
</
Button
>
render
:
(
text
:
any
,
record
:
any
)
=>
<
Button
type=
'link'
disabled=
{
record
.
externalState
!==
2
&&
record
.
interiorState
!==
4
}
onClick=
{
()
=>
{
setId
(
record
.
id
);
setvisible
(
true
)}
}
>
提交报价单
</
Button
>
}]
const
format
=
(
text
)
=>
{
return
<>
{
moment
(
text
).
format
(
"YYYY-MM-DD HH:mm:ss"
)
}
</>
...
...
src/utils/index.tsx
View file @
b5c766a9
...
...
@@ -28,72 +28,72 @@ export function timeRange(val: number) {
moment
()
.
startOf
(
'days'
)
.
format
(
'YYYY-MM-DD HH:mm:ss'
),
).
unix
();
).
valueOf
();
et
=
moment
(
moment
()
.
endOf
(
'days'
)
.
format
(
'YYYY-MM-DD HH:mm:ss'
),
).
unix
();
).
valueOf
();
break
;
case
2
:
st
=
moment
(
moment
()
.
subtract
(
7
,
'days'
)
.
format
(
'YYYY-MM-DD'
)
+
' 00:00:00'
,
).
unix
();
).
valueOf
();
et
=
moment
(
moment
()
.
endOf
(
'days'
)
.
format
(
'YYYY-MM-DD HH:mm:ss'
),
).
unix
();
).
valueOf
();
break
;
case
3
:
st
=
moment
(
moment
()
.
subtract
(
29
,
'days'
)
.
format
(
'YYYY-MM-DD'
)
+
' 00:00:00'
,
).
unix
();
).
valueOf
();
et
=
moment
(
moment
()
.
endOf
(
'days'
)
.
format
(
'YYYY-MM-DD HH:mm:ss'
),
).
unix
();
).
valueOf
();
break
;
case
4
:
st
=
moment
(
moment
()
.
subtract
(
89
,
'days'
)
.
format
(
'YYYY-MM-DD'
)
+
' 00:00:00'
,
).
unix
();
).
valueOf
();
et
=
moment
(
moment
()
.
endOf
(
'days'
)
.
format
(
'YYYY-MM-DD HH:mm:ss'
),
).
unix
();
).
valueOf
();
break
;
case
5
:
st
=
moment
(
moment
()
.
subtract
(
179
,
'days'
)
.
format
(
'YYYY-MM-DD'
)
+
' 00:00:00'
,
).
unix
();
).
valueOf
();
et
=
moment
(
moment
()
.
endOf
(
'days'
)
.
format
(
'YYYY-MM-DD HH:mm:ss'
),
).
unix
();
).
valueOf
();
break
;
case
6
:
st
=
moment
(
moment
()
.
subtract
(
364
,
'days'
)
.
format
(
'YYYY-MM-DD'
)
+
' 00:00:00'
,
).
unix
();
).
valueOf
();
et
=
moment
(
moment
()
.
endOf
(
'days'
)
.
format
(
'YYYY-MM-DD HH:mm:ss'
),
).
unix
();
).
valueOf
();
break
;
case
7
:
st
=
moment
(
...
...
@@ -101,13 +101,13 @@ export function timeRange(val: number) {
.
year
(
moment
().
year
()
-
1
)
.
startOf
(
'year'
)
.
format
(
'YYYY-MM-DD HH:mm:ss'
),
).
unix
();
).
valueOf
();
et
=
moment
(
moment
()
.
year
(
moment
().
year
()
-
1
)
.
endOf
(
'year'
)
.
format
(
'YYYY-MM-DD HH:mm:ss'
),
).
unix
();
).
valueOf
();
break
;
}
return
{
st
,
et
}
...
...
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