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
94f2fd9b
Commit
94f2fd9b
authored
Mar 16, 2022
by
Gavin Peng
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2-220418' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2-220418
parents
72e89563
7760f1c5
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
213 additions
and
177 deletions
+213
-177
stockSellStorage.ts
src/locales/en-US/stockSellStorage.ts
+1
-0
stockSellStorage.ts
src/locales/ko-KR/stockSellStorage.ts
+1
-0
stockSellStorage.ts
src/locales/zh-CN/stockSellStorage.ts
+1
-0
useBusinessEffects.ts
.../bills/components/BillsForm/effects/useBusinessEffects.ts
+132
-132
index.tsx
...ion/stockSellStorage/bills/components/BillsForm/index.tsx
+6
-6
index.ts
...ockSellStorage/bills/components/BillsForm/schema/index.ts
+7
-7
index.tsx
src/pages/transaction/stockSellStorage/inventory/index.tsx
+10
-3
index.tsx
...s/transaction/stockSellStorage/inventory/schema/index.tsx
+55
-29
No files found.
src/locales/en-US/stockSellStorage.ts
View file @
94f2fd9b
...
@@ -154,6 +154,7 @@ export default {
...
@@ -154,6 +154,7 @@ export default {
'stockSellStorage.anquankucun'
:
'Safety Stock'
,
'stockSellStorage.anquankucun'
:
'Safety Stock'
,
'stockSellStorage.kucun'
:
'Inventory'
,
'stockSellStorage.kucun'
:
'Inventory'
,
'stockSellStorage.tiaozhenganquankucun'
:
'Adjust safety stock'
,
'stockSellStorage.tiaozhenganquankucun'
:
'Adjust safety stock'
,
'stockSellStorage.piliangtiaozhenganquankucun'
:
'Bulk adjustment of safety stock'
,
'stockSellStorage.cangkudizhi'
:
'Warehouse address'
,
'stockSellStorage.cangkudizhi'
:
'Warehouse address'
,
'stockSellStorage.quedingyaoshanchugaicangwei'
:
'Are you sure you want to delete this position? '
,
'stockSellStorage.quedingyaoshanchugaicangwei'
:
'Are you sure you want to delete this position? '
,
'stockSellStorage.xinjiancangku'
:
'New warehouse'
,
'stockSellStorage.xinjiancangku'
:
'New warehouse'
,
...
...
src/locales/ko-KR/stockSellStorage.ts
View file @
94f2fd9b
...
@@ -154,6 +154,7 @@ export default {
...
@@ -154,6 +154,7 @@ export default {
'stockSellStorage.anquankucun'
:
'안전 재고'
,
'stockSellStorage.anquankucun'
:
'안전 재고'
,
'stockSellStorage.kucun'
:
'재고품'
,
'stockSellStorage.kucun'
:
'재고품'
,
'stockSellStorage.tiaozhenganquankucun'
:
'보안 재고 조정'
,
'stockSellStorage.tiaozhenganquankucun'
:
'보안 재고 조정'
,
'stockSellStorage.piliangtiaozhenganquankucun'
:
'안전재고 일괄 조정'
,
'stockSellStorage.cangkudizhi'
:
'창고 주소'
,
'stockSellStorage.cangkudizhi'
:
'창고 주소'
,
'stockSellStorage.quedingyaoshanchugaicangwei'
:
'이 창고를 삭제하시겠습니까?'
,
'stockSellStorage.quedingyaoshanchugaicangwei'
:
'이 창고를 삭제하시겠습니까?'
,
'stockSellStorage.xinjiancangku'
:
'새 창고'
,
'stockSellStorage.xinjiancangku'
:
'새 창고'
,
...
...
src/locales/zh-CN/stockSellStorage.ts
View file @
94f2fd9b
...
@@ -154,6 +154,7 @@ export default {
...
@@ -154,6 +154,7 @@ export default {
'stockSellStorage.anquankucun'
:
'安全库存'
,
'stockSellStorage.anquankucun'
:
'安全库存'
,
'stockSellStorage.kucun'
:
'库存'
,
'stockSellStorage.kucun'
:
'库存'
,
'stockSellStorage.tiaozhenganquankucun'
:
'调整安全库存'
,
'stockSellStorage.tiaozhenganquankucun'
:
'调整安全库存'
,
'stockSellStorage.piliangtiaozhenganquankucun'
:
'批量调整安全库存'
,
'stockSellStorage.cangkudizhi'
:
'仓库地址'
,
'stockSellStorage.cangkudizhi'
:
'仓库地址'
,
'stockSellStorage.quedingyaoshanchugaicangwei'
:
'确定要删除该仓位吗?'
,
'stockSellStorage.quedingyaoshanchugaicangwei'
:
'确定要删除该仓位吗?'
,
'stockSellStorage.xinjiancangku'
:
'新建仓库'
,
'stockSellStorage.xinjiancangku'
:
'新建仓库'
,
...
...
src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/useBusinessEffects.ts
View file @
94f2fd9b
...
@@ -224,53 +224,53 @@ export const useBusinessEffects = (context, actions) => {
...
@@ -224,53 +224,53 @@ export const useBusinessEffects = (context, actions) => {
// 根据 单据类型 联动 对应单据所选项
// 根据 单据类型 联动 对应单据所选项
onFieldInputChange$
(
'invoicesTypeId'
).
subscribe
(
fieldState
=>
{
onFieldInputChange$
(
'invoicesTypeId'
).
subscribe
(
fieldState
=>
{
const
newEnum
=
[...
getFieldState
(
'relevanceInvoices'
,
state
=>
state
.
props
.
enum
)];
//
const newEnum = [...getFieldState('relevanceInvoices', state => state.props.enum)];
switch
(
fieldState
.
value
)
{
//
switch (fieldState.value) {
// 采购入库单、销售发货单只能选择 订单
//
// 采购入库单、销售发货单只能选择 订单
case
DOC_TYPE_PURCHASE_RECEIPT
:
//
case DOC_TYPE_PURCHASE_RECEIPT:
case
DOC_TYPE_SALES_INVOICE
:
{
//
case DOC_TYPE_SALES_INVOICE: {
freeEnumItem
(
newEnum
,
'value'
,
DEPENDENT_DOC_ORDER
);
//
freeEnumItem(newEnum, 'value', DEPENDENT_DOC_ORDER);
break
;
//
break;
}
//
}
// 加工入库单、加工发货单只能选择 生产通知单
//
// 加工入库单、加工发货单只能选择 生产通知单
case
DOC_TYPE_PROCESS_RECEIPT
:
//
case DOC_TYPE_PROCESS_RECEIPT:
case
DOC_TYPE_PROCESS_INVOICE
:
{
//
case DOC_TYPE_PROCESS_INVOICE: {
freeEnumItem
(
newEnum
,
'value'
,
DEPENDENT_DOC_PRODUCTION
);
//
freeEnumItem(newEnum, 'value', DEPENDENT_DOC_PRODUCTION);
break
;
//
break;
}
//
}
// 退货发货单、退货入库单只能选择 退货申请单
//
// 退货发货单、退货入库单只能选择 退货申请单
case
DOC_TYPE_RETURN_INVOICE
:
//
case DOC_TYPE_RETURN_INVOICE:
case
DOC_TYPE_RETURN_RECEIPT
:
{
//
case DOC_TYPE_RETURN_RECEIPT: {
freeEnumItem
(
newEnum
,
'value'
,
DEPENDENT_DOC_RETURN
);
//
freeEnumItem(newEnum, 'value', DEPENDENT_DOC_RETURN);
break
;
//
break;
}
//
}
// 换货退货发货单、换货退货入库单只能选择 换货申请单
//
// 换货退货发货单、换货退货入库单只能选择 换货申请单
case
DOC_TYPE_EXCHANGE_RETURN_INVOICE
:
//
case DOC_TYPE_EXCHANGE_RETURN_INVOICE:
case
DOC_TYPE_EXCHANGE_RETURN_RECEIPT
:
{
//
case DOC_TYPE_EXCHANGE_RETURN_RECEIPT: {
freeEnumItem
(
newEnum
,
'value'
,
DEPENDENT_DOC_EXCHANGE
);
//
freeEnumItem(newEnum, 'value', DEPENDENT_DOC_EXCHANGE);
break
;
//
break;
}
//
}
// 换货发货单、换货入库单只能选择 换货申请单
//
// 换货发货单、换货入库单只能选择 换货申请单
case
DOC_TYPE_EXCHANGE_INVOICE
:
//
case DOC_TYPE_EXCHANGE_INVOICE:
case
DOC_TYPE_EXCHANGE_RECEIPT
:
{
//
case DOC_TYPE_EXCHANGE_RECEIPT: {
freeEnumItem
(
newEnum
,
'value'
,
DEPENDENT_DOC_EXCHANGE
);
//
freeEnumItem(newEnum, 'value', DEPENDENT_DOC_EXCHANGE);
break
;
//
break;
}
//
}
// 其他的走内部单据
//
// 其他的走内部单据
default
:
{
//
default: {
freeEnumItem
(
newEnum
,
'value'
,
DEPENDENT_DOC_INTERNAL
);
//
freeEnumItem(newEnum, 'value', DEPENDENT_DOC_INTERNAL);
break
;
//
break;
}
//
}
}
//
}
linkage
.
value
(
'relevanceInvoices'
,
undefined
);
//
linkage.value('relevanceInvoices', undefined);
linkage
.
enum
(
'relevanceInvoices'
,
newEnum
);
//
linkage.enum('relevanceInvoices', newEnum);
const
invoicesDetailsRequestsVal
=
getFieldValue
(
'invoicesDetailsRequests'
);
const
invoicesDetailsRequestsVal
=
getFieldValue
(
'invoicesDetailsRequests'
);
if
(
invoicesDetailsRequestsVal
&&
invoicesDetailsRequestsVal
.
length
)
{
if
(
invoicesDetailsRequestsVal
&&
invoicesDetailsRequestsVal
.
length
)
{
...
@@ -836,90 +836,90 @@ export const useBusinessEffects = (context, actions) => {
...
@@ -836,90 +836,90 @@ export const useBusinessEffects = (context, actions) => {
);
);
const
current
=
originAsyncData
?
originAsyncData
.
find
(
item
=>
item
.
id
===
goodId
)
:
null
;
const
current
=
originAsyncData
?
originAsyncData
.
find
(
item
=>
item
.
id
===
goodId
)
:
null
;
switch
(
invoicesTypeIdVal
)
{
//
switch (invoicesTypeIdVal) {
// 采购入库单、销售发货单
//
// 采购入库单、销售发货单
case
DOC_TYPE_PURCHASE_RECEIPT
:
//
case DOC_TYPE_PURCHASE_RECEIPT:
case
DOC_TYPE_SALES_INVOICE
:
{
//
case DOC_TYPE_SALES_INVOICE: {
if
(
current
&&
+
value
>
current
.
purchaseCount
)
{
//
if (current && +value > current.purchaseCount) {
Modal
.
destroyAll
();
//
Modal.destroyAll();
Modal
.
confirm
({
//
Modal.confirm({
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.tishi'
}),
//
title: intl.formatMessage({id: 'stockSellStorage.tishi'}),
content
:
intl
.
formatMessage
({
id
:
'stockSellStorage.danjushuliangyichaoguoshang'
}),
//
content: intl.formatMessage({id: 'stockSellStorage.danjushuliangyichaoguoshang'}),
okText
:
intl
.
formatMessage
({
id
:
'stockSellStorage.queren'
}),
//
okText: intl.formatMessage({id: 'stockSellStorage.queren'}),
cancelText
:
intl
.
formatMessage
({
id
:
'stockSellStorage.quxiao'
}),
//
cancelText: intl.formatMessage({id: 'stockSellStorage.quxiao'}),
});
//
});
}
//
}
break
;
//
break;
}
//
}
// 加工入库单、加工发货单
//
// 加工入库单、加工发货单
case
DOC_TYPE_PROCESS_RECEIPT
:
//
case DOC_TYPE_PROCESS_RECEIPT:
case
DOC_TYPE_PROCESS_INVOICE
:
{
//
case DOC_TYPE_PROCESS_INVOICE: {
if
(
current
&&
+
value
>
current
.
processNum
)
{
//
if (current && +value > current.processNum) {
Modal
.
destroyAll
();
//
Modal.destroyAll();
Modal
.
confirm
({
//
Modal.confirm({
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.tishi'
}),
//
title: intl.formatMessage({id: 'stockSellStorage.tishi'}),
content
:
intl
.
formatMessage
({
id
:
'stockSellStorage.danjushuliangyichaoguojia'
}),
//
content: intl.formatMessage({id: 'stockSellStorage.danjushuliangyichaoguojia'}),
okText
:
intl
.
formatMessage
({
id
:
'stockSellStorage.queren'
}),
//
okText: intl.formatMessage({id: 'stockSellStorage.queren'}),
cancelText
:
intl
.
formatMessage
({
id
:
'stockSellStorage.quxiao'
}),
//
cancelText: intl.formatMessage({id: 'stockSellStorage.quxiao'}),
cancelButtonProps
:
{
//
cancelButtonProps: {
style
:
{
//
style: {
display
:
'none'
,
//
display: 'none',
},
//
},
},
//
},
});
//
});
}
//
}
break
;
//
break;
}
//
}
// 换货退货发货单
//
// 换货退货发货单
case
DOC_TYPE_EXCHANGE_RETURN_INVOICE
:
//
case DOC_TYPE_EXCHANGE_RETURN_INVOICE:
// 换货退货入库单
//
// 换货退货入库单
case
DOC_TYPE_EXCHANGE_RETURN_RECEIPT
:
//
case DOC_TYPE_EXCHANGE_RETURN_RECEIPT:
// 换货发货单
//
// 换货发货单
case
DOC_TYPE_EXCHANGE_INVOICE
:
//
case DOC_TYPE_EXCHANGE_INVOICE:
// 换货入库单
//
// 换货入库单
case
DOC_TYPE_EXCHANGE_RECEIPT
:
{
//
case DOC_TYPE_EXCHANGE_RECEIPT: {
if
(
current
&&
+
value
>
current
.
replaceCount
)
{
//
if (current && +value > current.replaceCount) {
Modal
.
destroyAll
();
//
Modal.destroyAll();
Modal
.
confirm
({
//
Modal.confirm({
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.tishi'
}),
//
title: intl.formatMessage({id: 'stockSellStorage.tishi'}),
content
:
intl
.
formatMessage
({
id
:
'stockSellStorage.danjushuliangyichaoguohuan'
}),
//
content: intl.formatMessage({id: 'stockSellStorage.danjushuliangyichaoguohuan'}),
okText
:
intl
.
formatMessage
({
id
:
'stockSellStorage.queren'
}),
//
okText: intl.formatMessage({id: 'stockSellStorage.queren'}),
cancelText
:
intl
.
formatMessage
({
id
:
'stockSellStorage.quxiao'
}),
//
cancelText: intl.formatMessage({id: 'stockSellStorage.quxiao'}),
cancelButtonProps
:
{
//
cancelButtonProps: {
style
:
{
//
style: {
display
:
'none'
,
//
display: 'none',
},
//
},
},
//
},
});
//
});
}
//
}
break
;
//
break;
}
//
}
// 退货发货单
//
// 退货发货单
case
DOC_TYPE_RETURN_INVOICE
:
//
case DOC_TYPE_RETURN_INVOICE:
// 退货入库单
//
// 退货入库单
case
DOC_TYPE_RETURN_RECEIPT
:
{
//
case DOC_TYPE_RETURN_RECEIPT: {
if
(
current
&&
+
value
>
current
.
returnCount
)
{
//
if (current && +value > current.returnCount) {
Modal
.
destroyAll
();
//
Modal.destroyAll();
Modal
.
confirm
({
//
Modal.confirm({
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.tishi'
}),
//
title: intl.formatMessage({id: 'stockSellStorage.tishi'}),
content
:
intl
.
formatMessage
({
id
:
'stockSellStorage.danjushuliangyichaoguotui'
}),
//
content: intl.formatMessage({id: 'stockSellStorage.danjushuliangyichaoguotui'}),
okText
:
intl
.
formatMessage
({
id
:
'stockSellStorage.queren'
}),
//
okText: intl.formatMessage({id: 'stockSellStorage.queren'}),
cancelText
:
intl
.
formatMessage
({
id
:
'stockSellStorage.quxiao'
}),
//
cancelText: intl.formatMessage({id: 'stockSellStorage.quxiao'}),
cancelButtonProps
:
{
//
cancelButtonProps: {
style
:
{
//
style: {
display
:
'none'
,
//
display: 'none',
},
//
},
},
//
},
});
//
});
}
//
}
break
;
//
break;
}
//
}
// 内部单据
// 内部单据
default
:
{
//
default: {
// 成本价
// 成本价
const
costPriceValue
=
getFieldState
(
const
costPriceValue
=
getFieldState
(
FormPath
.
transform
(
name
,
/
\d
/
,
$1
=>
{
FormPath
.
transform
(
name
,
/
\d
/
,
$1
=>
{
...
@@ -936,9 +936,9 @@ export const useBusinessEffects = (context, actions) => {
...
@@ -936,9 +936,9 @@ export const useBusinessEffects = (context, actions) => {
state
.
value
=
costPriceValue
?
`
${
intl
.
formatMessage
({
id
:
'common.money'
})}${(
+
value
*
costPriceValue
).
toFixed
(
2
)}
`
:
null
;
state
.
value
=
costPriceValue
?
`
${
intl
.
formatMessage
({
id
:
'common.money'
})}${(
+
value
*
costPriceValue
).
toFixed
(
2
)}
`
:
null
;
}
}
);
);
break
;
//
break;
}
//
}
}
//
}
if
(
current
)
{
if
(
current
)
{
setFieldState
(
setFieldState
(
...
...
src/pages/transaction/stockSellStorage/bills/components/BillsForm/index.tsx
View file @
94f2fd9b
...
@@ -770,12 +770,12 @@ const BillsForm: React.FC<BillsFormProps> = ({
...
@@ -770,12 +770,12 @@ const BillsForm: React.FC<BillsFormProps> = ({
// 弹出单据明细
// 弹出单据明细
const
handleAdd
=
()
=>
{
const
handleAdd
=
()
=>
{
const
orderNoVal
=
addSchemaAction
.
getFieldValue
(
'orderNo'
);
//
const orderNoVal = addSchemaAction.getFieldValue('orderNo');
const
relevanceInvoicesVal
=
addSchemaAction
.
getFieldValue
(
'relevanceInvoices'
);
//
const relevanceInvoicesVal = addSchemaAction.getFieldValue('relevanceInvoices');
if
(
!
orderNoVal
&&
relevanceInvoicesVal
!==
DEPENDENT_DOC_INTERNAL
)
{
//
if (!orderNoVal && relevanceInvoicesVal !== DEPENDENT_DOC_INTERNAL) {
message
.
warning
(
intl
.
formatMessage
({
id
:
'stockSellStorage.qingxuanzeduiyingdanju'
}));
//
message.warning(intl.formatMessage({ id: 'stockSellStorage.qingxuanzeduiyingdanju' }));
return
;
//
return;
}
//
}
setVisible
(
true
);
setVisible
(
true
);
};
};
...
...
src/pages/transaction/stockSellStorage/bills/components/BillsForm/schema/index.ts
View file @
94f2fd9b
...
@@ -459,7 +459,7 @@ export const addBillSchema: ISchema = {
...
@@ -459,7 +459,7 @@ export const addBillSchema: ISchema = {
type
:
'string'
,
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.huohao'
}),
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.huohao'
}),
'x-props'
:
{
'x-props'
:
{
width
:
1
2
0
,
width
:
1
5
0
,
},
},
'x-component'
:
'Text'
,
'x-component'
:
'Text'
,
'x-component-props'
:
{
'x-component-props'
:
{
...
@@ -470,7 +470,7 @@ export const addBillSchema: ISchema = {
...
@@ -470,7 +470,7 @@ export const addBillSchema: ISchema = {
type
:
'string'
,
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.huopinmingcheng'
}),
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.huopinmingcheng'
}),
'x-props'
:
{
'x-props'
:
{
width
:
1
2
0
,
width
:
1
5
0
,
},
},
'x-component'
:
'Text'
,
'x-component'
:
'Text'
,
'x-component-props'
:
{
'x-component-props'
:
{
...
@@ -481,7 +481,7 @@ export const addBillSchema: ISchema = {
...
@@ -481,7 +481,7 @@ export const addBillSchema: ISchema = {
type
:
'string'
,
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.guigexinghao'
}),
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.guigexinghao'
}),
'x-props'
:
{
'x-props'
:
{
width
:
1
2
0
,
width
:
1
5
0
,
},
},
'x-component'
:
'Text'
,
'x-component'
:
'Text'
,
'x-component-props'
:
{
'x-component-props'
:
{
...
@@ -492,7 +492,7 @@ export const addBillSchema: ISchema = {
...
@@ -492,7 +492,7 @@ export const addBillSchema: ISchema = {
type
:
'string'
,
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.pinlei'
}),
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.pinlei'
}),
'x-props'
:
{
'x-props'
:
{
width
:
1
2
0
,
width
:
1
5
0
,
},
},
'x-component'
:
'Text'
,
'x-component'
:
'Text'
,
'x-component-props'
:
{
'x-component-props'
:
{
...
@@ -503,7 +503,7 @@ export const addBillSchema: ISchema = {
...
@@ -503,7 +503,7 @@ export const addBillSchema: ISchema = {
type
:
'string'
,
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.pinpai'
}),
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.pinpai'
}),
'x-props'
:
{
'x-props'
:
{
width
:
1
2
0
,
width
:
1
5
0
,
},
},
'x-component'
:
'Text'
,
'x-component'
:
'Text'
,
'x-component-props'
:
{
'x-component-props'
:
{
...
@@ -514,7 +514,7 @@ export const addBillSchema: ISchema = {
...
@@ -514,7 +514,7 @@ export const addBillSchema: ISchema = {
type
:
'string'
,
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.danwei'
}),
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.danwei'
}),
'x-props'
:
{
'x-props'
:
{
width
:
1
2
0
,
width
:
1
5
0
,
},
},
'x-component'
:
'Text'
,
'x-component'
:
'Text'
,
'x-component-props'
:
{
'x-component-props'
:
{
...
@@ -525,7 +525,7 @@ export const addBillSchema: ISchema = {
...
@@ -525,7 +525,7 @@ export const addBillSchema: ISchema = {
type
:
'string'
,
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.chengbenjia'
}),
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.chengbenjia'
}),
'x-props'
:
{
'x-props'
:
{
width
:
1
2
0
,
width
:
1
5
0
,
},
},
'x-component'
:
'Text'
,
'x-component'
:
'Text'
,
'x-component-props'
:
{
'x-component-props'
:
{
...
...
src/pages/transaction/stockSellStorage/inventory/index.tsx
View file @
94f2fd9b
...
@@ -141,7 +141,10 @@ const Inventory: React.FC<{}> = () => {
...
@@ -141,7 +141,10 @@ const Inventory: React.FC<{}> = () => {
// 修改安全库存
// 修改安全库存
const
handleSubmit
=
async
values
=>
{
const
handleSubmit
=
async
values
=>
{
setConfirmLoading
(
true
);
setConfirmLoading
(
true
);
if
(
!
current
)
{
// selectedRowKeys 批量
return
}
const
res
=
await
postProductInventorySafetyUpdate
({
const
res
=
await
postProductInventorySafetyUpdate
({
id
:
current
.
id
,
id
:
current
.
id
,
safetyInvoices
:
+
values
.
safetyInvoices
,
safetyInvoices
:
+
values
.
safetyInvoices
,
...
@@ -162,7 +165,12 @@ const Inventory: React.FC<{}> = () => {
...
@@ -162,7 +165,12 @@ const Inventory: React.FC<{}> = () => {
};
};
const
controllerBtns
=
(
const
controllerBtns
=
(
<
AuthButton
btnCode=
"bills.add"
>
<
AuthButton
btnCode=
"bills.add"
>
<
Button
onClick=
{
()
=>
console
.
log
(
selectedRowKeys
,
'selectedRowKeysselectedRowKeys'
)
}
style=
{
{
width
:
154
}
}
>
批量调整安全库存
</
Button
>
<
Button
onClick=
{
()
=>
handleUpdateSafetyStock
(
undefined
)
}
style=
{
{
width
:
154
}
}
>
{
intl
.
formatMessage
({
id
:
'stockSellStorage.piliangtiaozhenganquankucun'
})
}
</
Button
>
</
AuthButton
>
</
AuthButton
>
);
);
return
(
return
(
...
@@ -182,7 +190,6 @@ const Inventory: React.FC<{}> = () => {
...
@@ -182,7 +190,6 @@ const Inventory: React.FC<{}> = () => {
onSubmit=
{
values
=>
ref
.
current
.
reload
(
values
)
}
onSubmit=
{
values
=>
ref
.
current
.
reload
(
values
)
}
expressionScope=
{
{
expressionScope=
{
{
controllerBtns
,
controllerBtns
,
selectedRowKeys
}
}
}
}
effects=
{
(
$
,
actions
)
=>
{
effects=
{
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
useStateFilterSearchLinkageEffect
(
...
...
src/pages/transaction/stockSellStorage/inventory/schema/index.tsx
View file @
94f2fd9b
...
@@ -9,65 +9,87 @@ export const inventorySchema: ISchema = {
...
@@ -9,65 +9,87 @@ export const inventorySchema: ISchema = {
megaLayout
:
{
megaLayout
:
{
type
:
'object'
,
type
:
'object'
,
'x-component'
:
'mega-layout'
,
'x-component'
:
'mega-layout'
,
'x-component-props'
:
{
grid
:
true
,
},
properties
:
{
properties
:
{
ctl
:
{
topLayout
:
{
type
:
'object'
,
type
:
'object'
,
'x-component'
:
'
Children
'
,
'x-component'
:
'
mega-layout
'
,
'x-component-props'
:
{
'x-component-props'
:
{
children
:
'{{controllerBtns}}'
,
grid
:
true
,
},
},
},
properties
:
{
goodsName
:
{
ctl
:
{
type
:
'string'
,
type
:
'object'
,
'x-component'
:
'Search'
,
'x-component'
:
'Children'
,
'x-mega-props'
:
{},
'x-component-props'
:
{
'x-component-props'
:
{
children
:
'{{controllerBtns}}'
,
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.sousuo'
}),
},
tip
:
intl
.
formatMessage
({
id
:
'stockSellStorage.shuruhuopinmingcheng'
}),
},
// align: 'flex-left',
goodsName
:
{
type
:
'string'
,
'x-component'
:
'Search'
,
'x-mega-props'
:
{},
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.sousuo'
,
}),
tip
:
intl
.
formatMessage
({
id
:
'stockSellStorage.shuruhuopinmingcheng'
,
}),
// align: 'flex-left',
},
},
},
},
},
},
[
FORM_FILTER_PATH
]:
{
[
FORM_FILTER_PATH
]:
{
type
:
'object'
,
type
:
'object'
,
'x-component'
:
'
mega
-layout'
,
'x-component'
:
'
flex
-layout'
,
'x-component-props'
:
{
'x-component-props'
:
{
grid
:
true
,
rowStyle
:
{
full
:
true
,
flexWrap
:
'nowrap'
,
autoRow
:
true
,
},
columns
:
6
,
colStyle
:
{
marginLeft
:
20
,
},
},
},
properties
:
{
properties
:
{
itemNo
:
{
itemNo
:
{
type
:
'string'
,
type
:
'string'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.huohao'
}),
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.huohao'
,
}),
},
},
},
},
specifications
:
{
specifications
:
{
type
:
'string'
,
type
:
'string'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.guigexinghao'
}),
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.guigexinghao'
,
}),
},
},
},
},
category
:
{
category
:
{
type
:
'string'
,
type
:
'string'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.pinlei'
}),
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.pinlei'
,
}),
},
},
},
},
brand
:
{
brand
:
{
type
:
'string'
,
type
:
'string'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.pinpai'
}),
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.pinpai'
,
}),
},
},
},
},
warehouseId
:
{
warehouseId
:
{
type
:
'string'
,
type
:
'string'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.cangku'
}),
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.cangku'
,
}),
},
},
enum
:
[],
enum
:
[],
},
},
...
@@ -77,7 +99,7 @@ export const inventorySchema: ISchema = {
...
@@ -77,7 +99,7 @@ export const inventorySchema: ISchema = {
span
:
1
,
span
:
1
,
},
},
'x-component-props'
:
{
'x-component-props'
:
{
children
:
intl
.
formatMessage
({
id
:
'stockSellStorage.chaxun'
}),
children
:
intl
.
formatMessage
({
id
:
'stockSellStorage.chaxun'
}),
},
},
},
},
},
},
...
@@ -99,15 +121,19 @@ export const safetyModalSchema: ISchema = {
...
@@ -99,15 +121,19 @@ export const safetyModalSchema: ISchema = {
properties
:
{
properties
:
{
safetyInvoices
:
{
safetyInvoices
:
{
type
:
'string'
,
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.anquankucun'
}),
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.anquankucun'
}),
required
:
true
,
required
:
true
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.qingshuru'
}),
placeholder
:
intl
.
formatMessage
({
id
:
'stockSellStorage.qingshuru'
,
}),
},
},
'x-rules'
:
[
'x-rules'
:
[
{
{
pattern
:
PATTERN_MAPS
.
weight
,
pattern
:
PATTERN_MAPS
.
weight
,
message
:
intl
.
formatMessage
({
id
:
'stockSellStorage.qingshuruzhengshu'
}),
message
:
intl
.
formatMessage
({
id
:
'stockSellStorage.qingshuruzhengshu'
,
}),
},
},
],
],
},
},
...
...
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