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
3dc815b5
Commit
3dc815b5
authored
Aug 12, 2021
by
alwayOnlie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2
parents
27ed56a0
2e8ab412
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
372 additions
and
196 deletions
+372
-196
index.tsx
...ents/AddressSelect/components/AddressRadioGroup/index.tsx
+0
-0
index.tsx
src/components/AddressSelect/index.tsx
+36
-11
schema.ts
src/components/AddressSelect/schema.ts
+6
-2
index.tsx
src/pages/afterService/components/ReturnAnalysis/index.tsx
+2
-2
index.tsx
.../returnPrDeliver/components/ReturnDeliverDrawer/index.tsx
+16
-4
verify.tsx
...afterService/returnApplication/returnPrDeliver/verify.tsx
+6
-2
selectChannel.tsx
...pages/commodity/products/addChannelItem/selectChannel.tsx
+4
-5
selectProduct.tsx
...pages/commodity/products/addChannelItem/selectProduct.tsx
+1
-2
addDirectChannel.tsx
src/pages/commodity/products/addDirectChannel.tsx
+3
-1
schema.ts
...s/member/memberFlowRule/components/FlowRuleForm/schema.ts
+2
-2
index.tsx
...es/transaction/components/saleOrderProductTable/index.tsx
+9
-14
index.tsx
...ransaction/dealAbility/confirmOffer/offerSearch/index.tsx
+5
-0
index.tsx
...ges/transaction/dealAbility/inquiryOffer/detail/index.tsx
+1
-0
index.tsx
...nsaction/dealAbility/inquiryOffer/inquirySearch/index.tsx
+4
-1
addForm.tsx
...saction/dealAbility/inquiryOffer/waitAddOffer/addForm.tsx
+21
-5
otherExplain.tsx
...ity/inquiryOffer/waitAddOffer/components/otherExplain.tsx
+170
-3
productQuote.tsx
...ity/inquiryOffer/waitAddOffer/components/productQuote.tsx
+1
-0
quote.tsx
...ansaction/dealAbility/inquiryOffer/waitAddOffer/quote.tsx
+0
-1
index.tsx
...s/transaction/dealAbility/productInquiry/detail/index.tsx
+2
-0
addForm.tsx
...ion/dealAbility/productInquiry/waitAddInquiry/addForm.tsx
+11
-5
index.less
...ility/productInquiry/waitAddInquiry/components/index.less
+7
-0
tradeTerms.tsx
...y/productInquiry/waitAddInquiry/components/tradeTerms.tsx
+23
-37
index.tsx
...readySubmitExamine/components/productListLayout/index.tsx
+12
-7
receivedSchema.tsx
...ion/purchaserEvaluation/common/schemas/receivedSchema.tsx
+2
-2
index.tsx
...nsaction/purchaserEvaluation/unevaluated/schema/index.tsx
+14
-45
index.tsx
...ansaction/supplierEvaluation/unevaluated/schema/index.tsx
+14
-45
No files found.
src/components/AddressSelect/components/AddressRadioGroup/index.tsx
View file @
3dc815b5
This diff is collapsed.
Click to expand it.
src/components/AddressSelect/index.tsx
View file @
3dc815b5
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-08-05 10:28:06
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-1
0 16:55:26
* @LastEditTime: 2021-08-1
1 20:05:50
* @Description: 地址选择 FormItem
*/
import
React
,
{
useState
,
useEffect
,
useMemo
,
useRef
}
from
'react'
;
...
...
@@ -115,6 +115,9 @@ const AddressSelect: React.FC<IProps> = (props) => {
// 记录当前编辑的地址id
const
editAddressId
=
useRef
<
number
|
null
>
(
null
);
// 记录是否是新增或编辑操作
const
actionFlagRef
=
useRef
<
boolean
>
(
false
);
const
triggerChange
=
(
value
:
AddressValueType
)
=>
{
if
(
onChange
)
{
onChange
(
value
);
...
...
@@ -148,7 +151,7 @@ const AddressSelect: React.FC<IProps> = (props) => {
triggerChange
(
undefined
);
}
if
(
isDefaultAddress
&&
defaultItem
&&
!
disabled
)
{
if
(
isDefaultAddress
&&
defaultItem
&&
!
disabled
&&
!
actionFlagRef
.
current
)
{
const
{
shipperName
,
receiverName
,
...
rest
}
=
defaultItem
;
const
next
=
{
name
:
shipperName
||
receiverName
,
...
...
@@ -251,9 +254,11 @@ const AddressSelect: React.FC<IProps> = (props) => {
id
:
addRes
.
data
?.
id
,
isDefault
:
values
.
isDefault
?
1
:
0
,
name
:
values
.
name
,
phone
:
values
.
tel
,
phone
:
values
.
phone
,
};
// 重新获取列表,打新添加的内容加载出来
// 不触发默认值提交
actionFlagRef
.
current
=
true
;
getAddressList
();
formActions
.
reset
({
selector
:
'ADDRESS_NEW.*'
,
validate
:
false
});
...
...
@@ -288,9 +293,11 @@ const AddressSelect: React.FC<IProps> = (props) => {
id
:
editAddressId
.
current
,
isDefault
:
values
.
isDefault
?
1
:
0
,
name
:
values
.
name
,
phone
:
values
.
tel
,
phone
:
values
.
phone
,
};
// 重新获取列表,打新添加的内容加载出来
// 不触发默认值提交
actionFlagRef
.
current
=
true
;
getAddressList
();
editAddressId
.
current
=
null
;
...
...
@@ -325,8 +332,16 @@ const AddressSelect: React.FC<IProps> = (props) => {
const
handleAddAddress
=
async
()
=>
{
formActions
.
reset
({
selector
:
'ADDRESS_NEW.*'
,
validate
:
false
});
const
visible
=
formActions
.
getFieldState
(
'ADDRESS_NEW'
,
targetState
=>
{
return
targetState
.
visible
;
});
formActions
.
setFieldState
(
'ADDRESS_NEW'
,
state
=>
{
state
.
visible
=
true
;
state
.
visible
=
!
visible
;
});
formActions
.
setFieldState
(
'ADD_ACTION'
,
state
=>
{
state
.
props
[
'x-component-props'
]
=
{
flag
:
visible
,
};
});
// 先获取地区信息
formActions
.
setFieldState
(
'provinceCode'
,
targetState
=>
{
...
...
@@ -354,12 +369,17 @@ const AddressSelect: React.FC<IProps> = (props) => {
};
const
AddButton
=
useMemo
(()
=>
{
return
()
=>
(
<
div
>
<
Button
onClick=
{
handleAddAddress
}
>
{
`新增${addressType === 2 ? '发货' : '收货'}地址`
}
</
Button
>
<
Divider
style=
{
{
marginBottom
:
4
}
}
/>
</
div
>
);
return
(
props
)
=>
{
const
{
flag
=
true
}
=
props
;
return
(
<
div
>
<
Button
onClick=
{
handleAddAddress
}
>
{
flag
?
`新增${addressType === 2 ? '发货' : '收货'}地址`
:
'取消'
}
</
Button
>
<
Divider
style=
{
{
marginBottom
:
4
}
}
/>
</
div
>
);
}
},
[]);
const
handleEditAddress
=
async
(
id
:
number
)
=>
{
...
...
@@ -402,6 +422,11 @@ const AddressSelect: React.FC<IProps> = (props) => {
formActions
.
setFieldState
(
'ADDRESS_NEW'
,
state
=>
{
state
.
visible
=
true
;
});
formActions
.
setFieldState
(
'ADD_ACTION'
,
state
=>
{
state
.
props
[
'x-component-props'
]
=
{
flag
:
false
,
};
});
editAddressId
.
current
=
id
;
}
else
{
...
...
src/components/AddressSelect/schema.ts
View file @
3dc815b5
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-08-05 14:02:46
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-1
0 16:58:04
* @LastEditTime: 2021-08-1
1 18:07:18
* @Description:
*/
import
{
ISchema
}
from
'@formily/antd'
;
...
...
@@ -192,12 +192,16 @@ export const createSchema = (addressType = 2): ISchema => {
'x-component'
:
'mega-layout'
,
'x-component-props'
:
{
grid
:
true
,
columns
:
3
,
full
:
true
,
},
properties
:
{
areaCode
:
{
type
:
'string'
,
enum
:
[],
'x-mega-props'
:
{
span
:
1
,
},
'x-component-props'
:
{
placeholder
:
'请选择'
,
},
...
...
@@ -207,7 +211,7 @@ export const createSchema = (addressType = 2): ISchema => {
type
:
'string'
,
required
:
true
,
'x-mega-props'
:
{
span
:
3
,
span
:
2
,
},
'x-component-props'
:
{
placeholder
:
'请输入你的手机号码'
,
...
...
src/pages/afterService/components/ReturnAnalysis/index.tsx
View file @
3dc815b5
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 15:18:15
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-1
0 15:31:35
* @LastEditTime: 2021-08-1
1 16:45:01
* @Description: 退货收货统计、退货发货明细
*/
import
React
,
{
useState
}
from
'react'
;
...
...
@@ -106,7 +106,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
dataIndex
:
'orderNo'
,
render
:
(
text
,
record
)
=>
(
<
a
href=
{
`${target}/orderDetail?
orderNo=${record.orderNo
}`
}
href=
{
`${target}/orderDetail?
id=${record.orderId
}`
}
target=
"_blank"
>
{
text
}
...
...
src/pages/afterService/returnApplication/returnPrDeliver/components/ReturnDeliverDrawer/index.tsx
View file @
3dc815b5
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-08-07 15:11:54
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-
09 14:12:50
* @LastEditTime: 2021-08-
11 16:41:14
* @Description: 退货发货处理抽屉
*/
import
React
from
'react'
;
...
...
@@ -18,7 +18,7 @@ import {
import
{
ArrayTable
}
from
'@formily/antd-components'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
GetAsReturnGoods
PageReturnedGoodsResponseDetail
,
GetAsReturnGoods
GetDetailByConsumerResponse
,
}
from
'@/services/AfterServiceV2Api'
;
import
{
useAsyncSelect
}
from
'@/formSchema/effects/useAsyncSelect'
;
import
NiceForm
from
'@/components/NiceForm'
;
...
...
@@ -70,6 +70,10 @@ export type ValuesType = {
* 已发货数量
*/
deliveryCount
:
string
,
/**
* 未退货发货数量
*/
noDeliveryCount
:
number
,
}[],
/**
* 退货发货地址
...
...
@@ -77,6 +81,13 @@ export type ValuesType = {
returnDeliverAddress
:
AddressValueType
,
}
type
ProductListItemType
=
GetAsReturnGoodsGetDetailByConsumerResponse
[
'goodsDetailList'
][
0
]
&
{
/**
* 退货数量
*/
count
:
number
,
}
interface
IProps
{
/**
* 是否可见
...
...
@@ -89,7 +100,7 @@ interface IProps {
/**
* 商品列表
*/
productList
:
GetAsReturnGoodsPageReturnedGoodsResponseDetail
[],
productList
:
ProductListItemType
[],
},
/**
* 配送方式
...
...
@@ -153,7 +164,8 @@ const ReturnDeliverDrawer: React.FC<IProps> = (props) => {
const
{
productList
,
...
rest
}
=
values
;
onSubmit
({
...
rest
,
productList
:
productList
.
filter
((
item
)
=>
+
item
.
deliveryCount
<
+
item
.
returnCount
),
// 过滤掉退货数量为0的数据
productList
:
productList
.
filter
((
item
)
=>
+
item
.
deliveryCount
<
+
item
.
returnCount
&&
+
item
.
count
>
0
),
});
}
};
...
...
src/pages/afterService/returnApplication/returnPrDeliver/verify.tsx
View file @
3dc815b5
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-01-06 11:36:34
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-1
0 18:18:45
* @LastEditTime: 2021-08-1
1 16:18:09
* @Description: 退货发货
*/
import
React
,
{
useState
}
from
'react'
;
...
...
@@ -77,7 +77,11 @@ const ReturnPrDeliverVerify: React.FC = () => {
<
ReturnDeliverDrawer
value=
{
{
productList
:
info
?.
goodsDetailList
.
filter
((
item
)
=>
item
.
isNeedReturn
&&
item
.
noDeliveryCount
>
0
),
productList
:
(
info
?.
goodsDetailList
.
filter
((
item
)
=>
item
.
isNeedReturn
&&
item
.
noDeliveryCount
>
0
)
.
map
((
item
)
=>
({
...
item
,
count
:
item
.
noDeliveryCount
}))
),
}
}
deliveryType=
{
info
?.
returnGoodsAddress
.
deliveryType
}
visible=
{
visible
}
...
...
src/pages/commodity/products/addChannelItem/selectChannel.tsx
View file @
3dc815b5
import
React
,
{
useState
,
use
Ref
,
use
Effect
}
from
'react'
import
React
,
{
useState
,
useEffect
}
from
'react'
import
{
history
}
from
'umi'
;
import
{
Button
,
Form
,
Card
,
Tabs
,
Input
,
Radio
,
Table
,
message
,
Row
,
Col
,
Select
}
from
'antd'
import
{
Button
,
Form
,
Input
,
Radio
,
Table
,
message
,
Row
,
Col
,
Select
}
from
'antd'
import
{
PlusOutlined
,
SettingOutlined
,
PlusOutlined
,
}
from
'@ant-design/icons'
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
styles
from
'../index.less'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
ModalTable
from
'@/components/ModalTable'
import
{
store
}
from
'@/store'
import
{
inject
,
observer
}
from
'mobx-react'
import
{
observer
}
from
'mobx-react'
import
EyePreview
from
'@/components/EyePreview'
;
const
{
Search
}
=
Input
...
...
src/pages/commodity/products/addChannelItem/selectProduct.tsx
View file @
3dc815b5
...
...
@@ -124,7 +124,6 @@ const SelectProduct:React.FC<IProps> = (props) => {
// 获取会员角色列表
PublicApi
.
getMemberManageChannelLowerRoleList
().
then
(
res
=>
{
const
{
data
}
=
res
console
.
log
(
data
)
})
},
[])
...
...
@@ -133,7 +132,6 @@ const SelectProduct:React.FC<IProps> = (props) => {
},
[
source
])
useEffect
(()
=>
{
console
.
log
(
productRowCtl
.
selectRow
[
0
])
if
(
productRowCtl
.
selectRow
.
length
>
0
){
setPriceType
(
productRowCtl
.
selectRow
[
0
].
priceType
)
setProductName
(
productRowCtl
.
selectRow
[
0
].
name
)
...
...
@@ -166,6 +164,7 @@ const SelectProduct:React.FC<IProps> = (props) => {
}
const
handleSourceChange
=
(
v
:
any
)
=>
{
console
.
log
(
v
.
target
.
value
)
setProductSourceInStore
(
v
.
target
.
value
)
setSource
(
v
.
target
.
value
)
setSelectProduct
([])
...
...
src/pages/commodity/products/addDirectChannel.tsx
View file @
3dc815b5
...
...
@@ -9,7 +9,7 @@ import SelectChannel from './addChannelItem/selectChannel'
import
SetPrice
from
'./addChannelItem/setPrice'
import
SetLogistics
from
'./addChannelItem/setLogistics'
import
{
store
}
from
'@/store'
import
{
inject
,
observer
}
from
'mobx-react'
import
{
observer
}
from
'mobx-react'
import
{
PublicApi
}
from
'@/services/api'
;
const
{
TabPane
}
=
Tabs
...
...
@@ -25,6 +25,7 @@ const AddDirectChannel:React.FC<{}> = (props) => {
tableDataInSetPrice
,
selectedRole
,
selectChannel
,
productSourceInStore
}
=
ChannelProudctStore
const
callback
=
(
key
:
string
)
=>
{
...
...
@@ -53,6 +54,7 @@ const AddDirectChannel:React.FC<{}> = (props) => {
params
.
parentMemberName
=
productSelectRowInStore
.
memberName
params
.
childMemberRoleName
=
selectedRole
?.
children
||
null
params
.
commodityMemberList
=
selectChannel
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
memberName
:
item
.
name
}))
params
.
source
=
productSourceInStore
if
(
!
tableDataInSetPrice
.
length
){
message
.
error
(
'请选择商品规格!'
)
...
...
src/pages/member/memberFlowRule/components/FlowRuleForm/schema.ts
View file @
3dc815b5
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-27 16:13:26
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-0
6-01 17:58:12
* @LastEditTime: 2021-0
8-12 09:36:50
* @Description:
*/
import
{
ISchema
}
from
'@formily/antd'
;
...
...
@@ -155,7 +155,7 @@ const formSchema: ISchema = {
type
:
'object'
,
'x-component'
:
'TabPane'
,
'x-component-props'
:
{
tab
:
'会员
表
更流程'
,
tab
:
'会员
变
更流程'
,
},
properties
:
{
MEGA_LAYOUT1
:
{
...
...
src/pages/transaction/components/saleOrderProductTable/index.tsx
View file @
3dc815b5
...
...
@@ -11,12 +11,7 @@ import { usePageStatus } from '@/hooks/usePageStatus'
import
ModalTable
from
'@/components/ModalTable'
import
{
formatTimeString
}
from
'@/utils'
import
{
DELIVERY_TYPE
,
OrderKindType
,
OrderModalType
,
ORDER_TYPE2_BIDDING_CONTRACT
,
ORDER_TYPE2_ENQUIRY_CONTRACT
,
ORDER_TYPE2_TENDER_CONTRACT
,
SaleOrderInsideWorkStateTexts
}
from
'@/constants/order'
import
{
AddressPop
}
from
'../addressPop'
...
...
@@ -93,11 +88,11 @@ const modalPriceActions = createFormActions()
// 总计金额联动框
export
const
MoneyTotalBox
=
({
dataSource
,
isEditData
})
=>
{
const
{
reloadFormData
}
=
useContext
(
OrderDetailContext
)
const
{
product
,
orderProductRequests
=
[],
receiverAddressId
,
amount
,
orderMode
,
sumPric
e
,
orderKind
}
=
dataSource
||
{}
const
{
product
,
receiverAddressId
,
orderMod
e
,
orderKind
}
=
dataSource
||
{}
const
creditsCommodity
=
(
orderMode
===
24
||
orderMode
===
25
)
// @todo 积分或渠道积分下单模式
const
contractOrder
=
(
orderKind
===
OrderKindType
.
SRM_ORDER
)
const
{
productAmount
,
freight
,
totalAmount
}
=
product
const
{
productAmount
,
freight
,
totalAmount
,
promotionAmount
,
couponAmount
,
products
}
=
product
const
modelRef
=
useRef
<
any
>
({})
const
[
freePrice
,
setFreePrice
]
=
useState
<
number
>
(
freight
||
0
)
const
[
sum
,
setSum
]
=
useState
<
number
>
(
0
)
...
...
@@ -105,12 +100,12 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
modelRef
.
current
.
setVisible
(
true
)
}
const
[
amountMoney
,
setAmountMoney
]
=
useState
<
number
>
((
sum
Price
*
1000
)
/
1000
||
(
sum
*
1000
+
freePrice
*
1000
)
/
1000
)
const
[
amountMoney
,
setAmountMoney
]
=
useState
<
number
>
((
sum
*
1000
+
freePrice
*
1000
)
/
1000
)
// 总计金额
useEffect
(()
=>
{
setAmountMoney
(()
=>
(
sum
Price
*
1000
)
/
1000
||
(
sum
*
1000
+
freePrice
*
1000
)
/
1000
)
},
[
sum
,
freePrice
,
sumPrice
])
setAmountMoney
(()
=>
(
sum
*
1000
+
freePrice
*
1000
)
/
1000
)
},
[
sum
,
freePrice
])
const
handleConfirm
=
()
=>
{
let
free
=
modalPriceActions
.
getFieldValue
(
'freePrice'
)
...
...
@@ -126,9 +121,9 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
useEffect
(()
=>
{
// 存在商品 并且有选择收货地址,则开始计算运费
if
(
orderProductRequests
&&
orderProductReques
ts
.
length
>
0
&&
receiverAddressId
)
{
if
(
products
&&
produc
ts
.
length
>
0
&&
receiverAddressId
)
{
// 筛选配送方式为物流的商品并且使用了运费模板
const
logsiticsDataMaps
=
orderProductReques
ts
.
filter
(
v
=>
v
.
logistics
&&
v
.
logistics
.
useTemplate
&&
v
.
logistics
.
deliveryType
===
1
)
const
logsiticsDataMaps
=
produc
ts
.
filter
(
v
=>
v
.
logistics
&&
v
.
logistics
.
useTemplate
&&
v
.
logistics
.
deliveryType
===
1
)
if
(
logsiticsDataMaps
.
length
>
0
)
{
PublicApi
.
postLogisticsFreightTemplateCalFreightPrice
({
orderProductList
:
logsiticsDataMaps
.
map
(
v
=>
({
...
...
@@ -144,9 +139,9 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
}
}
const
_sum
=
amount
||
orderProductRequests
.
reduce
((
prev
,
next
)
=>
prev
+
Number
((
next
.
money
||
0
)),
0
)
const
_sum
=
productAmount
||
products
.
reduce
((
prev
,
next
)
=>
prev
+
Number
((
next
.
amount
||
0
)),
0
)
setSum
(
_sum
)
},
[
orderProductReques
ts
])
},
[
produc
ts
])
return
<
RowStyle
>
<
Col
span=
{
2
}
>
...
...
src/pages/transaction/dealAbility/confirmOffer/offerSearch/index.tsx
View file @
3dc815b5
...
...
@@ -66,6 +66,11 @@ const OfferSearch = () => {
dataIndex
:
'interiorState'
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
Badge
status=
{
INTERNALSTATE_COLOR
[
text
]
}
text=
{
record
.
interiorStateName
}
/>
},
{
title
:
'操作'
,
key
:
'operate'
,
dataIndex
:
'operate'
,
}
];
return
(
...
...
src/pages/transaction/dealAbility/inquiryOffer/detail/index.tsx
View file @
3dc815b5
...
...
@@ -178,6 +178,7 @@ const InquiryOfferDetail = () => {
title
:
'含税/税率'
,
key
:
'isTax'
,
dataIndex
:
'isTax'
,
render
:
(
_
,
record
)
=>
`
${
record
.
taxRate
?
'是'
:
'否'
}
/
${
record
.
taxRate
}
`
},
{
title
:
'报价单价'
,
...
...
src/pages/transaction/dealAbility/inquiryOffer/inquirySearch/index.tsx
View file @
3dc815b5
...
...
@@ -63,7 +63,10 @@ const InquirySearch = () => {
title
:
'操作'
,
key
:
'options'
,
dataIndex
:
'options'
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
Button
disabled=
{
record
.
isQuoted
===
1
}
onClick=
{
()
=>
history
.
push
(
`/memberCenter/tranactionAbility/inquiryOffer/waitAddOffer/offer?id=${record.id}`
)
}
type=
'link'
>
报价
</
Button
>
render
:
(
text
:
any
,
record
:
any
)
=>
<>
<
Button
disabled=
{
record
.
isQuoted
===
1
}
onClick=
{
()
=>
history
.
push
(
`/memberCenter/tranactionAbility/inquiryOffer/waitAddOffer/offer?id=${record.id}`
)
}
type=
'link'
>
报价
</
Button
>
<
Button
disabled=
{
record
.
isQuoted
===
1
}
type=
'link'
>
二次询价
</
Button
>
</>
}
];
...
...
src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/addForm.tsx
View file @
3dc815b5
...
...
@@ -84,10 +84,18 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
}
setDataSource
(
res
.
data
);
setProductQuote
(
res
.
data
.
inquiryListProductRequests
)
form
.
setFieldsValue
({
...
res
.
data
,
"inquiryListProductRequests"
:
res
.
data
.
inquiryListProductRequests
,
})
if
(
isEdit
)
{
form
.
setFieldsValue
({
...
res
.
data
,
"inquiryListProductRequests"
:
res
.
data
.
inquiryListProductRequests
,
})
}
else
{
form
.
setFieldsValue
({
"inquiryListNo"
:
res
.
data
.
inquiryListNo
,
"inquiryListProductRequests"
:
res
.
data
.
inquiryListProductRequests
,
})
}
}).
catch
(
error
=>
{
console
.
warn
(
error
)
})
...
...
@@ -166,6 +174,14 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
})
}
const
getContacts
=
(
value
)
=>
{
form
.
setFieldsValue
({
"contacts"
:
value
.
name
,
'contactsPhone'
:
value
.
phone
,
'phoneCode'
:
86
,
});
}
return
(
<
Context
.
Provider
value=
{
dataSource
}
>
<
AddedLayout
...
...
@@ -200,7 +216,7 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
>
<
BasicInfoLayout
getInquiryInfo=
{
getInquiryInfo
}
inq=
{
inquiry
}
isEdit=
{
spam
}
/>
<
ProductQuoteLayout
setProductQuote=
{
productQuote
}
/>
<
OtherExplainLayout
/>
<
OtherExplainLayout
getContacts=
{
getContacts
}
/>
<
AttachLayout
enclosureUrls=
{
enclosureUrls
}
getEnclosureUrls=
{
getEnclosureUrls
}
removeEnclosureUrls=
{
removeEnclosureUrls
}
/>
</
Form
>
}
...
...
src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/components/otherExplain.tsx
View file @
3dc815b5
import
React
from
'react'
;
import
{
Row
,
Col
,
Form
,
Input
,
InputNumber
}
from
'antd'
;
import
React
,
{
useCallback
,
useState
}
from
'react'
;
import
{
Row
,
Col
,
Form
,
Input
,
InputNumber
,
Select
,
Button
}
from
'antd'
;
import
Card
from
'@/pages/transaction/components/card'
;
import
{
LinkOutlined
}
from
'@ant-design/icons'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
TableModal
from
'@/pages/transaction/components/TableModal'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
interface
OtherExplainLayoutProps
{
/** 获取联系人 */
getContacts
?:
(
e
)
=>
void
,
}
const
OtherExplainLayout
:
React
.
FC
<
OtherExplainLayoutProps
>
=
(
props
:
any
)
=>
{
const
{
getContacts
}
=
props
;
const
[
visible
,
setVisible
]
=
useState
<
boolean
>
(
false
)
const
handleFetchData
=
useCallback
((
params
:
any
)
=>
{
return
new
Promise
(
resolve
=>
{
PublicApi
.
getMemberManageUsersPage
({
...
params
}).
then
(
res
=>
{
if
(
res
.
code
!==
1000
)
{
return
}
resolve
(
res
.
data
)
}).
catch
(
error
=>
{
console
.
warn
(
error
)
})
})
},
[])
const
toggle
=
(
flag
:
boolean
)
=>
{
setVisible
(
flag
)
}
const
columns
:
any
=
[
{
title
:
'序号'
,
dataIndex
:
'userId'
,
key
:
'userId'
,
},
{
title
:
'用户姓名'
,
dataIndex
:
'name'
,
key
:
'name'
,
},
{
title
:
'手机号'
,
dataIndex
:
'phone'
,
key
:
'phone'
,
},
{
title
:
'所属机构'
,
dataIndex
:
'orgName'
,
key
:
'orgName'
,
},
]
const
handleConfirm
=
(
selectRowKeys
:
string
[]
|
number
[],
selectRowRecord
:
any
)
=>
{
const
target
=
selectRowRecord
[
0
];
getContacts
(
target
)
toggle
(
false
)
}
return
(
<
Card
id=
"otherExplainLayout"
...
...
@@ -27,6 +79,39 @@ const OtherExplainLayout: React.FC<OtherExplainLayoutProps> = (props: any) => {
]
}
>
<
InputNumber
min=
{
0
}
style=
{
{
width
:
'100%'
}
}
/>
</
Form
.
Item
>
<
Form
.
Item
label=
'询价联系人'
name=
'contacts'
rules=
{
[{
required
:
true
,
message
:
'请选择询价联系人'
}]
}
>
<
Input
.
Search
onSearch=
{
()
=>
toggle
(
true
)
}
readOnly
enterButton=
{
<
Button
style=
{
{
height
:
'31.19px'
}
}
icon=
{
<
LinkOutlined
/>
}
>
选择
</
Button
>
}
/>
</
Form
.
Item
>
<
Form
.
Item
label=
'联系人电话'
required
style=
{
{
marginBottom
:
'0px'
}
}
>
<
Row
gutter=
{
16
}
>
<
Col
span=
{
8
}
>
<
Form
.
Item
name=
'phoneCode'
rules=
{
[{
required
:
true
,
message
:
'请选择'
}]
}
>
<
Select
>
<
Select
.
Option
value=
{
86
}
>
86
</
Select
.
Option
>
</
Select
>
</
Form
.
Item
>
</
Col
>
<
Col
span=
{
16
}
>
<
Form
.
Item
name=
'contactsPhone'
rules=
{
[{
required
:
true
,
message
:
'请选择'
}]
}
>
<
Input
type=
'number'
maxLength=
{
11
}
/>
</
Form
.
Item
>
</
Col
>
</
Row
>
</
Form
.
Item
>
<
Form
.
Item
label=
'交付说明'
name=
'deliveryInstructions'
>
<
Input
.
TextArea
maxLength=
{
50
}
autoSize
placeholder=
'最长100个字符,50个汉字'
/>
</
Form
.
Item
>
...
...
@@ -49,6 +134,88 @@ const OtherExplainLayout: React.FC<OtherExplainLayoutProps> = (props: any) => {
</
Form
.
Item
>
</
Col
>
</
Row
>
<
TableModal
modalType=
"Drawer"
visible=
{
visible
}
title=
"选择用户"
mode=
"radio"
tableProps=
{
{
rowKey
:
'userId'
,
}
}
customKey=
"userId"
fetchData=
{
handleFetchData
}
onClose=
{
()
=>
toggle
(
false
)
}
onOk=
{
handleConfirm
}
columns=
{
columns
}
effects=
{
(
$
,
actions
)
=>
{
actions
.
reset
()
useStateFilterSearchLinkageEffect
(
$
,
actions
,
"name"
,
FORM_FILTER_PATH
)
}
}
schema=
{
{
type
:
'object'
,
properties
:
{
megalayout
:
{
type
:
'object'
,
"x-component"
:
'mega-layout'
,
properties
:
{
name
:
{
type
:
'string'
,
"x-component"
:
"Search"
,
"x-mega-props"
:
{
},
"x-component-props"
:
{
placeholder
:
'用户姓名'
,
align
:
'flex-left'
,
}
}
}
},
[
FORM_FILTER_PATH
]:
{
type
:
'object'
,
"x-component"
:
"flex-layout"
,
"x-component-props"
:
{
rowStyle
:
{
justifyContent
:
'flex-start'
,
flexWrap
:
'nowrap'
},
colStyle
:
{
//改变间隔
marginRight
:
20
}
},
properties
:
{
PRO_LAYOUT
:
{
type
:
'object'
,
"x-component"
:
'mega-layout'
,
"x-mega-props"
:
{
span
:
5
},
"x-component-props"
:
{
inline
:
true
},
properties
:
{
orgName
:
{
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'所属机构'
}
},
}
},
sumbit
:
{
"x-component"
:
'Submit'
,
"x-mega-props"
:
{
span
:
1
},
"x-component-props"
:
{
children
:
'查询'
}
}
}
}
}
}
}
/>
</
Card
>
)
}
...
...
src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/components/productQuote.tsx
View file @
3dc815b5
...
...
@@ -66,6 +66,7 @@ const ProductQuoteLayout: React.FC<ProductQuoteLayoutProps> = (props: any) => {
title
:
"含税/税率"
,
key
:
"isTax"
,
dataIndex
:
"isTax"
,
render
:
(
_
,
record
)
=>
`
${
record
.
taxRate
?
'是'
:
'否'
}
/
${
record
.
taxRate
}
`
},
{
title
:
"采购数量/单位"
,
...
...
src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/quote.tsx
View file @
3dc815b5
...
...
@@ -7,7 +7,6 @@ const Quote = (props: any) => {
return
(
<
AddQuoteForm
id=
{
id
}
isEdit
title=
{
props
.
route
.
name
}
fetchRequest=
{
PublicApi
.
postTransactionProductQuotationAdd
}
spam
...
...
src/pages/transaction/dealAbility/productInquiry/detail/index.tsx
View file @
3dc815b5
...
...
@@ -74,6 +74,8 @@ const ProductInquiryDetail = () => {
{
label
:
'交付日期'
,
extra
:
format
(
data
.
deliveryTime
)
},
{
label
:
'交付地址'
,
extra
:
data
.
fullAddress
},
{
label
:
'报价截止时间'
,
extra
:
format
(
data
.
quotationAsTime
)
},
{
label
:
'询价联系人'
,
extra
:
data
.
contacts
},
{
label
:
'联系人电话'
,
extra
:
data
.
contactsPhone
}
]
},
{
...
...
src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/addForm.tsx
View file @
3dc815b5
...
...
@@ -51,8 +51,8 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
memberId
:
memberInfo
.
memberId
,
memberRoleId
:
memberInfo
.
roleId
,
memberRoleName
:
memberInfo
.
roleName
,
fullAddress
:
fullAddress
.
children
,
fullAddressId
:
re
s
.
fullAddressId
,
fullAddress
:
fullAddress
.
fullAddress
,
fullAddressId
:
fullAddres
s
.
fullAddressId
,
offer
:
res
.
offer
,
paymentType
:
res
.
paymentType
,
taxes
:
res
.
taxes
,
...
...
@@ -100,7 +100,12 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
}
const
getFullAddress
=
(
info
)
=>
{
setFullAddress
(
info
)
console
.
log
(
info
)
const
address
=
{
fullAddress
:
`
${
info
.
name
}
${
info
.
fullAddress
}
${
info
.
phone
}
`
,
fullAddressId
:
info
.
id
,
}
setFullAddress
(
address
)
}
const
getEnclosureUrls
=
(
data
)
=>
{
...
...
@@ -185,7 +190,8 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
roleName
:
data
.
memberName
,
})
setFullAddress
({
children
:
data
.
fullAddress
,
fullAddress
:
data
.
fullAddress
,
fullAddressId
:
data
.
fullAddressId
,
})
setInquiryProduct
(
data
.
inquiryListProductRequests
)
setEnclosureUrls
(
data
.
enclosureUrls
)
...
...
@@ -240,7 +246,7 @@ const AddedFormLayout: React.FC<AddedFormLayoutProps> = (props: any) => {
>
<
BasicInfoLatyout
getMemberInfo=
{
getMemberInfo
}
memb=
{
memberInfo
}
isEdit=
{
spam
}
/>
<
InquiryProductLayout
getInquiryProduct=
{
getInquiryProduct
}
member=
{
memberInfo
}
setInquiryProduct=
{
inquiryProduct
}
/>
<
TradeTermsLayout
getFullAddress=
{
getFullAddress
}
getContacts=
{
getContacts
}
/>
<
TradeTermsLayout
getFullAddress=
{
getFullAddress
}
getContacts=
{
getContacts
}
fullAddress=
{
fullAddress
}
/>
<
AttachLayout
enclosureUrls=
{
enclosureUrls
}
getEnclosureUrls=
{
getEnclosureUrls
}
removeEnclosureUrls=
{
removeEnclosureUrls
}
/>
</
Form
>
}
...
...
src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/components/index.less
View file @
3dc815b5
...
...
@@ -5,3 +5,10 @@
}
}
}
.addressLayout {
:global {
.ant-form-item-control {
width: 0;
}
}
}
src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/components/tradeTerms.tsx
View file @
3dc815b5
import
React
,
{
useCallback
,
use
Effect
,
useState
}
from
'react'
;
import
{
Row
,
Col
,
Form
,
Input
,
DatePicker
,
Select
,
Button
,
Space
}
from
'antd'
;
import
React
,
{
useCallback
,
use
State
,
useEffect
}
from
'react'
;
import
{
Row
,
Col
,
Form
,
Input
,
DatePicker
,
Select
,
Button
}
from
'antd'
;
import
Card
from
'@/pages/transaction/components/card'
;
import
moment
from
'moment'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
isEmpty
}
from
'lodash'
;
import
{
LinkOutlined
}
from
'@ant-design/icons'
;
import
TableModal
from
'@/pages/transaction/components/TableModal'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
AddressSelect
from
'@/components/AddressSelect'
;
import
style
from
'./index.less'
;
import
{
isEmpty
}
from
'lodash'
;
const
disabledDate
=
(
current
)
=>
{
return
current
&&
current
<
moment
().
startOf
(
'day'
);
...
...
@@ -18,28 +20,14 @@ interface TradeTermsLayoutProps {
getFullAddress
?:
(
e
)
=>
void
,
/** 获取联系人 */
getContacts
?:
(
e
)
=>
void
,
/** 回显数据 */
fullAddress
?:
any
,
}
const
TradeTermsLayout
:
React
.
FC
<
TradeTermsLayoutProps
>
=
(
props
:
any
)
=>
{
const
{
getFullAddress
,
getContacts
}
=
props
;
const
[
fullAddress
,
setFullAddress
]
=
useState
<
any
[]
>
([]);
const
{
getFullAddress
,
getContacts
,
fullAddress
}
=
props
;
const
[
visible
,
setVisible
]
=
useState
<
boolean
>
(
false
)
useEffect
(()
=>
{
PublicApi
.
getLogisticsSelectListReceiverAddress
().
then
(
res
=>
{
if
(
res
.
code
!==
1000
)
{
return
}
setFullAddress
(
res
.
data
)
}).
catch
(
error
=>
{
console
.
warn
(
error
)
})
},
[])
const
handleFullAddress
=
(
_v
,
option
)
=>
{
getFullAddress
(
option
)
}
const
[
address
,
setaddress
]
=
useState
<
any
>
({})
const
handleFetchData
=
useCallback
((
params
:
any
)
=>
{
return
new
Promise
(
resolve
=>
{
PublicApi
.
getMemberManageUsersPage
({
...
params
}).
then
(
res
=>
{
...
...
@@ -80,12 +68,20 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
},
]
const
handleConfirm
=
(
selectRowKeys
:
string
[]
|
number
[],
selectRowRecord
:
any
)
=>
{
const
handleConfirm
=
(
_
selectRowKeys
:
string
[]
|
number
[],
selectRowRecord
:
any
)
=>
{
const
target
=
selectRowRecord
[
0
];
getContacts
(
target
)
toggle
(
false
)
}
useEffect
(()
=>
{
if
(
!
isEmpty
(
fullAddress
))
{
setaddress
({
id
:
fullAddress
.
fullAddressId
,
})
}
},
[
fullAddress
])
return
(
<
Card
id=
"tradeTermsLayout"
...
...
@@ -100,21 +96,8 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
format=
"YYYY-MM-DD HH:mm:ss"
/>
</
Form
.
Item
>
<
Form
.
Item
label=
'交付地址'
name=
'fullAddressId'
rules=
{
[{
required
:
true
,
message
:
'请选择交付地址'
}]
}
>
<
Select
onChange=
{
handleFullAddress
}
>
{
!
isEmpty
(
fullAddress
)
&&
(
fullAddress
.
map
(
item
=>
(
<
Select
.
Option
key=
{
item
.
id
}
value=
{
item
.
id
}
>
{
item
.
fullAddress
}
</
Select
.
Option
>
))
)
}
</
Select
>
<
Form
.
Item
label=
'交付地址'
className=
{
style
.
addressLayout
}
>
<
AddressSelect
value=
{
address
}
isDefaultAddress
addressType=
{
1
}
disabled=
{
false
}
onChange=
{
getFullAddress
}
/>
</
Form
.
Item
>
<
Form
.
Item
label=
'报价截止时间'
name=
'quotationAsTime'
rules=
{
[{
required
:
true
,
message
:
'请选择报价截止时间'
}]
}
>
<
DatePicker
...
...
@@ -178,6 +161,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
</
Form
.
Item
>
</
Col
>
</
Row
>
{
/* 选择用户 */
}
<
TableModal
modalType=
"Drawer"
visible=
{
visible
}
...
...
@@ -260,6 +244,8 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
}
}
}
/>
{
/* 地址管理 */
}
</
Card
>
)
}
...
...
src/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/components/productListLayout/index.tsx
View file @
3dc815b5
...
...
@@ -37,6 +37,7 @@ const ProductListLayout: React.FC<ProductListLayoutProps> = (props: any) => {
const
[
type
,
setType
]
=
useState
<
number
>
(
0
);
const
[
visible
,
setVisible
]
=
useState
<
boolean
>
(
false
);
const
[
dataSource
,
setDataSource
]
=
useState
<
any
>
([])
const
[
shopIdList
,
setShopIdList
]
=
useState
<
number
[]
>
([]);
const
components
=
{
body
:
{
row
:
EditableRow
,
...
...
@@ -63,6 +64,9 @@ const ProductListLayout: React.FC<ProductListLayoutProps> = (props: any) => {
useEffect
(()
=>
{
if
(
!
isEmpty
(
data
))
{
setType
(
data
.
activityType
)
setShopIdList
(
data
.
shopList
.
map
(
item
=>
{
return
item
.
shopId
}))
}
},
[
data
])
...
...
@@ -109,7 +113,7 @@ const ProductListLayout: React.FC<ProductListLayoutProps> = (props: any) => {
const
handleFetchData
=
useCallback
((
params
:
any
)
=>
{
return
new
Promise
(
resolve
=>
{
PublicApi
.
postProductCommodity
CommonGetCommodityListByPlatform
({
...
params
},
{
ctlType
:
'none'
}).
then
(
res
=>
{
PublicApi
.
postProductCommodity
GetCommoditySkuListByShopId
({
shopIdList
,
...
params
},
{
ctlType
:
'none'
}).
then
(
res
=>
{
if
(
res
.
code
!==
1000
)
{
return
}
...
...
@@ -121,9 +125,9 @@ const ProductListLayout: React.FC<ProductListLayoutProps> = (props: any) => {
id
:
item
.
id
,
productId
:
item
.
commodityId
,
productName
:
item
.
name
,
category
:
item
.
categoryName
,
category
:
item
.
c
ustomerC
ategoryName
,
brand
:
item
.
brandName
,
status
:
item
.
status
,
status
:
5
,
productImgUrl
:
item
.
mainPic
,
unit
:
item
.
unitName
,
price
:
item
.
unitPrice
[
'0-0'
]
...
...
@@ -134,13 +138,14 @@ const ProductListLayout: React.FC<ProductListLayoutProps> = (props: any) => {
console
.
warn
(
error
)
})
})
},
[])
},
[
shopIdList
])
const
handleOk
=
(
selectRowKeys
:
string
[]
|
number
[],
selectRowRecord
:
any
)
=>
{
const
rowRecord
:
any
[]
=
[...
selectRowRecord
]
const
productList
=
rowRecord
.
map
(
item
=>
{
return
{
id
:
item
.
id
,
skuId
:
item
.
id
,
productImgUrl
:
item
.
productImgUrl
,
productId
:
item
.
productId
,
productName
:
item
.
productName
,
...
...
@@ -229,7 +234,7 @@ const ProductListLayout: React.FC<ProductListLayoutProps> = (props: any) => {
onOk=
{
handleOk
}
effects=
{
(
$
,
actions
)
=>
{
actions
.
reset
()
useStateFilterSearchLinkageEffect
(
$
,
actions
,
"
n
ame"
,
FORM_FILTER_PATH
)
useStateFilterSearchLinkageEffect
(
$
,
actions
,
"
commodityN
ame"
,
FORM_FILTER_PATH
)
}
}
schema=
{
{
type
:
"object"
,
...
...
@@ -238,7 +243,7 @@ const ProductListLayout: React.FC<ProductListLayoutProps> = (props: any) => {
type
:
"object"
,
"x-component"
:
"mega-layout"
,
properties
:
{
n
ame
:
{
commodityN
ame
:
{
type
:
"string"
,
"x-component"
:
"Search"
,
"x-mega-props"
:
{},
...
...
@@ -272,7 +277,7 @@ const ProductListLayout: React.FC<ProductListLayoutProps> = (props: any) => {
inline
:
true
},
properties
:
{
categoryId
:
{
c
ustomerC
ategoryId
:
{
type
:
"string"
,
"x-component-props"
:
{
placeholder
:
"商品品类"
,
...
...
src/pages/transaction/purchaserEvaluation/common/schemas/receivedSchema.tsx
View file @
3dc815b5
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-08-11 14:04:22
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-11 1
5:01:48
* @LastEditTime: 2021-08-11 1
6:41:32
* @Description: 收到的评价详情 schema
*/
import
{
ISchema
}
from
'@formily/antd'
;
...
...
@@ -88,7 +88,7 @@ const createSchema = (showExplain = true): ISchema => ({
...(
showExplain
?
{
replyTime
:
{
type
:
'string'
,
title
:
'
商家
时间'
,
title
:
'
解释
时间'
,
},
replyContent
:
{
type
:
'string'
,
...
...
src/pages/transaction/purchaserEvaluation/unevaluated/schema/index.tsx
View file @
3dc815b5
/*
* @Author: XieZhiXiong
* @Date: 2021-01-06 11:36:35
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-11 19:55:25
* @Description:
*/
import
{
ISchema
}
from
'@formily/antd'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
ORDER_TYPE2_INQUIRY
,
ORDER_TYPE2_DEMAND
,
ORDER_TYPE2_SPOT
,
ORDER_TYPE2_CENTRALIZED
,
ORDER_TYPE2_POINTS
,
ORDER_TYPE2_CHANNEL_DIRECT
,
ORDER_TYPE2_CHANNEL_SPOT
,
ORDER_TYPE2_CHANNEL_POINTS
,
ORDER_TYPE2
,
}
from
'@/constants/order'
;
import
{
GlobalConfig
}
from
'@/global/config'
;
const
orderTypeArr
=
GlobalConfig
.
web
.
orderType
.
map
((
item
)
=>
({
label
:
item
.
platformWayName
,
value
:
item
.
id
,
}));
export
const
listSearchSchema
:
ISchema
=
{
type
:
'object'
,
...
...
@@ -65,40 +67,7 @@ export const listSearchSchema: ISchema = {
orderType
:
{
type
:
'string'
,
default
:
undefined
,
enum
:
[
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_INQUIRY
],
value
:
ORDER_TYPE2_INQUIRY
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_DEMAND
],
value
:
ORDER_TYPE2_DEMAND
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_SPOT
],
value
:
ORDER_TYPE2_SPOT
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_CENTRALIZED
],
value
:
ORDER_TYPE2_CENTRALIZED
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_POINTS
],
value
:
ORDER_TYPE2_POINTS
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_CHANNEL_DIRECT
],
value
:
ORDER_TYPE2_CHANNEL_DIRECT
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_CHANNEL_SPOT
],
value
:
ORDER_TYPE2_CHANNEL_SPOT
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_CHANNEL_POINTS
],
value
:
ORDER_TYPE2_CHANNEL_POINTS
,
},
],
enum
:
orderTypeArr
,
'x-component-props'
:
{
placeholder
:
'订单类型'
,
allowClear
:
true
,
...
...
src/pages/transaction/supplierEvaluation/unevaluated/schema/index.tsx
View file @
3dc815b5
/*
* @Author: XieZhiXiong
* @Date: 2021-01-06 11:36:35
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-11 19:55:18
* @Description:
*/
import
{
ISchema
}
from
'@formily/antd'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
ORDER_TYPE2_INQUIRY
,
ORDER_TYPE2_DEMAND
,
ORDER_TYPE2_SPOT
,
ORDER_TYPE2_CENTRALIZED
,
ORDER_TYPE2_POINTS
,
ORDER_TYPE2_CHANNEL_DIRECT
,
ORDER_TYPE2_CHANNEL_SPOT
,
ORDER_TYPE2_CHANNEL_POINTS
,
ORDER_TYPE2
,
}
from
'@/constants/order'
;
import
{
GlobalConfig
}
from
'@/global/config'
;
const
orderTypeArr
=
GlobalConfig
.
web
.
orderType
.
map
((
item
)
=>
({
label
:
item
.
platformWayName
,
value
:
item
.
id
,
}));
export
const
listSearchSchema
:
ISchema
=
{
type
:
'object'
,
...
...
@@ -65,40 +67,7 @@ export const listSearchSchema: ISchema = {
type
:
{
type
:
'string'
,
default
:
undefined
,
enum
:
[
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_INQUIRY
],
value
:
ORDER_TYPE2_INQUIRY
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_DEMAND
],
value
:
ORDER_TYPE2_DEMAND
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_SPOT
],
value
:
ORDER_TYPE2_SPOT
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_CENTRALIZED
],
value
:
ORDER_TYPE2_CENTRALIZED
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_POINTS
],
value
:
ORDER_TYPE2_POINTS
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_CHANNEL_DIRECT
],
value
:
ORDER_TYPE2_CHANNEL_DIRECT
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_CHANNEL_SPOT
],
value
:
ORDER_TYPE2_CHANNEL_SPOT
,
},
{
label
:
ORDER_TYPE2
[
ORDER_TYPE2_CHANNEL_POINTS
],
value
:
ORDER_TYPE2_CHANNEL_POINTS
,
},
],
enum
:
orderTypeArr
,
'x-component-props'
:
{
placeholder
:
'订单类型'
,
allowClear
:
true
,
...
...
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