Skip to content

J
jinfa-platform
Commit faaf79fd authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

fix: 修改翻译

parent f17ec721
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 90 deletions
src/components/NiceForm/index.tsx
View file @ faaf79fd
......@@ -68,6 +68,15 @@ registerValidationRules({
message += `,${intl.formatMessage({id: 'components.huozhe'})}${maxByte / 2}${intl.formatMessage({id: 'components.gehanzi'})}`
}
return str.length > maxByte ? message : "";
},
required: (value, desc, rules) => {
const { required } = desc;
let str = value;
let message = ``
if (required) {
message += `${intl.formatMessage({id: 'common.bitian'})}`
}
return (required && !str) ? message : ''
}
});
......@@ -75,6 +84,7 @@ registerValidationRules({
registerVirtualBox("MellowCard", ({ children, schema }) => {
const props = schema['x-component-props']
console.log(props, 10086)
return (
<FormItemCard {...props}>
......@@ -95,6 +105,8 @@ const schemaLayout = createControllerBox("schemaLayout", (_props) => {
// const { visible, title, onCancel, footer, ...others } = componentProps;
console.log(_props, 1111)
return (
<NiceForm>
<SchemaField schema={nestedSchema}></SchemaField>
......@@ -148,6 +160,7 @@ export const componentExport = {
}
const NiceForm: React.FC<NiceFormProps> = props => {
const { children, components, effects, expressionScope, loading = false, ...reset } = props;
console.log(props, 1008611)
const match = useRouteMatch();
const defineComponents = Object.assign(componentExport, components);
......
src/locales/en-US/afterService/components.ts
View file @ faaf79fd
......@@ -33,13 +33,13 @@ export default {
'afterService.components.ExchangeAddressInfo.deliveryType':'Delivery Method',
'afterService.components.ExchangeAddressInfo.deliveryType.placeholder':'Please select',
'afterService.components.ExchangeAddressInfo.deliveryType.required':'Please select a delivery method',
'afterService.components.ExchangeAddressInfo.deliveryAddress':'Exchange shipping address',
'afterService.components.ExchangeAddressInfo.deliveryAddress':'Return address',
'afterService.components.ExchangeAddressInfo.deliveryAddress.placeholder':'Please select',
'afterService.components.ExchangeAddressInfo.deliveryAddress.required':'Please select the replacement shipping address',
'afterService.components.ExchangeAddressInfo.pickupAddress':'Exchange Pickup Address',
'afterService.components.ExchangeAddressInfo.pickupAddress.placeholder':'Please select',
'afterService.components.ExchangeAddressInfo.pickupAddress.required':'Please select the replacement address from the pickup',
'afterService.components.ExchangeAddressInfo.shippingAddress':'Exchange shipping address',
'afterService.components.ExchangeAddressInfo.shippingAddress':'Ship Addresss',
'afterService.components.ExchangeDeliverInfo.title':'Exchange Delivery Information',
'afterService.components.ExchangeDeliverInfo.summaryColumns.orderNo':'Order number',
......@@ -171,10 +171,10 @@ export default {
'afterService.components.ReturnAddressInfo.title': 'Return shipping address',
'afterService.components.ReturnAddressInfo.deliveryType': 'Delivery Method',
'afterService.components.ReturnAddressInfo.shippingAddress': 'Return shipping address',
'afterService.components.ReturnAddressInfo.shippingAddress': 'Return address',
'afterService.components.ReturnAddressInfo.shippingAddress.placeholder': 'please choose',
'afterService.components.ReturnAddressInfo.shippingAddress.required': 'Please select the return address',
'afterService.components.ReturnAddressInfo.deliveryAddress': 'Return shipping address',
'afterService.components.ReturnAddressInfo.deliveryAddress': 'Ship Address',
'afterService.components.ReturnAddressInfo.pickupAddress': 'Return address',
'afterService.components.ReturnAnalysis.title': 'Return shipping information',
......@@ -234,8 +234,8 @@ export default {
'afterService.components.Score.content': 'After-sales evaluation',
'afterService.components.StopModal.title': 'Reason for suspension',
'afterService.components.StopModal.date': 'Suspension time',
'afterService.components.StopModal.remark': 'Reason for suspension',
'afterService.components.StopModal.date': 'Pause time',
'afterService.components.StopModal.remark': 'Pause Reason',
'afterService.components.StopModal.remark.placeholder': 'Enter your content here, up to 100 characters, 50 Chinese characters',
'afterService.components.StopModal.remark.required': 'Please fill in the reason',
......
src/locales/en-US/content.ts
View file @ faaf79fd
......@@ -53,5 +53,5 @@
'content.notice.edit':'Edit notice',
'content.notice.see':'View announcement',
'content.notice.topping':'Topping',
}
\ No newline at end of file
'content.xuanze': 'Select from the following labels'
}
src/locales/en-US/handling.ts
View file @ faaf79fd
......@@ -7,7 +7,7 @@
'handling.submit.batch':'Batch submission',
'handling.description':'Summary',
'handling.noticeficationNumAndDesc':'Noticefication Number/Summary',
'handling.processName':'Processing company name',
'handling.processName':'Company',
'handling.docApproval':'Document review',
'handling.docTime':'Document time',
'handling.restProcessNum':'Remaining processing quantity',
......@@ -22,12 +22,12 @@
'handling.assign.allQuery':'Assign production notice query',
'handling.assign.tobeAddQuery':'Query to be added production notice',
'handling.process.require':'Processing requirements',
'handling.delivery.instructions':'Delivery instructions',
'handling.pay.instructions':'Payment Instructions',
'handling.tax.instructions':'tax instructions',
'handling.material.instructions':'Material instructions',
'handling.packing.instructions':'Packing instructions',
'handling.other.instructions':'Other instructions',
'handling.delivery.instructions':'Deliverable',
'handling.pay.instructions':'Payment',
'handling.tax.instructions':'tax',
'handling.material.instructions':'Material',
'handling.packing.instructions':'Packing',
'handling.other.instructions':'Other',
'handling.toExamine':'Examine',
'handling.toExamine.doc':'Examine documents',
'handling.toExamine.batch':'Batch submission for review',
......@@ -238,7 +238,7 @@
'handling.fukuanshuoming':'Payment Instructions',
'handling.shuifeishuoming':'Description of taxes and fees',
'handling.wuzishuoming':'Material description',
'handling.baozhuangshuoming':'Packing instructions',
'handling.baozhuangshuoming':'Packing',
'handling.qitashuoming':'Other instructions',
'handling.zuichang60gezifu30ge':'The longest is 60 characters, 30 Chinese characters',
'handling.qingtianxiejiagongfei':'Please fill in the processing fee',
......@@ -305,4 +305,4 @@
'handling.fujian':'Attachment',
'handling.sousuo':'Search',
'handling.sousuoshengchantongzhidanhao':'Search production notification number',
}
\ No newline at end of file
}
src/locales/en-US/home.ts
View file @ faaf79fd
......@@ -129,7 +129,7 @@ export default {
'home.useGuaid.guideTitle': '1. New product',
'home.useGuaid.guideDesc':'Intelligent in three minutes, complete product creation',
'home.useGuaid.guideClose':'Close',
'home.userCenter.year':'year',
'home.userCenter.year':'Year',
'home.userCenter.month':'Month',
'home.userCenter.day':'Day',
'home.userCenter.day0':'Sunday',
......
src/locales/en-US/payandSettle.ts
View file @ faaf79fd
......@@ -74,35 +74,35 @@ export default {
'payandSettle.eAccountApprove.title': 'Tonglian account',
'payandSettle.eAccountApprove.components.company.mellowCard.1': 'Enterprise Certification (1/4)',
'payandSettle.eAccountApprove.components.company.mellowCard.1.company': 'Company Name',
'payandSettle.eAccountApprove.components.company.mellowCard.1.company': 'Company',
'payandSettle.eAccountApprove.components.company.mellowCard.1.company.message': 'Please enter the company name',
'payandSettle.eAccountApprove.components.company.mellowCard.1.company.placeholder': 'Please enter the company name',
'payandSettle.eAccountApprove.components.company.mellowCard.1.account': 'Business to public account',
'payandSettle.eAccountApprove.components.company.mellowCard.1.account': 'Public Account',
'payandSettle.eAccountApprove.components.company.mellowCard.1.account.message': 'Please enter a business-to-public account',
'payandSettle.eAccountApprove.components.company.mellowCard.1.account.placeholder': 'Please enter a business-to-public account',
'payandSettle.eAccountApprove.components.company.mellowCard.1.name': 'Corporate name',
'payandSettle.eAccountApprove.components.company.mellowCard.1.name': 'Corporate',
'payandSettle.eAccountApprove.components.company.mellowCard.1.name.message': 'Please enter the name of the legal person',
'payandSettle.eAccountApprove.components.company.mellowCard.1.name.placeholder': 'Please enter the name of the legal person',
'payandSettle.eAccountApprove.components.company.mellowCard.1.bank': 'Name of the bank that opened the account',
'payandSettle.eAccountApprove.components.company.mellowCard.1.bank': 'Deposit Bank',
'payandSettle.eAccountApprove.components.company.mellowCard.1.bank.message': 'Please enter the name of the bank that opened the account',
'payandSettle.eAccountApprove.components.company.mellowCard.1.bank.placeholder': 'Please enter the name of the bank that opened the account',
'payandSettle.eAccountApprove.components.company.mellowCard.1.type': 'Legal person ID type',
'payandSettle.eAccountApprove.components.company.mellowCard.1.type': 'Voucher Type',
'payandSettle.eAccountApprove.components.company.mellowCard.1.type.1': 'ID Card',
'payandSettle.eAccountApprove.components.company.mellowCard.1.type.message': 'Please select the legal person certificate type',
'payandSettle.eAccountApprove.components.company.mellowCard.1.type.placeholder': 'Please select the legal person certificate type',
'payandSettle.eAccountApprove.components.company.mellowCard.1.bankPart': 'Name of bank branch where the account is opened',
'payandSettle.eAccountApprove.components.company.mellowCard.1.bankPart': 'Branch name',
'payandSettle.eAccountApprove.components.company.mellowCard.1.bankPart.message': 'Please enter the bank branch name',
'payandSettle.eAccountApprove.components.company.mellowCard.1.bankPart.placeholder': 'Please enter the name of the bank branch where the account is opened',
'payandSettle.eAccountApprove.components.company.mellowCard.1.idcard': 'Legal person ID number',
'payandSettle.eAccountApprove.components.company.mellowCard.1.idcard': 'Voucher number',
'payandSettle.eAccountApprove.components.company.mellowCard.1.idcard.message': 'Please enter the legal person ID number',
'payandSettle.eAccountApprove.components.company.mellowCard.1.idcard.placeholder': 'Please enter the legal person ID number',
'payandSettle.eAccountApprove.components.company.mellowCard.1.bankNo': 'Branch number',
'payandSettle.eAccountApprove.components.company.mellowCard.1.bankNo.message': 'Please enter the branch number',
'payandSettle.eAccountApprove.components.company.mellowCard.1.bankNo.placeholder': 'Please enter the branch number',
'payandSettle.eAccountApprove.components.company.mellowCard.1.phone': 'Corporate phone number',
'payandSettle.eAccountApprove.components.company.mellowCard.1.phone': 'Phone number',
'payandSettle.eAccountApprove.components.company.mellowCard.1.phone.message': `Please enter the legal person's mobile phone number`,
'payandSettle.eAccountApprove.components.company.mellowCard.1.phone.placeholder': `Please enter the legal person's mobile phone number`,
'payandSettle.eAccountApprove.components.company.mellowCard.1.uniCredit': 'Unified Social Credit Code',
'payandSettle.eAccountApprove.components.company.mellowCard.1.uniCredit': 'Credit Code',
'payandSettle.eAccountApprove.components.company.mellowCard.1.uniCredit.message': 'Please enter the unified social credit code',
'payandSettle.eAccountApprove.components.company.mellowCard.1.uniCredit.message1': 'Please fill in the 12-digit unified social credit number',
'payandSettle.eAccountApprove.components.company.mellowCard.1.uniCredit.placeholder': 'Please enter the unified social credit code',
......@@ -130,7 +130,7 @@ export default {
'payandSettle.eAccountApprove.components.companyFinish.1.title': 'Corporate Information',
'payandSettle.eAccountApprove.components.companyFinish.1.name': 'Name',
'payandSettle.eAccountApprove.components.companyFinish.1.phone': 'Mobile phone number',
'payandSettle.eAccountApprove.components.companyFinish.1.phone': 'Phone number',
'payandSettle.eAccountApprove.components.companyFinish.1.phone.button': 'Untie',
'payandSettle.eAccountApprove.components.companyFinish.1.idCardAhead': 'Legal person ID front photo',
'payandSettle.eAccountApprove.components.companyFinish.1.idCardBehind': 'Legal person ID reverse photo',
......@@ -150,7 +150,7 @@ export default {
'payandSettle.eAccountApprove.components.personal.cardNo': 'Certificate Number',
'payandSettle.eAccountApprove.components.personal.cardNo.message': 'Please enter the ID number',
'payandSettle.eAccountApprove.components.personal.cardNo.placeholder': 'Please enter the ID number',
'payandSettle.eAccountApprove.components.personal.phone': 'Mobile phone number',
'payandSettle.eAccountApprove.components.personal.phone': 'Phone number',
'payandSettle.eAccountApprove.components.personal.phone.message': 'Please enter your phone number',
'payandSettle.eAccountApprove.components.personal.phone.placeholder': 'Please enter your phone number',
'payandSettle.eAccountApprove.components.personal.captcha': 'Verification code',
......@@ -161,7 +161,7 @@ export default {
'payandSettle.eAccountApprove.components.personalFinish.mellowCard.1': 'Personal Information',
'payandSettle.eAccountApprove.components.personalFinish.mellowCard.name': 'Name',
'payandSettle.eAccountApprove.components.personalFinish.mellowCard.phone': 'Mobile phone number',
'payandSettle.eAccountApprove.components.personalFinish.mellowCard.phone': 'Phone number',
'payandSettle.eAccountApprove.components.personalFinish.mellowCard.button.1': 'Untie',
'payandSettle.eAccountApprove.components.personalFinish.mellowCard.button.2': 'View contract agreement',
'payandSettle.eAccountApprove.components.personalFinish.mellowCard.button.3': 'Improve now',
......@@ -701,7 +701,7 @@ export default {
'payandSettle.capitalAccounts.accountLists.accountDetail.card.1.rightTitle.3': 'Locked amount (yuan):',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.1.rightTitle.4': 'Account Status:',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.1.button.1': 'Recharge',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.1.button.2': 'Apply for withdrawal',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.1.button.2': 'Withdraw',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.2': 'Transaction record',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.3': 'Circulation record',
'payandSettle.capitalAccounts.accountLists.accountDetail.modal.1.modalTitle': 'Account recharge',
......@@ -1006,9 +1006,9 @@ export default {
'payandSettle.capitalAccounts.eAccount.chaxun': 'Query',
'payandSettle.capitalAccounts.eAccount.zuiduoketixian': 'Can withdraw up to ¥',
'payandSettle.capitalAccounts.eAccount.jinejinxianliang': 'Amount is limited to two decimal places',
'payandSettle.capitalAccounts.eAccount.qiyemingcheng': 'Company Name',
'payandSettle.capitalAccounts.eAccount.qiyemingcheng': 'Company',
'payandSettle.capitalAccounts.eAccount.qiyeduigongzhang': 'Business-to-public accounts',
'payandSettle.capitalAccounts.eAccount.farenxingming': 'Corporate name',
'payandSettle.capitalAccounts.eAccount.farenxingming': 'Corporate',
'payandSettle.capitalAccounts.eAccount.kaihuyinhangming': 'Account opening bank name',
'payandSettle.capitalAccounts.eAccount.farenzhengjianlei': 'Legal person certificate type',
'payandSettle.capitalAccounts.eAccount.shenfenzheng': 'ID Card',
......
src/locales/en-US/purchase.ts
View file @ faaf79fd
......@@ -991,4 +991,9 @@ export default {
'purchase.zhenduiyuxiangmukeshiyong': 'Budget amount available for the project',
'purchase.yusuanjine': 'budget amount',
'purchase.zhileguishudishihou': 'The bidding can be screened according to the cities after the owning cities are set. If the bidding is not set, it will be all cities by default',
'purchase.zhaobiaoxiagmuqiwnag': 'Expected transaction price of bidding project',
'purchase.zhaobiaofabuzhicaigoumen': 'Tender is posted to the procurement portal',
'purchase.yaoqingzhaobiao': 'Invite bidding',
'purchase.xuanzeyudangqianhuiyuanxia':
'Select members who are affiliated with the current member and whose role type is service provision members (suppliers), the bidding will only be sent to designated members',
}
src/locales/ko-KR/content.ts
View file @ faaf79fd
......@@ -53,5 +53,5 @@
'content.notice.edit': '공지 편집',
'content.notice.see': '게시 보기',
'content.notice.topping': '지붕을 얹다',
'content.xuanze': '아래 라벨에서 선택하십시오'
}
src/locales/ko-KR/handling.ts
View file @ faaf79fd
......@@ -68,7 +68,7 @@ export default {
'handling.assign.add.processName.requiredMsg': '가공업체를 선택하세요',
'handling.assign.add.receiveAddress': '배송 주소',
'handling.assign.add.receiveAddress.requiredMsg': '가공업체를 선택하세요',
'handling.assign.add.notice.source': '알림 메시지 원본',
'handling.assign.add.notice.source': '고지서 출처',
'handling.assign.add.notice.source.order': '주문 가공',
'handling.assign.add.notice.source.product': '상품 가공',
'handling.assign.add.notice.deliveryDate': '납기',
......
src/locales/ko-KR/payandSettle.ts
View file @ faaf79fd
......@@ -701,7 +701,7 @@ export default {
'payandSettle.capitalAccounts.accountLists.accountDetail.card.1.rightTitle.3': '잠금 금액(원):',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.1.rightTitle.4': '계정 상태:',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.1.button.1': '충전하다',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.1.button.2': '현금 인출을 신청하다',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.1.button.2': '신청하다',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.2': '거래 기록',
'payandSettle.capitalAccounts.accountLists.accountDetail.card.3': '유전 기록',
'payandSettle.capitalAccounts.accountLists.accountDetail.modal.1.modalTitle': '계정 충전',
......
src/locales/ko-KR/purchase.ts
View file @ faaf79fd
......@@ -991,4 +991,9 @@ export default {
'purchase.zhenduiyuxiangmukeshiyong': '프로젝트에 사용할 수 있는 예산 금액',
'purchase.yusuanjine': '예산 금액',
'purchase.zhileguishudishihou': '귀속 지구시를 설정한후이 입찰은 지구시에 따라 선별할수 있으며 설치하지 않았을 때는 모든 지구시를 묵인했다',
'purchase.zhaobiaoxiagmuqiwnag': '입찰 프로젝트의 예상 거래 가격',
'purchase.zhaobiaofabuzhicaigoumen': '입찰이 조달 포털에 게시됨',
'purchase.yaoqingzhaobiao': '입찰 초대',
'purchase.xuanzeyudangqianhuiyuanxia':
'현재 회원과 제휴하고 역할 유형이 서비스 제공 회원(공급자)인 회원을 선택하면 지정된 회원에게만 입찰이 발송됩니다.',
}
src/locales/zh-CN/content.ts
View file @ faaf79fd
......@@ -53,5 +53,6 @@
'content.notice.edit': '编辑公告',
'content.notice.see': '查看公告',
'content.notice.topping': '置顶',
'content.xuanze': '从下列标签中选择'
}
src/locales/zh-CN/purchase.ts
View file @ faaf79fd
......@@ -992,4 +992,9 @@ export default {
'purchase.zhenduiyuxiangmukeshiyong': '针对于项目可使用的预算金额',
'purchase.yusuanjine': '预算金额',
'purchase.zhileguishudishihou': '置了归属地市后，此招标可根据地市进行筛选，未设置时默认为所有地市',
'purchase.zhaobiaoxiagmuqiwnag': '招标项目期望成交价格',
'purchase.zhaobiaofabuzhicaigoumen': '招标发布至采购门户',
'purchase.yaoqingzhaobiao': '邀请招标',
'purchase.xuanzeyudangqianhuiyuanxia':
'选择与当前会员下属关系的会员且角色类型为服务提供的会员（供应商），招标只发送给指定会员',
}
src/pages/balance/settleRules/memberSettle/schema/index.tsx
View file @ faaf79fd
......@@ -149,7 +149,7 @@ export const addSchema = {
'x-rules': [
{
required: true,
message: intl.formatMessage({ id: 'balance.settleRules.memberSettle.info.schema.addSchema.memberTab.message' })
message: intl.formatMessage({ id: 'balance.settleRules.memberSettle.info.schema.addSchema.memberTab.someLists' })
}
]
}
......
src/pages/channel/memberList/index.tsx
View file @ faaf79fd
......@@ -107,7 +107,7 @@ const ChannelMember: React.FC<{}> = () => {
layouts: {
order: 2
},
children: <Button style={{width: 140}} icon={<PlusOutlined/>} onClick={() => history.push('/memberCenter/channelAbility/memberList/add')} type='primary'>新建</Button>
children: <Button style={{width: 140}} icon={<PlusOutlined/>} onClick={() => history.push('/memberCenter/channelAbility/memberList/add')} type='primary'>{intl.formatMessage({id: 'common.button.add'})}</Button>
}}
formilyProps={{
layouts: {
......
src/pages/content/components/CustomCheckbox/index.tsx
View file @ faaf79fd
import React from 'react';
import { Checkbox } from 'antd';
import { getIntl } from 'umi';
const CustomCheckbox = (props) => {
console.log(props);
const intl = getIntl();
const editable = props.editable
const handleChange = (e) => {
props.mutators.change(e.target.checked)
}
return (
<Checkbox disabled={!editable} checked={props.value} onChange={handleChange}>置顶</Checkbox>
<Checkbox disabled={!editable} checked={props.value} onChange={handleChange}>{intl.formatMessage({id: 'content.notice.topping'})}</Checkbox>
)
}
CustomCheckbox.isFieldComponent = true
export default CustomCheckbox
\ No newline at end of file
export default CustomCheckbox
src/pages/content/components/Tags/Tags.tsx
View file @ faaf79fd
import React, { useState, useEffect } from 'react';
import styles from './Tags.less';
import { CloseCircleOutlined } from '@ant-design/icons';
import { getIntl } from 'umi';
const Tags = (props) => {
const seletedTag = props.props['x-component-props']['seletedTag'] ;
const intl = getIntl();
const editable = props.editable;
const [tags, setTags] = useState<number[]>([]);
......@@ -12,7 +14,7 @@ const Tags = (props) => {
setTags(seletedTag);
}
}, [seletedTag])
const handleItemSelect = (params) => {
const { value } = params;
if(tags.includes(value)) {
......@@ -40,7 +42,7 @@ const Tags = (props) => {
const dataSource = props.props['x-component-props']['dataSource'] || [];
const selected = dataSource.filter((item) => tags.includes(item.value) )
return (
<div className={styles.tagContainer}>
<div className={styles.selection}>
......@@ -54,32 +56,32 @@ const Tags = (props) => {
? <span className={styles.icon} onClick={() => handleCancel(item)}><CloseCircleOutlined /></span>
: null
}
</div>
)
})
}
</div>
{
editable
editable
? <>
<p className={styles.tips}>从下列标签中选择</p>
<p className={styles.tips}>{intl.formatMessage({id: 'content.xuanze'})}</p>
<div className={styles.tags}>
{
dataSource.map((item) => {
return (
<div className={styles.tagItem} key={item.value} onClick={() => handleItemSelect(item)}>
{item.label}
</div>
</div>
)
})
}
</div>
</>
: null
}
</div>
)
}
......
src/pages/content/infomation/schema/infomationInfoSchema.tsx
View file @ faaf79fd
import { getIntl } from 'umi';
interface IOption {
value: number|string,
label: number|string
value: number | string,
label: number | string
}
const sortedList = (() => {
let res: IOption[] = []
for(let i = 1; i <= 10; i++ ) {
for (let i = 1; i <= 10; i++) {
let data: IOption = {
label: i,
value: i
......@@ -30,7 +30,7 @@ const schema = {
"labelAlign": "left",
},
properties: {
title : {
title: {
name: 'title',
title: getIntl().formatMessage({ id: 'common.text.title' }),
'x-component': 'Input',
......@@ -74,12 +74,12 @@ const schema = {
},
allowClear: true,
options: [
{label: getIntl().formatMessage({ id: 'content.info.label1' }), value: 1},
{label: getIntl().formatMessage({ id: 'content.info.label2' }), value: 2},
{label: getIntl().formatMessage({ id: 'content.info.label3' }), value: 3},
{label: getIntl().formatMessage({ id: 'content.info.label4' }), value: 4},
{label: getIntl().formatMessage({ id: 'content.info.label5' }), value: 5},
{label: getIntl().formatMessage({ id: 'content.info.label6' }), value: 6}
{ label: getIntl().formatMessage({ id: 'content.info.label1' }), value: 1 },
{ label: getIntl().formatMessage({ id: 'content.info.label2' }), value: 2 },
{ label: getIntl().formatMessage({ id: 'content.info.label3' }), value: 3 },
{ label: getIntl().formatMessage({ id: 'content.info.label4' }), value: 4 },
{ label: getIntl().formatMessage({ id: 'content.info.label5' }), value: 5 },
{ label: getIntl().formatMessage({ id: 'content.info.label6' }), value: 6 }
],
},
},
......@@ -187,7 +187,7 @@ const schema = {
name: "imageUrl",
"x-component": "CustomUpload",
"x-component-props": {
size: '无',
size: getIntl().formatMessage({ id: 'commodity.products.viewProducts.card.6.isMemberPrice.2' }),
// onChange: "{{uploadImage}}",
fileMaxSize: 300
},
......
src/pages/handling/assign/tobeReviewII/index.tsx
View file @ faaf79fd
......@@ -38,7 +38,7 @@ const AllQuery = () => {
});
const { columns } = useColumnWithFilter(queryColumns, [
{
title: intl.formatMessage({id: 'common,table.action'}),
title: intl.formatMessage({id: 'common.table.action'}),
render: (text, record) => {
return (
<Space>
......
src/pages/home/components/UserCenter/index.tsx
View file @ faaf79fd
......@@ -75,7 +75,7 @@ const UserCenter: React.FC<Iprops> = (props) => {
{`Hi, ${userAuth?.company}! ${intl.formatMessage({ id: 'home.userCenter.wellcome' })}${GlobalConfig.global.siteInfo.name}`}
</div>
<div className={styles.date}>
{today.format(`YYYY${intl.formatMessage({ id: 'home.userCenter.year' })}MM${intl.formatMessage({ id: 'home.userCenter.month' })}DD${intl.formatMessage({ id: 'home.userCenter.day' })}`)} {intl.formatMessage({ id: `home.userCenter.day${today.day()}` })}
{today.format(`YYYY[${intl.formatMessage({ id: 'home.userCenter.year' })}]MM[${intl.formatMessage({ id: 'home.userCenter.month' })}]DD[${intl.formatMessage({ id: 'home.userCenter.day' })}]`)} {intl.formatMessage({ id: `home.userCenter.day${today.day()}` })}
</div>
</div>
<div className={styles.images}>
......
src/pages/payandSettle/eAccountApprove/constant.tsx
View file @ faaf79fd
......@@ -6,11 +6,11 @@ const { Option } = Select;
/**
* 绑定手机
*/
export const BIND_PHONE = 9;
/**
* 解绑手机
*/
export const UNBIND_PHONE = 6;
export const BIND_PHONE = 9;
/**
* 解绑手机
*/
export const UNBIND_PHONE = 6;
// e账户认证 组件切换控制 Context
export const EDetailContext = createContext<any>({})
......@@ -19,11 +19,11 @@ export const EDetailContext = createContext<any>({})
export const formItemLayout = {
labelCol: {
xs: { span: 24 },
sm: { span: 2 },
sm: { span: 4 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 10 },
sm: { span: 8 },
},
};
......
src/pages/procurement/callForBids/addNewBid/schema/index.ts
View file @ faaf79fd
......@@ -77,12 +77,15 @@ const basicInfo: ISchema = {
properties: {
purchaseType: {
type: 'string',
required: true,
enum: Object.values(PURCHASE_TYPE).map((item, index) => ({ label: item, value: ++index })),
title: `{{help('${getIntl().formatMessage({ id: 'schma.purchase.purchaseType.help', defaultMessage: '采购类型' })}', '${getIntl().formatMessage({ id: 'schma.purchase.purchaseType.help.text', defaultMessage: "有固定采购金额：采购金额固定，合同期内不可超过采购金额，无固定采购金额：采购金额不固定，可在合同期内按需采购" })}')}}`,
"x-component-props": {
placeholder: intl.formatMessage({ id: 'schma.purchase.purchaseType' }),
}
},
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}]
},
projectName: {
type: 'string',
......@@ -120,7 +123,8 @@ const basicInfo: ISchema = {
},
budget: {
type: 'number',
title: '{{help("预算金额", "针对于项目可使用的预算金额")}}',
// title: '{{help("预算金额", "针对于项目可使用的预算金额")}}',
title: `{{help("${intl.formatMessage({ id: 'purchase.yusuanjine' })}", "${intl.formatMessage({ id: 'purchase.zhenduiyuxiangmukeshiyong' })}")}}`,
'x-component-props': {
placeholder: intl.formatMessage({ id: 'schma.purchase.budgetPlaceholder' }),
style: {
......@@ -146,14 +150,18 @@ const basicInfo: ISchema = {
},
inviteTenderAreaList: {
type: 'array',
title: '{{help("适用地市", "置了归属地市后，此招标可根据地市进行筛选，未设置时默认为所有地市")}}',
// title: '{{help("适用地市", "置了归属地市后，此招标可根据地市进行筛选，未设置时默认为所有地市")}}',
title: `{{help("${intl.formatMessage({ id: 'detail.purchase.areas' })}", "${intl.formatMessage({ id: 'purchase.zhileguishudishihou' })}")}}`,
'x-component': 'MultAddress',
'x-component-props': {
placeholder: intl.formatMessage({ id: 'detail.purchase.placeholder13' }),
warningText: intl.formatMessage({ id: 'detail.purchase.placeholder14' }),
},
// default: [{ provinceCode: null, province: null, cityCode: null, city: null }],
required: true,
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}]
},
memberName: {
type: 'string',
......@@ -209,7 +217,10 @@ const bidMaterial: ISchema = {
addMode: {
type: 'radio',
title: intl.formatMessage({ id: 'detail.purchase.modalTitle3' }),
required: true,
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}],
enum: [
{
label: intl.formatMessage({ id: 'detail.purchase.modalTitle4' }),
......@@ -257,7 +268,10 @@ const bidRequestInfo: ISchema = {
type: 'string',
"x-component": 'daterange',
title: intl.formatMessage({ id: 'schma.purchase.inviteTenderStartTime' }),
required: true,
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}],
"x-component-props": {
placeholder: [intl.formatMessage({ id: 'detail.purchase.startTime1' }), intl.formatMessage({ id: 'detail.purchase.endTime1' })],
disabledDate: current => {
......@@ -271,7 +285,10 @@ const bidRequestInfo: ISchema = {
type: 'string',
"x-component": 'date',
title: intl.formatMessage({ id: 'table.purchase.openTenderTime' }),
required: true,
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}],
"x-component-props": {
placeholder: intl.formatMessage({ id: 'table.purchase.openTenderTime' }),
disabledDate: current => {
......@@ -285,7 +302,10 @@ const bidRequestInfo: ISchema = {
type: 'string',
"x-component": 'date',
title: intl.formatMessage({ id: 'table.purchase.deliveryTime' }),
required: true,
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}],
"x-component-props": {
placeholder: intl.formatMessage({ id: 'table.purchase.deliveryTime' }),
disabledDate: current => {
......@@ -304,7 +324,8 @@ const bidRequestInfo: ISchema = {
marginTop: 4,
}
},
title: '{{help("目标价", "招标项目期望成交价格")}}',
// title: '{{help("目标价", "招标项目期望成交价格")}}',
title: `{{help("${intl.formatMessage({ id: 'detail.purchase.targetPrice' })}", "${intl.formatMessage({ id: 'purchase.zhaobiaoxiagmuqiwnag' })}")}}`,
default: true,
"x-linkages": [
{
......@@ -392,7 +413,10 @@ const enterRequestInfo: ISchema = {
type: 'string',
"x-component": 'daterange',
title: intl.formatMessage({ id: 'detail.purchase.startSignUp' }),
required: true,
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}],
"x-component-props": {
disabledDate: current => {
return current && current < moment().startOf('second')
......@@ -485,7 +509,10 @@ const qualificationNeedInfo: ISchema = {
showTime: true,
style: { width: "100%" }
},
required: true,
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}],
},
preCheckRequirement: {
type: 'string',
......@@ -553,7 +580,10 @@ const evaluationNeedInfo: ISchema = {
showTime: true,
style: { width: "100%" }
},
required: true,
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}],
},
evaluationRequirement: {
type: 'string',
......@@ -591,7 +621,10 @@ const evaluationNeedInfo: ISchema = {
},
isOnlineEvaluation: {
// type: 'boolean',
required: true,
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}],
"x-component": 'CheckboxSingle',
"x-component-props": {
children: intl.formatMessage({ id: 'table.purchase.zaixianpingbiao' }),
......@@ -612,7 +645,10 @@ const evaluationNeedInfo: ISchema = {
templateId: {
type: 'number',
title: intl.formatMessage({ id: 'table.purchase.pingbiaoxiangmuban' }),
required: true,
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}],
enum: [],
"x-component-props": {
placeholder: intl.formatMessage({ id: 'table.purchase.qingxuanzepingbiao' })
......@@ -754,10 +790,14 @@ const bidPattern: ISchema = {
inviteTenderType: {
type: 'radio',
title: intl.formatMessage({ id: 'table.purchase.zhaobiaofangshi' }),
required: true,
"x-rules": [{
required: true,
message: intl.formatMessage({ id: 'common.bitian' })
}],
enum: [
{
label: '{{help("公开招标", "招标发布至采购门户")}}',
// label: '{{help("公开招标", "招标发布至采购门户")}}',
label: `{{help("${intl.formatMessage({ id: 'detail.purchase.modalTitle' })}", "${intl.formatMessage({ id: 'purchase.zhaobiaofabuzhicaigoumen' })}")}}`,
value: 1
},
// {
......@@ -765,7 +805,8 @@ const bidPattern: ISchema = {
// value: 2
// },
{
label: '{{help("邀请招标", "选择与当前会员下属关系的会员且角色类型为服务提供的会员（供应商），招标只发送给指定会员")}}',
// label: '{{help("邀请招标", "选择与当前会员下属关系的会员且角色类型为服务提供的会员（供应商），招标只发送给指定会员")}}',
label: `{{help("${intl.formatMessage({ id: 'purchase.yaoqingzhaobiao' })}", "${intl.formatMessage({ id: 'purchase.xuanzeyudangqianhuiyuanxia' })}")}}`,
value: 3
}
],
......
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