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
黄庭坚
jinfa-platform
Commits
901b34cc
Commit
901b34cc
authored
Nov 16, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev
parents
1fa08769
6c5035f9
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
190 additions
and
123 deletions
+190
-123
logisticsRoutes.ts
config/routes/logisticsRoutes.ts
+7
-0
index.ts
src/components/ModalTable/schema/index.ts
+1
-1
index.ts
src/constants/index.ts
+1
-1
UserHeader.tsx
src/layouts/components/UserHeader.tsx
+1
-1
selectProduct.tsx
...pages/commodity/products/addChannelItem/selectProduct.tsx
+2
-0
logisticsForm.tsx
...ages/commodity/products/addProductsItem/logisticsForm.tsx
+23
-3
priceAttributeForm.tsx
...commodity/products/addProductsItem/priceAttributeForm.tsx
+2
-2
directChannel.tsx
src/pages/commodity/products/directChannel.tsx
+3
-1
index.less
src/pages/commodity/products/index.less
+8
-0
index.tsx
src/pages/commodity/products/index.tsx
+3
-1
channelSchema.tsx
src/pages/commodity/products/schema/channelSchema.tsx
+5
-5
confirmModal.tsx
src/pages/logistics/components/confirmModal.tsx
+4
-14
orderSearchDetail.tsx
src/pages/logistics/components/orderSearchDetail.tsx
+37
-43
toOrderComfirmList.tsx
src/pages/logistics/logisticsResult/toOrderComfirmList.tsx
+8
-4
PositionSetting.tsx
src/pages/repositories/components/PositionSetting.tsx
+2
-0
index.tsx
...s/transaction/components/orderHandReceivedModal/index.tsx
+8
-8
details.tsx
...es/transaction/confirmInquiryQuote/components/details.tsx
+14
-14
index.less
...ges/transaction/confirmInquiryQuote/components/index.less
+1
-0
tradingConditions.tsx
...odsOffer/addEnquiryOrder/components/tradingConditions.tsx
+14
-2
enquiryGoods.tsx
.../inquiryQuote/addInquiryOrder/components/enquiryGoods.tsx
+17
-5
details.tsx
src/pages/transaction/inquiryQuote/components/details.tsx
+14
-14
index.less
src/pages/transaction/inquiryQuote/components/index.less
+1
-0
index.less
src/pages/transaction/purchaseOrder/orderCollect/index.less
+9
-0
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+2
-1
index.tsx
src/pages/transaction/saleOrder/constant/index.tsx
+3
-3
No files found.
config/routes/logisticsRoutes.ts
View file @
901b34cc
...
...
@@ -201,6 +201,13 @@ const LogisticsRoute: RouterChild = {
component
:
'@/pages/logistics/components/orderSearchDetail'
,
hideInMenu
:
true
},
// 待确认物流单-详情
{
path
:
'/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/option'
,
name
:
'orderResultDeatil'
,
component
:
'@/pages/logistics/components/orderSearchDetail'
,
hideInMenu
:
true
},
]
}
]
...
...
src/components/ModalTable/schema/index.ts
View file @
901b34cc
...
...
@@ -9,7 +9,7 @@ export const productModalByMemberSchema: ISchema = {
type
:
'string'
,
'x-component'
:
'ModalSearch'
,
'x-component-props'
:
{
placeholder
:
'请输入商品名称
/ID
'
,
placeholder
:
'请输入商品名称'
,
align
:
'flex-left'
,
},
},
...
...
src/constants/index.ts
View file @
901b34cc
export
const
NOT_CHANGE_VALUE
=
'hello, world'
// socket的链接地址, 默认会使用后端接口网关地址
export
const
SOCKET_URL
=
process
.
env
.
SOCKET_URL
||
process
.
env
.
BACK_GATEWAY
||
"ws://10.0.0.25:9400"
export
const
SOCKET_URL
=
process
.
env
.
SOCKET_URL
||
process
.
env
.
BACK_GATEWAY
.
replace
(
'http'
,
'ws'
)
||
"ws://10.0.0.25:9400"
export
const
MALL_TYPE
=
{
1
:
'企业商城'
,
...
...
src/layouts/components/UserHeader.tsx
View file @
901b34cc
...
...
@@ -24,7 +24,7 @@ const UserHeader: React.FC<UserHeaderProps> = (props) => {
const
getRouteName
=
()
=>
{
switch
(
pathname
)
{
case
'/user/login'
:
setTitle
(
"欢登录"
)
setTitle
(
"欢
迎
登录"
)
break
case
'/user/register'
:
setTitle
(
"欢迎注册"
)
...
...
src/pages/commodity/products/addChannelItem/selectProduct.tsx
View file @
901b34cc
...
...
@@ -58,6 +58,8 @@ const SelectProduct:React.FC<IProps> = (props) => {
title
:
'商品名称'
,
dataIndex
:
'name'
,
key
:
'name'
,
width
:
300
,
ellipsis
:
true
,
},
{
title
:
'品类'
,
...
...
src/pages/commodity/products/addProductsItem/logisticsForm.tsx
View file @
901b34cc
...
...
@@ -37,6 +37,7 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
const
[
carriageType
,
setCarriageType
]
=
useState
<
number
>
()
const
flagRef
=
useRef
<
boolean
>
(
false
)
const
[
banCarriageType
,
setBanCarriageType
]
=
useState
(
false
)
const
[
template
,
setTemplate
]
=
useState
(
false
)
// 是否必填运费模板
const
{
productInfoByEdit
,
selectCategoryId
,
productPriceType
}
=
ProductStore
...
...
@@ -102,6 +103,19 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
logisticsForm
.
setFieldsValue
({
weight
:
null
})
}
const
changeCarriageType
=
(
e
)
=>
{
setCarriageType
(
e
.
target
.
value
)
if
(
e
.
target
.
value
===
2
)
{
setTemplate
(
true
)
setIsTemplate
(
true
)
logisticsForm
.
setFieldsValue
({
useTemplate
:
true
})
}
else
{
setTemplate
(
false
)
setIsTemplate
(
false
)
logisticsForm
.
setFieldsValue
({
useTemplate
:
false
})
}
}
return
(<>
<
Form
{
...
layout
}
...
...
@@ -140,7 +154,7 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
},
]
}
>
<
Radio
.
Group
onChange=
{
(
e
)
=>
setCarriageType
(
e
.
target
.
value
)
}
disabled=
{
banCarriageType
}
>
<
Radio
.
Group
onChange=
{
changeCarriageType
}
disabled=
{
banCarriageType
}
>
<
Radio
value=
{
1
}
>
卖家承担运费(默认)
</
Radio
>
<
Radio
value=
{
2
}
>
买家承担运费
</
Radio
>
</
Radio
.
Group
>
...
...
@@ -170,17 +184,23 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
}
{
carriageType
===
2
&&
<
Form
.
Item
name=
"useTemplate"
name=
"useTemplate"
valuePropName=
"checked"
label=
" "
>
<
Checkbox
onChange=
{
onChangeTemplate
}
>
使用运费模板(只有买家承担运费才能选择)
</
Checkbox
>
<
Checkbox
disabled=
{
template
}
onChange=
{
onChangeTemplate
}
>
使用运费模板(只有买家承担运费才能选择)
</
Checkbox
>
</
Form
.
Item
>
}
{
isTemplate
&&
<
Form
.
Item
name=
"templateId"
label=
"运费模板"
rules=
{
[
{
required
:
template
,
message
:
'请正确输入重量'
,
}
]
}
>
<
Select
placeholder=
"请选择运费模板"
...
...
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @
901b34cc
...
...
@@ -330,11 +330,11 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
if
(
updateFlag
.
current
){
// 初次渲染tab 再次进入tab采用缓存数据
_tempObj
[
'单价'
]
=
productInfoByEdit
.
unitPriceAndPicList
[
i
]?.
unitPrice
||
{}
}
else
{
_tempObj
[
'单价'
]
=
_tableDataSource
[
i
]
&&
tableDataSource
[
i
]
[
'单价'
]
||
{}
_tempObj
[
'单价'
]
=
_tableDataSource
[
i
]
&&
tableDataSource
[
i
]
||
{}
}
}
else
{
_tempObj
[
'对应货品'
]
=
selectedGoods
.
length
>
0
?
selectedGoods
[
0
].
id
:
0
_tempObj
[
'单价'
]
=
_tableDataSource
[
i
]
&&
tableDataSource
[
i
][
'单价'
]
||
{}
_tempObj
[
'单价'
]
=
_tableDataSource
[
i
]
&&
tableDataSource
[
i
]
&&
tableDataSource
[
i
]
[
'单价'
]
||
{}
}
// 价格属性变动引发的构建清空价格(仅清空一次)
if
(
clearPrice
.
current
){
...
...
src/pages/commodity/products/directChannel.tsx
View file @
901b34cc
...
...
@@ -26,7 +26,7 @@ import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect'
import
{
searchBrandOptionEffect
,
searchCustomerCategoryOptionEffect
}
from
'./effect'
import
EyePreview
from
'@/components/EyePreview'
import
moment
from
'moment'
import
{
GetProductChannelCommodityGetShopResponse
}
from
'@/services'
import
{
GetProductChannelCommodityGetShopResponse
}
from
'@/services
/ProductApi
'
// 定义选择的行数据的类型
interface
Item
{
...
...
@@ -68,6 +68,8 @@ const DirectChannel: React.FC<{}> = () => {
dataIndex
:
[
'channelCommodity'
,
'commodity'
,
'name'
],
key
:
'id'
,
className
:
'commonPickColor'
,
width
:
300
,
ellipsis
:
true
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
EyePreview
url=
{
`/memberCenter/commodityAbility/commodity/products/directChannel/detail?id=${record.id}`
}
>
...
...
src/pages/commodity/products/index.less
View file @
901b34cc
...
...
@@ -257,4 +257,11 @@
background-color: #909399 !important;
}
}
}
.overFlowEllipsis {
width: 300px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
\ No newline at end of file
src/pages/commodity/products/index.tsx
View file @
901b34cc
...
...
@@ -109,7 +109,9 @@ const Products: React.FC<{}> = () => {
dataIndex
:
'name'
,
key
:
'name'
,
className
:
'commonPickColor'
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
span
className=
"commonPickColor"
onClick=
{
()
=>
handleSee
(
record
)
}
>
{
text
}
<
EyeOutlined
/></
span
>
width
:
300
,
ellipsis
:
true
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
a
title=
{
text
}
onClick=
{
()
=>
handleSee
(
record
)
}
>
{
text
}
<
EyeOutlined
/></
a
>
},
{
title
:
'品类'
,
...
...
src/pages/commodity/products/schema/channelSchema.tsx
View file @
901b34cc
...
...
@@ -68,7 +68,7 @@ export const channelSchema: ISchema = {
defaultActiveFirstOption
:
false
,
filterOption
:
false
,
notFoundContent
:
null
,
style
:
{
width
:
'174px'
,
lineHeight
:
'32px'
},
//
style: { width: '174px', lineHeight: '32px' },
searchValue
:
null
,
dataoption
:
[],
},
...
...
@@ -83,7 +83,7 @@ export const channelSchema: ISchema = {
defaultActiveFirstOption
:
false
,
filterOption
:
false
,
notFoundContent
:
null
,
style
:
{
width
:
'174px'
,
lineHeight
:
'32px'
},
//
style: { width: '174px', lineHeight: '32px' },
searchValue
:
null
,
dataoption
:
[]
},
...
...
@@ -102,7 +102,7 @@ export const channelSchema: ISchema = {
],
'x-component-props'
:
{
placeholder
:
'商品来源'
,
style
:
{
width
:
'174px'
},
//
style: { width: '174px' },
},
},
statusList
:
{
...
...
@@ -123,7 +123,7 @@ export const channelSchema: ISchema = {
],
'x-component-props'
:
{
placeholder
:
'商品状态'
,
style
:
{
width
:
'174px'
},
//
style: { width: '174px' },
},
},
priceTypeList
:
{
...
...
@@ -144,7 +144,7 @@ export const channelSchema: ISchema = {
],
'x-component-props'
:
{
placeholder
:
'产品定价'
,
style
:
{
width
:
'174px'
},
//
style: { width: '174px' },
},
},
'NO_NAME_FIELD_$2'
:
{
...
...
src/pages/logistics/components/confirmModal.tsx
View file @
901b34cc
...
...
@@ -13,6 +13,7 @@ export interface Params {
dialogVisible
:
boolean
;
onCancel
:
Function
;
onOK
?:
Function
;
freightPrice
?:
any
;
dontReceive
?:
boolean
;
//默认展示
}
const
actions
=
createFormActions
()
...
...
@@ -24,7 +25,9 @@ const comfirmDialog: React.FC<Params> = (props) => {
const
handletOk
=
(
values
:
any
)
=>
{
let
value
=
{
...
values
}
value
.
id
=
props
.
id
console
.
log
(
values
)
if
(
props
.
freightPrice
)
{
value
.
freightPrice
=
props
.
freightPrice
}
PublicApi
.
postLogisticsOrderWaitConfirmConfirm
(
value
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
props
.
onOK
()
...
...
@@ -81,19 +84,6 @@ const comfirmDialog: React.FC<Params> = (props) => {
status
:
4
}
}
>
{
props
.
dontReceive
&&
<>
<
Field
title=
'运费'
name=
'freightPrice'
x
-
component=
"numberpicker"
x
-
mega
-
prop=
{
{
wrapperWidth
:
300
,
labelAlign
:
'left'
}
}
/>
</>
}
<
Field
enum=
{
[
...
...
src/pages/logistics/components/orderSearchDetail.tsx
View file @
901b34cc
...
...
@@ -254,7 +254,7 @@ const detailInfo: React.FC<{}> = () => {
//待确认物流单
if
(
pathname
===
'/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/detail'
)
{
PublicApi
.
getLogisticsOrderWaitConfirmGet
({
id
:
id
}).
then
(
res
=>
{
setdataInfo
(
res
.
data
)
let
current
=
0
...
...
@@ -288,6 +288,15 @@ const detailInfo: React.FC<{}> = () => {
history
.
goBack
()
}
// 获取路由link
const
{
pathname
}
=
history
.
location
;
const
type
=
pathname
.
split
(
'/'
)[
pathname
.
split
(
'/'
).
length
-
1
];
const
[
freightPrice
,
setfreightPrice
]
=
useState
<
any
>
(
null
);
// 输入报价价格
const
inputOnchange
=
(
e
:
any
)
=>
{
const
value
=
e
.
target
.
value
;
setfreightPrice
(
value
);
}
return
(
<
PageHeaderWrapper
...
...
@@ -303,19 +312,15 @@ const detailInfo: React.FC<{}> = () => {
</
div
>
</>
}
// extra={
// dataInfo.status === 2 &&
// <>
// <Button onClick={() => setvisible(true)}>
// <StopOutlined />
// 不接受物流单
// </Button>
// <Button onClick={() => setvisible(true)} className={style['saveBtn']}>
// <CheckSquareOutlined />
// 接受物流单
// </Button>
// </>
// }
extra=
{
type
===
'option'
&&
<>
<
Button
onClick=
{
()
=>
setvisible
(
true
)
}
className=
{
style
[
'saveBtn'
]
}
>
<
CheckSquareOutlined
/>
确认物流单
</
Button
>
</>
}
content=
{
<
div
className=
{
style
[
'headerMain'
]
}
>
<
div
className=
{
style
[
'headerMain-left'
]
}
>
...
...
@@ -410,7 +415,7 @@ const detailInfo: React.FC<{}> = () => {
{
infoTem
[
'base'
].
rightElem
.
map
(
(
item
:
any
,
index
:
number
)
=>
{
return
(
<
div
className=
{
style
[
'cols-main'
]
}
key=
{
index
}
>
<
div
className=
{
style
[
'cols-main'
]
}
key=
{
`base${index + 1}`
}
>
<
div
className=
{
style
[
'cols-main-options'
]
}
>
{
item
.
title
}
</
div
>
...
...
@@ -421,22 +426,7 @@ const detailInfo: React.FC<{}> = () => {
},
)
}
</
div
>
</
div
>
{
/* <div className={style['mainCol-row']}>
{infoTem['base'].elem.map((item: any, index: number) => {
return (
<div className={style['mainCol-row-col']} key={index}>
<div className={style['mainCol-row-col-option']}>
{item.title}
</div>
<div className={style['mainCol-row-col-option']}>
185 2929 6547
</div>
</div>
);
})}
</div> */
}
</
Col
>
<
Col
className=
{
style
[
'mainCol'
]
}
span=
{
24
}
>
<
div
className=
{
style
[
'mainCol-title'
]
}
>
...
...
@@ -473,16 +463,27 @@ const detailInfo: React.FC<{}> = () => {
{
infoTem
[
'freight'
].
leftElem
.
map
(
(
item
:
any
,
index
:
number
)
=>
{
return
(
<
div
className=
{
style
[
'cols-main'
]
}
key=
{
index
}
>
<
div
className=
{
style
[
'cols-main'
]
}
key=
{
`freight${index + 1}`
}
>
<
div
className=
{
style
[
'cols-main-options'
]
}
>
{
item
.
title
}
</
div
>
{
item
.
key
===
'freight'
?
<
div
className=
{
style
[
'cols-main-options'
]
}
>
{
dataInfo
.
status
<
3
?
'未报价'
:
item
.
value
}
</
div
>
<>
{
type
===
'option'
?
<
Input
addonBefore=
"¥"
onBlur=
{
inputOnchange
}
type=
'number'
maxLength=
{
25
}
style=
{
{
width
:
'300px'
}
}
/>
:
<
div
className=
{
style
[
'cols-main-options'
]
}
>
{
dataInfo
.
status
<
3
?
'未报价'
:
item
.
value
}
</
div
>
}
</>
:
<
div
className=
{
style
[
'cols-main-options'
]
}
>
{
item
.
value
}
</
div
>
...
...
@@ -501,19 +502,12 @@ const detailInfo: React.FC<{}> = () => {
外部流转记录
</
div
>
<
OrderLog
id=
{
id
}
pathName=
{
history
.
location
.
pathname
}
/>
{
/* <StandardTable
tableProps={{rowKey:'id'}}
currentRef={ref}
columns={columns}
fetchTableData={(params: any) => fetchData(params)}
/> */
}
</
Col
>
</
Row
>
<
ConfirmModal
id=
{
id
}
dialogVisible=
{
visible
}
freightPrice=
{
freightPrice
}
onCancel=
{
()
=>
setvisible
(
false
)
}
onOK=
{
()
=>
handleModalOK
()
}
/>
...
...
src/pages/logistics/logisticsResult/toOrderComfirmList.tsx
View file @
901b34cc
...
...
@@ -158,7 +158,7 @@ const OrderList: React.FC<ListProps> = (props) => {
align
:
'center'
,
key
:
'logisticsOrderNo'
,
render
:
(
text
:
any
,
reconds
:
any
)
=>
<
span
className=
"commonPickColor"
onClick=
{
()
=>
handleSee
(
reconds
.
id
)
}
>
{
text
}
<
EyeOutlined
/></
span
>
<
span
className=
"commonPickColor"
onClick=
{
()
=>
handleSee
(
false
,
reconds
.
id
)
}
>
{
text
}
<
EyeOutlined
/></
span
>
},
{
title
:
'对应订单号'
,
...
...
@@ -232,7 +232,7 @@ const OrderList: React.FC<ListProps> = (props) => {
render
:
(
_
:
any
,
record
:
any
)
=>
{
return
(
<>
<
Button
type=
'link'
onClick=
{
()
=>
handle
Dialog
(
record
.
id
)
}
>
确认
</
Button
>
<
Button
type=
'link'
onClick=
{
()
=>
handle
See
(
true
,
record
.
id
)
}
>
确认
</
Button
>
</>
)
}
...
...
@@ -271,8 +271,12 @@ const OrderList: React.FC<ListProps> = (props) => {
const
handleDelete
=
()
=>
{
console
.
log
(
'delete'
)
}
const
handleSee
=
(
id
:
any
)
=>
{
history
.
push
(
`/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/detail?id=
${
id
}
`
)
const
handleSee
=
(
option
:
boolean
,
id
:
any
)
=>
{
if
(
option
)
{
history
.
push
(
`/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/option?id=
${
id
}
`
)
}
else
{
history
.
push
(
`/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmList/detail?id=
${
id
}
`
)
}
}
const
confirm
=
()
=>
{
...
...
src/pages/repositories/components/PositionSetting.tsx
View file @
901b34cc
...
...
@@ -306,6 +306,8 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => {
dataIndex
:
'name'
,
align
:
'center'
,
key
:
'name'
,
width
:
210
,
ellipsis
:
true
,
},
{
title
:
'品类'
,
...
...
src/pages/transaction/components/orderHandReceivedModal/index.tsx
View file @
901b34cc
...
...
@@ -45,20 +45,20 @@ const OrderHandReceivedModal:React.FC<OrderHandReceivedModalProps> = ({currentRe
formData
&&
<>
<
Row
>
<
Col
span=
{
6
}
>
发货地址:
</
Col
>
<
Col
>
{
formData
.
name
}
</
Col
>
<
Col
span=
{
6
}
>
<
p
>
发货地址:
</
p
>
</
Col
>
<
Col
>
<
p
>
{
formData
.
name
}
</
p
>
</
Col
>
</
Row
>
<
Row
>
<
Col
span=
{
6
}
>
发货时间:
</
Col
>
<
Col
>
{
moment
(
formData
.
deliverTime
).
format
(
'YYYY-MM-DD'
)
}
</
Col
>
<
Col
span=
{
6
}
>
<
p
>
发货时间:
</
p
>
</
Col
>
<
Col
>
<
p
>
{
moment
(
formData
.
deliverTime
).
format
(
'YYYY-MM-DD'
)
}
</
p
>
</
Col
>
</
Row
>
<
Row
>
<
Col
span=
{
6
}
>
物流单号:
</
Col
>
<
Col
>
{
formData
.
deliverNo
}
</
Col
>
<
Col
span=
{
6
}
>
<
p
>
物流单号:
</
p
>
</
Col
>
<
Col
>
<
p
><
a
href=
{
`https://www.kuaidi100.com/chaxun?nu=${formData.deliverNo}`
}
target=
"_blank"
>
{
formData
.
deliverNo
}
</
a
></
p
>
</
Col
>
</
Row
>
<
Row
>
<
Col
span=
{
6
}
>
物流公司:
</
Col
>
<
Col
>
{
formData
.
logisticsCompany
}
</
Col
>
<
Col
span=
{
6
}
>
<
p
>
物流公司:
</
p
>
</
Col
>
<
Col
>
<
p
>
{
formData
.
logisticsCompany
}
</
p
>
</
Col
>
</
Row
>
</>
}
...
...
src/pages/transaction/confirmInquiryQuote/components/details.tsx
View file @
901b34cc
...
...
@@ -359,7 +359,7 @@ const Details: React.FC<parmas> = (props) => {
</
div
>
}
>
<
Card
className=
{
style
.
item_wrap
}
>
<
div
className=
{
style
.
item_wrap
}
>
{
Number
(
page_type
)
===
4
?
<>
...
...
@@ -419,8 +419,8 @@ const Details: React.FC<parmas> = (props) => {
</
Tabs
>
}
</
Card
>
<
Card
className=
{
style
.
item_wrap
}
>
</
div
>
<
div
className=
{
style
.
item_wrap
}
>
<
div
className=
{
style
.
mainCol_title
}
style=
{
view
===
2
?
{
paddingBottom
:
'0px'
}:
{
paddingBottom
:
'24px'
}
}
>
询价商品
</
div
>
{
view
===
1
&&
<
Table
columns=
{
inquiryGoods
}
pagination=
{
false
}
rowKey=
'id'
dataSource=
{
data
.
inquiryListProductRequests
}
/>
}
{
view
===
2
&&
...
...
@@ -431,12 +431,12 @@ const Details: React.FC<parmas> = (props) => {
fetchTableData=
{
(
params
:
any
)
=>
fetchData
(
params
)
}
/>
}
</
Card
>
<
Card
className=
{
style
.
item_wrap
}
>
<
div
className=
{
style
.
mainCol_title
}
>
{
infoTem
[
(
Number
(
page_type
)
===
1
||
Number
(
page_type
)
===
5
)
?
'freight'
:
'base'
].
title
}
</
div
>
</
div
>
<
div
className=
{
style
.
item_wrap
}
>
<
div
className=
{
style
.
mainCol_title
}
>
{
infoTem
[
type
===
'quote'
?
'freight'
:
'base'
].
title
}
</
div
>
<
div
className=
{
style
[
'mainCol-rows'
]
}
>
<
div
className=
{
style
[
'mainCol-rows-cols'
]
}
>
{
infoTem
[
(
Number
(
page_type
)
===
1
||
Number
(
page_type
)
===
5
)
?
'freight'
:
'base'
].
leftElem
.
map
(
{
infoTem
[
type
===
'quote'
?
'freight'
:
'base'
].
leftElem
.
map
(
(
item
:
any
,
index
:
number
)
=>
{
return
(
<
div
className=
{
style
[
'cols-main'
]
}
key=
{
index
}
>
...
...
@@ -452,7 +452,7 @@ const Details: React.FC<parmas> = (props) => {
)
}
</
div
>
<
div
className=
{
style
[
'mainCol-rows-cols'
]
}
>
{
infoTem
[
(
Number
(
page_type
)
===
1
||
Number
(
page_type
)
===
5
)
?
'freight'
:
'base'
].
centerElem
.
map
(
{
infoTem
[
type
===
'quote'
?
'freight'
:
'base'
].
centerElem
.
map
(
(
item
:
any
,
index
:
number
)
=>
{
return
(
<
div
className=
{
style
[
'cols-main'
]
}
key=
{
index
}
>
...
...
@@ -467,7 +467,7 @@ const Details: React.FC<parmas> = (props) => {
)
}
</
div
>
<
div
className=
{
style
[
'mainCol-rows-cols'
]
}
>
{
infoTem
[
(
Number
(
page_type
)
===
1
||
Number
(
page_type
)
===
5
)
?
'freight'
:
'base'
].
rightElem
.
map
(
{
infoTem
[
type
===
'quote'
?
'freight'
:
'base'
].
rightElem
.
map
(
(
item
:
any
,
index
:
number
)
=>
{
return
(
<
div
className=
{
style
[
'cols-main'
]
}
key=
{
index
}
>
...
...
@@ -482,8 +482,8 @@ const Details: React.FC<parmas> = (props) => {
)
}
</
div
>
</
div
>
</
Card
>
<
Card
className=
{
style
.
item_wrap
}
>
</
div
>
<
div
className=
{
style
.
item_wrap
}
>
<
div
className=
{
style
.
mainCol_title
}
>
附件
</
div
>
<
div
className=
{
style
.
upload_data
}
>
{
...
...
@@ -498,8 +498,8 @@ const Details: React.FC<parmas> = (props) => {
))
}
</
div
>
</
Card
>
<
Card
className=
{
style
.
item_wrap
}
>
</
div
>
<
div
className=
{
style
.
item_wrap
}
>
{
Number
(
page_type
)
===
4
?
<>
...
...
@@ -516,7 +516,7 @@ const Details: React.FC<parmas> = (props) => {
</
TabPane
>
</
Tabs
>
}
</
Card
>
</
div
>
<
AuditModal
id=
{
id
}
type=
{
page_type
}
...
...
src/pages/transaction/confirmInquiryQuote/components/index.less
View file @
901b34cc
...
...
@@ -3,6 +3,7 @@
margin-bottom: 24px;
background-color: #FFF;
border-radius: 8px;
padding: 24px;
&:last-child {
margin-bottom: 0px;
...
...
src/pages/transaction/goodsOffer/addEnquiryOrder/components/tradingConditions.tsx
View file @
901b34cc
...
...
@@ -79,6 +79,12 @@ const TradingConditions: React.FC<queryProps> = (props) => {
const
addressOnChange
=
(
value
:
any
,
option
:
any
)
=>
{
getAddress
(
option
)
}
const
disabledDate
=
(
current
)
=>
{
return
current
&&
current
<
moment
().
endOf
(
'day'
);
}
return
(
<
Form
{
...
layout
}
...
...
@@ -88,7 +94,10 @@ const TradingConditions: React.FC<queryProps> = (props) => {
<
Row
gutter=
{
70
}
>
<
Col
span=
{
12
}
>
<
Form
.
Item
label=
'交付日期'
name=
'deliveryTime'
rules=
{
[{
required
:
true
,
message
:
'请选择交付日期'
}]
}
>
<
DatePicker
format=
"YYYY-MM-DD HH:mm:ss"
/>
<
DatePicker
disabledDate=
{
disabledDate
}
format=
"YYYY-MM-DD HH:mm:ss"
/>
</
Form
.
Item
>
<
Form
.
Item
label=
'交付地址'
name=
'fullAddressId'
rules=
{
[{
required
:
true
,
message
:
'请选择交付地址'
}]
}
>
<
Select
onChange=
{
addressOnChange
}
>
...
...
@@ -98,7 +107,10 @@ const TradingConditions: React.FC<queryProps> = (props) => {
</
Select
>
</
Form
.
Item
>
<
Form
.
Item
label=
'报价截止时间'
name=
'quotationAsTime'
rules=
{
[{
required
:
true
,
message
:
'请选择报价截止时间'
}]
}
>
<
DatePicker
format=
"YYYY-MM-DD HH:mm:ss"
/>
<
DatePicker
format=
"YYYY-MM-DD HH:mm:ss"
disabledDate=
{
disabledDate
}
/>
</
Form
.
Item
>
<
Form
.
Item
label=
'报价要求'
name=
'offer'
>
<
Input
.
TextArea
placeholder=
'最长100个字符,50个汉字'
/>
...
...
src/pages/transaction/inquiryQuote/addInquiryOrder/components/enquiryGoods.tsx
View file @
901b34cc
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
React
,
{
useState
,
useEffect
,
ReactNode
}
from
'react'
;
import
styles
from
'./index.less'
;
import
{
Input
,
Table
,
Form
}
from
'antd'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
...
...
@@ -17,16 +17,24 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
// 会员添加弹窗控制
const
[
goodsList
,
setgoodsList
]
=
useState
([]);
// 计算金额
const
countMoney
=
(
num
:
any
,
money
:
any
)
=>
{
let
price
:
ReactNode
=
null
;
price
=
(
Number
(
money
)
*
1
)
/
Number
(
num
);
return
Number
(
price
).
toFixed
(
4
);
}
/**输入框输入 */
const
inputOnchange
=
(
id
,
e
)
=>
{
const
{
value
}
=
e
.
target
goodsList
.
forEach
(
v
=>
{
if
(
v
.
productId
===
id
)
{
v
.
money
=
value
v
.
price
=
countMoney
(
v
.
purchaseCount
,
value
);
}
})
getGoodsList
(
goodsList
)
// 返回给父级
setgoodsList
(
goodsList
)
getGoodsList
(
[...
goodsList
]
)
// 返回给父级
setgoodsList
(
[...
goodsList
]
)
}
const
columns
:
ColumnType
<
any
>
[]
=
[{
...
...
@@ -70,8 +78,12 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
console
.
log
(
123
)
PublicApi
.
getOrderProductInquiryDetails
({
id
:
inquiryNo
.
orderId
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
getGoodsList
(
res
.
data
.
inquiryListProductRequests
)
setgoodsList
(
res
.
data
.
inquiryListProductRequests
)
const
data
=
res
.
data
.
inquiryListProductRequests
;
data
.
forEach
((
item
:
any
)
=>
{
item
.
money
=
item
.
purchaseCount
*
item
.
price
})
getGoodsList
(
data
)
setgoodsList
(
data
)
}
})
}
...
...
src/pages/transaction/inquiryQuote/components/details.tsx
View file @
901b34cc
...
...
@@ -403,7 +403,7 @@ const Details: React.FC<parmas> = (props) => {
</
div
>
}
>
<
Card
className=
{
style
.
item_wrap
}
>
<
div
className=
{
style
.
item_wrap
}
>
{
Number
(
page_type
)
===
4
?
<>
...
...
@@ -463,8 +463,8 @@ const Details: React.FC<parmas> = (props) => {
</
Tabs
>
}
</
Card
>
<
Card
className=
{
style
.
item_wrap
}
>
</
div
>
<
div
className=
{
style
.
item_wrap
}
>
<
div
className=
{
style
.
mainCol_title
}
>
询价商品
</
div
>
{
view
===
1
&&
<
Table
columns=
{
inquiryGoods
}
pagination=
{
false
}
rowKey=
'id'
dataSource=
{
data
.
inquiryListProductRequests
}
/>
}
{
view
===
2
&&
...
...
@@ -475,12 +475,12 @@ const Details: React.FC<parmas> = (props) => {
fetchTableData=
{
(
params
:
any
)
=>
fetchData
(
params
)
}
/>
}
</
Card
>
<
Card
className=
{
style
.
item_wrap
}
>
<
div
className=
{
style
.
mainCol_title
}
>
{
infoTem
[
(
Number
(
page_type
)
===
1
||
Number
(
page_type
)
===
5
)
?
'freight'
:
'base'
].
title
}
</
div
>
</
div
>
<
div
className=
{
style
.
item_wrap
}
>
<
div
className=
{
style
.
mainCol_title
}
>
{
infoTem
[
type
===
'quote'
?
'freight'
:
'base'
].
title
}
</
div
>
<
div
className=
{
style
[
'mainCol-rows'
]
}
>
<
div
className=
{
style
[
'mainCol-rows-cols'
]
}
>
{
infoTem
[
(
Number
(
page_type
)
===
1
||
Number
(
page_type
)
===
5
)
?
'freight'
:
'base'
].
leftElem
.
map
(
{
infoTem
[
type
===
'quote'
?
'freight'
:
'base'
].
leftElem
.
map
(
(
item
:
any
,
index
:
number
)
=>
{
return
(
<
div
className=
{
style
[
'cols-main'
]
}
key=
{
index
}
>
...
...
@@ -496,7 +496,7 @@ const Details: React.FC<parmas> = (props) => {
)
}
</
div
>
<
div
className=
{
style
[
'mainCol-rows-cols'
]
}
>
{
infoTem
[
(
Number
(
page_type
)
===
1
||
Number
(
page_type
)
===
5
)
?
'freight'
:
'base'
].
centerElem
.
map
(
{
infoTem
[
type
===
'quote'
?
'freight'
:
'base'
].
centerElem
.
map
(
(
item
:
any
,
index
:
number
)
=>
{
return
(
<
div
className=
{
style
[
'cols-main'
]
}
key=
{
index
}
>
...
...
@@ -511,7 +511,7 @@ const Details: React.FC<parmas> = (props) => {
)
}
</
div
>
<
div
className=
{
style
[
'mainCol-rows-cols'
]
}
>
{
infoTem
[
(
Number
(
page_type
)
===
1
||
Number
(
page_type
)
===
5
)
?
'freight'
:
'base'
].
rightElem
.
map
(
{
infoTem
[
type
===
'quote'
?
'freight'
:
'base'
].
rightElem
.
map
(
(
item
:
any
,
index
:
number
)
=>
{
return
(
<
div
className=
{
style
[
'cols-main'
]
}
key=
{
index
}
>
...
...
@@ -526,8 +526,8 @@ const Details: React.FC<parmas> = (props) => {
)
}
</
div
>
</
div
>
</
Card
>
<
Card
className=
{
style
.
item_wrap
}
>
</
div
>
<
div
className=
{
style
.
item_wrap
}
>
<
div
className=
{
style
.
mainCol_title
}
>
附件
</
div
>
<
div
className=
{
style
.
upload_data
}
>
{
...
...
@@ -542,8 +542,8 @@ const Details: React.FC<parmas> = (props) => {
))
}
</
div
>
</
Card
>
<
Card
className=
{
style
.
item_wrap
}
>
</
div
>
<
div
className=
{
style
.
item_wrap
}
>
{
Number
(
page_type
)
===
4
?
<>
...
...
@@ -560,7 +560,7 @@ const Details: React.FC<parmas> = (props) => {
</
TabPane
>
</
Tabs
>
}
</
Card
>
</
div
>
<
AuditModal
id=
{
id
}
type=
{
page_type
}
...
...
src/pages/transaction/inquiryQuote/components/index.less
View file @
901b34cc
...
...
@@ -3,6 +3,7 @@
margin-bottom: 24px;
background-color: #FFF;
border-radius: 8px;
padding: 24px;
&:last-child {
margin-bottom: 0px;
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.less
0 → 100644
View file @
901b34cc
.orderCollectCard {
:global {
.ant-form-item-explain-error {
position: absolute;
top: 92%;
}
}
}
\ No newline at end of file
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
901b34cc
...
...
@@ -29,6 +29,7 @@ import { changeRouterTitleByStatus } from '../../_public/order/utils'
import
{
ReadyAddOrderDetailContext
}
from
'../context'
import
AuditProcess
from
'@/components/AuditProcess'
import
styles
from
'./index.less'
export
interface
PurchaseOrderDetailProps
{}
...
...
@@ -329,7 +330,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
[]
}
></
AuditProcess
>
}
<
Card
className=
''
style=
{
{
marginTop
:
24
}
}
>
<
Card
className=
{
styles
.
orderCollectCard
}
style=
{
{
marginTop
:
24
}
}
>
<
NiceForm
loading=
{
formLoading
}
previewPlaceholder=
' '
...
...
src/pages/transaction/saleOrder/constant/index.tsx
View file @
901b34cc
...
...
@@ -28,10 +28,10 @@ export const baseOrderListColumns: any[] = [
key
:
'orderThe'
,
},
{
title
:
'
供应
会员'
,
title
:
'
采购
会员'
,
align
:
'center'
,
dataIndex
:
'
supplyMembers
Name'
,
key
:
'
supplyMembers
Name'
,
dataIndex
:
'
member
Name'
,
key
:
'
member
Name'
,
},
{
title
:
'下单时间'
,
...
...
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