Commit e6ec82e5 authored by 前端-吴智勇's avatar 前端-吴智勇

Merge branch 'jinfa-0518' into 'jinfa-0518'

Jinfa 0518 See merge request project/jinfa-platform!324
parents 1105c26a fbfbdd5d
......@@ -97,7 +97,7 @@ export default {
'contract.zhengzaicaozuo': 'In operation',
'contract.shangchuanchenggong': 'Uploaded successfully',
'contract.shangchuanshibai': 'Upload failed',
'contract.fujiandaxiaochaoguo20M': 'Attachment size exceeds 20M',
'contract.fujiandaxiaochaoguo10M': 'Attachment size exceeds 20M',
'contract.zhizhihetongyifangyi': 'Paper contract (Party B has signed and sealed)',
'contract.shangchuanfujian': 'Upload attachment',
'contract.tijiaoshenhe': 'Submit for review',
......
......@@ -97,7 +97,7 @@ export default {
'contract.zhengzaicaozuo': '작업 중',
'contract.shangchuanchenggong': '업로드 성공',
'contract.shangchuanshibai': '업로드 실패',
'contract.fujiandaxiaochaoguo20M': '액세서리 크기 20M 이상',
'contract.fujiandaxiaochaoguo10M': '액세서리 크기 20M 이상',
'contract.zhizhihetongyifangyi': '종이 계약서(을이 이미 날인하여 서명함)',
'contract.shangchuanfujian': '첨부 파일 업로드',
'contract.tijiaoshenhe': '제출 심사',
......
......@@ -97,7 +97,7 @@ export default {
'contract.zhengzaicaozuo': '正在操作',
'contract.shangchuanchenggong': '上传成功',
'contract.shangchuanshibai': '上传失败',
'contract.fujiandaxiaochaoguo20M': '附件大小超过20M',
'contract.fujiandaxiaochaoguo10M': '附件大小超过10M',
'contract.zhizhihetongyifangyi': '纸质合同(乙方已盖章签字)',
'contract.shangchuanfujian': '上传附件',
'contract.tijiaoshenhe': '提交审核',
......@@ -348,7 +348,7 @@ export default {
'contract.jingjiadanzhaiyao': '竞价单/摘要',
'contract.huiyuanID': '会员ID',
'contract.qingxianxuanzehetongmoban': '请先选择合同模版',
'contract.shangchuanwenjiandaxiaobuchao': '上传文件大小不超过 20M!',
'contract.shangchuanwenjiandaxiaobuchao': '上传文件大小不超过 10M!',
'contract.hetongmuban': '合同模板',
'contract.qingxuanzehetongmuban': '请选择合同模板',
'contract.shengchenghetong': '生成合同',
......
......@@ -195,8 +195,8 @@ const Examine: React.FC<Iprops> = ({
message.warning(intl.formatMessage({ id: 'contract.fujiandaxiaochaoguo.limit' }));
return Upload.LIST_IGNORE;
}
if (file.size / 1024 / 1024 > 20) {
message.warning(intl.formatMessage({ id: 'contract.fujiandaxiaochaoguo20M' }));
if (file.size / 1024 / 1024 > 10) {
message.warning(intl.formatMessage({ id: 'contract.fujiandaxiaochaoguo10M' }));
// return Promise.reject();
return Upload.LIST_IGNORE;
}
......
......@@ -120,11 +120,11 @@ const ContractText = (props: any) => {
message.warning(intl.formatMessage({ id: 'contract.fujiandaxiaochaoguo.limit' }));
return Upload.LIST_IGNORE;
}
const isLt20M = file.size / 1024 / 1024 < 20;
if (!isLt20M) {
const isLt10M = file.size / 1024 / 1024 < 10;
if (!isLt10M) {
message.error(intl.formatMessage({ id: 'contract.shangchuanwenjiandaxiaobuchao' }));
}
return isLt20M;
return isLt10M;
}
// 上传回调
const handleChange = ({ fileList }) => {
......
......@@ -81,11 +81,11 @@ const ContractText = (props: any) => {
}, [ctText])
/**判断文件类型和大小 */
const beforeDocUpload = (file: any) => {
const isLt20M = file.size / 1024 / 1024 < 20;
if (!isLt20M) {
const isLt10M = file.size / 1024 / 1024 < 10;
if (!isLt10M) {
message.error(intl.formatMessage({ id: 'contract.shangchuanwenjiandaxiaobuchao' }));
}
return isLt20M;
return isLt10M;
}
// 上传回调
const handleChange = ({ fileList }) => {
......
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