Commit e36c909c authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

fix: 翻译修改

parent 3e4a90db
......@@ -110,4 +110,5 @@
'common.zhaohuimima': 'Retrieve password',
'common.huanyingzhuce': 'Welcome to register',
'common.huanyingdenglu': 'Welcome to login',
'common.bitian': 'This field is required',
}
......@@ -19,16 +19,16 @@ export default {
'dealAbility.baojiazhaiyao':'Offer summary',
'dealAbility.waibuzhuangtai':'External state',
'dealAbility.neibuzhuangtai':'Internal State',
'dealAbility.duiyingxunjiadanhao':'corresponding to the inquiry order number',
'dealAbility.duiyingxunjiadanhao':'Inquire Odd Number',
'dealAbility.baojiahuiyuan':'Offer member',
'dealAbility.baojiajiezhishijian':'Quotation deadline',
'dealAbility.danjushijian':'Receipt time',
'dealAbility.baojialianxiren':'Contact person for quotation',
'dealAbility.baojialianxiren':'Quotation Contact',
'dealAbility.lianxirendianhua':'Contact phone',
'dealAbility.zuixiaoqiding':'Minimum order',
'dealAbility.jiaofushuoming':'Deal Ability',
'dealAbility.fukuanshuoming':'Payment Description',
'dealAbility.shuifeishuoming':'Description of taxes and fees',
'dealAbility.shuifeishuoming':'Taxes Instruction',
'dealAbility.wuliushuoming':'Logistics description',
'dealAbility.baozhuangshuoming':'Package Description',
'dealAbility.shangpinIDmingcheng':'Product ID/Name',
......@@ -133,4 +133,4 @@ export default {
'dealAbility.huiyuandengji':'Membership level',
'dealAbility.xuanzehuiyuan':'Select member',
'dealAbility.qingshuruxunjiadanzhaiyao':'Please enter the summary of the inquiry form',
}
\ No newline at end of file
}
......@@ -117,7 +117,7 @@ export default {
'purchaseOrder.orderCollect.schema.title6': 'Other information',
'purchaseOrder.orderCollect.schema.pack': 'Packing requirements',
'purchaseOrder.orderCollect.schema.remark': 'Other requirements',
'purchaseOrder.orderCollect.schema.contractNo': 'Corresponding contract number',
'purchaseOrder.orderCollect.schema.contractNo': 'Contract Number',
'purchaseOrder.orderCollect.schema.buyerMemberMajorId': 'Purchase Member',
'purchaseOrder.orderCollect.schema.buyerMemberMajorIdPh': 'Please enter the search purchasing member',
'purchaseOrder.orderCollect.memberSchema.placeholder': 'Please enter the name of the member',
......@@ -167,7 +167,7 @@ export default {
'purchaseOrder.orderCollect.constant.relevanceProductId': 'Relevant offer product ID/name/specification/category/brand',
'purchaseOrder.orderCollect.constant.price': 'Unit price',
'purchaseOrder.orderCollect.constant.quantity': 'Purchase Quantity',
'purchaseOrder.orderCollect.constant. tax included': 'logistics',
'purchaseOrder.orderCollect.constant.tax': 'logistics',
'purchaseOrder.orderCollect.constant.logistics': 'Delivery Method',
'purchaseOrder.orderCollect.theInvoiceList.kind1': 'VAT general invoice',
'purchaseOrder.orderCollect.theInvoiceList.kind2': 'VAT invoice',
......
......@@ -8,7 +8,7 @@ export default {
'authConfig.baseInfo':'Basic information',
'authConfig.roleName':'Role Name',
'authConfig.secondName':'Remarks',
'authConfig.ifHasIM':'Do you have IM communication permissions',
'authConfig.ifHasIM':'Whether Have IM Authority',
'authConfig.state':'State',
'authConfig.operationAuthority':'Operation Authority',
'authConfig.menuAccess':'Menu access authority',
......@@ -68,4 +68,4 @@ export default {
"authConfig.lookUser": "View User",
"authConfig.addUser": "Add User",
"authConfig.editUser": "Edit User"
}
\ No newline at end of file
}
......@@ -110,4 +110,5 @@ export default {
'common.zhaohuimima': '비밀번호 찾기',
'common.huanyingzhuce': '등록을 환영합니다',
'common.huanyingdenglu': '로그인을 환영합니다',
'common.bitian': '이 필드는 필수 항목입니다.',
}
......@@ -110,4 +110,5 @@ export default {
'common.zhaohuimima': '找回密码',
'common.huanyingzhuce': '欢迎注册',
'common.huanyingdenglu': '欢迎登录',
'common.bitian': '该字段是必填字段',
}
......@@ -167,7 +167,7 @@ export default {
'purchaseOrder.orderCollect.constant.relevanceProductId': '关联报价商品ID/名称/规格/品类/品牌',
'purchaseOrder.orderCollect.constant.price': '单价',
'purchaseOrder.orderCollect.constant.quantity': '采购数量',
'purchaseOrder.orderCollect.constant.含税': '物流',
'purchaseOrder.orderCollect.constant.tax': '物流',
'purchaseOrder.orderCollect.constant.logistics': '配送方式',
'purchaseOrder.orderCollect.theInvoiceList.kind1': '增值税普通发票',
'purchaseOrder.orderCollect.theInvoiceList.kind2': '增值税专用发票',
......
.header {
margin: 12px 0 32px 0;
.title {
width: 112px;
min-width: 112px;
height: 22px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
......@@ -19,4 +19,4 @@
color: #172B4D;
line-height: 32px;
}
}
\ No newline at end of file
}
......@@ -353,7 +353,10 @@ const MemberDetail: React.FC<{}> = () => {
roleName: {
type: 'string',
title: intl.formatMessage({ id: 'authConfig.roleName' }),
required: true,
'x-rules': [{
required: true,
message: intl.formatMessage({ id: 'common.form.input.placeholder' })
}],
},
remark: {
type: 'textarea',
......
import { ISchema } from '@formily/antd';
import { getIntl } from 'umi';
const intl = getIntl();
export const menuSchema: ISchema = {
type: 'object',
......@@ -13,18 +15,24 @@ export const menuSchema: ISchema = {
properties: {
code: {
type: 'string',
title: '组织代码',
required: true,
title: intl.formatMessage({ id: 'authConfig.origanCode' }),
'x-rules': [{
required: true,
message: intl.formatMessage({ id: 'common.form.input.placeholder' })
}],
},
title: {
type: 'string',
title: '组织机构',
required: true
title: intl.formatMessage({ id: 'authConfig.origanJiGou' }),
'x-rules': [{
required: true,
message: intl.formatMessage({ id: 'common.form.input.placeholder' })
}]
},
remark: {
type: 'textarea',
title: '描述',
title: intl.formatMessage({ id: 'authConfig.describe' }),
"x-component-props": {
rows: 4
}
......
......@@ -21,28 +21,37 @@ export const UserDetailSchema:ISchema = {
title: intl.formatMessage({ id: 'authConfig.loginAccount' }),
"x-rules": [
{
required: true,
message: intl.formatMessage({ id: 'common.form.input.placeholder' })
},
{
pattern: /^\w{6,20}$/,
message: intl.formatMessage({ id: 'authConfig.inputbetween6and20' })
}
],
required: true
},
password: {
type: 'password',
title: intl.formatMessage({ id: 'authConfig.loginPsw' }),
"x-rules": [
{
required: true,
message: intl.formatMessage({ id: 'common.form.input.placeholder' })
},
{
pattern: PATTERN_MAPS.password,
message: intl.formatMessage({ id: 'authConfig.input8Psw' })
}
],
required: true
},
name: {
type: 'string',
title: intl.formatMessage({ id: 'authConfig.personName' }),
maxLength: 16,
required: true
'x-rules': [{
required: true,
message: intl.formatMessage({ id: 'common.form.input.placeholder' })
}],
},
phoneLayout: {
type: 'object',
......@@ -55,7 +64,6 @@ export const UserDetailSchema:ISchema = {
required: true,
properties: {
countryCode: {
required: true,
type: 'string',
enum: ['+86'],
"x-mega-props": {
......@@ -65,17 +73,24 @@ export const UserDetailSchema:ISchema = {
flexcol: {
span: 6
}
}
},
'x-rules': [{
required: true,
message: intl.formatMessage({ id: 'common.text.pleaseSelect' })
}],
},
phone: {
type: 'number',
required: true,
"x-mega-props": {
wrapperCol: 24,
full: true
},
"x-rules": [
{
required: true,
message: intl.formatMessage({ id: 'common.form.input.placeholder' })
},
{
pattern: PATTERN_MAPS.phone,
message: intl.formatMessage({ id: 'authConfig.correntTel' })
}
......@@ -116,7 +131,10 @@ export const UserDetailSchema:ISchema = {
orgName: {
type: 'string',
title: intl.formatMessage({ id: 'authConfig.belongOrigan' }),
required: true,
'x-rules': [{
required: true,
message: intl.formatMessage({ id: 'common.text.pleaseSelect' })
}],
'x-component-props': {
disabled: true,
addonAfter: "{{connectCategory}}"
......@@ -127,7 +145,10 @@ export const UserDetailSchema:ISchema = {
visible: false
},
memberRoleIds: {
required: true,
'x-rules': [{
required: true,
message: intl.formatMessage({ id: 'common.text.pleaseSelect' })
}],
type: 'array:string',
"x-component": 'tableTagList',
"x-component-props": {
......@@ -136,8 +157,8 @@ export const UserDetailSchema:ISchema = {
},
title: intl.formatMessage({ id: 'authConfig.relatePerson' })
},
}
}
}
}
\ No newline at end of file
}
......@@ -70,7 +70,7 @@ const ChannelSeoAdded = () => {
onBack={() => history.goBack()}
backIcon={<ReutrnEle description={intl.formatMessage({ id: 'common.button.back' })} />}
extra={
link !== 'detail' && <Button type="primary" loading={confirmLoading} onClick={handleSave}> 保存</Button>
link !== 'detail' && <Button type="primary" loading={confirmLoading} onClick={handleSave}> {intl.formatMessage({ id: 'common.button.save' })}</Button>
}
>
<Prompt when={formIsHalfFilledOut} message={intl.formatMessage({ id: 'common.tip.save.confirm' })} />
......
......@@ -1120,7 +1120,10 @@ export const repositInSchema: ISchema = padRequiredMessage({
type: 'string',
title: getIntl().formatMessage({ id: 'repositories.schema.repositInSchema.freightSpaceId' }),
enum: [],
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({ id: 'common.text.pleaseSelect' }),
}],
"x-mega-props": {
span: 1
}
......@@ -1156,7 +1159,10 @@ export const repositInSchema: ISchema = padRequiredMessage({
"foldInventory": {
type: 'number',
"x-component": "CustomSlider",
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({ id: 'common.form.input.placeholder' }),
}],
"x-component-props": {
width: '80%',
isNumber: true,
......
......@@ -356,14 +356,19 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
title={modalText()}
name={causeName(modalType)}
x-component="TextArea"
required
x-component-props={{
placeholder: `${intl.formatMessage({id: 'transaction_components.zaicishurunideneirong'})}${maxNumber}${intl.formatMessage({id: 'transaction_components.gehanzi'})}`
}}
x-rules={{
max: maxNumber,
message: `${intl.formatMessage({id: 'transaction_components.yuanyinzuiduo'})}${maxNumber}${intl.formatMessage({id: 'transaction_components.gehanzi'})}`
}}
x-rules={[
{
required: true,
message: `${intl.formatMessage({id: 'common.form.input.placeholder'})}${modalText()}`
},
{
max: maxNumber,
message: `${intl.formatMessage({id: 'transaction_components.yuanyinzuiduo'})}${maxNumber}${intl.formatMessage({id: 'transaction_components.gehanzi'})}`
}
]}
/>)}
</SchemaForm>
</Modal>
......
......@@ -50,7 +50,7 @@ export const baseOrderListColumns: any = () => {
fixed: 'left',
},
{
title: intl.formatMessage({ id: 'purchaseOrder.dingdandigest', defaultMessage: '订单摘要' }),
title: intl.formatMessage({ id: 'purchaseRequisition.dingdanzhaiyao', defaultMessage: '订单摘要' }),
align: 'center',
dataIndex: 'digest',
key: 'digest',
......
......@@ -104,7 +104,10 @@ const basicInfo: ISchema = {
// enum: getShopTypeMap,
enum: [],
title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.schema.shopId'}),
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
"x-component-props": {
disabled: true,
},
......@@ -116,7 +119,10 @@ const basicInfo: ISchema = {
"x-component-props": {
disabled: true,
},
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
},
vendorMemberId: {
type: 'string',
......@@ -189,7 +195,10 @@ export const orderProduct: ISchema = {
products: {
type: 'array',
"x-component": 'MultTable',
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
"x-component-props": {
rowKey: 'id',
columns: "{{productColumns}}",
......@@ -239,7 +248,7 @@ const submitInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
'x-component-props': {
labelCol: 2,
labelCol: 3,
wrapperCol: 9,
labelAlign: "left",
grid: true,
......@@ -256,7 +265,10 @@ const submitInfo: ISchema = {
type: 'string',
"x-component": 'date',
title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.schema.deliverDate'}),
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
"x-component-props": {
showTime: true,
format: 'YYYY-MM-DD HH:mm',
......@@ -279,8 +291,8 @@ const submitInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 2,
wrapperCol: 22,
labelCol: 3,
wrapperCol: 21,
},
properties: {
deliveryAddresId: {
......@@ -324,7 +336,7 @@ const invoiceInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 2,
labelCol: 3,
wrapperCol: 9,
labelAlign: "left",
grid: true,
......@@ -389,8 +401,8 @@ const ortherInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 4,
wrapperCol: 18,
labelCol: 6,
wrapperCol: 16,
labelAlign: "left",
grid: true,
full: true,
......
......@@ -43,7 +43,10 @@ const basicInfo: ISchema = {
disabled: true,
addonAfter: "{{orderMember}}"
},
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
},
vendorMemberId: {
type: 'string',
......@@ -145,7 +148,10 @@ export const orderProduct: ISchema = {
products: {
type: 'array',
"x-component": 'MultTable',
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
"x-component-props": {
rowKey: 'id',
columns: "{{productColumns}}",
......@@ -196,7 +202,7 @@ const submitInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
'x-component-props': {
labelCol: 2,
labelCol: 3,
wrapperCol: 9,
labelAlign: "left",
grid: true,
......@@ -213,7 +219,10 @@ const submitInfo: ISchema = {
type: 'string',
"x-component": 'date',
title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.schema.deliverDate'}),
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
"x-component-props": {
showTime: true,
format: 'YYYY-MM-DD HH:mm',
......@@ -237,8 +246,8 @@ const submitInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 2,
wrapperCol: 22,
labelCol: 3,
wrapperCol: 21,
},
properties: {
deliveryAddresId: {
......@@ -297,7 +306,7 @@ const invoiceInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 2,
labelCol: 3,
wrapperCol: 9,
labelAlign: "left",
grid: true,
......@@ -362,8 +371,8 @@ const ortherInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 4,
wrapperCol: 18,
labelCol: 6,
wrapperCol: 16,
labelAlign: "left",
grid: true,
full: true,
......
......@@ -27,7 +27,10 @@ const basicInfo: ISchema = {
properties: {
orderMode: {
type: 'string',
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
enum: [{
label: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.requisition.type'}),
value: 15,
......@@ -55,7 +58,10 @@ const basicInfo: ISchema = {
requisitionNo: {
type: 'string',
title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.requisition.requisitionNo'}),
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
"x-component-props": {
disabled: true,
addonAfter: "{{orderRequisition}}"
......@@ -73,7 +79,10 @@ const basicInfo: ISchema = {
disabled: true,
addonAfter: "{{orderMember}}"
},
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
},
vendorMemberId: {
type: 'string',
......@@ -138,7 +147,10 @@ export const orderMaterial: ISchema = {
products: {
type: 'array',
"x-component": 'MultTable',
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
"x-component-props": {
rowKey: 'productId',
columns: "{{materialColumns}}",
......@@ -167,7 +179,7 @@ const submitInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
'x-component-props': {
labelCol: 2,
labelCol: 3,
wrapperCol: 9,
labelAlign: "left",
grid: true,
......@@ -184,7 +196,10 @@ const submitInfo: ISchema = {
type: 'string',
"x-component": 'date',
title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.schema.deliverDate'}),
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
"x-component-props": {
showTime: true,
format: 'YYYY-MM-DD HH:mm',
......@@ -199,8 +214,8 @@ const submitInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 2,
wrapperCol: 22,
labelCol: 3,
wrapperCol: 21,
},
properties: {
deliveryAddresId: {
......@@ -244,7 +259,7 @@ const invoiceInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 2,
labelCol: 3,
wrapperCol: 9,
labelAlign: "left",
grid: true,
......@@ -309,8 +324,8 @@ const ortherInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 4,
wrapperCol: 18,
labelCol: 6,
wrapperCol: 16,
labelAlign: "left",
grid: true,
full: true,
......
......@@ -16,7 +16,7 @@ const basicInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 4,
labelCol: 6,
wrapperCol: 18,
labelAlign: "left",
grid: true,
......@@ -99,7 +99,10 @@ const basicInfo: ISchema = {
"x-component-props": {
disabled: true,
},
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
},
vendorMemberId: {
type: 'string',
......@@ -168,7 +171,10 @@ export const orderMaterial: ISchema = {
products: {
type: 'array',
"x-component": 'MultTable',
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
"x-component-props": {
rowKey: 'materialId',
columns: "{{materialColumns}}",
......@@ -203,7 +209,7 @@ const submitInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
'x-component-props': {
labelCol: 2,
labelCol: 3,
wrapperCol: 9,
labelAlign: "left",
grid: true,
......@@ -220,7 +226,10 @@ const submitInfo: ISchema = {
type: 'string',
"x-component": 'date',
title: getIntl().formatMessage({id: 'purchaseOrder.orderCollect.schema.deliverDate'}),
required: true,
'x-rules': [{
required: true,
message: getIntl().formatMessage({id: 'common.bitian'}),
}],
"x-component-props": {
showTime: true,
format: 'YYYY-MM-DD HH:mm',
......@@ -235,8 +244,8 @@ const submitInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 2,
wrapperCol: 22,
labelCol: 3,
wrapperCol: 21,
},
properties: {
deliveryAddresId: {
......@@ -280,7 +289,7 @@ const invoiceInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 2,
labelCol: 3,
wrapperCol: 9,
labelAlign: "left",
grid: true,
......@@ -345,8 +354,8 @@ const ortherInfo: ISchema = {
type: 'object',
"x-component": 'mega-layout',
"x-component-props": {
labelCol: 4,
wrapperCol: 18,
labelCol: 6,
wrapperCol: 16,
labelAlign: "left",
grid: true,
full: true,
......
......@@ -232,7 +232,10 @@ export const addBillSchema: ISchema = {
'x-component-props': {
placeholder: intl.formatMessage({id: 'stockSellStorage.qingxuanze'}),
},
required: true,
'x-rules': [{
required: true,
message: intl.formatMessage({id: 'common.text.pleaseSelect'})
}]
},
invoicesTypeCode: {
type: 'string',
......@@ -245,17 +248,26 @@ export const addBillSchema: ISchema = {
'x-component-props': {
placeholder: intl.formatMessage({id: 'stockSellStorage.qingxuanze'}),
},
required: true,
'x-rules': [{
required: true,
message: intl.formatMessage({id: 'common.text.pleaseSelect'})
}]
},
invoicesAbstract: {
type: 'string',
title: intl.formatMessage({id: 'stockSellStorage.danjuzhaiyao'}),
required: true,
'x-rules': [{
required: true,
message: intl.formatMessage({id: 'common.form.input.placeholder'})
}]
},
inventoryRole: {
type: 'string',
title: intl.formatMessage({id: 'stockSellStorage.cangkurenyuan'}),
required: true,
'x-rules': [{
required: true,
message: intl.formatMessage({id: 'common.form.input.placeholder'})
}]
},
transactionTime: {
type: 'date',
......
......@@ -39,6 +39,7 @@ export const ruleDetailSchema: ISchema = padRequiredMessage({
"x-rules": [
{
required: true,
message: getIntl().formatMessage({ id: 'processRuleSetting.qingshuruguize', defaultMessage: '请输入规则名称' })
},
{
limitByte: true,
......@@ -166,7 +167,10 @@ export const ruleDetailSchema: ISchema = padRequiredMessage({
type: 'radio' // CardCheckBox 单选模式
},
"title": getIntl().formatMessage({ id: 'processRuleSetting.shiyongshangcheng', defaultMessage: '适用商城' }),
required: true,
"x-rules": [{
required: true,
message: getIntl().formatMessage({ id: 'common.text.pleaseSelect' }),
}]
}
}
}
......
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