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
63fe498f
Commit
63fe498f
authored
Apr 07, 2022
by
Gavin Peng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 订单能力 - 送货计划管理-待提交送货B2B对接完善
parent
ebb26556
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
118 additions
and
41 deletions
+118
-41
label.ts
src/pages/order/constants/label.ts
+2
-1
details.tsx
...r/deliveryPlanManagement/deliveryPlanAwaitB2B/details.tsx
+86
-35
assemblyTools.ts
src/pages/order/utils/assemblyTools.ts
+20
-0
date.ts
src/pages/order/utils/date.ts
+6
-3
index.ts
src/pages/order/utils/index.ts
+4
-2
No files found.
src/pages/order/constants/label.ts
View file @
63fe498f
...
@@ -51,7 +51,8 @@ export const ReceivingAddress = '收货地址';
...
@@ -51,7 +51,8 @@ export const ReceivingAddress = '收货地址';
export
const
SubmitDeliveryNotice
=
'提交送货通知单'
;
export
const
SubmitDeliveryNotice
=
'提交送货通知单'
;
export
const
ConfirmDeliveryNotice
=
'确认送货通知单'
;
export
const
ConfirmDeliveryNotice
=
'确认送货通知单'
;
export
const
DeliveryPlanText
=
'送货计划'
export
const
DeliveryPlanRemark
=
'最长600个字符,300个汉字'
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/details.tsx
View file @
63fe498f
This diff is collapsed.
Click to expand it.
src/pages/order/utils/assemblyTools.ts
0 → 100644
View file @
63fe498f
// 公共组装类工具
/**
* 数组转对象 默认赋值 0 (示例:['$04-01','$04-02'] = { '$04-01': {}, '$04-02': {} })
* @param arr
* @returns
*/
const
convertArrtoObj
=
(
arr
)
=>
{
return
arr
.
reduce
((
obj
,
currVal
)
=>
{
return
{
...
obj
,
[
currVal
]:
{
day
:
currVal
.
substr
(
1
),
planCount
:
0
,
createNotice
:
false
,
createDelivery
:
false
}
}
},
{})
}
export
{
convertArrtoObj
}
\ No newline at end of file
src/pages/order/utils/date.ts
View file @
63fe498f
// 公共日期类工具
const
getDayAll
=
(
starDay
:
string
,
endDay
:
string
)
=>
{
const
getDayAll
=
(
starDay
:
string
,
endDay
:
string
)
=>
{
let
arr
=
[]
let
arr
=
[]
let
dates
=
[]
let
dates
=
[]
...
@@ -24,10 +26,10 @@ const getDayAll = (starDay: string, endDay: string) => {
...
@@ -24,10 +26,10 @@ const getDayAll = (starDay: string, endDay: string) => {
let
day
=
time
.
getDate
()
>=
10
?
time
.
getDate
()
:
'0'
+
time
.
getDate
()
let
day
=
time
.
getDate
()
>=
10
?
time
.
getDate
()
:
'0'
+
time
.
getDate
()
// year + '-' +
// year + '-' +
// let YYMMDD = year + '-' + mouth + '-' + day
// let YYMMDD = year + '-' + mouth + '-' + day
let
MMDD
=
mouth
+
'-'
+
day
let
MMDD
=
'$'
+
mouth
+
'-'
+
day
dates
.
push
(
MMDD
)
dates
.
push
(
MMDD
)
}
}
dates
.
pop
()
//
dates.pop()
return
dates
return
dates
}
}
// deliveryPlanManagement - deliveryPlanAwaitB2B - details copy.ts 测试使用,上线前需要删除
// deliveryPlanManagement - deliveryPlanAwaitB2B - details copy.ts 测试使用,上线前需要删除
...
@@ -65,5 +67,5 @@ const getDayAll2 = (starDay: string, endDay: string) => {
...
@@ -65,5 +67,5 @@ const getDayAll2 = (starDay: string, endDay: string) => {
export
{
export
{
getDayAll
,
getDayAll
,
getDayAll2
getDayAll2
,
}
}
\ No newline at end of file
src/pages/order/utils/index.ts
View file @
63fe498f
export
*
from
'./status'
export
*
from
'./status'
\ No newline at end of file
export
*
from
'./date'
export
*
from
'./assemblyTools'
\ No newline at end of file
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