Skip to content

J
jinfa-platform
Commit aedfae11 authored by 前端-彭佳文's avatar 前端-彭佳文
Browse files
Options

Merge branch 'fix-v2-220418' into 'v2-220418'

feat: 补充订单模块的国家化 See merge request linkseeks-design/pro-platform!618
parents a8ef939e e899bb0f
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 61 deletions
src/locales/en-US/order.ts
View file @ aedfae11
......@@ -712,4 +712,55 @@ export default {
'purchaseRequisition.wuliao':'material',
'purchaseRequisition.xinxi':'information',
'order.shouhuodanzhaiyao': 'Receipt summary',
'order.xinzengshouhuodan': 'Add receipt',
'order.songhuodanzhaiyao': 'Delivery note summary',
'order.songhuotongzhibianhao': 'Delivery Notice No',
'order.shouhuodanbianhao': 'Receipt No',
'order.songhuojihuabianhao': 'Delivery plan No',
'order.gongyinghuiyuan': 'Supply member',
'order.beizhu': 'remarks',
'order.shouhuoren': 'consignee',
'order.fahuoshijian': 'Delivery time',
'order.shouhuorendianhua': 'Consignee telephone',
'order.songhuodingdanhao': 'Delivery order No',
'order.songhuodanbianhao': 'Delivery note No',
'order.fahuoriqi': 'the date of issuance',
'order.songhuodizhi': 'Shipping address',
'order.fahuozitidizhi': 'Shipping (pick-up) address',
'order.songhuoren': 'Deliveryman',
'order.songhuorendianhua': 'Deliveryman telephone',
'order.wuliugongsi': 'logistics company',
'order.chepaihaoma': 'license plate',
'order.wuliudanhao': 'Logistics order No',
'order.jihuabianhao': 'Plan number',
'order.jihuazhaiyao': 'Plan summary',
'order.jihuazhouqi': 'Planning cycle',
'order.caigouhuiyuan': 'Purchasing member',
'order.waibuzhuangtai': 'External state',
'order.peisongfangshi': 'Distribution mode',
'order.caigoushang': 'Purchaser',
'order.tijiaosonghuojihua': 'Submit delivery plan',
'order.gongyingshang': 'supplier',
'order.querensonghuojihua': 'Confirm delivery plan',
'order.waibudanjuliuzhuanjilu': 'External document flow record',
'order.tongzhidanbianhao': 'Notice No',
'order.tongzhidanzhaiyao': 'Notice summary',
'order.songhuoriqi': 'Delivery date',
'order.songhuoshijian': 'Delivery time',
'order.shouhuodizhi': 'Receiving address',
'order.shouhuoshijian': 'Receiving time',
'order.shouhuoriqi': 'Date of receipt',
'order.tijiaosonghuotongzhidan': 'Submit delivery notice',
'order.querensonghuotongzhidan': 'Confirm delivery notice',
'order.songhuojihua': 'Delivery plan',
'order.zuichang600gezifu300ge': 'Up to 600 characters, 300 Chinese characters',
'order.xinzengsonghuojihuaSRM': 'Add delivery plan(SRM)',
'order.xinzengsonghuojihuaB2B': 'Add delivery plan(B2B)',
'order.shengchengsonghuotongzhidan': 'Generate delivery notice',
'order.shengchengsonghuodan': 'Generate delivery note',
'order.yishengchengsonghuotongzhidan': 'Delivery note generated',
'order.yishengchengsonghuodan': 'Delivery note generated',
'order.songhuoshuliangbunengdayu': 'Delivery quantity cannot be greater than the quantity to be delivered',
}
src/locales/ko-KR/order.ts
View file @ aedfae11
......@@ -709,4 +709,55 @@ export default {
'purchaseRequisition.neirongbuneng1weikong':'컨텐트는 비워둘 수 없습니다.',
'purchaseRequisition.wuliao':'재료',
'purchaseRequisition.xinxi':'메시지',
'order.shouhuodanzhaiyao': '청구서 요약',
'order.xinzengshouhuodan': '새 청구서',
'order.songhuodanzhaiyao': '배송지 요약',
'order.songhuotongzhibianhao': '배송 알림 번호',
'order.shouhuodanbianhao': '청구서 번호',
'order.songhuojihuabianhao': '배송 계획 번호',
'order.gongyinghuiyuan': '공급원',
'order.beizhu': '비고',
'order.shouhuoren': '수취인',
'order.fahuoshijian': '배송 일자',
'order.shouhuorendianhua': '수취인 전화',
'order.songhuodingdanhao': '배송 주문 번호',
'order.songhuodanbianhao': '배송지 번호',
'order.fahuoriqi': '출하 일자',
'order.songhuodizhi': '배송 주소',
'order.fahuozitidizhi': '배송 주소',
'order.songhuoren': '배달인',
'order.songhuorendianhua': '배달인 전화',
'order.wuliugongsi': '물류 회사',
'order.chepaihaoma': '차량 번호',
'order.wuliudanhao': '물류번호',
'order.jihuabianhao': '계획 번호',
'order.jihuazhaiyao': '계획 요약',
'order.jihuazhouqi': '계획 주기',
'order.caigouhuiyuan': '구매 회원',
'order.waibuzhuangtai': '외부 상태',
'order.peisongfangshi': '배송 방법',
'order.caigoushang': '구매상',
'order.tijiaosonghuojihua': '배송 계획 제출',
'order.gongyingshang': '공급자',
'order.querensonghuojihua': '배송 계획 확인',
'order.waibudanjuliuzhuanjilu': '외부 증빙서류 유전 기록',
'order.tongzhidanbianhao': '통지서 번호',
'order.tongzhidanzhaiyao': '통지서 요약',
'order.songhuoriqi': '배송 일자',
'order.songhuoshijian': '배송 시간',
'order.shouhuodizhi': '배송 주소',
'order.shouhuoshijian': '납품 시간',
'order.shouhuoriqi': '납품 일자',
'order.tijiaosonghuotongzhidan': '배송 통지서 제출',
'order.querensonghuotongzhidan': '배송 확인 통지서',
'order.songhuojihua': '배송 계획',
'order.zuichang600gezifu300ge': '최대 600자, 한자 300자',
'order.xinzengsonghuojihuaSRM': '신규 배송 계획(SRM)',
'order.xinzengsonghuojihuaB2B': '신규 배송 계획(B2B)',
'order.shengchengsonghuotongzhidan': '배송 통지서 생성',
'order.shengchengsonghuodan': '배송지 생성',
'order.yishengchengsonghuotongzhidan': '배송 통지서가 생성됨',
'order.yishengchengsonghuodan': '배송지 생성됨',
'order.songhuoshuliangbunengdayu': '배송 수량은 배송 대기 수량보다 클 수 없습니다.',
}
src/locales/zh-CN/order.ts
View file @ aedfae11
......@@ -393,7 +393,7 @@ export default {
'saleOrder.pingjia': '评价',
'saleOrder.zhuandan': '转单',
'saleOrder.xiugaidingdanjia': '修改订单价格',
'saleOrder.xiugaidingdan': "修改订单",
'saleOrder.xiugaidingdan': '修改订单',
'saleOrder.shengchengzhifulian': '生成支付链接',
'saleOrder.songhuodizhi': '送货地址',
'saleOrder.caozuo': '操作',
......@@ -703,12 +703,62 @@ export default {
'purchaseRequisition.jigoumingcheng': '机构名称',
'purchaseRequisition.caigoushouhuodan': '采购收货单',
'purchaseRequisition.dingdan': '订单',
'purchaseRequisition.wuliaozu':'物料组',
'purchaseRequisition.shengchangchangjia':'生产厂家',
'purchaseRequisition.changdi':'产地',
'purchaseRequisition.beizu':'备注',
'purchaseRequisition.neirongbuneng1weikong':'内容不能为空',
'purchaseRequisition.wuliao':'物料',
'purchaseRequisition.xinxi':'信息',
'purchaseRequisition.wuliaozu': '物料组',
'purchaseRequisition.shengchangchangjia': '生产厂家',
'purchaseRequisition.changdi': '产地',
'purchaseRequisition.beizu': '备注',
'purchaseRequisition.neirongbuneng1weikong': '内容不能为空',
'purchaseRequisition.wuliao': '物料',
'purchaseRequisition.xinxi': '信息',
'order.shouhuodanzhaiyao': '收货单摘要',
'order.xinzengshouhuodan': '新增收货单',
'order.songhuodanzhaiyao': '送货单摘要',
'order.songhuotongzhibianhao': '送货通知编号',
'order.shouhuodanbianhao': '收货单编号',
'order.songhuojihuabianhao': '送货计划编号',
'order.gongyinghuiyuan': '供应会员',
'order.beizhu': '备注',
'order.shouhuoren': '收货人',
'order.fahuoshijian': '发货时间',
'order.shouhuorendianhua': '收货人电话',
'order.songhuodingdanhao': '送货订单号',
'order.songhuodanbianhao': '送货单编号',
'order.fahuoriqi': '发货日期',
'order.songhuodizhi': '送货地址',
'order.fahuozitidizhi': '发货（自提）地址',
'order.songhuoren': '送货人',
'order.songhuorendianhua': '送货人电话',
'order.wuliugongsi': '物流公司',
'order.chepaihaoma': '车牌号码',
'order.wuliudanhao': '物流单号',
'order.jihuabianhao': '计划编号',
'order.jihuazhaiyao': '计划摘要',
'order.jihuazhouqi': '计划周期',
'order.caigouhuiyuan': '采购会员',
'order.waibuzhuangtai': '外部状态',
'order.peisongfangshi': '配送方式',
'order.caigoushang': '采购商',
'order.tijiaosonghuojihua': '提交送货计划',
'order.gongyingshang': '供应商',
'order.querensonghuojihua': '确认送货计划',
'order.waibudanjuliuzhuanjilu': '外部单据流转记录',
'order.tongzhidanbianhao': '通知单编号',
'order.tongzhidanzhaiyao': '通知单摘要',
'order.songhuoriqi': '送货日期',
'order.songhuoshijian': '送货时间',
'order.shouhuodizhi': '收货地址',
'order.shouhuoshijian': '收货时间',
'order.shouhuoriqi': '收货日期',
'order.tijiaosonghuotongzhidan': '提交送货通知单',
'order.querensonghuotongzhidan': '确认送货通知单',
'order.songhuojihua': '送货计划',
'order.zuichang600gezifu300ge': '最长600个字符,300个汉字',
'order.xinzengsonghuojihuaSRM': '新增送货计划(SRM)',
'order.xinzengsonghuojihuaB2B': '新增送货计划(B2B)',
'order.shengchengsonghuotongzhidan': '生成送货通知单',
'order.shengchengsonghuodan': '生成送货单',
'order.yishengchengsonghuotongzhidan': '已生成送货通知单',
'order.yishengchengsonghuodan': '已生成送货单',
'order.songhuoshuliangbunengdayu': '送货数量不能大于待送货数量',
}
src/pages/order/constants/label.ts
View file @ aedfae11
......@@ -4,78 +4,78 @@ const intl = getIntl();
// export const ReceiptAddLabel = intl.formatMessage({id: 'coupon.weishiyong', defaultMessage: '新增收货单'});
export const ReceiptAddLabel = '新增收货单';
export const ReceiptAddLabel = intl.formatMessage({id: 'order.xinzengshouhuodan',defaultMessage: '新增收货单'});
export const ReceiptAbstractLabel = '收货单摘要';
export const DeliveryAbstractLabel = '送货单摘要';
export const DeliveryAbstractNoLabel = '送货通知编号';
export const ReNoLabel = '收货单编号';
export const DeliveryPanleNoLabel = '送货计划编号'
export const SupplyMembersLabel = '供应会员';
export const NoteLabel = '备注';
export const ReceiptAbstractLabel = intl.formatMessage({id: 'order.shouhuodanzhaiyao',defaultMessage: '收货单摘要'});
export const DeliveryAbstractLabel = intl.formatMessage({id: 'order.songhuodanzhaiyao',defaultMessage: '送货单摘要'});
export const DeliveryAbstractNoLabel = intl.formatMessage({id: 'order.songhuotongzhibianhao',defaultMessage: '送货通知编号'});
export const ReNoLabel = intl.formatMessage({id: 'order.shouhuodanbianhao',defaultMessage: '收货单编号'});
export const DeliveryPanleNoLabel = intl.formatMessage({id: 'order.songhuojihuabianhao',defaultMessage: '送货计划编号'})
export const SupplyMembersLabel = intl.formatMessage({id: 'order.gongyinghuiyuan',defaultMessage: '供应会员'});
export const NoteLabel = intl.formatMessage({id: 'order.beizhu',defaultMessage: '备注'});
export const ConsigneeLabel = '收货人';
export const ConsigneeTimeLabel = '发货时间';
export const ConsigneePhoneLabel = '收货人电话';
export const ConsigneeLabel = intl.formatMessage({id: 'order.shouhuoren',defaultMessage: '收货人'});
export const ConsigneeTimeLabel = intl.formatMessage({id: 'order.fahuoshijian',defaultMessage: '发货时间'});
export const ConsigneePhoneLabel = intl.formatMessage({id: 'order.shouhuorendianhua',defaultMessage: '收货人电话'});
export const DeliveryOrderNoLabel = '送货订单号';
export const DeliveryNoLabel = '送货单编号';
export const DeliveryDateLabel = '发货日期';
export const DeliveryTimeLabel = '发货时间';
export const DeliveryAddrLabel = '送货地址';
export const DeliverySlefAddrLabel = '发货（自提）地址';
export const DeliveryNameLabel = '送货人';
export const DeliveryPhoneLabel = '送货人电话';
export const DeliveryOrderNoLabel = intl.formatMessage({id: 'order.songhuodingdanhao',defaultMessage: '送货订单号'});
export const DeliveryNoLabel = intl.formatMessage({id: 'order.songhuodanbianhao',defaultMessage: '送货单编号'});
export const DeliveryDateLabel = intl.formatMessage({id: 'order.fahuoriqi',defaultMessage: '发货日期'});
export const DeliveryTimeLabel = intl.formatMessage({id: 'order.fahuoshijian',defaultMessage: '发货时间'});
export const DeliveryAddrLabel = intl.formatMessage({id: 'order.songhuodizhi',defaultMessage: '送货地址'});
export const DeliverySlefAddrLabel = intl.formatMessage({id: 'order.fahuozitidizhi',defaultMessage: '发货（自提）地址'});
export const DeliveryNameLabel = intl.formatMessage({id: 'order.songhuoren',defaultMessage: '送货人'});
export const DeliveryPhoneLabel = intl.formatMessage({id: 'order.songhuorendianhua',defaultMessage: '送货人电话'});
export const LogisticsCompanyLabel = '物流公司';
export const LogisticsCarNoLabel = '车牌号码';
export const LogisticsNoLabel = '物流单号';
export const LogisticsCompanyLabel = intl.formatMessage({id: 'order.wuliugongsi',defaultMessage: '物流公司'});
export const LogisticsCarNoLabel = intl.formatMessage({id: 'order.chepaihaoma',defaultMessage: '车牌号码'});
export const LogisticsNoLabel = intl.formatMessage({id: 'order.wuliudanhao',defaultMessage: '物流单号'});
export const PlanNumber = '计划编号';
export const SupplyMember = '供应会员';
export const PlanSummary = '计划摘要';
export const PlanningCycle = '计划周期';
export const ExternalState = '外部状态';
export const PlanNumber = intl.formatMessage({id: 'order.jihuabianhao',defaultMessage: '计划编号'});
export const SupplyMember = intl.formatMessage({id: 'order.gongyinghuiyuan',defaultMessage: '供应会员'});
export const PlanSummary = intl.formatMessage({id: 'order.jihuazhaiyao',defaultMessage: '计划摘要'});
export const PlanningCycle = intl.formatMessage({id: 'order.jihuazhouqi',defaultMessage: '计划周期'});
export const ExternalState = intl.formatMessage({id: 'order.waibuzhuangtai',defaultMessage: '外部状态'});
export const BuyerLabel = '采购会员';
export const OutStatusLabel = '外部状态';
export const BuyerLabel = intl.formatMessage({id: 'order.caigouhuiyuan',defaultMessage: '采购会员'});
export const OutStatusLabel = intl.formatMessage({id: 'order.waibuzhuangtai',defaultMessage: '外部状态'});
export const DeliveryTypeLabel = '配送方式';
export const DeliveryTypeLabel = intl.formatMessage({id: 'order.peisongfangshi',defaultMessage: '配送方式'});
export const Purchaser = '采购商';
export const SubmitDeliveryPlan = '提交送货计划';
export const Purchaser = intl.formatMessage({id: 'order.caigoushang',defaultMessage: '采购商'});
export const SubmitDeliveryPlan = intl.formatMessage({id: 'order.tijiaosonghuojihua',defaultMessage: '提交送货计划'});
export const Supplier = '供应商';
export const ConfirmDeliveryPlan = '确认送货计划';
export const Supplier = intl.formatMessage({id: 'order.gongyingshang',defaultMessage: '供应商'});
export const ConfirmDeliveryPlan = intl.formatMessage({id: 'order.querensonghuojihua',defaultMessage: '确认送货计划'});
export const OutStatusLogTitleLabel = '外部单据流转记录';
export const OutStatusLogTitleLabel = intl.formatMessage({id: 'order.waibudanjuliuzhuanjilu',defaultMessage: '外部单据流转记录'});
export const NoticeNo = '通知单编号';
export const NoticeSummary = '通知单摘要';
export const DeliveryDate = '送货日期';
export const DeliveryTime = '送货时间';
export const ReceivingAddress = '收货地址';
export const ReceivingTime = '收货时间';
export const ReceivingDate = '收货日期';
export const NoticeNo = intl.formatMessage({id: 'order.tongzhidanbianhao',defaultMessage: '通知单编号'});
export const NoticeSummary = intl.formatMessage({id: 'order.tongzhidanzhaiyao',defaultMessage: '通知单摘要'});
export const DeliveryDate = intl.formatMessage({id: 'order.songhuoriqi',defaultMessage: '送货日期'});
export const DeliveryTime = intl.formatMessage({id: 'order.songhuoshijian',defaultMessage: '送货时间'});
export const ReceivingAddress = intl.formatMessage({id: 'order.shouhuodizhi',defaultMessage: '收货地址'});
export const ReceivingTime = intl.formatMessage({id: 'order.shouhuoshijian',defaultMessage: '收货时间'});
export const ReceivingDate = intl.formatMessage({id: 'order.shouhuoriqi',defaultMessage: '收货日期'});
export const SubmitDeliveryNotice = '提交送货通知单';
export const ConfirmDeliveryNotice = '确认送货通知单';
export const SubmitDeliveryNotice = intl.formatMessage({id: 'order.tijiaosonghuotongzhidan',defaultMessage: '提交送货通知单'});
export const ConfirmDeliveryNotice = intl.formatMessage({id: 'order.querensonghuotongzhidan',defaultMessage: '确认送货通知单'});
export const DeliveryPlanText = '送货计划'
export const DeliveryPlanRemark = '最长600个字符,300个汉字'
export const DeliveryPlanText = intl.formatMessage({id: 'order.songhuojihua',defaultMessage: '送货计划'})
export const DeliveryPlanRemark = intl.formatMessage({id: 'order.zuichang600gezifu300ge',defaultMessage: '最长600个字符,300个汉字'})
export const CreateDeliveryPlanTitleSRM = '新增送货计划(SRM)'
export const CreateDeliveryPlanTitleB2B = '新增送货计划(B2B)'
export const CreateDeliveryPlanTitleSRM = intl.formatMessage({id: 'order.xinzengsonghuojihuaSRM',defaultMessage: '新增送货计划(SRM)'})
export const CreateDeliveryPlanTitleB2B = intl.formatMessage({id: 'order.xinzengsonghuojihuaB2B',defaultMessage: '新增送货计划(B2B)'})
export const NoticeGenerated = '生成送货通知单'
export const DeliveryNoteGenerated = '生成送货单'
export const NoticeGenerated = intl.formatMessage({id: 'order.shengchengsonghuotongzhidan',defaultMessage: '生成送货通知单'})
export const DeliveryNoteGenerated = intl.formatMessage({id: 'order.shengchengsonghuodan',defaultMessage: '生成送货单'})
export const AlreadyNoticeGenerated = '已生成送货通知单'
export const AlreadyDeliveryNoteGenerated = '已生成送货单'
export const AlreadyNoticeGenerated = intl.formatMessage({id: 'order.yishengchengsonghuotongzhidan',defaultMessage: '已生成送货通知单'})
export const AlreadyDeliveryNoteGenerated = intl.formatMessage({id: 'order.yishengchengsonghuodan',defaultMessage: '已生成送货单'})
export const Deliverylimit = '送货数量不能大于待送货数量'
export const Deliverylimit = intl.formatMessage({id: 'order.songhuoshuliangbunengdayu',defaultMessage: '送货数量不能大于待送货数量'})
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