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
212229e8
Commit
212229e8
authored
Oct 29, 2020
by
XieZhiXiong
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
3605e4d7
4469c85a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
47 deletions
+18
-47
LXShopLayout.tsx
src/pages/lxMall/layouts/LXShopLayout.tsx
+7
-2
index.tsx
src/pages/lxMall/order/index.tsx
+2
-0
tableStatusList.tsx
src/pages/transaction/common/tableStatusList.tsx
+3
-2
index.tsx
...ages/transaction/confirmInquiryQuote/quoteOrder/index.tsx
+0
-18
productModal.tsx
...ges/transaction/enquirySubmit/components/productModal.tsx
+5
-5
detail.tsx
src/pages/transaction/enquirySubmit/toAddSubmit/detail.tsx
+0
-0
index.tsx
src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx
+1
-20
No files found.
src/pages/lxMall/layouts/LXShopLayout.tsx
View file @
212229e8
...
...
@@ -40,6 +40,7 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
const
[
shopInfo
,
setShopInfo
]
=
useState
<
GetTemplateShopFindShopResponse
>
()
const
[
query
,
setQuery
]
=
useState
<
any
>
({})
const
[
mallInfo
,
setMallInfo
]
=
useState
<
any
>
({})
const
[
loading
,
setLoading
]
=
useState
<
boolean
>
(
true
)
useEffect
(()
=>
{
try
{
...
...
@@ -48,6 +49,7 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
setQuery
(
queryParam
)
}
catch
(
error
)
{
console
.
log
(
error
)
setLoading
(
false
)
}
getWebMallInfo
()
},
[])
...
...
@@ -70,6 +72,9 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
if
(
res
.
code
===
1000
)
{
setShopInfo
(
res
.
data
)
}
setLoading
(
false
)
}).
catch
(()
=>
{
setLoading
(
false
)
})
}
...
...
@@ -103,7 +108,7 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
<
ShopHeader
logo=
{
mallInfo
.
logoUrl
}
shopId=
{
query
.
shopId
}
shopUrlParam=
{
shopId
}
shopInfo=
{
shopInfo
}
updateShopInfo=
{
()
=>
handleUpdate
()
}
/>
<
MainNav
menuData=
{
menuData
}
pathname=
{
location
.
pathname
}
type=
{
LAYOUT_TYPE
.
shop
}
shopId=
{
query
.
shopId
}
shopUrlParam=
{
shopId
}
/>
{
shopInfo
?
shopInfo
.
status
===
1
?
children
&&
React
.
Children
.
map
(
children
,
(
child
:
any
)
=>
{
!
loading
?
shopInfo
?
shopInfo
.
status
===
1
?
children
&&
React
.
Children
.
map
(
children
,
(
child
:
any
)
=>
{
return
React
.
cloneElement
(
child
,
{
layoutType
:
LAYOUT_TYPE
.
shop
,
...
...
@@ -114,7 +119,7 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
updateShopInfo
:
()
=>
handleUpdate
()
},
);
})
:
<
SearchShopResult
search
=
{
shopInfo
.
company
}
/> : <SearchShopResult /
>
})
:
<
SearchShopResult
search
=
{
shopInfo
.
company
}
/> : <SearchShopResult /
>
:
null
}
</
div
>
<
Footer
/>
...
...
src/pages/lxMall/order/index.tsx
View file @
212229e8
...
...
@@ -280,9 +280,11 @@ const Order: React.FC<OrderPropsType> = (props) => {
temp
.
category
=
orderItem
.
category
temp
.
brand
=
orderItem
.
brand
temp
.
logistics
=
orderItem
.
logistics
temp
.
deliveryType
=
orderItem
.
logistics
.
deliveryType
orderProductRequests
.
push
(
temp
)
}
}
params
.
supplyMembersName
=
orderInfo
.
supplyMembersName
params
.
supplyMembersId
=
orderInfo
.
supplyMembersId
params
.
supplyMembersRoleId
=
orderInfo
.
supplyMembersRoleId
params
.
deliveryType
=
orderInfo
.
logistics
.
deliveryType
...
...
src/pages/transaction/common/tableStatusList.tsx
View file @
212229e8
...
...
@@ -155,8 +155,8 @@ export const inquiryQuoteOuterState = (text:any) => {
let
component
:
ReactNode
=
null
;
text
===
1
?
component
=
<
Tag
color=
"default"
>
提交询价单
</
Tag
>:
text
===
2
?
component
=
<
Tag
color=
"default"
>
提交报价单
</
Tag
>:
text
===
1
?
component
=
<
Tag
color=
"processing"
>
确认报价单
</
Tag
>:
text
===
2
?
component
=
<
Tag
color=
"success"
>
报价通过
</
Tag
>:
text
===
3
?
component
=
<
Tag
color=
"processing"
>
确认报价单
</
Tag
>:
text
===
4
?
component
=
<
Tag
color=
"success"
>
报价通过
</
Tag
>:
component
=
<
Tag
color=
"error"
>
报价不通过
</
Tag
>
return
component
;
}
\ No newline at end of file
src/pages/transaction/confirmInquiryQuote/quoteOrder/index.tsx
View file @
212229e8
...
...
@@ -65,29 +65,11 @@ const EnquiryOrder: React.FC<{}> = (props) => {
quoteOrderInternalState
(
text
)
}];
//交易能力 询价报价 询价单查询
const
data
=
{
totalCount
:
1
,
data
:
[{
id
:
91
,
quotationNo
:
'BPTY12'
,
inquiryListNo
:
'SD2015PPLJ'
,
details
:
'阿珍爱上阿强'
,
memberName
:
'wutiaoren'
,
memberId
:
5
,
quotationAsTime
:
'2020-10-13 15:37:00'
,
voucherTime
:
'2020-10-13 15:37:00'
,
externalState
:
1
,
interiorState
:
2
}]
}
const
fetchData
=
(
params
?:
any
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
getOrderNotarizeEnquiryProductQuotationList
({...
params
}).
then
(
res
=>
{
resolve
(
res
.
data
)
})
// setTimeout(() => {
// resolve(data)
// }, 1000)
})
}
// 搜索
...
...
src/pages/transaction/enquirySubmit/components/productModal.tsx
View file @
212229e8
...
...
@@ -46,11 +46,11 @@ const comfirmDialog: React.FC<Params> = (props) => {
const
handletOk
=
async
()
=>
{
try
{
const
value
=
await
form
.
validateFields
();
for
(
let
key
in
value
)
{
if
(
key
!==
'model'
&&
key
!==
'brand'
&&
key
!==
'purchaseNuit'
&&
key
!==
'purchaseQuantity'
)
{
value
[
key
]
=
value
[
key
].
join
(
'/'
);
}
}
//
for(let key in value) {
//
if(key !== 'model' && key !== 'brand' && key !== 'purchaseNuit' && key !== 'purchaseQuantity') {
//
value[key] = value[key].join('/');
//
}
//
}
props
.
onOK
(
value
)
}
catch
(
err
)
{
message
.
error
(
'有必填项没填写请检查!'
)
...
...
src/pages/transaction/enquirySubmit/toAddSubmit/detail.tsx
View file @
212229e8
This diff is collapsed.
Click to expand it.
src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx
View file @
212229e8
...
...
@@ -98,31 +98,12 @@ const PendingSubmit: React.FC<{}> = () => {
</
Row
>
/**列表数据 */
// const data = {
// totalCount: 2,
// data: [{
// id: 1,
// quotationNo: 'BPTY12',
// inquiryListNo: 'SZX125KJS',
// details: '模拟的数据',
// memberName: '冰红茶',
// memberId: 10,
// deliveryTime: '2020-10-13 13:59:00',
// quotationAsTime: '2020-10-13 23:59:00',
// voucherTime: '2020-10-13 13:59:00',
// externalState: 1,
// interiorState: 1
// }]
// }
const
fetchData
=
(
params
?:
any
)
=>
{
console
.
log
(
params
)
//可以直接打印参数
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
getOrderToSubmitProductQuotationList
({
...
params
}).
then
(
res
=>
{
resolve
(
res
.
data
)
})
// setTimeout(() => {
// resolve(data)
// }, 500)
})
}
...
...
@@ -151,7 +132,7 @@ const PendingSubmit: React.FC<{}> = () => {
const
handleModalOK
=
()
=>
{
setvisible
(
false
)
setTimeout
(()
=>
{
history
.
goBack
()
ref
.
current
.
reload
();
},
1000
)
}
...
...
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