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
3553b33b
Commit
3553b33b
authored
Oct 30, 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
92d7594b
b6a8db75
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
35 additions
and
113 deletions
+35
-113
statusList.ts
src/pages/transaction/common/statusList.ts
+26
-17
formleftIndex.tsx
...nsaction/enquiryOfferConfirm/components/formleftIndex.tsx
+1
-1
index.tsx
src/pages/transaction/goodsOffer/addEnquiryOrder/index.tsx
+2
-21
index.tsx
src/pages/transaction/goodsOffer/enquiryOrder/index.tsx
+2
-2
index.tsx
src/pages/transaction/goodsOffer/pendingReviewOne/index.tsx
+0
-29
index.tsx
src/pages/transaction/goodsOffer/schema/index.tsx
+4
-14
index.tsx
...pages/transaction/inquiryQuote/pendingReviewTwo/index.tsx
+0
-29
No files found.
src/pages/transaction/common/statusList.ts
View file @
3553b33b
...
...
@@ -94,30 +94,30 @@ export const filterInteriorStateList = [
/**
* @description: 商品询价外部状态筛选
* @param {type}
* @return {type}
内
1.提交询价单 2.提交报价单 3.确认报价单 4.报价通过 5.报价不通过
* @return {type} 1.提交询价单 2.提交报价单 3.确认报价单 4.报价通过 5.报价不通过
*/
export
const
filterExternalState
=
[
{
text
:
'提交询价单'
,
value
:
1
},
{
text
:
'提交
询
价单'
,
value
:
2
text
:
'提交
报
价单'
,
value
:
2
},
{
text
:
'确认
询
价单'
,
value
:
3
text
:
'确认
报
价单'
,
value
:
3
},
{
text
:
'
询
价通过'
,
value
:
4
text
:
'
报
价通过'
,
value
:
4
},
{
text
:
'
询价不通过'
,
value
:
4
text
:
'
报价不通过'
,
value
:
5
},
]
/**
* @description: 商品询价内部状态筛选
* @param {type}
* @return {type}
内
1.新增询价单 2.审核询价单 3.审核询价单 4.提交询价单 5.完成 6.审核不通过
* @return {type} 1.新增询价单 2.审核询价单 3.审核询价单 4.提交询价单 5.完成 6.审核不通过
*/
export
const
filterInternalState
=
[
{
...
...
@@ -143,40 +143,49 @@ export const filterInternalState = [
/**
* @description: 商品询价外部状态筛选
* @param {type}
* @return {type}
内
* @return {type}
1.提交询价单 2.提交报价单 3.确认报价单 4.报价通过 5.报价不通过
*/
export
const
filterExternalStateLabelList
=
[
{
label
:
'
待提交
'
,
value
:
1
label
:
'
提交询价单
'
,
value
:
1
},
{
label
:
'
待确认
'
,
value
:
2
label
:
'
提交报价单
'
,
value
:
2
},
{
label
:
'
接受报价
'
,
value
:
3
label
:
'
确认报价单
'
,
value
:
3
},
{
label
:
'不接受报价'
,
value
:
4
}
label
:
'报价通过'
,
value
:
4
},
{
label
:
'报价不通过'
,
value
:
5
},
]
/**
* @description: 商品询价内部状态筛选
* @param {type}
* @return {type}
内
* @return {type}
1.新增询价单 2.审核询价单 3.审核询价单 4.提交询价单 5.完成 6.审核不通过
*/
export
const
filterInternalStateLabelList
=
[
{
label
:
'待提交审核'
,
value
:
1
label
:
'新增询价单'
,
value
:
1
},
{
label
:
'审核询价单'
,
value
:
2
},
{
label
:
'审核询价单'
,
value
:
3
},
{
label
:
'
待审核'
,
value
:
2
label
:
'
提交询价单'
,
value
:
4
},
{
label
:
'
审核通过'
,
value
:
3
label
:
'
完成'
,
value
:
5
},
{
label
:
'审核不通过'
,
value
:
4
label
:
'审核不通过'
,
value
:
6
}
]
...
...
src/pages/transaction/enquiryOfferConfirm/components/formleftIndex.tsx
View file @
3553b33b
...
...
@@ -203,7 +203,7 @@ const List: React.FC<listParams> = (props) => {
* @param {type}
* @return {type}
*/
const
handleDelete
=
(
arr
:
number
[]
|
string
[]
)
=>
{
const
handleDelete
=
(
arr
:
any
)
=>
{
PublicApi
.
postOrderRequisitionFormDeleteAll
({
ids
:
arr
}).
then
(
res
=>
{
ref
.
current
.
reload
()
})
...
...
src/pages/transaction/goodsOffer/addEnquiryOrder/index.tsx
View file @
3553b33b
...
...
@@ -120,30 +120,11 @@ const AddEnquiryOrder: React.FC<{}> = () => {
},
}
//列表数据
// const data = {
// totalCount: 2,
// data: [{
// id: 100,
// 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: 2,
// interiorState: 2
// }]
// }
const
fetchData
=
async
(
params
:
any
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
getOrderInquiryList
({
...
params
}).
then
(
res
=>
{
resolve
(
res
.
data
)
})
// setTimeout(() => {
// resolve(data)
// }, 500)
})
}
//批量审核&批量删除按钮
...
...
@@ -211,8 +192,8 @@ const AddEnquiryOrder: React.FC<{}> = () => {
// 搜索
const
search
=
(
values
:
any
)
=>
{
if
(
values
.
voucherTime
)
{
values
.
start
Voucher
Time
=
timeRange
(
values
.
voucherTime
).
st
values
.
end
Voucher
Time
=
timeRange
(
values
.
voucherTime
).
et
values
.
start
Documents
Time
=
timeRange
(
values
.
voucherTime
).
st
values
.
end
Documents
Time
=
timeRange
(
values
.
voucherTime
).
et
delete
values
.
voucherTime
}
ref
.
current
.
reload
(
values
)
...
...
src/pages/transaction/goodsOffer/enquiryOrder/index.tsx
View file @
3553b33b
...
...
@@ -80,8 +80,8 @@ const EnquiryOrder: React.FC<{}> = (props) => {
// 搜索
const
search
=
(
values
:
any
)
=>
{
if
(
values
.
voucherTime
)
{
values
.
start
Voucher
Time
=
timeRange
(
values
.
voucherTime
).
st
values
.
end
Voucher
Time
=
timeRange
(
values
.
voucherTime
).
et
values
.
start
Documents
Time
=
timeRange
(
values
.
voucherTime
).
st
values
.
end
Documents
Time
=
timeRange
(
values
.
voucherTime
).
et
delete
values
.
voucherTime
}
ref
.
current
.
reload
(
values
)
...
...
src/pages/transaction/goodsOffer/pendingReviewOne/index.tsx
View file @
3553b33b
...
...
@@ -14,41 +14,12 @@ const PendingReviewOne: React.FC<{}> = () => {
console
.
log
(
values
,
'我是多选的id'
)
}
// 列表数据
// const data = { // 模拟的数据
// totalCount: 6,
// data: [{
// id: 100,
// 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: 2
// }, {
// id: 2,
// inquiryListNo: 'SZX125LIP',
// details: '模拟的数据10086',
// memberName: '打喷嚏',
// memberId: 1,
// deliveryTime: '2020-10-12 13:59:00',
// quotationAsTime: '2020-10-14 23:59:00',
// voucherTime: '2020-10-12 13:59:00',
// externalState: 1,
// interiorState: 1
// }]
// }
const
fetchData
=
(
params
?:
any
)
=>
{
console
.
log
(
params
)
//可以直接打印参数
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
getOrderInquiryToAuditList
({
...
params
}).
then
(
res
=>
{
resolve
(
res
.
data
)
})
// setTimeout(() => {
// resolve(data)
// }, 500)
})
}
// 批量操作
...
...
src/pages/transaction/goodsOffer/schema/index.tsx
View file @
3553b33b
...
...
@@ -25,14 +25,14 @@ export const commonEnquieryOfferSchema: ISchema = {
children
:
"{{controllerBtns}}"
}
},
quotation
No
:{
//报价单号
inquiryList
No
:{
//报价单号
type
:
'string'
,
"x-component"
:
"Search"
,
"x-mega-props"
:{
},
"x-component-props"
:{
placeholder
:
'询价单
搜索
'
placeholder
:
'询价单
号
'
}
}
}
...
...
@@ -59,23 +59,13 @@ export const commonEnquieryOfferSchema: ISchema = {
inline
:
true
},
properties
:{
inquiryListNo
:{
//需求单号
type
:
'string'
,
"x-mega-props"
:{
},
"x-component-props"
:{
placeholder
:
'询价单号'
}
},
details
:{
type
:
'string'
,
"x-component-props"
:{
placeholder
:
'询价单摘要'
}
},
m
emberName
:{
inquiryListM
emberName
:{
type
:
'string'
,
"x-component-props"
:{
placeholder
:
'被询价会员'
...
...
@@ -271,7 +261,7 @@ export const enquieryOfferSearchSchema: ISchema = {
inline
:
true
},
properties
:{
m
emberName
:{
inquiryListM
emberName
:{
type
:
'string'
,
"x-component-props"
:{
placeholder
:
'询价会员'
...
...
src/pages/transaction/inquiryQuote/pendingReviewTwo/index.tsx
View file @
3553b33b
...
...
@@ -15,41 +15,12 @@ const PendingReviewTwo: React.FC<{}> = () => {
console
.
log
(
values
,
'我是多选的id'
)
}
// 列表数据
// const data = { // 模拟的数据
// totalCount: 6,
// data: [{
// id: 1,
// quotationNo: 'BPTY12',
// inquiryListNo: 'SZX125KJS',
// details: '模拟的数据',
// memberName: '冰红茶',
// memberId: 10,
// quotationAsTime: '2020-10-13 23:59:00',
// voucherTime: '2020-10-13 13:59:00',
// externalState: 1,
// interiorState: 1
// }, {
// id: 2,
// quotationNo: 'BPTY12',
// inquiryListNo: 'SZX125LIP',
// details: '模拟的数据10086',
// memberName: '打喷嚏',
// memberId: 1,
// quotationAsTime: '2020-10-14 23:59:00',
// voucherTime: '2020-10-12 13:59:00',
// externalState: 1,
// interiorState: 1
// }]
// }
const
fetchData
=
(
params
?:
any
)
=>
{
console
.
log
(
params
)
//可以直接打印参数
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
getOrderAuditProductQuotationListTwo
({...
params
}).
then
(
res
=>
{
resolve
(
res
.
data
)
})
// setTimeout(() => {
// resolve(data)
// }, 500)
})
}
// 批量操作
...
...
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