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
21e58287
Commit
21e58287
authored
Nov 30, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 能力中心 -> 采购计划管理国际化
parent
23b0215e
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
49 additions
and
41 deletions
+49
-41
purchase.ts
src/locales/zh-CN/purchase.ts
+8
-0
index.tsx
...transaction/purchaseAbility/purchasePlan/demand/index.tsx
+10
-10
index.tsx
.../purchaseAbility/purchasePlan/demandPlanSummary/index.tsx
+5
-5
index.tsx
...transaction/purchaseAbility/purchasePlan/detail/index.tsx
+13
-13
modal.tsx
...transaction/purchaseAbility/purchasePlan/detail/modal.tsx
+3
-3
index.tsx
...on/purchaseAbility/purchasePlan/purchasePlanOne/index.tsx
+2
-2
index.tsx
...urchaseAbility/purchasePlan/purchasePlanPerform/index.tsx
+1
-1
index.tsx
...purchaseAbility/purchasePlan/purchasePlanSearch/index.tsx
+1
-1
index.tsx
...purchaseAbility/purchasePlan/purchasePlanSubmit/index.tsx
+4
-4
index.tsx
...on/purchaseAbility/purchasePlan/purchasePlanTwo/index.tsx
+2
-2
No files found.
src/locales/zh-CN/purchase.ts
View file @
21e58287
...
...
@@ -5,6 +5,7 @@ const PurchaseLocales = {
'table.purchase.submit'
:
'提交'
,
'table.purchase.delete'
:
'删除'
,
'table.purchase.purchasePlanNo'
:
'需求计划编号/摘要'
,
'table.purchase.purchasePlanNo1'
:
'需求计划编号/摘要'
,
'table.purchase.startTime'
:
'计划开始/截止时间'
,
'table.purchase.department'
:
'编制部门'
,
'table.purchase.userName'
:
'编制人'
,
...
...
@@ -118,7 +119,9 @@ const PurchaseLocales = {
'detail.purchase.summary'
:
'采购计划摘要'
,
'detail.purchase.innerStatus'
:
'内部状态'
,
'detail.purchase.startTime'
:
'采购计划开始'
,
'detail.purchase.purchaseStartTime'
:
'计划开始时间'
,
'detail.purchase.endTime'
:
'采购计划截止'
,
'detail.purchase.purchaseEndTime'
:
'计划结束时间'
,
'detail.purchase.operate'
:
'编制部门'
,
'detail.purchase.department'
:
'编制人'
,
'detail.purchase.createTime'
:
'编制时间'
,
...
...
@@ -128,6 +131,8 @@ const PurchaseLocales = {
'detail.purchase.demendSummary'
:
'需求计划摘要'
,
'detail.purchase.demendStartTime'
:
'需求计划开始'
,
'detail.purchase.demendEndTime'
:
'需求计划截止'
,
'detail.purchase.billBack'
:
'单据退回'
,
'detail.purchase.billBack1'
:
'退回'
,
'detail.purchase.type'
:
'物料编号/名称'
,
'detail.purchase.nameCode'
:
'规格型号'
,
'detail.purchase.customerCategory'
:
'品类'
,
...
...
@@ -224,6 +229,7 @@ const PurchaseLocales = {
'detail.purchase.modalTitle7'
:
'邀请会员'
,
'detail.purchase.modalTitle8'
:
'选择货品添加'
,
'detail.purchase.modalTitle9'
:
'导入货品生成'
,
'detail.purchase.modalTitle10'
:
'汇总生成采购计划'
,
'detail.purchase.message1'
:
'投标开始时间必须大于报名截止时间'
,
'detail.purchase.message2'
:
'投标开始时间必须大于资质预审截止时间'
,
...
...
@@ -266,6 +272,7 @@ const PurchaseLocales = {
'detail.purchase.message39'
:
'请选择报价截止日期'
,
'detail.purchase.message40'
:
'请选择对接方式'
,
'detail.purchase.message41'
:
'请选择会员'
,
'detail.purchase.message42'
:
'请勾选要汇总生成订单'
,
'detail.purchase.placeholder'
:
'选择开始日期'
,
'detail.purchase.placeholder1'
:
'确定要执行这个操作?'
,
...
...
@@ -288,6 +295,7 @@ const PurchaseLocales = {
'detail.purchase.tips5'
:
'打开开关,审核通过后,将发送需求至选择的归属会员'
,
'detail.purchase.tips6'
:
'需求发布至采购门户'
,
'detail.purchase.tips7'
:
'选择与当前会员有归属关系的会员且角色类型为服务提供的会员(供应商),需求只发送给指定会员'
,
'detail.purchase.tips8'
:
'是否将选择的需求计划汇总生成采购计划?生成采购计划后如需重新生成,需要先删除已生成的采购计划'
,
}
export
default
PurchaseLocales
src/pages/transaction/purchaseAbility/purchasePlan/demand/index.tsx
View file @
21e58287
...
...
@@ -19,10 +19,10 @@ import { getPurchaseNeedPlanDetails, getPurchaseNeedPlanNeedPlanDetail, postPurc
const
intl
=
getIntl
();
const
TABLINK
=
[
{
id
:
'progressLayout'
,
title
:
'流转进度'
},
{
id
:
'basicLayout'
,
title
:
'基本信息'
},
{
id
:
'materialLayout'
,
title
:
'采购物料'
},
{
id
:
'recordLyout'
,
title
:
'流转记录'
},
{
id
:
'progressLayout'
,
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.progressLayout'
})
},
{
id
:
'basicLayout'
,
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.basicLayout'
})
},
{
id
:
'materialLayout'
,
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.materialLayout'
})
},
{
id
:
'recordLyout'
,
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.recordLyout'
})
},
]
const
DemandDetailed
=
()
=>
{
...
...
@@ -43,15 +43,15 @@ const DemandDetailed = () => {
setBasicEffect
([
{
col
:
[
{
label
:
'需求计划编号'
,
extra
:
data
.
needPlanNo
},
{
label
:
'需求计划摘要'
,
extra
:
data
.
summary
},
{
label
:
intl
.
formatMessage
({
id
:
'detail.purchase.needPlanNo'
})
,
extra
:
data
.
needPlanNo
},
{
label
:
intl
.
formatMessage
({
id
:
'detail.purchase.demendSummary'
})
,
extra
:
data
.
summary
},
{
label
:
intl
.
formatMessage
({
id
:
'table.purchase.innerStatus'
}),
extra
:
<
Badge
status=
{
OFFTER_INTERNALSTATE_COLOR
[
data
.
innerStatus
]
}
text=
{
data
.
innerStatusName
}
/>
},
]
},
{
col
:
[
{
label
:
'需求计划开始'
,
extra
:
format
(
data
.
startTime
,
"YYYY-MM-DD"
)
},
{
label
:
'需求计划截止'
,
extra
:
format
(
data
.
endTime
,
"YYYY-MM-DD"
)
},
{
label
:
intl
.
formatMessage
({
id
:
'detail.purchase.demendStartTime'
})
,
extra
:
format
(
data
.
startTime
,
"YYYY-MM-DD"
)
},
{
label
:
intl
.
formatMessage
({
id
:
'detail.purchase.demendEndTime'
})
,
extra
:
format
(
data
.
endTime
,
"YYYY-MM-DD"
)
},
]
},
{
...
...
@@ -132,7 +132,7 @@ const DemandDetailed = () => {
type=
'primary'
>
<
MinusCircleOutlined
/>
单据退回
{
intl
.
formatMessage
({
id
:
'detail.purchase.billBack'
})
}
</
Button
>
)
}
</>
...
...
@@ -151,7 +151,7 @@ const DemandDetailed = () => {
/>
<
ModalOperate
id=
{
id
}
title=
"单据退回"
title=
{
intl
.
formatMessage
({
id
:
'detail.purchase.billBack'
})
}
modalType=
"billBack"
visible=
{
visible
}
fetch=
{
postPurchaseNeedPlanSendBack
}
...
...
src/pages/transaction/purchaseAbility/purchasePlan/demandPlanSummary/index.tsx
View file @
21e58287
...
...
@@ -71,7 +71,7 @@ const DemandPlanSummary = () => {
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/procurementAbility/purchasePlan/demandPlanSummary/detail?id=${record.id}`
)
}
>
退回
{
intl
.
formatMessage
({
id
:
'detail.purchase.billBack1'
})
}
</
Button
>
</>
)
...
...
@@ -83,7 +83,7 @@ const DemandPlanSummary = () => {
const
fetchSubmitBatch
=
async
()
=>
{
if
(
isEmpty
(
idList
))
{
message
.
warning
(
'请勾选要汇总生成订单'
);
message
.
warning
(
intl
.
formatMessage
({
id
:
'detail.purchase.message42'
})
);
return
;
}
setConfirmLoading
(
true
);
...
...
@@ -118,21 +118,21 @@ const DemandPlanSummary = () => {
disabled=
{
idList
.
length
===
0
}
onClick=
{
()
=>
setVisible
(
true
)
}
>
汇总生成采购计划
{
intl
.
formatMessage
({
id
:
'detail.purchase.modalTitle10'
})
}
</
Button
>
</
Col
>
</
Row
>
}
/>
<
Modal
title=
"汇总生成采购计划"
title=
{
intl
.
formatMessage
({
id
:
'detail.purchase.modalTitle10'
})
}
visible=
{
visible
}
onOk=
{
fetchSubmitBatch
}
confirmLoading=
{
confirmLoading
}
onCancel=
{
handleCancel
}
>
<
p
>
是否将选择的需求计划汇总生成采购计划?生成采购计划后如需重新生成,需要先删除已生成的采购计划
{
intl
.
formatMessage
({
id
:
'detail.purchase.tips8'
})
}
</
p
>
</
Modal
>
</>
...
...
src/pages/transaction/purchaseAbility/purchasePlan/detail/index.tsx
View file @
21e58287
...
...
@@ -20,10 +20,10 @@ import { getPurchasePurchasePlanDetails, getPurchasePurchasePlanPurchasePlanDeta
const
intl
=
getIntl
();
const
TABLINK
=
[
{
id
:
'progressLayout'
,
title
:
'流转进度'
},
{
id
:
'basicLayout'
,
title
:
'基本信息'
},
{
id
:
'materialLayout'
,
title
:
'采购物料'
},
{
id
:
'recordLyout'
,
title
:
'流转记录'
},
{
id
:
'progressLayout'
,
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.progressLayout'
})
},
{
id
:
'basicLayout'
,
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.basicLayout'
})
},
{
id
:
'materialLayout'
,
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.materialLayout'
})
},
{
id
:
'recordLyout'
,
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.recordLyout'
})
},
]
interface
PropsType
{
...
...
@@ -67,12 +67,12 @@ const PurchasePlanDetailed = () => {
setBasicEffect
([
{
col
:
[
{
label
:
'采购计划编号'
,
extra
:
data
.
purchasePlanNo
},
{
label
:
intl
.
formatMessage
({
id
:
'detail.purchase.purchasePlanNo'
})
,
extra
:
data
.
purchasePlanNo
},
{
label
:
'采购计划摘要'
,
extra
:
(
label
:
intl
.
formatMessage
({
id
:
'detail.purchase.summary'
})
,
extra
:
(
<
div
style=
{
{
display
:
'flex'
,
justifyContent
:
'space-between'
,
width
:
'100%'
}
}
>
<
span
>
{
data
.
summary
}
</
span
>
{
(
pathPci
===
'purchasePlanSubmit'
&&
path
===
'detail'
)
&&
(<
span
onClick=
{
()
=>
handleEidt
(
data
.
summary
,
'采购计划摘要'
,
'summary'
)
}
style=
{
{
padding
:
0
,
color
:
'#00B37A'
,
cursor
:
'pointer'
}
}
>
修改摘要
</
span
>)
}
{
(
pathPci
===
'purchasePlanSubmit'
&&
path
===
'detail'
)
&&
(<
span
onClick=
{
()
=>
handleEidt
(
data
.
summary
,
intl
.
formatMessage
({
id
:
'detail.purchase.summary'
})
,
'summary'
)
}
style=
{
{
padding
:
0
,
color
:
'#00B37A'
,
cursor
:
'pointer'
}
}
>
修改摘要
</
span
>)
}
</
div
>
)
...
...
@@ -83,18 +83,18 @@ const PurchasePlanDetailed = () => {
{
col
:
[
{
label
:
'采购计划开始'
,
extra
:
(
label
:
intl
.
formatMessage
({
id
:
'detail.purchase.startTime'
})
,
extra
:
(
<
div
style=
{
{
display
:
'flex'
,
justifyContent
:
'space-between'
,
width
:
'100%'
}
}
>
<
span
>
{
format
(
data
.
startTime
,
"YYYY-MM-DD"
)
}
</
span
>
{
(
pathPci
===
'purchasePlanSubmit'
&&
path
===
'detail'
)
&&
(<
span
onClick=
{
()
=>
handleEidt
(
data
.
startTime
,
'计划开始时间'
,
'startTime'
)
}
style=
{
{
padding
:
0
,
color
:
'#00B37A'
,
cursor
:
'pointer'
}
}
>
修改时间
</
span
>)
}
{
(
pathPci
===
'purchasePlanSubmit'
&&
path
===
'detail'
)
&&
(<
span
onClick=
{
()
=>
handleEidt
(
data
.
startTime
,
intl
.
formatMessage
({
id
:
'detail.purchase.purchaseStartTime'
})
,
'startTime'
)
}
style=
{
{
padding
:
0
,
color
:
'#00B37A'
,
cursor
:
'pointer'
}
}
>
修改时间
</
span
>)
}
</
div
>
)
},
{
label
:
'采购计划截止'
,
extra
:
(
label
:
intl
.
formatMessage
({
id
:
'detail.purchase.endTime'
})
,
extra
:
(
<
div
style=
{
{
display
:
'flex'
,
justifyContent
:
'space-between'
,
width
:
'100%'
}
}
>
<
span
>
{
format
(
data
.
endTime
,
"YYYY-MM-DD"
)
}
</
span
>
{
(
pathPci
===
'purchasePlanSubmit'
&&
path
===
'detail'
)
&&
(<
span
onClick=
{
()
=>
handleEidt
(
data
.
endTime
,
'计划结束时间'
,
'endTime'
)
}
style=
{
{
padding
:
0
,
color
:
'#00B37A'
,
cursor
:
'pointer'
}
}
>
修改时间
</
span
>)
}
{
(
pathPci
===
'purchasePlanSubmit'
&&
path
===
'detail'
)
&&
(<
span
onClick=
{
()
=>
handleEidt
(
data
.
endTime
,
intl
.
formatMessage
({
id
:
'detail.purchase.purchaseEndTime'
})
,
'endTime'
)
}
style=
{
{
padding
:
0
,
color
:
'#00B37A'
,
cursor
:
'pointer'
}
}
>
修改时间
</
span
>)
}
</
div
>
)
},
...
...
@@ -219,7 +219,7 @@ const PurchasePlanDetailed = () => {
type=
'primary'
>
<
CheckCircleOutlined
/>
提交审核
{
intl
.
formatMessage
({
id
:
'detail.purchase.submit'
})
}
</
Button
>
)
}
</>
...
...
@@ -238,7 +238,7 @@ const PurchasePlanDetailed = () => {
/>
<
ModalOperate
id=
{
id
}
title=
"单据审核"
title=
{
intl
.
formatMessage
({
id
:
'detail.purchase.modelTitle'
})
}
modalType=
"planAudit"
visible=
{
visible
}
fetch=
{
fetchLink
()
}
...
...
src/pages/transaction/purchaseAbility/purchasePlan/detail/modal.tsx
View file @
21e58287
...
...
@@ -105,7 +105,7 @@ const ModalLayout: React.FC<ModalLayoutProps> = (props: any) => {
>
{
type
===
'summary'
&&
(
<
Field
title=
"采购计划摘要"
title=
{
intl
.
formatMessage
({
id
:
'detail.purchase.summary'
})
}
name=
"summary"
required
x
-
component=
"Input"
...
...
@@ -118,7 +118,7 @@ const ModalLayout: React.FC<ModalLayoutProps> = (props: any) => {
)
}
{
type
===
'startTime'
&&
(
<
Field
title=
"计划开始时间"
title=
{
intl
.
formatMessage
({
id
:
'detail.purchase.purchaseStartTime'
})
}
name=
"startTime"
required
x
-
component=
"DatePicker"
...
...
@@ -133,7 +133,7 @@ const ModalLayout: React.FC<ModalLayoutProps> = (props: any) => {
)
}
{
type
===
'endTime'
&&
(
<
Field
title=
"计划结束时间"
title=
{
intl
.
formatMessage
({
id
:
'detail.purchase.purchaseEndTime'
})
}
name=
"endTime"
required
x
-
component=
"DatePicker"
...
...
src/pages/transaction/purchaseAbility/purchasePlan/purchasePlanOne/index.tsx
View file @
21e58287
...
...
@@ -19,7 +19,7 @@ const PurchasePlanOne = () => {
return
<>
{
moment
(
text
).
format
(
"YYYY-MM-DD"
)
}
</>
}
const
columns
:
ColumnType
<
any
>
[]
=
[{
title
:
'采购计划编号/摘要'
,
title
:
intl
.
formatMessage
({
id
:
'table.purchase.purchasePlanNo1'
})
,
key
:
'purchasePlanNo'
,
dataIndex
:
'purchasePlanNo'
,
render
:
(
text
:
any
,
record
:
any
)
=>
(
...
...
@@ -66,7 +66,7 @@ const PurchasePlanOne = () => {
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/procurementAbility/purchasePlan/purchasePlanOne/detail?id=${record.id}`
)
}
>
审核
{
intl
.
formatMessage
({
id
:
'table.purchase.audit'
})
}
</
Button
>
</>
)
...
...
src/pages/transaction/purchaseAbility/purchasePlan/purchasePlanPerform/index.tsx
View file @
21e58287
...
...
@@ -19,7 +19,7 @@ const PurchasePlanPerform = () => {
return
<>
{
moment
(
text
).
format
(
"YYYY-MM-DD"
)
}
</>
}
const
columns
:
ColumnType
<
any
>
[]
=
[{
title
:
'采购计划编号/摘要'
,
title
:
intl
.
formatMessage
({
id
:
'table.purchase.purchasePlanNo1'
})
,
key
:
'purchasePlanNo'
,
dataIndex
:
'purchasePlanNo'
,
render
:
(
text
:
any
,
record
:
any
)
=>
(
...
...
src/pages/transaction/purchaseAbility/purchasePlan/purchasePlanSearch/index.tsx
View file @
21e58287
...
...
@@ -19,7 +19,7 @@ const PurchasePlanSearch = () => {
return
<>
{
moment
(
text
).
format
(
"YYYY-MM-DD"
)
}
</>
}
const
columns
:
ColumnType
<
any
>
[]
=
[{
title
:
'采购计划编号/摘要'
,
title
:
intl
.
formatMessage
({
id
:
'table.purchase.purchasePlanNo1'
})
,
key
:
'purchasePlanNo'
,
dataIndex
:
'purchasePlanNo'
,
render
:
(
text
:
any
,
record
:
any
)
=>
(
...
...
src/pages/transaction/purchaseAbility/purchasePlan/purchasePlanSubmit/index.tsx
View file @
21e58287
...
...
@@ -21,7 +21,7 @@ const PurchasePlanSubmit = () => {
return
<>
{
moment
(
text
).
format
(
"YYYY-MM-DD"
)
}
</>
}
const
columns
:
ColumnType
<
any
>
[]
=
[{
title
:
'采购计划编号/摘要'
,
title
:
intl
.
formatMessage
({
id
:
'table.purchase.purchasePlanNo1'
})
,
key
:
'purchasePlanNo'
,
dataIndex
:
'purchasePlanNo'
,
render
:
(
text
:
any
,
record
:
any
)
=>
(
...
...
@@ -66,12 +66,12 @@ const PurchasePlanSubmit = () => {
<>
{
record
.
innerStatus
===
DEMANDPLAN_INTERNALSTATE_TYPE
.
WAITESUBMITAUDIT_TYPE
&&
(
<
Button
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/procurementAbility/purchasePlan/purchasePlanSubmit/detail?id=${record.id}`
)
}
>
提交
{
intl
.
formatMessage
({
id
:
'table.purchase.submit'
})
}
</
Button
>
)
}
<
Popconfirm
title=
"确定要删除吗?"
okText=
"是"
cancelText=
"否"
onConfirm=
{
()
=>
handleDelect
(
record
.
id
)
}
>
<
Popconfirm
title=
{
intl
.
formatMessage
({
id
:
'table.purchase.popconfirm2'
})
}
okText=
{
intl
.
formatMessage
({
id
:
'table.purchase.okText'
})
}
cancelText=
{
intl
.
formatMessage
({
id
:
'table.purchase.cancelText'
})
}
onConfirm=
{
()
=>
handleDelect
(
record
.
id
)
}
>
<
Button
type=
'link'
>
删除
{
intl
.
formatMessage
({
id
:
'table.purchase.delete'
})
}
</
Button
>
</
Popconfirm
>
</>
...
...
src/pages/transaction/purchaseAbility/purchasePlan/purchasePlanTwo/index.tsx
View file @
21e58287
...
...
@@ -19,7 +19,7 @@ const PurchasePlanTwo = () => {
return
<>
{
moment
(
text
).
format
(
"YYYY-MM-DD"
)
}
</>
}
const
columns
:
ColumnType
<
any
>
[]
=
[{
title
:
'采购计划编号/摘要'
,
title
:
intl
.
formatMessage
({
id
:
'table.purchase.purchasePlanNo1'
})
,
key
:
'purchasePlanNo'
,
dataIndex
:
'purchasePlanNo'
,
render
:
(
text
:
any
,
record
:
any
)
=>
(
...
...
@@ -66,7 +66,7 @@ const PurchasePlanTwo = () => {
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/procurementAbility/purchasePlan/purchasePlanTwo/detail?id=${record.id}`
)
}
>
审核
{
intl
.
formatMessage
({
id
:
'table.purchase.audit'
})
}
</
Button
>
</>
)
...
...
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