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
shenshaokai
jinfa-platform
Commits
4aa36959
Commit
4aa36959
authored
Oct 14, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into test
parents
79fad5cf
32854e1f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
16 deletions
+17
-16
regExp.ts
src/constants/regExp.ts
+1
-1
templateForm.tsx
src/pages/logistics/list/components/templateForm.tsx
+2
-2
toOrderSubmitDetail.tsx
src/pages/logistics/logisticsSubmit/toOrderSubmitDetail.tsx
+14
-13
No files found.
src/constants/regExp.ts
View file @
4aa36959
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Author: LeeJiancong
* @Date: 2020-07-22 09:54:50
* @Date: 2020-07-22 09:54:50
* @LastEditors: LeeJiancong
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-10-
09 10:54:23
* @LastEditTime: 2020-10-
12 18:13:49
*/
*/
/**
/**
* 正则表达式集合
* 正则表达式集合
...
...
src/pages/logistics/list/components/templateForm.tsx
View file @
4aa36959
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Author: LeeJiancong
* @Date: 2020-07-15 10:31:55
* @Date: 2020-07-15 10:31:55
* @LastEditors: LeeJiancong
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-
09-17 17:22:21
* @LastEditTime: 2020-
10-14 15:16:33
*/
*/
import
React
,
{
Component
,
useState
,
useEffect
}
from
'react'
;
import
React
,
{
Component
,
useState
,
useEffect
}
from
'react'
;
import
ReactDOM
from
'react-dom'
import
ReactDOM
from
'react-dom'
...
@@ -108,7 +108,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
...
@@ -108,7 +108,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
PublicApi
.
getManageAreaByPcodeAll
({
pcode
:
'100000'
}).
then
(
res
=>
{
PublicApi
.
getManageAreaByPcodeAll
({
pcode
:
'100000'
}).
then
(
res
=>
{
let
list
=
[]
let
list
=
[]
res
.
data
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
res
.
data
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
list
.
push
({
label
:
item
.
name
,
value
:
Number
(
item
.
code
)
})
list
.
push
({
label
:
item
.
name
,
value
:
item
.
code
})
})
})
setProvinceList
(
list
)
setProvinceList
(
list
)
})
})
...
...
src/pages/logistics/logisticsSubmit/toOrderSubmitDetail.tsx
View file @
4aa36959
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* @Date: 2020-07-28 11:25:30
* @Date: 2020-07-28 11:25:30
* @LastEditors: LeeJiancong
* @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-
09-29 11:47:41
* @LastEditTime: 2020-
10-14 16:23:57
*/
*/
import
React
,
{
Component
,
useEffect
,
useRef
,
useState
,
ReactNode
}
from
'react'
import
React
,
{
Component
,
useEffect
,
useRef
,
useState
,
ReactNode
}
from
'react'
...
@@ -49,6 +49,7 @@ import {
...
@@ -49,6 +49,7 @@ import {
import
ReturnEle
from
'@/components/ReturnEle'
import
ReturnEle
from
'@/components/ReturnEle'
import
style
from
'../components/index.less'
import
style
from
'../components/index.less'
import
{
history
}
from
'umi'
import
{
history
}
from
'umi'
import
moment
from
'moment'
import
{
values
,
action
}
from
'mobx'
import
{
values
,
action
}
from
'mobx'
import
Search
from
'@/components/NiceForm/components/Search'
import
Search
from
'@/components/NiceForm/components/Search'
const
actions
=
createFormActions
()
const
actions
=
createFormActions
()
...
@@ -180,8 +181,7 @@ const Deatail: React.FC<{}> = () => {
...
@@ -180,8 +181,7 @@ const Deatail: React.FC<{}> = () => {
align
:
'center'
,
align
:
'center'
,
dataIndex
:
'createTime'
,
dataIndex
:
'createTime'
,
key
:
'createTime'
,
key
:
'createTime'
,
render
:
(
text
,
redcord
)
=>
render
:
(
text
:
any
)
=>
<>
{
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
}
</>
<>
{
text
}
</>
}
}
]
]
...
@@ -201,32 +201,33 @@ const Deatail: React.FC<{}> = () => {
...
@@ -201,32 +201,33 @@ const Deatail: React.FC<{}> = () => {
{
{
title
:
'对应订单号'
,
title
:
'对应订单号'
,
align
:
'center'
,
align
:
'center'
,
dataIndex
:
'i
d2
'
,
dataIndex
:
'i
nvoicesNo
'
,
key
:
'i
d2
'
,
key
:
'i
nvoicesNo
'
,
},
},
{
{
title
:
'单据摘要'
,
title
:
'单据摘要'
,
align
:
'center'
,
align
:
'center'
,
dataIndex
:
'
orderThe
'
,
dataIndex
:
'
invoicesAbstract
'
,
key
:
'
orderThe
'
key
:
'
invoicesAbstract
'
},
},
{
{
title
:
'对应仓库'
,
title
:
'对应仓库'
,
align
:
'center'
,
align
:
'center'
,
dataIndex
:
''
,
dataIndex
:
'
inventory
'
,
key
:
''
,
key
:
'
inventory
'
,
},
},
{
{
title
:
'单据类型'
,
title
:
'单据类型'
,
align
:
'center'
,
align
:
'center'
,
dataIndex
:
''
,
dataIndex
:
'
invoicesType
'
,
key
:
''
,
key
:
'
invoicesType
'
,
},
},
{
{
title
:
'单据时间'
,
title
:
'单据时间'
,
align
:
'center'
,
align
:
'center'
,
dataIndex
:
'createTime'
,
dataIndex
:
'transactionTime'
,
key
:
'createTime'
,
key
:
'transactionTime'
,
render
:
(
text
:
any
)
=>
<>
{
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
}
</>
}
}
]
]
...
...
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