Skip to content

J
jinfa-platform
Commit dbd8b7ab authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

chore: 拉取代码

parent 3b42b94d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 45 deletions
src/locales/en-US/commodity.ts
View file @ dbd8b7ab
...@@ -105,7 +105,7 @@ export default { ...@@ -105,7 +105,7 @@ export default {
'commodity.products.columns.type.2' : 'The upstream commodity', 'commodity.products.columns.type.2' : 'The upstream commodity',
'commodity.products.columns.type.3' : 'Consignment', 'commodity.products.columns.type.3' : 'Consignment',
'commodity.products.columns.min':'Price', 'commodity.products.columns.min':'Price',
'commodity.products.columns.currency':'¥', 'commodity.products.columns.currency':'$',
'commodity.products.columns.applyTime':'Apply for review time', 'commodity.products.columns.applyTime':'Apply for review time',
'commodity.products.columns.status':'Product status', 'commodity.products.columns.status':'Product status',
'commodity.products.columns.option':'Operation', 'commodity.products.columns.option':'Operation',
...@@ -257,7 +257,7 @@ export default { ...@@ -257,7 +257,7 @@ export default {
'commodity.products.fastModifyPrice.columns.unitName':'Unit', 'commodity.products.fastModifyPrice.columns.unitName':'Unit',
'commodity.products.fastModifyPrice.columns.priceType':'Product pricing', 'commodity.products.fastModifyPrice.columns.priceType':'Product pricing',
'commodity.products.fastModifyPrice.columns.min':'Price', 'commodity.products.fastModifyPrice.columns.min':'Price',
'commodity.products.fastModifyPrice.columns.currency':'￥', 'commodity.products.fastModifyPrice.columns.currency':'$',
'commodity.products.fastModifyPrice.columns.applyTime':'Apply for review time', 'commodity.products.fastModifyPrice.columns.applyTime':'Apply for review time',
'commodity.products.fastModifyPrice.columns.status':'Status', 'commodity.products.fastModifyPrice.columns.status':'Status',
'commodity.products.fastModifyPrice.columns.option':'Operation', 'commodity.products.fastModifyPrice.columns.option':'Operation',
...@@ -291,7 +291,7 @@ export default { ...@@ -291,7 +291,7 @@ export default {
'commodity.products.modifyDirectChannel.structureTable.unitPrice':'Unit price', 'commodity.products.modifyDirectChannel.structureTable.unitPrice':'Unit price',
'commodity.products.modifyDirectChannel.structureTable.unitPrice.1':'Points', 'commodity.products.modifyDirectChannel.structureTable.unitPrice.1':'Points',
'commodity.products.modifyDirectChannel.structureTable.unitPrice.2':'Unit Price', 'commodity.products.modifyDirectChannel.structureTable.unitPrice.2':'Unit Price',
'commodity.products.modifyDirectChannel.structureTable.unitPrice.currency':'￥', 'commodity.products.modifyDirectChannel.structureTable.unitPrice.currency':'$',
'commodity.products.modifyDirectChannel.handleOkAddSpec.option':'Operation', 'commodity.products.modifyDirectChannel.handleOkAddSpec.option':'Operation',
'commodity.products.modifyDirectChannel.handleOkAddSpec.option.button.1':'Set points', 'commodity.products.modifyDirectChannel.handleOkAddSpec.option.button.1':'Set points',
'commodity.products.modifyDirectChannel.handleOkAddSpec.option.button.2':'Set price', 'commodity.products.modifyDirectChannel.handleOkAddSpec.option.button.2':'Set price',
...@@ -374,7 +374,7 @@ export default { ...@@ -374,7 +374,7 @@ export default {
'commodity.products.viewDirectChannel.structureTable.unitPrice':'Unit Price', 'commodity.products.viewDirectChannel.structureTable.unitPrice':'Unit Price',
'commodity.products.viewDirectChannel.structureTable.unitPrice.1':'Points', 'commodity.products.viewDirectChannel.structureTable.unitPrice.1':'Points',
'commodity.products.viewDirectChannel.structureTable.unitPrice.2':'Unit Price', 'commodity.products.viewDirectChannel.structureTable.unitPrice.2':'Unit Price',
'commodity.products.viewDirectChannel.structureTable.unitPrice.currency':'￥', 'commodity.products.viewDirectChannel.structureTable.unitPrice.currency':'$',
'commodity.products.viewDirectChannel.content.status':'Product status', 'commodity.products.viewDirectChannel.content.status':'Product status',
'commodity.products.viewDirectChannel.content.source':'Upper channel', 'commodity.products.viewDirectChannel.content.source':'Upper channel',
'commodity.products.viewDirectChannel.content.customerCategory':'Commodity category', 'commodity.products.viewDirectChannel.content.customerCategory':'Commodity category',
...@@ -415,7 +415,7 @@ export default { ...@@ -415,7 +415,7 @@ export default {
'commodity.products.viewProducts.constructTableData.unitPrice':'Unit Price', 'commodity.products.viewProducts.constructTableData.unitPrice':'Unit Price',
'commodity.products.viewProducts.constructTableData.unitPrice.1':'Points required', 'commodity.products.viewProducts.constructTableData.unitPrice.1':'Points required',
'commodity.products.viewProducts.constructTableData.unitPrice.2':'Unit price (yuan)', 'commodity.products.viewProducts.constructTableData.unitPrice.2':'Unit price (yuan)',
'commodity.products.viewProducts.constructTableData.unitPrice.currency':'￥', 'commodity.products.viewProducts.constructTableData.unitPrice.currency':'$',
'commodity.products.viewProducts.constructTableData.planPrice':'Sub-unit price', 'commodity.products.viewProducts.constructTableData.planPrice':'Sub-unit price',
'commodity.products.viewProducts.constructTableData.planPrice.1':'Points (sub-unit)', 'commodity.products.viewProducts.constructTableData.planPrice.1':'Points (sub-unit)',
'commodity.products.viewProducts.constructTableData.planPrice.2':'Unit price (sub-unit)', 'commodity.products.viewProducts.constructTableData.planPrice.2':'Unit price (sub-unit)',
...@@ -546,7 +546,7 @@ export default { ...@@ -546,7 +546,7 @@ export default {
'commodity.products.addChannelItem.setPrice.structureTable.unitPrice':'Unit price', 'commodity.products.addChannelItem.setPrice.structureTable.unitPrice':'Unit price',
'commodity.products.addChannelItem.setPrice.structureTable.unitPrice.1':'Points', 'commodity.products.addChannelItem.setPrice.structureTable.unitPrice.1':'Points',
'commodity.products.addChannelItem.setPrice.structureTable.unitPrice.2':'Unit price', 'commodity.products.addChannelItem.setPrice.structureTable.unitPrice.2':'Unit price',
'commodity.products.addChannelItem.setPrice.structureTable.currency':'￥', 'commodity.products.addChannelItem.setPrice.structureTable.currency':'$',
'commodity.products.addChannelItem.setPrice.error':'Please select channel products first! ', 'commodity.products.addChannelItem.setPrice.error':'Please select channel products first! ',
'commodity.products.addChannelItem.setPrice.handleOkAddSpec.option':'Operation', 'commodity.products.addChannelItem.setPrice.handleOkAddSpec.option':'Operation',
'commodity.products.addChannelItem.setPrice.handleOkAddSpec.button.1':'Set Points', 'commodity.products.addChannelItem.setPrice.handleOkAddSpec.button.1':'Set Points',
...@@ -663,7 +663,7 @@ export default { ...@@ -663,7 +663,7 @@ export default {
'commodity.products.addProductsItem.priceAttributeForm.planPrice':'Sub-unit price', 'commodity.products.addProductsItem.priceAttributeForm.planPrice':'Sub-unit price',
'commodity.products.addProductsItem.priceAttributeForm.planPrice.1':'Points (sub-unit)', 'commodity.products.addProductsItem.priceAttributeForm.planPrice.1':'Points (sub-unit)',
'commodity.products.addProductsItem.priceAttributeForm.planPrice.2':'Unit price (sub-unit)', 'commodity.products.addProductsItem.priceAttributeForm.planPrice.2':'Unit price (sub-unit)',
'commodity.products.addProductsItem.priceAttributeForm.currency':'￥', 'commodity.products.addProductsItem.priceAttributeForm.currency':'$',
'commodity.products.addProductsItem.priceAttributeForm.option':'Operation', 'commodity.products.addProductsItem.priceAttributeForm.option':'Operation',
'commodity.products.addProductsItem.priceAttributeForm.button.1':'Set points', 'commodity.products.addProductsItem.priceAttributeForm.button.1':'Set points',
'commodity.products.addProductsItem.priceAttributeForm.button.2':'Set price', 'commodity.products.addProductsItem.priceAttributeForm.button.2':'Set price',
...@@ -861,7 +861,7 @@ export default { ...@@ -861,7 +861,7 @@ export default {
'commodity.products.constant.upperCommodityColumns.unitName':'Unit', 'commodity.products.constant.upperCommodityColumns.unitName':'Unit',
'commodity.products.constant.upperCommodityColumns.priceType':'Product pricing', 'commodity.products.constant.upperCommodityColumns.priceType':'Product pricing',
'commodity.products.constant.upperCommodityColumns.min':'Price', 'commodity.products.constant.upperCommodityColumns.min':'Price',
'commodity.products.constant.upperCommodityColumns.currency':'￥', 'commodity.products.constant.upperCommodityColumns.currency':'$',
'commodity.products.constant.upperCommodityColumns.memberName':'Supply Member', 'commodity.products.constant.upperCommodityColumns.memberName':'Supply Member',
'commodity.products.constant.upperCommodityColumns.status':'Product status', 'commodity.products.constant.upperCommodityColumns.status':'Product status',
'commodity.products.constant.upperCommoditySchema.name':'Product name', 'commodity.products.constant.upperCommoditySchema.name':'Product name',
...@@ -894,6 +894,7 @@ export default { ...@@ -894,6 +894,7 @@ export default {
'commodity.products.schema.addChannelSchema.parentMemberId':'Parent Channel', 'commodity.products.schema.addChannelSchema.parentMemberId':'Parent Channel',
'commodity.products.schema.addChannelSchema.submit':'Query', 'commodity.products.schema.addChannelSchema.submit':'Query',
'commodity.products.schema.productSchema.productId' : 'product ID',
'commodity.products.schema.productSchema.name':'Commodity name', 'commodity.products.schema.productSchema.name':'Commodity name',
'commodity.products.schema.productSchema.priceTypeList.1':'Spot price', 'commodity.products.schema.productSchema.priceTypeList.1':'Spot price',
'commodity.products.schema.productSchema.priceTypeList.2':'Price inquiry is required', 'commodity.products.schema.productSchema.priceTypeList.2':'Price inquiry is required',
......
src/locales/en-US/common.ts
View file @ dbd8b7ab
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
'common.error.shushangyunfu':'Shushangyunfu', 'common.error.shushangyunfu':'Shushangyunfu',
/** other */ /** other */
'common.money':'¥', 'common.money':'$',
'common.money.yuan':'yuan', 'common.money.yuan':'yuan',
'common.weizhiyonghu': 'Unknown user', 'common.weizhiyonghu': 'Unknown user',
'common.xiugaimima': 'Change the password', 'common.xiugaimima': 'Change the password',
......
src/locales/en-US/marketing.ts
View file @ dbd8b7ab
...@@ -396,7 +396,7 @@ export default { ...@@ -396,7 +396,7 @@ export default {
'marketingAbility.man100yuanzengsong':'Free 100 yuan / 2 coupons for a total of 25 yuan', 'marketingAbility.man100yuanzengsong':'Free 100 yuan / 2 coupons for a total of 25 yuan',
'marketingAbility.zengsongyouhuiquan1':'Gift coupon 1', 'marketingAbility.zengsongyouhuiquan1':'Gift coupon 1',
'marketingAbility.zhijiangjiageweishangpinjia': 'marketingAbility.zhijiangjiageweishangpinjia':
'The straight down price is the straight down price of the commodity price. For example, if the original price is ￥20.00 per item, the price of each piece is reduced by ￥2.00, then the straight down price input box enters ￥2.00', 'The straight down price is the straight down price of the commodity price. For example, if the original price is $20.00 per item, the price of each piece is reduced by $2.00, then the straight down price input box enters $2.00',
'marketingAbility.xuanze':'Select', 'marketingAbility.xuanze':'Select',
'marketingAbility.yuankeyong':'yuankeyong', 'marketingAbility.yuankeyong':'yuankeyong',
'marketingAbility.tian':'天', 'marketingAbility.tian':'天',
...@@ -405,7 +405,7 @@ export default { ...@@ -405,7 +405,7 @@ export default {
'marketingAbility.yuanyin':'Reason', 'marketingAbility.yuanyin':'Reason',
'marketingAbility.shijian':'Time', 'marketingAbility.shijian':'Time',
'marketingAbility.zhijiangjiageweishangpin': 'marketingAbility.zhijiangjiageweishangpin':
'The straight down price is the straight down price of the commodity price. For example, if the original price is ￥20.00 per item, the price of each piece is reduced by ￥2.00, then the straight down price input box enters ￥2.00', 'The straight down price is the straight down price of the commodity price. For example, if the original price is $20.00 per item, the price of each piece is reduced by $2.00, then the straight down price input box enters $2.00',
'marketingAbility.haisheng59miao': '59 seconds left', 'marketingAbility.haisheng59miao': '59 seconds left',
'marketingAbility.shuruhuiyuanming':'Enter member name to search', 'marketingAbility.shuruhuiyuanming':'Enter member name to search',
'marketingAbility.2020nian9yuetejiacuxiao':'September 2020 special promotions', 'marketingAbility.2020nian9yuetejiacuxiao':'September 2020 special promotions',
......
src/locales/en-US/payandSettle.ts
View file @ dbd8b7ab
This diff is collapsed.
src/locales/en-US/priceManage.ts
View file @ dbd8b7ab
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
'priceManage.priceStrategy.columns.priceType.2':'Price requires inquiry', 'priceManage.priceStrategy.columns.priceType.2':'Price requires inquiry',
'priceManage.priceStrategy.columns.priceType.3':'Points to redeem goods', 'priceManage.priceStrategy.columns.priceType.3':'Points to redeem goods',
'priceManage.priceStrategy.columns.min':'Price', 'priceManage.priceStrategy.columns.min':'Price',
'priceManage.priceStrategy.columns.currency':'￥', 'priceManage.priceStrategy.columns.currency':'$',
'priceManage.priceStrategy.columns.isEnable':'Status', 'priceManage.priceStrategy.columns.isEnable':'Status',
'priceManage.priceStrategy.columns.isEnable.1':'Valid', 'priceManage.priceStrategy.columns.isEnable.1':'Valid',
'priceManage.priceStrategy.columns.isEnable.2':'Invalid', 'priceManage.priceStrategy.columns.isEnable.2':'Invalid',
......
src/locales/en-US/transaction_components.ts
View file @ dbd8b7ab
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
'transaction_components.shifoushanchu': 'Delete?', 'transaction_components.shifoushanchu': 'Delete?',
'transaction_components.shanchu': 'Delete', 'transaction_components.shanchu': 'Delete',
'transaction_components.zhijiangjiageweishangpinjia': 'transaction_components.zhijiangjiageweishangpinjia':
'The straight down price is the straight down price of the commodity price. For example, if the original price is ￥20.00 per item, the price of each piece is reduced by ￥2.00, then the straight down price input box enters ￥2.00', 'The straight down price is the straight down price of the commodity price. For example, if the original price is $20.00 per item, the price of each piece is reduced by $2.00, then the straight down price input box enters $2.00',
'transaction_components.zhijiangjiage': 'Direct price reduction', 'transaction_components.zhijiangjiage': 'Direct price reduction',
'transaction_components.zhekouweishangpinjiagede': 'Discount is the discount of the product price, enter a number, such as 15% off, enter 85, 10% off, enter 90', 'transaction_components.zhekouweishangpinjiagede': 'Discount is the discount of the product price, enter a number, such as 15% off, enter 85, 10% off, enter 90',
'transaction_components.zhekou': 'Discount', 'transaction_components.zhekou': 'Discount',
......
src/locales/ko-KR/commodity.ts
View file @ dbd8b7ab
...@@ -10,7 +10,7 @@ export default { ...@@ -10,7 +10,7 @@ export default {
'commodity.goods.columns.unit' : '유닛', 'commodity.goods.columns.unit' : '유닛',
'commodity.goods.columns.costPrice' : '성단가', 'commodity.goods.columns.costPrice' : '성단가',
'commodity.goods.columns.costPrice.tip' : '원가란 해당 상품을 판매할 때이 가격보다 낮아서는 안되며 상품을 공포할 때 상품의 판매가격이 원가보다 낮으면 위험통제조기경보를 유발하게 된다.', 'commodity.goods.columns.costPrice.tip' : '원가란 해당 상품을 판매할 때이 가격보다 낮아서는 안되며 상품을 공포할 때 상품의 판매가격이 원가보다 낮으면 위험통제조기경보를 유발하게 된다.',
'commodity.goods.columns.currency' : '¥', 'commodity.goods.columns.currency' : '₩',
'commodity.goods.columns.batch' : '배치 가져오기', 'commodity.goods.columns.batch' : '배치 가져오기',
'commodity.goods.columns.option' : '조작하다', 'commodity.goods.columns.option' : '조작하다',
'commodity.goods.columns.option.button.1' : '수정', 'commodity.goods.columns.option.button.1' : '수정',
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
'commodity.products.columns.type.2' : '상위 상품', 'commodity.products.columns.type.2' : '상위 상품',
'commodity.products.columns.type.3' : '상품을 대리 판매하다', 'commodity.products.columns.type.3' : '상품을 대리 판매하다',
'commodity.products.columns.min' : '가격.', 'commodity.products.columns.min' : '가격.',
'commodity.products.columns.currency' : '¥', 'commodity.products.columns.currency' : '₩',
'commodity.products.columns.applyTime' : '신청 심사 시간', 'commodity.products.columns.applyTime' : '신청 심사 시간',
'commodity.products.columns.status' : '상품 상태', 'commodity.products.columns.status' : '상품 상태',
'commodity.products.columns.option' : '조작하다', 'commodity.products.columns.option' : '조작하다',
...@@ -216,7 +216,7 @@ export default { ...@@ -216,7 +216,7 @@ export default {
'commodity.products.directChannel.columns.brand' : '상품 브랜드', 'commodity.products.directChannel.columns.brand' : '상품 브랜드',
'commodity.products.directChannel.columns.unitName' : '유닛', 'commodity.products.directChannel.columns.unitName' : '유닛',
'commodity.products.directChannel.columns.min' : '가격.', 'commodity.products.directChannel.columns.min' : '가격.',
'commodity.products.directChannel.columns.currency' : '$', 'commodity.products.directChannel.columns.currency' : '₩',
'commodity.products.directChannel.columns.memberRoleName' : '채널 회원 역할', 'commodity.products.directChannel.columns.memberRoleName' : '채널 회원 역할',
'commodity.products.directChannel.columns.memberName' : '적용 경로', 'commodity.products.directChannel.columns.memberName' : '적용 경로',
'commodity.products.directChannel.columns.source' : '상품 공급원', 'commodity.products.directChannel.columns.source' : '상품 공급원',
...@@ -258,7 +258,7 @@ export default { ...@@ -258,7 +258,7 @@ export default {
'commodity.products.fastModifyPrice.columns.unitName' : '유닛', 'commodity.products.fastModifyPrice.columns.unitName' : '유닛',
'commodity.products.fastModifyPrice.columns.priceType' : '상품정가', 'commodity.products.fastModifyPrice.columns.priceType' : '상품정가',
'commodity.products.fastModifyPrice.columns.min' : '가격.', 'commodity.products.fastModifyPrice.columns.min' : '가격.',
'commodity.products.fastModifyPrice.columns.currency' : '￥', 'commodity.products.fastModifyPrice.columns.currency' : '₩',
'commodity.products.fastModifyPrice.columns.applyTime' : '신청 심사 시간', 'commodity.products.fastModifyPrice.columns.applyTime' : '신청 심사 시간',
'commodity.products.fastModifyPrice.columns.status' : '컨디션', 'commodity.products.fastModifyPrice.columns.status' : '컨디션',
'commodity.products.fastModifyPrice.columns.option' : '조작하다', 'commodity.products.fastModifyPrice.columns.option' : '조작하다',
...@@ -292,7 +292,7 @@ export default { ...@@ -292,7 +292,7 @@ export default {
'commodity.products.modifyDirectChannel.structureTable.unitPrice' : '단가', 'commodity.products.modifyDirectChannel.structureTable.unitPrice' : '단가',
'commodity.products.modifyDirectChannel.structureTable.unitPrice.1' : '적분', 'commodity.products.modifyDirectChannel.structureTable.unitPrice.1' : '적분',
'commodity.products.modifyDirectChannel.structureTable.unitPrice.2' : '단가', 'commodity.products.modifyDirectChannel.structureTable.unitPrice.2' : '단가',
'commodity.products.modifyDirectChannel.structureTable.unitPrice.currency' : '￥', 'commodity.products.modifyDirectChannel.structureTable.unitPrice.currency' : '₩',
'commodity.products.modifyDirectChannel.handleOkAddSpec.option' : '조작하다', 'commodity.products.modifyDirectChannel.handleOkAddSpec.option' : '조작하다',
'commodity.products.modifyDirectChannel.handleOkAddSpec.option.button.1' : '포인트 설정', 'commodity.products.modifyDirectChannel.handleOkAddSpec.option.button.1' : '포인트 설정',
'commodity.products.modifyDirectChannel.handleOkAddSpec.option.button.2' : '설정 가격', 'commodity.products.modifyDirectChannel.handleOkAddSpec.option.button.2' : '설정 가격',
...@@ -375,7 +375,7 @@ export default { ...@@ -375,7 +375,7 @@ export default {
'commodity.products.viewDirectChannel.structureTable.unitPrice' : '단가', 'commodity.products.viewDirectChannel.structureTable.unitPrice' : '단가',
'commodity.products.viewDirectChannel.structureTable.unitPrice.1' : '적분', 'commodity.products.viewDirectChannel.structureTable.unitPrice.1' : '적분',
'commodity.products.viewDirectChannel.structureTable.unitPrice.2' : '단가', 'commodity.products.viewDirectChannel.structureTable.unitPrice.2' : '단가',
'commodity.products.viewDirectChannel.structureTable.unitPrice.currency' : '￥', 'commodity.products.viewDirectChannel.structureTable.unitPrice.currency' : '₩',
'commodity.products.viewDirectChannel.content.status' : '상품 상태', 'commodity.products.viewDirectChannel.content.status' : '상품 상태',
'commodity.products.viewDirectChannel.content.source' : '상위 경로', 'commodity.products.viewDirectChannel.content.source' : '상위 경로',
'commodity.products.viewDirectChannel.content.customerCategory' : '상품류', 'commodity.products.viewDirectChannel.content.customerCategory' : '상품류',
...@@ -416,7 +416,7 @@ export default { ...@@ -416,7 +416,7 @@ export default {
'commodity.products.viewProducts.constructTableData.unitPrice' : '단가', 'commodity.products.viewProducts.constructTableData.unitPrice' : '단가',
'commodity.products.viewProducts.constructTableData.unitPrice.1' : '필요한 포인트', 'commodity.products.viewProducts.constructTableData.unitPrice.1' : '필요한 포인트',
'commodity.products.viewProducts.constructTableData.unitPrice.2' : '단가', 'commodity.products.viewProducts.constructTableData.unitPrice.2' : '단가',
'commodity.products.viewProducts.constructTableData.unitPrice.currency' : '￥', 'commodity.products.viewProducts.constructTableData.unitPrice.currency' : '₩',
'commodity.products.viewProducts.constructTableData.planPrice' : '부단가', 'commodity.products.viewProducts.constructTableData.planPrice' : '부단가',
'commodity.products.viewProducts.constructTableData.planPrice.1' : '포인트(보조 단위)', 'commodity.products.viewProducts.constructTableData.planPrice.1' : '포인트(보조 단위)',
'commodity.products.viewProducts.constructTableData.planPrice.2' : '단가(보조 단위)', 'commodity.products.viewProducts.constructTableData.planPrice.2' : '단가(보조 단위)',
...@@ -547,7 +547,7 @@ export default { ...@@ -547,7 +547,7 @@ export default {
'commodity.products.addChannelItem.setPrice.structureTable.unitPrice' : '단가', 'commodity.products.addChannelItem.setPrice.structureTable.unitPrice' : '단가',
'commodity.products.addChannelItem.setPrice.structureTable.unitPrice.1' : '적분', 'commodity.products.addChannelItem.setPrice.structureTable.unitPrice.1' : '적분',
'commodity.products.addChannelItem.setPrice.structureTable.unitPrice.2' : '단가', 'commodity.products.addChannelItem.setPrice.structureTable.unitPrice.2' : '단가',
'commodity.products.addChannelItem.setPrice.structureTable.currency' : '￥', 'commodity.products.addChannelItem.setPrice.structureTable.currency' : '₩',
'commodity.products.addChannelItem.setPrice.error' : '먼저 채널 상품을 선택하세요!', 'commodity.products.addChannelItem.setPrice.error' : '먼저 채널 상품을 선택하세요!',
'commodity.products.addChannelItem.setPrice.handleOkAddSpec.option' : '조작하다', 'commodity.products.addChannelItem.setPrice.handleOkAddSpec.option' : '조작하다',
'commodity.products.addChannelItem.setPrice.handleOkAddSpec.button.1' : '포인트 설정', 'commodity.products.addChannelItem.setPrice.handleOkAddSpec.button.1' : '포인트 설정',
...@@ -664,7 +664,7 @@ export default { ...@@ -664,7 +664,7 @@ export default {
'commodity.products.addProductsItem.priceAttributeForm.planPrice' : '부단가', 'commodity.products.addProductsItem.priceAttributeForm.planPrice' : '부단가',
'commodity.products.addProductsItem.priceAttributeForm.planPrice.1' : '포인트(보조 단위)', 'commodity.products.addProductsItem.priceAttributeForm.planPrice.1' : '포인트(보조 단위)',
'commodity.products.addProductsItem.priceAttributeForm.planPrice.2' : '단가(보조 단위)', 'commodity.products.addProductsItem.priceAttributeForm.planPrice.2' : '단가(보조 단위)',
'commodity.products.addProductsItem.priceAttributeForm.currency' : '￥', 'commodity.products.addProductsItem.priceAttributeForm.currency' : '₩',
'commodity.products.addProductsItem.priceAttributeForm.option' : '조작하다', 'commodity.products.addProductsItem.priceAttributeForm.option' : '조작하다',
'commodity.products.addProductsItem.priceAttributeForm.button.1' : '포인트 설정', 'commodity.products.addProductsItem.priceAttributeForm.button.1' : '포인트 설정',
'commodity.products.addProductsItem.priceAttributeForm.button.2' : '설정 가격', 'commodity.products.addProductsItem.priceAttributeForm.button.2' : '설정 가격',
...@@ -861,7 +861,7 @@ export default { ...@@ -861,7 +861,7 @@ export default {
'commodity.products.constant.upperCommodityColumns.unitName' : '유닛', 'commodity.products.constant.upperCommodityColumns.unitName' : '유닛',
'commodity.products.constant.upperCommodityColumns.priceType' : '제품 가격', 'commodity.products.constant.upperCommodityColumns.priceType' : '제품 가격',
'commodity.products.constant.upperCommodityColumns.min' : '가격.', 'commodity.products.constant.upperCommodityColumns.min' : '가격.',
'commodity.products.constant.upperCommodityColumns.currency' : '￥', 'commodity.products.constant.upperCommodityColumns.currency' : '₩',
'commodity.products.constant.upperCommodityColumns.memberName' : '공급원', 'commodity.products.constant.upperCommodityColumns.memberName' : '공급원',
'commodity.products.constant.upperCommodityColumns.status' : '상품 상태', 'commodity.products.constant.upperCommodityColumns.status' : '상품 상태',
'commodity.products.constant.upperCommoditySchema.name' : '상품명', 'commodity.products.constant.upperCommoditySchema.name' : '상품명',
...@@ -894,6 +894,7 @@ export default { ...@@ -894,6 +894,7 @@ export default {
'commodity.products.schema.addChannelSchema.parentMemberId' : '상위 경로', 'commodity.products.schema.addChannelSchema.parentMemberId' : '상위 경로',
'commodity.products.schema.addChannelSchema.submit' : '조회', 'commodity.products.schema.addChannelSchema.submit' : '조회',
'commodity.products.schema.productSchema.productId' : '상품 ID',
'commodity.products.schema.productSchema.name' : '상품명', 'commodity.products.schema.productSchema.name' : '상품명',
'commodity.products.schema.productSchema.priceTypeList.1' : '현물 가격', 'commodity.products.schema.productSchema.priceTypeList.1' : '현물 가격',
'commodity.products.schema.productSchema.priceTypeList.2' : '가격 문의 필요', 'commodity.products.schema.productSchema.priceTypeList.2' : '가격 문의 필요',
......
src/locales/ko-KR/common.ts
View file @ dbd8b7ab
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
'common.error.shushangyunfu': '디지털 클라우드 서비스', 'common.error.shushangyunfu': '디지털 클라우드 서비스',
/** 其他 */ /** 其他 */
'common.money': '¥', 'common.money': '₩',
'common.money.yuan': '원.', 'common.money.yuan': '원.',
'common.weizhiyonghu': '알 수 없는 사용자', 'common.weizhiyonghu': '알 수 없는 사용자',
'common.xiugaimima': '비밀번호 변경', 'common.xiugaimima': '비밀번호 변경',
......
src/locales/ko-KR/editor.ts
View file @ dbd8b7ab
...@@ -79,16 +79,16 @@ export default { ...@@ -79,16 +79,16 @@ export default {
'editor.marketing.type_title_18': '세트', 'editor.marketing.type_title_18': '세트',
'editor.marketing.type_title_19': '값을 깎다', 'editor.marketing.type_title_19': '값을 깎다',
'editor.marketing.type_explain_1': '폭액 기한 특가', 'editor.marketing.type_explain_1': '폭액 기한 특가',
'editor.marketing.type_explain_2': '거물급 상품 최고 $내림', 'editor.marketing.type_explain_2': '거물급 상품 최고 ₩내림',
'editor.marketing.type_explain_3': '거물급 상품이 최고 $감액되다', 'editor.marketing.type_explain_3': '거물급 상품이 최고 ₩감액되다',
'editor.marketing.type_explain_4': '유명 상품이 $할인까지 낮다', 'editor.marketing.type_explain_4': '유명 상품이 ₩할인까지 낮다',
'editor.marketing.type_explain_8': '$만 달러가 되면 상품을 증정할 기회가 있습니다', 'editor.marketing.type_explain_8': '₩만 달러가 되면 상품을 증정할 기회가 있습니다',
'editor.marketing.type_explain_9': '$원 쿠폰 무료 수령', 'editor.marketing.type_explain_9': '₩원 쿠폰 무료 수령',
'editor.marketing.type_explain_10': '$개 상품을 선택하세요, $접어!', 'editor.marketing.type_explain_10': '₩개 상품을 선택하세요, ₩접어!',
'editor.marketing.type_explain_11': '$개 상품을 선택하여 $원만 필요합니다!', 'editor.marketing.type_explain_11': '₩개 상품을 선택하여 ₩원만 필요합니다!',
'editor.marketing.type_explain_12': '오늘 대패 초살', 'editor.marketing.type_explain_12': '오늘 대패 초살',
'editor.marketing.type_explain_13': '대패 파티 $원 즉시 감소', 'editor.marketing.type_explain_13': '대패 파티 ₩원 즉시 감소',
'editor.marketing.type_explain_14': '$만 달러면 아래 상품을 교환 구입할 수 있습니다', 'editor.marketing.type_explain_14': '₩만 달러면 아래 상품을 교환 구입할 수 있습니다',
'editor.marketing.type_explain_15': '지정 상품 을 구매하면 아래 상품 으로 교환 구입할 수 있다', 'editor.marketing.type_explain_15': '지정 상품 을 구매하면 아래 상품 으로 교환 구입할 수 있다',
'editor.marketing.type_explain_16': '대형 신상품 이 불티나게 예매 되다', 'editor.marketing.type_explain_16': '대형 신상품 이 불티나게 예매 되다',
'editor.marketing.type_explain_17': '신제품을 앞다투어 시용하다.', 'editor.marketing.type_explain_17': '신제품을 앞다투어 시용하다.',
......
src/locales/ko-KR/handling.ts
View file @ dbd8b7ab
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
'handling.query.processStock.delivery': '송장 번호', 'handling.query.processStock.delivery': '송장 번호',
// {deliveryNo} 用正则replace掉 // {deliveryNo} 用正则replace掉
'handling.query.processStock.exam.deliverNo': '송장 번호가 {deliveryNo}인 가공 송장을 검토하시겠습니까?', 'handling.query.processStock.exam.deliverNo': '송장 번호가 {deliveryNo}인 가공 송장을 검토하시겠습니까?',
'handling.query.processStock.exam.storageNo': '${storageNo} 의 체크인 번호가 ${storageNo}인 가공 체크 인을 확인하시겠습니까?', 'handling.query.processStock.exam.storageNo': '₩{storageNo} 의 체크인 번호가 ₩{storageNo}인 가공 체크 인을 확인하시겠습니까?',
'handling.query.processStock.add.processShipment': '신규 인건비 명세서', 'handling.query.processStock.add.processShipment': '신규 인건비 명세서',
'handling.query.processStock.add.logisticDoc': '신규 물류 명세서', 'handling.query.processStock.add.logisticDoc': '신규 물류 명세서',
'handling.query.processStock.view.logisticDoc': '물류표 보기', 'handling.query.processStock.view.logisticDoc': '물류표 보기',
......
src/locales/ko-KR/marketing.ts
View file @ dbd8b7ab
...@@ -396,7 +396,7 @@ export default { ...@@ -396,7 +396,7 @@ export default {
'marketingAbility.man100yuanzengsong': '100원 이상 쿠폰 2장 총 25원 증정/증정', 'marketingAbility.man100yuanzengsong': '100원 이상 쿠폰 2장 총 25원 증정/증정',
'marketingAbility.zengsongyouhuiquan1': '쿠폰 증정 1', 'marketingAbility.zengsongyouhuiquan1': '쿠폰 증정 1',
'marketingAbility.zhijiangjiageweishangpinjia': 'marketingAbility.zhijiangjiageweishangpinjia':
'직강가격은 상품가격의 직강가격이다. 예를 들어 원가가 1벌에 20.00위안인 상품은 1벌에 2.00위안 내리면 직강가격 입력란에 $2.00을 입력한다.', '직강가격은 상품가격의 직강가격이다. 예를 들어 원가가 1벌에 20.00위안인 상품은 1벌에 2.00위안 내리면 직강가격 입력란에 ₩2.00을 입력한다.',
'marketingAbility.xuanze': '선택 항목', 'marketingAbility.xuanze': '선택 항목',
'marketingAbility.yuankeyong': '원 사용 가능', 'marketingAbility.yuankeyong': '원 사용 가능',
'marketingAbility.tian': '일', 'marketingAbility.tian': '일',
...@@ -405,7 +405,7 @@ export default { ...@@ -405,7 +405,7 @@ export default {
'marketingAbility.yuanyin': '까닭', 'marketingAbility.yuanyin': '까닭',
'marketingAbility.shijian': '타임', 'marketingAbility.shijian': '타임',
'marketingAbility.zhijiangjiageweishangpin': 'marketingAbility.zhijiangjiageweishangpin':
'직강가격은 상품가격의 직강가격이다. 예를 들어 원가가 1벌에 20.00위안인 상품은 1벌에 2.00위안 내리면 직강가격 입력란에 $2.00을 입력한다.', '직강가격은 상품가격의 직강가격이다. 예를 들어 원가가 1벌에 20.00위안인 상품은 1벌에 2.00위안 내리면 직강가격 입력란에 ₩2.00을 입력한다.',
'marketingAbility.haisheng59miao': '59초 남았습니다.', 'marketingAbility.haisheng59miao': '59초 남았습니다.',
'marketingAbility.shuruhuiyuanming': '회원 이름을 입력하여 검색하다', 'marketingAbility.shuruhuiyuanming': '회원 이름을 입력하여 검색하다',
'marketingAbility.2020nian9yuetejiacuxiao':'2020년 9월 특별 프로모션', 'marketingAbility.2020nian9yuetejiacuxiao':'2020년 9월 특별 프로모션',
......
src/locales/ko-KR/payandSettle.ts
View file @ dbd8b7ab
This diff is collapsed.
src/locales/ko-KR/priceManage.ts
View file @ dbd8b7ab
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
'priceManage.priceStrategy.columns.priceType.2' : '가격 문의 필요', 'priceManage.priceStrategy.columns.priceType.2' : '가격 문의 필요',
'priceManage.priceStrategy.columns.priceType.3' : '포인트 교환 상품', 'priceManage.priceStrategy.columns.priceType.3' : '포인트 교환 상품',
'priceManage.priceStrategy.columns.min' : '가격.', 'priceManage.priceStrategy.columns.min' : '가격.',
'priceManage.priceStrategy.columns.currency' : '￥', 'priceManage.priceStrategy.columns.currency' : '₩',
'priceManage.priceStrategy.columns.isEnable' : '컨디션', 'priceManage.priceStrategy.columns.isEnable' : '컨디션',
'priceManage.priceStrategy.columns.isEnable.1' : '유효하다.', 'priceManage.priceStrategy.columns.isEnable.1' : '유효하다.',
'priceManage.priceStrategy.columns.isEnable.2' : '무효', 'priceManage.priceStrategy.columns.isEnable.2' : '무효',
......
src/locales/ko-KR/transaction_components.ts
View file @ dbd8b7ab
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
'transaction_components.shifoushanchu': '삭제하시겠습니까?', 'transaction_components.shifoushanchu': '삭제하시겠습니까?',
'transaction_components.shanchu': '삭제', 'transaction_components.shanchu': '삭제',
'transaction_components.zhijiangjiageweishangpinjia': 'transaction_components.zhijiangjiageweishangpinjia':
'직강가격은 상품가격의 직강가격이다. 예를 들어 원가가 1벌에 20.00위안인 상품은 1벌에 2.00위안 내리면 직강가격 입력란에 $2.00을 입력한다.', '직강가격은 상품가격의 직강가격이다. 예를 들어 원가가 1벌에 20.00위안인 상품은 1벌에 2.00위안 내리면 직강가격 입력란에 ₩2.00을 입력한다.',
'transaction_components.zhijiangjiage': '가격을 내리다', 'transaction_components.zhijiangjiage': '가격을 내리다',
'transaction_components.zhekouweishangpinjiagede': '할인은 상품 가격의 할인으로 숫자를 입력한다. 예를 들어 85% 할인, 85% 할인, 9% 할인 90을 입력한다.', 'transaction_components.zhekouweishangpinjiagede': '할인은 상품 가격의 할인으로 숫자를 입력한다. 예를 들어 85% 할인, 85% 할인, 9% 할인 90을 입력한다.',
'transaction_components.zhekou': '디스카운트', 'transaction_components.zhekou': '디스카운트',
......
src/locales/zh-CN/commodity.ts
View file @ dbd8b7ab
...@@ -895,6 +895,7 @@ export default { ...@@ -895,6 +895,7 @@ export default {
'commodity.products.schema.addChannelSchema.parentMemberId' : '上级渠道', 'commodity.products.schema.addChannelSchema.parentMemberId' : '上级渠道',
'commodity.products.schema.addChannelSchema.submit' : '查询', 'commodity.products.schema.addChannelSchema.submit' : '查询',
'commodity.products.schema.productSchema.productId' : '商品ID',
'commodity.products.schema.productSchema.name' : '商品名称', 'commodity.products.schema.productSchema.name' : '商品名称',
'commodity.products.schema.productSchema.priceTypeList.1' : '现货价格', 'commodity.products.schema.productSchema.priceTypeList.1' : '现货价格',
'commodity.products.schema.productSchema.priceTypeList.2' : '价格需要询价', 'commodity.products.schema.productSchema.priceTypeList.2' : '价格需要询价',
......
src/pages/commodity/products/schema/channelSchema.tsx
View file @ dbd8b7ab
...@@ -45,6 +45,12 @@ export const channelSchema: ISchema = { ...@@ -45,6 +45,12 @@ export const channelSchema: ISchema = {
}, },
}, },
properties: { properties: {
productId: {
type: 'string',
'x-component-props': {
placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.productSchema.productId' })
}
},
memberName: { memberName: {
type: 'string', type: 'string',
'x-component-props': { 'x-component-props': {
......
src/pages/commodity/products/schema/productSchema.tsx
View file @ dbd8b7ab
...@@ -45,6 +45,12 @@ export const productSchema: ISchema = { ...@@ -45,6 +45,12 @@ export const productSchema: ISchema = {
}, },
}, },
properties: { properties: {
productId: {
type: 'string',
'x-component-props': {
placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.productSchema.productId' })
}
},
priceTypeList: { priceTypeList: {
type: 'string', type: 'string',
enum: [ enum: [
...@@ -189,6 +195,12 @@ export const fastSchema: ISchema = { ...@@ -189,6 +195,12 @@ export const fastSchema: ISchema = {
}, },
}, },
properties: { properties: {
productId: {
type: 'string',
'x-component-props': {
placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.productSchema.productId' })
}
},
priceTypeList: { priceTypeList: {
type: 'string', type: 'string',
enum: [ enum: [
...@@ -296,6 +308,12 @@ export const productWillSchema: ISchema = { ...@@ -296,6 +308,12 @@ export const productWillSchema: ISchema = {
}, },
}, },
properties: { properties: {
productId: {
type: 'string',
'x-component-props': {
placeholder: getIntl().formatMessage({ id: 'commodity.products.schema.productSchema.productId' })
}
},
memberName: { memberName: {
type: 'string', type: 'string',
'x-component-props': { 'x-component-props': {
......
src/pages/procurement/callForBids/addNewBid/components/relevanceGoodDrawer/index.tsx
View file @ dbd8b7ab
...@@ -168,7 +168,7 @@ export const RelevanceGoodDrawer: React.FC<RelevanceGoodDrawerProps> = ({ ...@@ -168,7 +168,7 @@ export const RelevanceGoodDrawer: React.FC<RelevanceGoodDrawerProps> = ({
await schemaAction.setFieldValue('unitId', selectRow[0]['unitId']) await schemaAction.setFieldValue('unitId', selectRow[0]['unitId'])
await schemaAction.setFieldValue('unitName', selectRow[0]['unitName']) await schemaAction.setFieldValue('unitName', selectRow[0]['unitName'])
await schemaAction.setFieldValue('has', true) await schemaAction.setFieldValue('has', true)
await schemaAction.setFieldValue('id', selectRow[0]['id']) await schemaAction.setFieldValue('goodsId', selectRow[0]['id'])
}, 300); }, 300);
setSelectRow([]) setSelectRow([])
setSelectedRowKeys([]) setSelectedRowKeys([])
......
src/pages/procurement/callForBids/addNewBid/schema/modal.ts
View file @ dbd8b7ab
...@@ -151,9 +151,9 @@ export const goodFormSchema: ISchema = { ...@@ -151,9 +151,9 @@ export const goodFormSchema: ISchema = {
title: intl.formatMessage({ id: 'table.purchase.shifouhuopinlie' }), title: intl.formatMessage({ id: 'table.purchase.shifouhuopinlie' }),
visible: false, visible: false,
}, },
id: { goodsId: {
type: 'string', type: 'string',
title: '主键id', title: '货品id',
visible: false, visible: false,
}, },
} }
......
src/pages/transaction/marketingAbility/platformexeCution/detail/index.tsx
View file @ dbd8b7ab
...@@ -251,9 +251,9 @@ const DetialLayout = () => { ...@@ -251,9 +251,9 @@ const DetialLayout = () => {
if (!isEmpty(DATA)) { if (!isEmpty(DATA)) {
DATA.forEach(item => { DATA.forEach(item => {
if ((item.recordType === ORDER_TYPE) && name) { if ((item.recordType === ORDER_TYPE) && name) {
buy_no += item[name] buy_no += Number(item[name])
} else if ((item.recordType === REFUND_TYPE) && name1) { } else if ((item.recordType === REFUND_TYPE) && name1) {
refund_no += item[name1].toString().split('-')[1] refund_no += Number(item[name1].toString().split('-')[1])
console.log(typeof item[name1], item[name1]) console.log(typeof item[name1], item[name1])
} }
}) })
......
src/pages/transaction/marketingAbility/selfbuiltexeCution/detail/index.tsx
View file @ dbd8b7ab
...@@ -250,9 +250,9 @@ const DetialLayout = () => { ...@@ -250,9 +250,9 @@ const DetialLayout = () => {
if (!isEmpty(DATA)) { if (!isEmpty(DATA)) {
DATA.forEach(item => { DATA.forEach(item => {
if ((item.recordType === ORDER_TYPE) && name) { if ((item.recordType === ORDER_TYPE) && name) {
buy_no += item[name] buy_no += Number(item[name])
} else if ((item.recordType === REFUND_TYPE) && name1) { } else if ((item.recordType === REFUND_TYPE) && name1) {
refund_no += item[name1].toString().split('-')[1] refund_no += Number(item[name1].toString().split('-')[1])
console.log(typeof item[name1], item[name1]) console.log(typeof item[name1], item[name1])
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment