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
29d936b5
Commit
29d936b5
authored
Jan 04, 2022
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 取消关联平台品类仅选择最后一级
parent
d7e013f8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
7 deletions
+14
-7
order.ts
src/locales/en-US/order.ts
+2
-0
order.ts
src/locales/ko-KR/order.ts
+2
-0
order.ts
src/locales/zh-CN/order.ts
+2
-0
index.tsx
src/pages/classAndProperty/class/index.tsx
+4
-3
index.tsx
...ransaction/purchaseOrder/readyDistributionOrder/index.tsx
+1
-1
useSelfTable.tsx
...rchaseOrder/readyDistributionOrder/model/useSelfTable.tsx
+1
-1
index.tsx
...es/transaction/saleOrder/readyDistributionOrder/index.tsx
+1
-1
useSelfTable.tsx
...n/saleOrder/readyDistributionOrder/model/useSelfTable.tsx
+1
-1
No files found.
src/locales/en-US/order.ts
View file @
29d936b5
...
...
@@ -305,6 +305,8 @@ export default {
'purchaseOrder.tijiaoshenhe'
:
'Submit for review'
,
'purchaseOrder.tijiaodingdan'
:
'Submit order'
,
'purchaseOrder.piliangtijiao'
:
'Batch submission'
,
'purchaseOrder.pilianglingqu'
:
'Batch to receive'
,
'purchaseOrder.lingqu'
:
'receive'
,
'purchaseOrder.shougongshouhuo'
:
'Manual receipt'
,
'purchaseOrder.ququerenshouhuo'
:
'Go to confirm receipt'
,
'purchaseOrder.di'
:
'第'
,
...
...
src/locales/ko-KR/order.ts
View file @
29d936b5
...
...
@@ -305,6 +305,8 @@ export default {
'purchaseOrder.tijiaoshenhe'
:
'제출 심사'
,
'purchaseOrder.tijiaodingdan'
:
'주문 전송'
,
'purchaseOrder.piliangtijiao'
:
'대량 제출'
,
'purchaseOrder.pilianglingqu'
:
'대량으로 수령하다'
,
'purchaseOrder.lingqu'
:
'받다'
,
'purchaseOrder.shougongshouhuo'
:
'수공 수령'
,
'purchaseOrder.ququerenshouhuo'
:
'수령을 확인하러 가다'
,
'purchaseOrder.di'
:
'다음을 수행합니다.'
,
...
...
src/locales/zh-CN/order.ts
View file @
29d936b5
...
...
@@ -305,6 +305,8 @@ export default {
'purchaseOrder.tijiaoshenhe'
:
'提交审核'
,
'purchaseOrder.tijiaodingdan'
:
'提交订单'
,
'purchaseOrder.piliangtijiao'
:
'批量提交'
,
'purchaseOrder.pilianglingqu'
:
'批量领取'
,
'purchaseOrder.lingqu'
:
'领取'
,
'purchaseOrder.shougongshouhuo'
:
'手工收货'
,
'purchaseOrder.ququerenshouhuo'
:
'去确认收货'
,
'purchaseOrder.di'
:
'第'
,
...
...
src/pages/classAndProperty/class/index.tsx
View file @
29d936b5
...
...
@@ -130,9 +130,10 @@ const ClassProperty: React.FC<{}> = () => {
}
const
handlePlateformSelect
=
(
key
,
node
)
=>
{
if
(
node
.
children
&&
node
.
children
.
length
>
0
)
{
return
;
}
// @ 取消关联平台品类仅选择最后一级
// if (node.children && node.children.length > 0) {
// return;
// }
setPlateformSelectNode
({
id
:
key
*
1
,
name
:
node
.
_title
})
}
...
...
src/pages/transaction/purchaseOrder/readyDistributionOrder/index.tsx
View file @
29d936b5
...
...
@@ -79,7 +79,7 @@ const ReadyDistributionOrder:React.FC<ReadyDistributionOrderProps> = (props) =>
}
}
formilyChilds=
{
{
children
:
<
Space
>
<
Button
onClick=
{
handleBitchPush
}
loading=
{
loading
}
>
{
intl
.
formatMessage
({
id
:
'purchaseOrder.piliang
tijiao'
,
defaultMessage
:
'批量提交
'
})
}
</
Button
>
<
Button
onClick=
{
handleBitchPush
}
loading=
{
loading
}
>
{
intl
.
formatMessage
({
id
:
'purchaseOrder.piliang
lingqu'
,
defaultMessage
:
'批量领取
'
})
}
</
Button
>
</
Space
>,
layouts
:
{
span
:
8
...
...
src/pages/transaction/purchaseOrder/readyDistributionOrder/model/useSelfTable.tsx
View file @
29d936b5
...
...
@@ -19,7 +19,7 @@ export const useSelfTable = () => {
align
:
'center'
,
dataIndex
:
'ctl'
,
key
:
'ctl'
,
render
:
(
text
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleSubmit
(
record
.
orderId
)
}
>
{
intl
.
formatMessage
({
id
:
'purchaseOrder.
tijiaodingdan'
,
defaultMessage
:
'提交订单
'
})
}
</
Button
>
render
:
(
text
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleSubmit
(
record
.
orderId
)
}
>
{
intl
.
formatMessage
({
id
:
'purchaseOrder.
lingqu'
,
defaultMessage
:
'领取
'
})
}
</
Button
>
}
])
...
...
src/pages/transaction/saleOrder/readyDistributionOrder/index.tsx
View file @
29d936b5
...
...
@@ -79,7 +79,7 @@ const ReadyDistributionOrder:React.FC<ReadyDistributionOrderProps> = (props) =>
}
}
formilyChilds=
{
{
children
:
<
Space
>
<
Button
onClick=
{
handleBitchPush
}
loading=
{
loading
}
>
{
intl
.
formatMessage
({
id
:
'purchaseOrder.piliang
tijiao'
,
defaultMessage
:
'批量提交
'
})
}
</
Button
>
<
Button
onClick=
{
handleBitchPush
}
loading=
{
loading
}
>
{
intl
.
formatMessage
({
id
:
'purchaseOrder.piliang
lingqu'
,
defaultMessage
:
'批量领取
'
})
}
</
Button
>
</
Space
>,
layouts
:
{
span
:
8
...
...
src/pages/transaction/saleOrder/readyDistributionOrder/model/useSelfTable.tsx
View file @
29d936b5
...
...
@@ -19,7 +19,7 @@ export const useSelfTable = () => {
align
:
'center'
,
dataIndex
:
'ctl'
,
key
:
'ctl'
,
render
:
(
text
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleSubmit
(
record
.
orderId
)
}
>
{
intl
.
formatMessage
({
id
:
'purchaseOrder.
tijiaodingdan'
,
defaultMessage
:
'提交订单
'
})
}
</
Button
>
render
:
(
text
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleSubmit
(
record
.
orderId
)
}
>
{
intl
.
formatMessage
({
id
:
'purchaseOrder.
lingqu'
,
defaultMessage
:
'领取
'
})
}
</
Button
>
}
])
...
...
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