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
c17d782b
Commit
c17d782b
authored
Jun 18, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
parent
e17c41d4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
29 deletions
+41
-29
index.tsx
...transaction/purchaseOrder/orderCollect/constant/index.tsx
+25
-16
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+3
-7
useMaterialTable.tsx
...ion/purchaseOrder/orderCollect/model/useMaterialTable.tsx
+4
-3
index.ts
...es/transaction/purchaseOrder/orderCollect/schema/index.ts
+6
-0
index.tsx
src/pages/transaction/purchaseOrder/readyAddOrder/index.tsx
+3
-3
No files found.
src/pages/transaction/purchaseOrder/orderCollect/constant/index.tsx
View file @
c17d782b
...
@@ -4,6 +4,7 @@ import { Row } from 'antd'
...
@@ -4,6 +4,7 @@ import { Row } from 'antd'
import
{
DELIVERY_TYPE
,
OrderModalType
,
PurchaseOrderOutWorkStateTexts
}
from
'@/constants/order'
import
{
DELIVERY_TYPE
,
OrderModalType
,
PurchaseOrderOutWorkStateTexts
}
from
'@/constants/order'
import
moment
from
'moment'
import
moment
from
'moment'
import
{
AddressPop
}
from
'../components/productModalTable'
import
{
AddressPop
}
from
'../components/productModalTable'
import
{
GlobalConfig
}
from
'@/global/config'
;
// 简单控制价格区间的组件
// 简单控制价格区间的组件
// @todo 后续需要优化, 样式,目录文件等。
// @todo 后续需要优化, 样式,目录文件等。
...
@@ -138,22 +139,30 @@ export const orderTypeLabel = ['',
...
@@ -138,22 +139,30 @@ export const orderTypeLabel = ['',
// '采购招标合同',
// '采购招标合同',
]
]
export
const
orderTypeLabelMap
=
{
// export const orderTypeLabelMap = {
"5"
:
"现货采购"
,
// "5": "现货采购",
"6"
:
"现货采购"
,
// "6": "现货采购",
"7"
:
"询价采购"
,
// "7": "询价采购",
"8"
:
"需求采购"
,
// "8": "需求采购",
"9"
:
"集采"
,
// "9": "集采",
"10"
:
"渠道直采"
,
// "10": "渠道直采",
"11"
:
"渠道直采"
,
// "11": "渠道直采",
"12"
:
"渠道现货"
,
// "12": "渠道现货",
"13"
:
"渠道现货"
,
// "13": "渠道现货",
// "24": "积分兑换",
// // "24": "积分兑换",
// "25": "渠道积分兑换",
// // "25": "渠道积分兑换",
"32"
:
"采购询价合同"
,
// "32": "采购询价合同",
"33"
:
"采购招标合同"
,
// "33": "采购招标合同",
"34"
:
"采购竞价合同"
,
// "34": "采购竞价合同",
}
// }
export
const
orderTypeLabelMap
=
()
=>
{
let
tempObject
:
{
[
key
:
number
]:
string
}
=
{}
GlobalConfig
[
'web'
][
'orderMode'
].
map
(
item
=>
{
tempObject
[
item
[
'value'
]]
=
item
[
'label'
]
})
return
tempObject
;
}
// 支付方式
// 支付方式
export
const
payTypeLabel
=
[
export
const
payTypeLabel
=
[
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
c17d782b
...
@@ -206,10 +206,6 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
...
@@ -206,10 +206,6 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
},
[])
},
[])
useEffect
(()
=>
{
console
.
log
(
initFormValue
,
'init'
)
},
[
initFormValue
])
const
handleSubmit
=
async
(
value
)
=>
{
const
handleSubmit
=
async
(
value
)
=>
{
let
_orderProductRequests
=
JSON
.
parse
(
JSON
.
stringify
(
value
.
orderProductRequests
))
let
_orderProductRequests
=
JSON
.
parse
(
JSON
.
stringify
(
value
.
orderProductRequests
))
let
processEnum
=
value
[
'processEnum'
]
let
processEnum
=
value
[
'processEnum'
]
...
@@ -589,7 +585,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
...
@@ -589,7 +585,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
// 判断合同下单
// 判断合同下单
if
(
value
>
30
)
{
if
(
value
>
30
)
{
ctx
.
setFieldState
(
'quotationNo'
,
state
=>
{
ctx
.
setFieldState
(
'quotationNo'
,
state
=>
{
state
.
props
.
title
=
orderTypeLabelMap
[
value
]
state
.
props
.
title
=
orderTypeLabelMap
()
[
value
]
state
.
visible
=
true
state
.
visible
=
true
})
})
ctx
.
setFieldState
(
'needTheInvoice'
,
state
=>
{
ctx
.
setFieldState
(
'needTheInvoice'
,
state
=>
{
...
@@ -663,7 +659,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
...
@@ -663,7 +659,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
addSchemaAction
.
setFieldState
(
'orderProductRequests'
,
productState
=>
{
addSchemaAction
.
setFieldState
(
'orderProductRequests'
,
productState
=>
{
productState
.
props
[
"x-component-props"
]
=
{
productState
.
props
[
"x-component-props"
]
=
{
...
productState
.
props
[
"x-component-props"
],
...
productState
.
props
[
"x-component-props"
],
prefix
:
editable
?
materialAddButton
:
''
,
prefix
:
editable
&&
pageStatus
===
PageStatus
.
ADD
?
materialAddButton
:
''
,
}
}
})
})
//
},
500
)
//
},
500
)
...
@@ -679,7 +675,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
...
@@ -679,7 +675,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
//
},
500
)
//
},
500
)
}
}
// 选择某种类型时, 需显示对应的订单类型
// 选择某种类型时, 需显示对应的订单类型
ctx
.
setFieldValue
(
'type'
,
orderTypeLabelMap
[
value
])
ctx
.
setFieldValue
(
'type'
,
orderTypeLabelMap
()
[
value
])
})
})
useEditHideField
()
useEditHideField
()
// 商品信息的改动 驱动支付信息变化
// 商品信息的改动 驱动支付信息变化
...
...
src/pages/transaction/purchaseOrder/orderCollect/model/useMaterialTable.tsx
View file @
c17d782b
...
@@ -60,11 +60,12 @@ export const useMaterialTable = (ctx: ISchemaFormActions | ISchemaFormAsyncActio
...
@@ -60,11 +60,12 @@ export const useMaterialTable = (ctx: ISchemaFormActions | ISchemaFormAsyncActio
const
[
materialColumns
,
setMaterialColumns
]
=
useState
(()
=>
{
const
[
materialColumns
,
setMaterialColumns
]
=
useState
(()
=>
{
const
{
pageStatus
}
=
usePageStatus
()
if
(
pageStatus
===
PageStatus
.
ADD
)
{
if
(
pageStatus
===
PageStatus
.
ADD
)
{
// 渲染操作
// 渲染操作
materialInfoColumns
[
materialInfoColumns
.
length
-
1
].
render
=
(
text
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleDelete
(
record
)
}
>
删除
</
Button
>
materialInfoColumns
[
materialInfoColumns
.
length
-
1
].
render
=
(
text
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleDelete
(
record
)
}
>
删除
</
Button
>
// 渲染单价
// 渲染单价
materialInfoColumns
[
7
].
render
=
(
t
,
r
)
=>
{
materialInfoColumns
[
8
].
render
=
(
t
,
r
)
=>
{
if
(
orderModel
===
OrderModalType
[
"HAND_ORDER"
])
{
if
(
orderModel
===
OrderModalType
[
"HAND_ORDER"
])
{
return
<
PriceComp
priceSection=
{
r
.
unitPrice
}
/>
return
<
PriceComp
priceSection=
{
r
.
unitPrice
}
/>
}
else
{
}
else
{
...
@@ -82,13 +83,13 @@ export const useMaterialTable = (ctx: ISchemaFormActions | ISchemaFormAsyncActio
...
@@ -82,13 +83,13 @@ export const useMaterialTable = (ctx: ISchemaFormActions | ISchemaFormAsyncActio
}
else
{
}
else
{
// 渲染单价
// 渲染单价
materialInfoColumns
[
7
].
render
=
(
t
,
r
)
=>
<
span
style=
{
{
color
:
'red'
}
}
>
¥
{
r
.
price
}
</
span
>
materialInfoColumns
[
8
].
render
=
(
t
,
r
)
=>
<
span
style=
{
{
color
:
'red'
}
}
>
¥
{
r
.
price
}
</
span
>
// 渲染商品ID
// 渲染商品ID
materialInfoColumns
[
0
].
render
=
(
t
,
r
)
=>
r
.
productId
materialInfoColumns
[
0
].
render
=
(
t
,
r
)
=>
r
.
productId
materialInfoColumns
[
materialInfoColumns
.
length
-
1
].
render
=
(
t
,
r
)
=>
null
}
}
return
materialInfoColumns
return
materialInfoColumns
})
})
const
handleShowMaterial
=
()
=>
{
const
handleShowMaterial
=
()
=>
{
...
...
src/pages/transaction/purchaseOrder/orderCollect/schema/index.ts
View file @
c17d782b
...
@@ -69,6 +69,7 @@ export const tableListSchema: ISchema = {
...
@@ -69,6 +69,7 @@ export const tableListSchema: ISchema = {
// 基本信息
// 基本信息
const
basicInfo
:
ISchema
=
{
const
basicInfo
:
ISchema
=
{
"x-index"
:
0
,
type
:
'object'
,
type
:
'object'
,
"x-component"
:
'tabpane'
,
"x-component"
:
'tabpane'
,
"x-component-props"
:
{
"x-component-props"
:
{
...
@@ -257,6 +258,7 @@ const basicInfo: ISchema = {
...
@@ -257,6 +258,7 @@ const basicInfo: ISchema = {
}
}
// 订单商品
// 订单商品
export
const
orderProduct
:
ISchema
=
{
export
const
orderProduct
:
ISchema
=
{
"x-index"
:
2
,
type
:
'object'
,
type
:
'object'
,
"x-component"
:
'tabpane'
,
"x-component"
:
'tabpane'
,
"x-component-props"
:
{
"x-component-props"
:
{
...
@@ -287,6 +289,7 @@ export const orderProduct: ISchema = {
...
@@ -287,6 +289,7 @@ export const orderProduct: ISchema = {
// 合同下单 订单物料
// 合同下单 订单物料
export
const
orderMaterial
:
ISchema
=
{
export
const
orderMaterial
:
ISchema
=
{
"x-index"
:
2
,
type
:
'object'
,
type
:
'object'
,
"x-component"
:
'tabpane'
,
"x-component"
:
'tabpane'
,
"x-component-props"
:
{
"x-component-props"
:
{
...
@@ -317,6 +320,7 @@ export const orderMaterial: ISchema = {
...
@@ -317,6 +320,7 @@ export const orderMaterial: ISchema = {
// 支付信息
// 支付信息
export
const
payInfo
:
ISchema
=
{
export
const
payInfo
:
ISchema
=
{
"x-index"
:
3
,
type
:
'object'
,
type
:
'object'
,
"x-component"
:
'tabpane'
,
"x-component"
:
'tabpane'
,
"x-component-props"
:
{
"x-component-props"
:
{
...
@@ -345,6 +349,7 @@ export const payInfo: ISchema = {
...
@@ -345,6 +349,7 @@ export const payInfo: ISchema = {
// 交付信息
// 交付信息
const
submitInfo
:
ISchema
=
{
const
submitInfo
:
ISchema
=
{
"x-index"
:
1
,
type
:
'object'
,
type
:
'object'
,
"x-component"
:
'tabpane'
,
"x-component"
:
'tabpane'
,
"x-component-props"
:
{
"x-component-props"
:
{
...
@@ -406,6 +411,7 @@ const submitInfo: ISchema = {
...
@@ -406,6 +411,7 @@ const submitInfo: ISchema = {
// 其他信息
// 其他信息
const
ortherInfo
:
ISchema
=
{
const
ortherInfo
:
ISchema
=
{
"x-index"
:
4
,
type
:
'object'
,
type
:
'object'
,
"x-component"
:
'tabpane'
,
"x-component"
:
'tabpane'
,
"x-component-props"
:
{
"x-component-props"
:
{
...
...
src/pages/transaction/purchaseOrder/readyAddOrder/index.tsx
View file @
c17d782b
...
@@ -51,8 +51,8 @@ const ReadyAddOrder:React.FC<ReadyAddOrderProps> = (props) => {
...
@@ -51,8 +51,8 @@ const ReadyAddOrder:React.FC<ReadyAddOrderProps> = (props) => {
}
}
const
handleBitchPush
=
async
()
=>
{
const
handleBitchPush
=
async
()
=>
{
const
canBitch
=
!
rowSelectionCtl
.
selectRow
.
some
(
v
=>
v
.
interiorState
!==
PurchaseOrderInsideWorkState
.
ADD_PURCHASE_ORDER
)
//
const canBitch = !rowSelectionCtl.selectRow.some(v => v.interiorState !== PurchaseOrderInsideWorkState.ADD_PURCHASE_ORDER)
if
(
canBitc
h
)
{
if
(
rowSelectionCtl
.
selectRow
.
lengt
h
)
{
const
{
code
}
=
await
submitRun
({
ids
:
rowSelectionCtl
.
selectedRowKeys
})
const
{
code
}
=
await
submitRun
({
ids
:
rowSelectionCtl
.
selectedRowKeys
})
if
(
code
===
1000
)
{
if
(
code
===
1000
)
{
ref
.
current
.
reload
()
ref
.
current
.
reload
()
...
@@ -60,7 +60,7 @@ const ReadyAddOrder:React.FC<ReadyAddOrderProps> = (props) => {
...
@@ -60,7 +60,7 @@ const ReadyAddOrder:React.FC<ReadyAddOrderProps> = (props) => {
rowSelectionCtl
.
setSelectedRowKeys
([])
rowSelectionCtl
.
setSelectedRowKeys
([])
}
}
}
else
{
}
else
{
message
.
error
(
'
只能提交审核
待新增的订单'
)
message
.
error
(
'
请先选择
待新增的订单'
)
}
}
}
}
...
...
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