Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linweijiong
jinfa-platform
Commits
e6ec82e5
Commit
e6ec82e5
authored
Sep 21, 2022
by
前端-吴智勇
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'jinfa-0518' into 'jinfa-0518'
Jinfa 0518 See merge request project/jinfa-platform!324
parents
1105c26a
fbfbdd5d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
contract.ts
src/locales/en-US/contract.ts
+1
-1
contract.ts
src/locales/ko-KR/contract.ts
+1
-1
contract.ts
src/locales/zh-CN/contract.ts
+2
-2
index.tsx
src/pages/contract/components/examine/index.tsx
+2
-2
ContractText.tsx
src/pages/contract/manage/add/components/ContractText.tsx
+3
-3
ContractText.tsx
...pages/contract/manage/editing/components/ContractText.tsx
+3
-3
No files found.
src/locales/en-US/contract.ts
View file @
e6ec82e5
...
...
@@ -97,7 +97,7 @@ export default {
'contract.zhengzaicaozuo'
:
'In operation'
,
'contract.shangchuanchenggong'
:
'Uploaded successfully'
,
'contract.shangchuanshibai'
:
'Upload failed'
,
'contract.fujiandaxiaochaoguo
2
0M'
:
'Attachment size exceeds 20M'
,
'contract.fujiandaxiaochaoguo
1
0M'
:
'Attachment size exceeds 20M'
,
'contract.zhizhihetongyifangyi'
:
'Paper contract (Party B has signed and sealed)'
,
'contract.shangchuanfujian'
:
'Upload attachment'
,
'contract.tijiaoshenhe'
:
'Submit for review'
,
...
...
src/locales/ko-KR/contract.ts
View file @
e6ec82e5
...
...
@@ -97,7 +97,7 @@ export default {
'contract.zhengzaicaozuo'
:
'작업 중'
,
'contract.shangchuanchenggong'
:
'업로드 성공'
,
'contract.shangchuanshibai'
:
'업로드 실패'
,
'contract.fujiandaxiaochaoguo
2
0M'
:
'액세서리 크기 20M 이상'
,
'contract.fujiandaxiaochaoguo
1
0M'
:
'액세서리 크기 20M 이상'
,
'contract.zhizhihetongyifangyi'
:
'종이 계약서(을이 이미 날인하여 서명함)'
,
'contract.shangchuanfujian'
:
'첨부 파일 업로드'
,
'contract.tijiaoshenhe'
:
'제출 심사'
,
...
...
src/locales/zh-CN/contract.ts
View file @
e6ec82e5
...
...
@@ -97,7 +97,7 @@ export default {
'contract.zhengzaicaozuo'
:
'正在操作'
,
'contract.shangchuanchenggong'
:
'上传成功'
,
'contract.shangchuanshibai'
:
'上传失败'
,
'contract.fujiandaxiaochaoguo
20M'
:
'附件大小超过2
0M'
,
'contract.fujiandaxiaochaoguo
10M'
:
'附件大小超过1
0M'
,
'contract.zhizhihetongyifangyi'
:
'纸质合同(乙方已盖章签字)'
,
'contract.shangchuanfujian'
:
'上传附件'
,
'contract.tijiaoshenhe'
:
'提交审核'
,
...
...
@@ -348,7 +348,7 @@ export default {
'contract.jingjiadanzhaiyao'
:
'竞价单/摘要'
,
'contract.huiyuanID'
:
'会员ID'
,
'contract.qingxianxuanzehetongmoban'
:
'请先选择合同模版'
,
'contract.shangchuanwenjiandaxiaobuchao'
:
'上传文件大小不超过
2
0M!'
,
'contract.shangchuanwenjiandaxiaobuchao'
:
'上传文件大小不超过
1
0M!'
,
'contract.hetongmuban'
:
'合同模板'
,
'contract.qingxuanzehetongmuban'
:
'请选择合同模板'
,
'contract.shengchenghetong'
:
'生成合同'
,
...
...
src/pages/contract/components/examine/index.tsx
View file @
e6ec82e5
...
...
@@ -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
>
2
0
)
{
message
.
warning
(
intl
.
formatMessage
({
id
:
'contract.fujiandaxiaochaoguo
2
0M'
}));
if
(
file
.
size
/
1024
/
1024
>
1
0
)
{
message
.
warning
(
intl
.
formatMessage
({
id
:
'contract.fujiandaxiaochaoguo
1
0M'
}));
// return Promise.reject();
return
Upload
.
LIST_IGNORE
;
}
...
...
src/pages/contract/manage/add/components/ContractText.tsx
View file @
e6ec82e5
...
...
@@ -120,11 +120,11 @@ const ContractText = (props: any) => {
message
.
warning
(
intl
.
formatMessage
({
id
:
'contract.fujiandaxiaochaoguo.limit'
}));
return
Upload
.
LIST_IGNORE
;
}
const
isLt
20M
=
file
.
size
/
1024
/
1024
<
2
0
;
if
(
!
isLt
2
0M
)
{
const
isLt
10M
=
file
.
size
/
1024
/
1024
<
1
0
;
if
(
!
isLt
1
0M
)
{
message
.
error
(
intl
.
formatMessage
({
id
:
'contract.shangchuanwenjiandaxiaobuchao'
}));
}
return
isLt
2
0M
;
return
isLt
1
0M
;
}
// 上传回调
const
handleChange
=
({
fileList
})
=>
{
...
...
src/pages/contract/manage/editing/components/ContractText.tsx
View file @
e6ec82e5
...
...
@@ -81,11 +81,11 @@ const ContractText = (props: any) => {
},
[
ctText
])
/**判断文件类型和大小 */
const
beforeDocUpload
=
(
file
:
any
)
=>
{
const
isLt
20M
=
file
.
size
/
1024
/
1024
<
2
0
;
if
(
!
isLt
2
0M
)
{
const
isLt
10M
=
file
.
size
/
1024
/
1024
<
1
0
;
if
(
!
isLt
1
0M
)
{
message
.
error
(
intl
.
formatMessage
({
id
:
'contract.shangchuanwenjiandaxiaobuchao'
}));
}
return
isLt
2
0M
;
return
isLt
1
0M
;
}
// 上传回调
const
handleChange
=
({
fileList
})
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment