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
3902b53e
Commit
3902b53e
authored
Oct 23, 2020
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改需求报价审核的bug
parent
ebc0a408
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
107 additions
and
65 deletions
+107
-65
confirmModal.tsx
...ages/transaction/enquiryOffer/components/confirmModal.tsx
+1
-1
detail.tsx
src/pages/transaction/enquiryOffer/components/detail.tsx
+14
-14
detail.tsx
src/pages/transaction/enquiryOffer/toAddSubmit/detail.tsx
+65
-46
detail.tsx
src/pages/transaction/enquirySubmit/toAddSubmit/detail.tsx
+16
-0
index.tsx
src/pages/transaction/enquirySubmit/toAddSubmit/index.tsx
+8
-2
add.tsx
src/pages/transaction/goodsOffer/addEnquiryOrder/add.tsx
+1
-0
tradingConditions.tsx
...odsOffer/addEnquiryOrder/components/tradingConditions.tsx
+2
-2
No files found.
src/pages/transaction/enquiryOffer/components/confirmModal.tsx
View file @
3902b53e
...
@@ -24,7 +24,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
...
@@ -24,7 +24,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
}
}
const
handletOk
=
(
values
:
any
)
=>
{
const
handletOk
=
(
values
:
any
)
=>
{
let
value
=
{
...
values
}
let
value
=
{
...
values
}
value
.
id
=
props
.
id
value
.
id
=
Number
(
props
.
id
)
console
.
log
(
'value'
,
value
)
console
.
log
(
'value'
,
value
)
if
(
props
.
type
==
1
){
if
(
props
.
type
==
1
){
PublicApi
.
postOrderRequisitionFormAudit
(
value
).
then
(
res
=>
{
PublicApi
.
postOrderRequisitionFormAudit
(
value
).
then
(
res
=>
{
...
...
src/pages/transaction/enquiryOffer/components/detail.tsx
View file @
3902b53e
...
@@ -326,25 +326,25 @@ const DetailsInfo: React.FC<dataInfoType> = (props) => {
...
@@ -326,25 +326,25 @@ const DetailsInfo: React.FC<dataInfoType> = (props) => {
const
init
=
()
=>
{
const
init
=
()
=>
{
PublicApi
.
getOrderQuotationDetails
({
id
:
id
}).
then
(
res
=>
{
PublicApi
.
getOrderQuotationDetails
({
id
:
id
}).
then
(
res
=>
{
let
{
data
}
=
res
let
{
data
}
=
res
//
if(pagetype == 2){
if
(
pagetype
==
2
){
//
if(data.interiorState === 3){//一级的审核通过变为2级的待审核
if
(
data
.
interiorState
===
3
){
//一级的审核通过变为2级的待审核
//
data.interiorState = 2
data
.
interiorState
=
2
//
}
}
//
}
}
setdataInfo
(
data
)
setdataInfo
(
data
)
getOrderProductAll
(
data
.
requisitionFormId
)
getOrderProductAll
(
data
.
requisitionFormId
)
// interiorStateList = [...data.interiorRequisitionFormStateResponses]
// interiorStateList = [...data.interiorRequisitionFormStateResponses]
//
if(pagetype == 1 || pagetype == 2){
if
(
pagetype
==
1
||
pagetype
==
2
){
//
if(data.interiorState === 2){
if
(
data
.
interiorState
===
2
){
//
setIsextraOption(true)
setIsextraOption
(
true
)
//
}
}
//
}else if(pagetype == 3){
}
else
if
(
pagetype
==
3
){
//
if(data.externalState == 1){
if
(
data
.
externalState
==
1
){
//
setIsextraOption(true)
setIsextraOption
(
true
)
//
}
}
//
}
}
// PublicApi.getLogisticsSelectListShipperAddress().then(res => {
// PublicApi.getLogisticsSelectListShipperAddress().then(res => {
// res.data.forEach(item => {
// res.data.forEach(item => {
...
...
src/pages/transaction/enquiryOffer/toAddSubmit/detail.tsx
View file @
3902b53e
...
@@ -563,69 +563,88 @@ const Detail: React.FC<{}> = () => {
...
@@ -563,69 +563,88 @@ const Detail: React.FC<{}> = () => {
* @param {type}
* @param {type}
* @return {type}
* @return {type}
*/
*/
const
pathname
=
history
.
location
.
pathname
if
(
id
)
{
if
(
pathname
===
"/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/add"
&&
id
)
{
PublicApi
.
getOrderQuotationDetails
({
id
:
id
}).
then
(
res
=>
{
PublicApi
.
getOrderQuotation
RequisitionForm
Details
({
id
:
id
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
let
data
=
res
.
data
let
data
=
res
.
data
console
.
log
(
data
,
'数据展示'
)
let
areaCodeList
=
[]
let
areaCodeList
=
[]
setdataInfo
(
data
)
//总
setdataInfo
(
data
)
//总
//地区
//地区
setinitialValues
(
data
)
setinitialValues
({
tabForm
.
resetFields
()
quotationSummary
:
data
,
})
getOrderProductAll
(
data
.
requisitionFormId
)
//查询规格 赋值弹窗单位和采购数量
getOrderProductAll
(
data
.
requisitionFormId
)
//查询规格 赋值弹窗单位和采购数量
tabForm
.
resetFields
()
}
}
})
})
}
else
{
if
(
id
)
{
PublicApi
.
getOrderQuotationDetails
({
id
:
id
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
let
data
=
res
.
data
let
areaCodeList
=
[]
setdataInfo
(
data
)
//总
//地区
setinitialValues
(
data
)
tabForm
.
resetFields
()
getOrderProductAll
(
data
.
requisitionFormId
)
//查询规格 赋值弹窗单位和采购数量
}
})
//商品列表 为动态列渲染做
// PublicApi.getOrderRequisitionFormProductAll({ id: id }).then(res => {
// if (res.code === 1000) {
// let { data } = res
// //商品
// let source = []
// let otherColumnkey = []//动态列的展示
// data.forEach((v)=> {
// let obj:any = {}
// obj.model = v.model
// obj.id = v.id
// obj.brand = v.brand
// obj.purchaseNuit = v.purchaseNuit
// obj.purchaseQuantity = v.purchaseQuantity
// if(v.productAttributeJson){
// JSON.parse(v.productAttributeJson).forEach(child => {
// Object.keys(child).forEach(key => {
// //获取列头
// otherColumnkey.push({
// title: key,
// dataIndex: key,
// key: key,
// align:'center'
// })
// // console.log('key',key,child,child[key])
// obj[key] = child[key]
// })
// });
// }
// source.push(obj)
// })
// console.log([...source])
// setotherList([...otherColumnkey])//生成列
// setproductSource([...source])
// }
// })
}
}
if
(
id
)
{
PublicApi
.
getOrderQuotationParticulars
({
id
:
id
}).
then
(
res
=>
{
PublicApi
.
getOrderQuotationParticulars
({
id
:
id
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
let
{
data
}
=
res
.
data
let
{
data
}
=
res
.
data
setproductSource
([...
data
])
setproductSource
([...
data
])
}
}
})
})
//商品列表 为动态列渲染做
// PublicApi.getOrderRequisitionFormProductAll({ id: id }).then(res => {
// if (res.code === 1000) {
// let { data } = res
// //商品
// let source = []
// let otherColumnkey = []//动态列的展示
// data.forEach((v)=> {
// let obj:any = {}
// obj.model = v.model
// obj.id = v.id
// obj.brand = v.brand
// obj.purchaseNuit = v.purchaseNuit
// obj.purchaseQuantity = v.purchaseQuantity
// if(v.productAttributeJson){
// JSON.parse(v.productAttributeJson).forEach(child => {
// Object.keys(child).forEach(key => {
// //获取列头
// otherColumnkey.push({
// title: key,
// dataIndex: key,
// key: key,
// align:'center'
// })
// // console.log('key',key,child,child[key])
// obj[key] = child[key]
// })
// });
// }
// source.push(obj)
// })
// console.log([...source])
// setotherList([...otherColumnkey])//生成列
// setproductSource([...source])
// }
// })
}
}
},
[])
},
[])
const
formTime
=
(
text
)
=>
{
const
formTime
=
(
text
)
=>
{
...
...
src/pages/transaction/enquirySubmit/toAddSubmit/detail.tsx
View file @
3902b53e
...
@@ -487,8 +487,24 @@ const Detail: React.FC<{}> = () => {
...
@@ -487,8 +487,24 @@ const Detail: React.FC<{}> = () => {
dataIndex
:
'purchaseQuantity'
,
dataIndex
:
'purchaseQuantity'
,
key
:
'purchaseQuantity'
,
key
:
'purchaseQuantity'
,
align
:
'center'
align
:
'center'
},
{
title
:
'操作'
,
dataIndex
:
'option'
,
key
:
'option'
,
align
:
'center'
,
render
:(
text
:
any
,
records
:
any
,
index
:
number
)
=>
{
return
(
<
Button
type=
'link'
onClick=
{
()
=>
handleDelete
(
records
,
index
)
}
>
删除
</
Button
>
)
}
}
}
]
]
const
handleDelete
=
(
value
:
any
,
index
:
number
)
=>
{
const
data
=
[...
productSource
];
data
.
splice
(
index
,
1
)
setproductSource
(
data
);
}
const
formSearch
:
ISchema
=
{
const
formSearch
:
ISchema
=
{
type
:
'object'
,
type
:
'object'
,
properties
:
{
properties
:
{
...
...
src/pages/transaction/enquirySubmit/toAddSubmit/index.tsx
View file @
3902b53e
...
@@ -55,13 +55,19 @@ const List:React.FC<{}> = () => {
...
@@ -55,13 +55,19 @@ const List:React.FC<{}> = () => {
const
format
=
(
text
)
=>
{
const
format
=
(
text
)
=>
{
return
<>
{
moment
(
text
).
format
(
"YYYY-MM-DD HH:mm:ss"
)
}
</>
return
<>
{
moment
(
text
).
format
(
"YYYY-MM-DD HH:mm:ss"
)
}
</>
}
}
const
handleToDetail
=
(
id
)
=>
{
// history.push(`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?page_type=${4}&id=${id}`)
history
.
push
(
`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?id=
${
id
}
`
)
}
const
columns
:
ColumnType
<
any
>
[]
=
[
const
columns
:
ColumnType
<
any
>
[]
=
[
{
{
title
:
'需求单号'
,
title
:
'需求单号'
,
key
:
'requisitionFormNo'
,
key
:
'requisitionFormNo'
,
dataIndex
:
'requisitionFormNo'
,
dataIndex
:
'requisitionFormNo'
,
align
:
'center'
align
:
'center'
,
render
:
(
text
:
any
,
records
:
any
)
=>
<
EyePreview
type=
"button"
handleClick=
{
()
=>
{
handleToDetail
(
records
.
id
)
}
}
>
{
text
}
</
EyePreview
>
},
},
{
{
title
:
'需求摘要'
,
title
:
'需求摘要'
,
...
...
src/pages/transaction/goodsOffer/addEnquiryOrder/add.tsx
View file @
3902b53e
...
@@ -30,6 +30,7 @@ const AddQuotes: React.FC<{}> = () => {
...
@@ -30,6 +30,7 @@ const AddQuotes: React.FC<{}> = () => {
})
})
}
}
useEffect
(()
=>
{
useEffect
(()
=>
{
console
.
log
(
history
.
location
)
if
(
id
)
{
if
(
id
)
{
handleGetDetails
();
handleGetDetails
();
setCount
(
'3'
);
setCount
(
'3'
);
...
...
src/pages/transaction/goodsOffer/addEnquiryOrder/components/tradingConditions.tsx
View file @
3902b53e
...
@@ -66,8 +66,8 @@ const TradingConditions: React.FC<queryProps> = (props) => {
...
@@ -66,8 +66,8 @@ const TradingConditions: React.FC<queryProps> = (props) => {
packRequire
:
editData
.
packRequire
,
packRequire
:
editData
.
packRequire
,
otherRequire
:
editData
.
otherRequire
,
otherRequire
:
editData
.
otherRequire
,
offer
:
editData
.
offer
,
offer
:
editData
.
offer
,
quotationAsTime
:
moment
(
editData
.
quotationAsTime
),
quotationAsTime
:
moment
(
editData
.
quotationAsTime
)
.
format
(
"x"
)
,
deliveryTime
:
moment
(
editData
.
deliveryTime
),
deliveryTime
:
moment
(
editData
.
deliveryTime
)
.
format
(
"x"
)
,
fullAddressId
:
editData
.
fullAddressId
,
fullAddressId
:
editData
.
fullAddressId
,
})
})
}
}
...
...
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