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
04649f54
Commit
04649f54
authored
Apr 14, 2022
by
Gavin Peng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 送货计划管理及协同加入按钮权限判断
parent
a8757e94
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
25 deletions
+36
-25
index.tsx
...der/deliveryPlanCollaboration/deliveryPlanAwait/index.tsx
+4
-3
index.tsx
...der/deliveryPlanCollaboration/deliveryPlanQuery/index.tsx
+5
-4
index.tsx
...der/deliveryPlanManagement/deliveryPlanAwaitB2B/index.tsx
+10
-6
index.tsx
...der/deliveryPlanManagement/deliveryPlanAwaitSRM/index.tsx
+13
-9
index.tsx
.../order/deliveryPlanManagement/deliveryPlanQuery/index.tsx
+4
-3
No files found.
src/pages/order/deliveryPlanCollaboration/deliveryPlanAwait/index.tsx
View file @
04649f54
...
...
@@ -20,6 +20,7 @@ import { deliveryPlanCollaborationAwaitSchema } from './schema'
import
{
godBtoa
,
TagStatus
}
from
'../../utils'
import
{
ExternalStateColumn
,
OperationColumn
,
PlannedEndDateColumn
,
PlannedStartDateColumn
,
PlanNumberColumn
,
PlanSummaryColumn
,
SupplyMemberColumn
}
from
'../../constants/table-column'
import
{
getOrderDeliveryPlanVendorPage
}
from
'@/services/OrderNewV2Api'
import
{
AuthUrl
}
from
'@/components/AuthButton/AuthUrl'
const
tagStatus
=
new
TagStatus
()
const
statusTxt
=
new
Map
([[
1
,
'待提交'
],
[
2
,
'待确认'
],
[
3
,
'待修订'
],
[
4
,
'已确认'
],
[
5
,
'已删除'
]])
...
...
@@ -31,8 +32,8 @@ const DeliveryPlanCollaborationAwait: React.FC = () => {
const
controllerBtns
=
(<
Space
></
Space
>)
const
renderOptionButton
=
(
record
:
any
)
=>
{
const
btnAuthOfOperationTextMap
=
{
'确认'
:
'
DevTest
'
,
'查看'
:
'
DevTest
'
,
'确认'
:
'
deliveryPlanCollaborationAwait.confirm
'
,
'查看'
:
'
deliveryPlanCollaborationAwait.looking
'
,
}
const
buttonGroup
=
{
'确认'
:
true
,
...
...
@@ -55,7 +56,7 @@ const DeliveryPlanCollaborationAwait: React.FC = () => {
...
PlanNumberColumn
,
dataIndex
:
'planNo'
,
key
:
'planNo'
,
render
:
(
text
:
unknown
,
record
:
any
)
=>
<
EyePreview
url=
{
`/memberCenter/order/deliveryPlanCollaboration/await/details?ty=${godBtoa(record.orderType)}&i=${godBtoa(record.id)}`
}
>
{
text
}
</
EyePreview
>
render
:
(
text
:
unknown
,
record
:
any
)
=>
<
EyePreview
type=
{
AuthUrl
(
'deliveryPlanCollaborationAwait.looking'
)?
'link'
:
'button'
}
url=
{
`/memberCenter/order/deliveryPlanCollaboration/await/details?ty=${godBtoa(record.orderType)}&i=${godBtoa(record.id)}`
}
>
{
text
}
</
EyePreview
>
},
{
...
PlanSummaryColumn
,
dataIndex
:
'digest'
,
key
:
'digest'
},
{
...
PlannedStartDateColumn
,
dataIndex
:
'planStartTime'
,
key
:
'planStartTime'
,
render
:
(
text
:
string
,
record
:
any
)
=>
(
moment
(
text
).
format
(
'YYYY-MM-DD'
))
},
...
...
src/pages/order/deliveryPlanCollaboration/deliveryPlanQuery/index.tsx
View file @
04649f54
...
...
@@ -20,6 +20,7 @@ import { deliveryPlanCollaborationQuerySchema } from './schema'
import
{
godBtoa
,
TagStatus
}
from
'../../utils'
import
{
ExternalStateColumn
,
OperationColumn
,
PlannedEndDateColumn
,
PlannedStartDateColumn
,
PlanNumberColumn
,
PlanSummaryColumn
,
SupplyMemberColumn
}
from
'../../constants/table-column'
import
{
getOrderDeliveryPlanVendorPage
}
from
'@/services/OrderNewV2Api'
import
{
AuthUrl
}
from
'@/components/AuthButton/AuthUrl'
const
tagStatus
=
new
TagStatus
()
...
...
@@ -36,9 +37,9 @@ const DeliveryPlanCollaborationQuery: React.FC = () => {
)
const
renderOptionButton
=
(
record
:
any
)
=>
{
const
btnAuthOfOperationTextMap
=
{
'查看'
:
'
DevTest
'
,
'生成送货通知单'
:
'
DevTest
'
,
'生成送货单'
:
'
DevTest
'
,
'查看'
:
'
deliveryPlanCollaboration.looking
'
,
'生成送货通知单'
:
'
deliveryPlanCollaboration.generateNotice
'
,
'生成送货单'
:
'
deliveryPlanCollaboration.generateDeliveryNote
'
,
}
const
buttonGroup
=
{
'查看'
:
true
,
...
...
@@ -67,7 +68,7 @@ const DeliveryPlanCollaborationQuery: React.FC = () => {
...
PlanNumberColumn
,
dataIndex
:
'planNo'
,
key
:
'planNo'
,
render
:
(
text
:
unknown
,
record
:
any
)
=>
<
EyePreview
url=
{
`/memberCenter/order/deliveryPlanCollaboration/query/details?ty=${godBtoa(record.orderType)}&i=${godBtoa(record.id)}`
}
>
{
text
}
</
EyePreview
>
render
:
(
text
:
unknown
,
record
:
any
)
=>
<
EyePreview
type=
{
AuthUrl
(
'deliveryPlanCollaboration.looking'
)?
'link'
:
'button'
}
url=
{
`/memberCenter/order/deliveryPlanCollaboration/query/details?ty=${godBtoa(record.orderType)}&i=${godBtoa(record.id)}`
}
>
{
text
}
</
EyePreview
>
},
{
...
PlanSummaryColumn
,
dataIndex
:
'digest'
,
key
:
'digest'
},
{
...
PlannedStartDateColumn
,
dataIndex
:
'planStartTime'
,
key
:
'planStartTime'
,
render
:
(
text
:
string
,
record
:
any
)
=>
(
moment
(
text
).
format
(
'YYYY-MM-DD'
))
},
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/index.tsx
View file @
04649f54
...
...
@@ -21,6 +21,8 @@ import { godBtoa, TagStatus } from '../../utils'
import
{
ExternalStateColumn
,
OperationColumn
,
PlannedEndDateColumn
,
PlannedStartDateColumn
,
PlanNumberColumn
,
PlanSummaryColumn
,
SupplyMemberColumn
}
from
'../../constants/table-column'
import
moment
from
'moment'
import
{
getOrderDeliveryPlanBuyerPage
,
postOrderDeliveryPlanDelete
,
postOrderDeliveryPlanSubmit
}
from
'@/services/OrderNewV2Api'
import
{
AuthUrl
}
from
'@/components/AuthButton/AuthUrl'
import
AuthButton
from
'@/components/AuthButton'
// 外部状态1-待提交 2-已确认
const
STATUS
=
2
...
...
@@ -64,15 +66,17 @@ const DeliveryPlanManagementAwaitB2B: React.FC = () => {
const
controllerBtns
=
(
<
Space
>
<
Button
type=
'primary'
icon=
{
<
PlusOutlined
/>
}
onClick=
{
()
=>
history
.
push
(
`/memberCenter/order/deliveryPlanManagement/awaitB2B/create`
)
}
>
新增
</
Button
>
<
AuthButton
btnCode=
'create'
>
<
Button
type=
'primary'
icon=
{
<
PlusOutlined
/>
}
onClick=
{
()
=>
history
.
push
(
`/memberCenter/order/deliveryPlanManagement/awaitB2B/create`
)
}
>
新增
</
Button
>
</
AuthButton
>
</
Space
>
)
const
renderOptionButton
=
(
record
:
any
)
=>
{
const
btnAuthOfOperationTextMap
=
{
'提交'
:
'
DevTes
t'
,
'修改'
:
'
DevTest
'
,
'删除'
:
'
DevTest
'
,
'查看'
:
'
DevTest
'
,
'提交'
:
'
awaitB2B.submi
t'
,
'修改'
:
'
awaitB2B.update
'
,
'删除'
:
'
awaitB2B.delete
'
,
'查看'
:
'
awaitB2B.looking
'
,
}
const
buttonGroup
=
{
'提交'
:
record
.
status
<=
1
,
...
...
@@ -100,7 +104,7 @@ const DeliveryPlanManagementAwaitB2B: React.FC = () => {
dataIndex
:
'planNo'
,
key
:
'planNo'
,
// width: 160,
render
:
(
text
:
unknown
,
record
:
any
)
=>
<
EyePreview
url=
{
`/memberCenter/order/deliveryPlanManagement/awaitB2B/details?i=${godBtoa(record.id)}`
}
>
{
text
}
</
EyePreview
>
render
:
(
text
:
unknown
,
record
:
any
)
=>
<
EyePreview
type=
{
AuthUrl
(
'awaitB2B.looking'
)
?
'link'
:
'button'
}
url=
{
`/memberCenter/order/deliveryPlanManagement/awaitB2B/details?i=${godBtoa(record.id)}`
}
>
{
text
}
</
EyePreview
>
},
{
...
PlanSummaryColumn
,
dataIndex
:
'digest'
,
key
:
'digest'
},
{
...
PlannedStartDateColumn
,
dataIndex
:
'planStartTime'
,
key
:
'planStartTime'
,
render
:
(
text
:
string
,
record
:
any
)
=>
(
moment
(
text
).
format
(
'YYYY-MM-DD'
))
},
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/index.tsx
View file @
04649f54
...
...
@@ -21,6 +21,8 @@ import { godBtoa, TagStatus } from '../../utils'
import
{
ExternalStateColumn
,
OperationColumn
,
PlannedEndDateColumn
,
PlannedStartDateColumn
,
PlanNumberColumn
,
PlanSummaryColumn
,
SupplyMemberColumn
}
from
'../../constants/table-column'
import
{
getOrderDeliveryPlanBuyerPage
,
postOrderDeliveryPlanDelete
,
postOrderDeliveryPlanSubmit
}
from
'@/services/OrderNewV2Api'
import
moment
from
'moment'
import
AuthButton
from
'@/components/AuthButton'
import
{
AuthUrl
}
from
'@/components/AuthButton/AuthUrl'
// 外部状态1-待提交 2-已确认
const
STATUS
=
2
...
...
@@ -64,15 +66,17 @@ const DeliveryPlanManagementAwaitSRM: React.FC = () => {
const
controllerBtns
=
(
<
Space
>
<
Button
type=
'primary'
icon=
{
<
PlusOutlined
/>
}
onClick=
{
()
=>
history
.
push
(
`/memberCenter/order/deliveryPlanManagement/awaitSRM/create`
)
}
>
新增
</
Button
>
<
AuthButton
btnCode=
'deliveryPlanAwaitSRM.create'
>
<
Button
type=
'primary'
icon=
{
<
PlusOutlined
/>
}
onClick=
{
()
=>
history
.
push
(
`/memberCenter/order/deliveryPlanManagement/awaitSRM/create`
)
}
>
新增
</
Button
>
</
AuthButton
>
</
Space
>
)
const
renderOptionButton
=
(
record
:
any
)
=>
{
const
btnAuthOfOperationTextMap
=
{
'提交'
:
'
DevTes
t'
,
'修改'
:
'
DevTest
'
,
'删除'
:
'
DevTest
'
,
'查看'
:
'
DevTest
'
,
'提交'
:
'
deliveryPlanAwaitSRM.submi
t'
,
'修改'
:
'
deliveryPlanAwaitSRM.update
'
,
'删除'
:
'
deliveryPlanAwaitSRM.delete
'
,
'查看'
:
'
deliveryPlanAwaitSRM.looking
'
,
}
const
buttonGroup
=
{
'提交'
:
record
.
status
<=
1
,
...
...
@@ -101,7 +105,7 @@ const DeliveryPlanManagementAwaitSRM: React.FC = () => {
dataIndex
:
'planNo'
,
key
:
'planNo'
,
// width: 160,
render
:
(
text
:
unknown
,
record
:
any
)
=>
<
EyePreview
url=
{
`/memberCenter/order/deliveryPlanManagement/awaitSRM/details?i=${godBtoa(record.id)}`
}
>
{
text
}
</
EyePreview
>
render
:
(
text
:
unknown
,
record
:
any
)
=>
<
EyePreview
type=
{
AuthUrl
(
'deliveryPlanAwaitSRM.looking'
)
?
'link'
:
'button'
}
url=
{
`/memberCenter/order/deliveryPlanManagement/awaitSRM/details?i=${godBtoa(record.id)}`
}
>
{
text
}
</
EyePreview
>
},
{
...
PlanSummaryColumn
,
dataIndex
:
'digest'
,
key
:
'digest'
},
{
...
PlannedStartDateColumn
,
dataIndex
:
'planStartTime'
,
key
:
'planStartTime'
,
render
:
(
text
:
string
,
record
:
any
)
=>
(
moment
(
text
).
format
(
'YYYY-MM-DD'
))
},
...
...
@@ -112,10 +116,10 @@ const DeliveryPlanManagementAwaitSRM: React.FC = () => {
dataIndex
:
'status'
,
key
:
'status'
,
render
:
(
text
:
string
,
record
:
any
)
=>
{
const
s
ytle
=
tagStatus
.
getTagStyle
(
record
.
status
);
const
s
tyles
=
tagStatus
.
getTagStyle
(
record
.
status
);
return
(
<
Tag
color=
{
s
ytle
.
bgColor
}
>
<
span
style=
{
{
color
:
s
ytle
.
fontColor
}
}
>
{
statusTxt
.
get
(
record
.
status
)
}
</
span
>
<
Tag
color=
{
s
tyles
.
bgColor
}
>
<
span
style=
{
{
color
:
s
tyles
.
fontColor
}
}
>
{
statusTxt
.
get
(
record
.
status
)
}
</
span
>
</
Tag
>
)
}
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanQuery/index.tsx
View file @
04649f54
...
...
@@ -19,6 +19,7 @@ import { deliveryPlanManagementQuerySchema } from './schema'
import
{
godBtoa
,
TagStatus
}
from
'../../utils'
import
{
ExternalStateColumn
,
OperationColumn
,
PlannedEndDateColumn
,
PlannedStartDateColumn
,
PlanNumberColumn
,
PlanSummaryColumn
,
SupplyMemberColumn
}
from
'../../constants/table-column'
import
{
getOrderDeliveryPlanBuyerPage
}
from
'@/services/OrderNewV2Api'
import
{
AuthUrl
}
from
'@/components/AuthButton/AuthUrl'
const
tagStatus
=
new
TagStatus
()
const
statusTxt
=
new
Map
([[
1
,
'待提交'
],
[
2
,
'待确认'
],
[
3
,
'待修订'
],[
4
,
'已确认'
],[
5
,
'已删除'
]])
...
...
@@ -34,8 +35,8 @@ const DeliveryPlanManagementQuery: React.FC = () => {
)
const
renderOptionButton
=
(
record
:
any
)
=>
{
const
btnAuthOfOperationTextMap
=
{
'查看'
:
'
DevTest
'
,
'变更'
:
'
DevTest
'
'查看'
:
'
deliveryPlanManagement.looking
'
,
'变更'
:
'
deliveryPlanManagement.update
'
}
const
buttonGroup
=
{
'查看'
:
true
,
...
...
@@ -59,7 +60,7 @@ const DeliveryPlanManagementQuery: React.FC = () => {
dataIndex
:
'planNo'
,
key
:
'planNo'
,
// width: 160,
render
:
(
text
:
string
,
record
:
any
)
=>
<
EyePreview
url=
{
`/memberCenter/order/deliveryPlanManagement/query/details?ty=${godBtoa(record.orderType)}&i=${godBtoa(record.id)}`
}
>
{
text
}
</
EyePreview
>
render
:
(
text
:
string
,
record
:
any
)
=>
<
EyePreview
type=
{
AuthUrl
(
'deliveryPlanManagement.looking'
)?
'link'
:
'button'
}
url=
{
`/memberCenter/order/deliveryPlanManagement/query/details?ty=${godBtoa(record.orderType)}&i=${godBtoa(record.id)}`
}
>
{
text
}
</
EyePreview
>
},
{
...
PlanSummaryColumn
,
dataIndex
:
'digest'
,
key
:
'digest'
},
{
...
PlannedStartDateColumn
,
dataIndex
:
'planStartTime'
,
key
:
'planStartTime'
,
render
:
(
text
:
string
,
record
:
any
)
=>
(
moment
(
text
).
format
(
'YYYY-MM-DD'
))
},
...
...
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