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
6daba067
Commit
6daba067
authored
Mar 28, 2022
by
wzy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 价格库 国际化
parent
2b56d9e0
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
127 additions
and
37 deletions
+127
-37
priceManage.ts
src/locales/en-US/priceManage.ts
+15
-0
stockSellStorage.ts
src/locales/en-US/stockSellStorage.ts
+1
-0
priceManage.ts
src/locales/ko-KR/priceManage.ts
+15
-0
stockSellStorage.ts
src/locales/ko-KR/stockSellStorage.ts
+1
-0
priceManage.ts
src/locales/zh-CN/priceManage.ts
+0
-0
stockSellStorage.ts
src/locales/zh-CN/stockSellStorage.ts
+1
-0
detailLibrary.tsx
src/pages/priceManage/priceLibrary/detailLibrary.tsx
+43
-16
index.tsx
src/pages/priceManage/priceLibrary/index.tsx
+46
-16
index.tsx
src/pages/priceManage/schema/index.tsx
+4
-4
index.ts
...ockSellStorage/bills/components/BillsForm/schema/index.ts
+1
-1
No files found.
src/locales/en-US/priceManage.ts
View file @
6daba067
...
...
@@ -114,4 +114,19 @@ export default {
'priceManage.schema.formProduct.customerCategoryId'
:
'Product category'
,
'priceManage.schema.formProduct.brandId'
:
'Please select a brand'
,
'priceManage.schema.formProduct.submit'
:
'Query'
,
'priceManage.schema.formProduct.wuliaobianhao'
:
'Material number'
,
'priceManage.schema.formProduct.wuliaomingcheng'
:
'Material name'
,
'priceManage.schema.formProduct.guigexinghao'
:
'Specification model'
,
'priceManage.schema.formProduct.pinlei'
:
'Category'
,
'priceManage.schema.formProduct.pinpai'
:
'brand'
,
'priceManage.schema.formProduct.danwei'
:
'Unit'
,
'priceManage.schema.formProduct.mulujia'
:
'catalog price'
,
'priceManage.schema.formProduct.shichangjia'
:
'market price'
,
'priceManage.schema.formProduct.hetongdingdanjia'
:
'Contract/Order Price'
,
'priceManage.schema.formProduct.hetongdingdan'
:
'Contract/Order'
,
'priceManage.schema.formProduct.gongyinghuiyuanID'
:
'Supply member ID'
,
'priceManage.schema.formProduct.gongyinghuiyuanmingcheng'
:
'Supply member name'
,
'priceManage.schema.formProduct.jiageyouxiaocong'
:
'Price is valid from'
,
'priceManage.schema.formProduct.jiageyouxiaodao'
:
'The price is valid until'
,
'priceManage.schema.formProduct.zhakanlishijiage'
:
'View historical prices'
,
}
src/locales/en-US/stockSellStorage.ts
View file @
6daba067
...
...
@@ -50,6 +50,7 @@ export default {
'stockSellStorage.xinjiandanju'
:
'New document'
,
'stockSellStorage.bianjidanju'
:
'Edit documents'
,
'stockSellStorage.zhakandanju'
:
'View documents'
,
'stockSellStorage.danjubianhao'
:
'document number'
,
'stockSellStorage.baocun'
:
'Save'
,
'stockSellStorage.xuanzehuopin'
:
'Select goods'
,
'stockSellStorage.ninhaiyouweibaocundenei'
:
'You still have unsaved content. Are you sure you want to leave? '
,
...
...
src/locales/ko-KR/priceManage.ts
View file @
6daba067
...
...
@@ -114,4 +114,19 @@ export default {
'priceManage.schema.formProduct.customerCategoryId'
:
'상품류'
,
'priceManage.schema.formProduct.brandId'
:
'브랜드 선택'
,
'priceManage.schema.formProduct.submit'
:
'조회'
,
'priceManage.schema.formProduct.wuliaobianhao'
:
'재료 번호'
,
'priceManage.schema.formProduct.wuliaomingcheng'
:
'재료 이름'
,
'priceManage.schema.formProduct.guigexinghao'
:
'사양 모델'
,
'priceManage.schema.formProduct.pinlei'
:
'범주'
,
'priceManage.schema.formProduct.pinpai'
:
'브랜드'
,
'priceManage.schema.formProduct.danwei'
:
'단위'
,
'priceManage.schema.formProduct.mulujia'
:
'카탈로그 가격'
,
'priceManage.schema.formProduct.shichangjia'
:
'시장 가격'
,
'priceManage.schema.formProduct.hetongdingdanjia'
:
'계약/주문 가격'
,
'priceManage.schema.formProduct.hetongdingdan'
:
'계약/주문'
,
'priceManage.schema.formProduct.gongyinghuiyuanID'
:
'공급 회원 ID'
,
'priceManage.schema.formProduct.gongyinghuiyuanmingcheng'
:
'공급 회원 이름'
,
'priceManage.schema.formProduct.jiageyouxiaocong'
:
'가격은 유효합니다'
,
'priceManage.schema.formProduct.jiageyouxiaodao'
:
'가격 유효 기간'
,
'priceManage.schema.formProduct.zhakanlishijiage'
:
'이전 가격 보기'
,
}
src/locales/ko-KR/stockSellStorage.ts
View file @
6daba067
...
...
@@ -50,6 +50,7 @@ export default {
'stockSellStorage.xinjiandanju'
:
'새 영수증'
,
'stockSellStorage.bianjidanju'
:
'영수증 편집'
,
'stockSellStorage.zhakandanju'
:
'영수증 보기'
,
'stockSellStorage.danjubianhao'
:
'문서 번호'
,
'stockSellStorage.baocun'
:
'보존'
,
'stockSellStorage.xuanzehuopin'
:
'상품을 고르다'
,
'stockSellStorage.ninhaiyouweibaocundenei'
:
'아직 저장하지 않은 내용이 있습니다. 떠나시겠습니까?'
,
...
...
src/locales/zh-CN/priceManage.ts
View file @
6daba067
This diff is collapsed.
Click to expand it.
src/locales/zh-CN/stockSellStorage.ts
View file @
6daba067
...
...
@@ -50,6 +50,7 @@ export default {
'stockSellStorage.xinjiandanju'
:
'新建单据'
,
'stockSellStorage.bianjidanju'
:
'编辑单据'
,
'stockSellStorage.zhakandanju'
:
'查看单据'
,
'stockSellStorage.danjubianhao'
:
'单据编号'
,
'stockSellStorage.baocun'
:
'保存'
,
'stockSellStorage.xuanzehuopin'
:
'选择货品'
,
'stockSellStorage.ninhaiyouweibaocundenei'
:
'您还有未保存的内容,是否确定要离开?'
,
...
...
src/pages/priceManage/priceLibrary/detailLibrary.tsx
View file @
6daba067
...
...
@@ -3,7 +3,7 @@ import { Card } from 'antd';
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
StandardTable
from
'@/components/StandardTable'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
history
}
from
'umi'
;
import
{
getIntl
,
history
}
from
'umi'
;
import
{
getProductPriceManagementGetGoodsPriceHistory
}
from
'@/services/ProductV2Api'
;
const
DetailLibrary
:
React
.
FC
<
{}
>
=
()
=>
{
...
...
@@ -12,79 +12,106 @@ const DetailLibrary: React.FC<{}> = () => {
const
columns
:
ColumnType
<
any
>
[]
=
[
{
title
:
'物料编号'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.wuliaobianhao'
,
}),
dataIndex
:
'goodsCode'
,
key
:
'goodsCode'
,
},
{
title
:
'物料名称'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.wuliaomingcheng'
,
}),
dataIndex
:
'name'
,
key
:
'name'
,
},
{
title
:
'规格型号'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.guigexinghao'
,
}),
dataIndex
:
'type'
,
key
:
'type'
,
},
{
title
:
'品类'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.pinlei'
,
}),
dataIndex
:
'customerCategory'
,
key
:
'customerCategory'
,
render
:
text
=>
text
?.
name
,
},
{
title
:
'品牌'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.pinpai'
,
}),
dataIndex
:
'unitName'
,
key
:
'unitName'
,
render
:
text
=>
text
?.
name
,
},
{
title
:
'单位'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.danwei'
,
}),
dataIndex
:
'unitName'
,
key
:
'unitName'
,
},
{
title
:
'目录价'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.mulujia'
,
}),
dataIndex
:
'costPrice'
,
key
:
'costPrice'
,
},
{
title
:
'市场价'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.shichangjia'
,
}),
dataIndex
:
'marketPrice'
,
key
:
'marketPrice'
,
},
{
title
:
'合同/订单价'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.hetongdingdanjia'
,
}),
dataIndex
:
'orderPrice'
,
key
:
'orderPrice'
,
},
{
title
:
'合同/订单'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.hetongdingdan'
,
}),
dataIndex
:
'code'
,
key
:
'code'
,
},
{
title
:
'供应会员ID'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.gongyinghuiyuanID'
,
}),
dataIndex
:
'upperMemberId'
,
key
:
'upperMemberId'
,
},
{
title
:
'供应会员名称'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.gongyinghuiyuanmingcheng'
,
}),
dataIndex
:
'upperMemberName'
,
key
:
'upperMemberName'
,
},
{
title
:
'价格有效从'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.jiageyouxiaocong'
,
}),
dataIndex
:
'effectiveStartTime'
,
key
:
'effectiveStartTime'
,
},
{
title
:
'价格有效到'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.jiageyouxiaodao'
,
}),
dataIndex
:
'effectiveEndTime'
,
key
:
'effectiveEndTime'
,
},
];
const
fetchData
=
(
params
:
any
)
=>
{
return
new
Promise
(
resolve
=>
{
getProductPriceManagementGetGoodsPriceHistory
({
...
...
src/pages/priceManage/priceLibrary/index.tsx
View file @
6daba067
...
...
@@ -6,7 +6,7 @@ import { ColumnType } from 'antd/lib/table/interface';
import
NiceForm
from
'@/components/NiceForm'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
{
librarySearch
}
from
'../schema'
;
import
{
history
,
useIntl
}
from
'umi'
;
import
{
getIntl
,
history
,
useIntl
}
from
'umi'
;
import
{
getProductPriceManagementGetGoodsPriceList
,
getProductPriceManagementAddGoodsPrice
,
...
...
@@ -21,44 +21,60 @@ const PriceLibrary: React.FC<{}> = () => {
const
columns
:
ColumnType
<
any
>
[]
=
[
{
title
:
'物料编号'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.wuliaobianhao'
,
}),
dataIndex
:
'goodsCode'
,
key
:
'goodsCode'
,
},
{
title
:
'物料名称'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.wuliaomingcheng'
,
}),
dataIndex
:
'name'
,
key
:
'name'
,
},
{
title
:
'规格型号'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.guigexinghao'
,
}),
dataIndex
:
'type'
,
key
:
'type'
,
},
{
title
:
'品类'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.pinlei'
,
}),
dataIndex
:
'customerCategory'
,
key
:
'customerCategory'
,
render
:
text
=>
text
?.
name
,
},
{
title
:
'品牌'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.pinpai'
,
}),
dataIndex
:
'unitName'
,
key
:
'unitName'
,
render
:
text
=>
text
?.
name
,
},
{
title
:
'单位'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.danwei'
,
}),
dataIndex
:
'unitName'
,
key
:
'unitName'
,
},
{
title
:
'目录价'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.mulujia'
,
}),
dataIndex
:
'costPrice'
,
key
:
'costPrice'
,
},
{
title
:
'市场价'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.shichangjia'
,
}),
dataIndex
:
'marketPrice'
,
key
:
'marketPrice'
,
render
:
(
text
,
record
)
=>
{
...
...
@@ -79,32 +95,44 @@ const PriceLibrary: React.FC<{}> = () => {
},
},
{
title
:
'合同/订单价'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.hetongdingdanjia'
,
}),
dataIndex
:
'orderPrice'
,
key
:
'orderPrice'
,
},
{
title
:
'合同/订单'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.hetongdingdan'
,
}),
dataIndex
:
'code'
,
key
:
'code'
,
},
{
title
:
'供应会员ID'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.gongyinghuiyuanID'
,
}),
dataIndex
:
'upperMemberId'
,
key
:
'upperMemberId'
,
},
{
title
:
'供应会员名称'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.gongyinghuiyuanmingcheng'
,
}),
dataIndex
:
'upperMemberName'
,
key
:
'upperMemberName'
,
},
{
title
:
'价格有效从'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.jiageyouxiaocong'
,
}),
dataIndex
:
'effectiveStartTime'
,
key
:
'effectiveStartTime'
,
},
{
title
:
'价格有效到'
,
title
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.jiageyouxiaodao'
,
}),
dataIndex
:
'effectiveEndTime'
,
key
:
'effectiveEndTime'
,
},
...
...
@@ -122,7 +150,9 @@ const PriceLibrary: React.FC<{}> = () => {
className=
"padLeft0"
onClick=
{
()
=>
handleModify
(
record
)
}
>
查看历史价格
{
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.zhakanlishijiage'
,
})
}
</
Button
>
</
AuthButton
>
);
...
...
src/pages/priceManage/schema/index.tsx
View file @
6daba067
...
...
@@ -491,25 +491,25 @@ export const librarySearch: ISchema = {
code
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
'物料编号'
,
placeholder
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.wuliaobianhao'
})
,
},
},
name
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
'物料名称'
,
placeholder
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.wuliaomingcheng'
})
,
},
},
customerCategoryId
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
'品类'
,
placeholder
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.pinlei'
})
,
},
},
uppreMemberName
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
'供应会员名称'
,
placeholder
:
getIntl
().
formatMessage
({
id
:
'priceManage.schema.formProduct.gongyinghuiyuanmingcheng'
})
,
},
},
submit
:
{
...
...
src/pages/transaction/stockSellStorage/bills/components/BillsForm/schema/index.ts
View file @
6daba067
...
...
@@ -115,7 +115,7 @@ export const addBillSchema: ISchema = {
properties
:
{
invoicesNo
:
{
type
:
'text'
,
title
:
'单据编号'
,
title
:
intl
.
formatMessage
({
id
:
'stockSellStorage.danjubianhao'
})
,
},
invoicesTypeId
:
{
type
:
'string'
,
...
...
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