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
3615c547
Commit
3615c547
authored
Jun 15, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
parent
64ed43ae
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
13 deletions
+15
-13
reset.less
src/global/styles/reset.less
+10
-8
index.tsx
...llForBids/readyConfirmBid/components/bidConfirm/index.tsx
+1
-1
index.tsx
...tender/addTender/components/relateProductDrawer/index.tsx
+1
-1
index.tsx
src/pages/procurement/tender/addTender/index.tsx
+1
-1
useProductTable.tsx
...es/procurement/tender/addTender/model/useProductTable.tsx
+1
-1
index.tsx
src/pages/transaction/components/orderPayModal/index.tsx
+1
-1
No files found.
src/global/styles/reset.less
View file @
3615c547
...
...
@@ -256,15 +256,17 @@
}
// 处理高级筛选input和search按钮不对齐问题、search按钮背景
.ant-input-search {
.ant-input-group {
.ant-input {
padding: 6px;
.god-standard-table {
.ant-input-search {
.ant-input-group {
.ant-input {
padding: 6px;
}
}
}
.ant-input-group-add
on {
.ant-input-search-button {
background-color: #F7F8FA;
.ant-input-group-addon {
.ant-input-search-butt
on {
background-color: #F7F8FA;
}
}
}
}
...
...
src/pages/procurement/callForBids/readyConfirmBid/components/bidConfirm/index.tsx
View file @
3615c547
...
...
@@ -59,7 +59,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
/** 组合table所需data */
let
tempData
:
any
=
[]
// 只需取一个投标会员的物料项 决定table的行数
_memberList
[
0
].
submitTender
.
submitTenderMateriel
.
forEach
((
item
,
index
)
=>
{
_memberList
[
0
]
?.
submitTender
&&
_memberList
[
0
]
.
submitTender
.
submitTenderMateriel
.
forEach
((
item
,
index
)
=>
{
tempData
.
push
({
inviteTenderMateriel
:
item
.
inviteTenderMateriel
,
count
:
item
.
inviteTenderMateriel
.
count
,
...
...
src/pages/procurement/tender/addTender/components/relateProductDrawer/index.tsx
View file @
3615c547
...
...
@@ -201,7 +201,7 @@ export const RelevanceTenderProduct: React.FC<RelateProductDrawerProps> = ({
if
(
item
=>
item
.
id
===
currentMaterial
[
0
][
'id'
])
{
item
.
file
=
v
[
'file'
]
item
.
commodityId
=
selectRow
[
0
][
'id'
]
item
.
product
Id
=
selectRow
[
0
][
'commodityId'
]
item
.
commoditySku
Id
=
selectRow
[
0
][
'commodityId'
]
// item.commodityId = selectRow[0]['commodityId']
}
return
item
...
...
src/pages/procurement/tender/addTender/index.tsx
View file @
3615c547
...
...
@@ -110,7 +110,7 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
})
}
// 校验是否关联商品
if
(
!
params
.
submitTenderMateriel
.
some
(
v
=>
v
.
product
Id
&&
v
.
commodityId
))
{
if
(
!
params
.
submitTenderMateriel
.
some
(
v
=>
v
.
commoditySku
Id
&&
v
.
commodityId
))
{
// if(!params.submitTenderMateriel.some(v => v.commodityId)) {
setBtnLoading
(
false
)
return
message
.
error
(
'请先关联投标商品'
)
...
...
src/pages/procurement/tender/addTender/model/useProductTable.tsx
View file @
3615c547
...
...
@@ -97,7 +97,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
const
renderDescription
=
async
(
record
)
=>
{
// 商品信息
let
res
=
await
PublicApi
.
getProductCommodityGetCommodity
({
id
:
record
.
product
Id
})
let
res
=
await
PublicApi
.
getProductCommodityGetCommodity
({
id
:
record
.
commoditySku
Id
})
// 商品规格信息
let
spec
=
await
PublicApi
.
getProductCommodityGetCommodityAttributeByUnitPriceAndPicId
({
unitPriceAndPicId
:
record
.
commodityId
})
const
{
code
,
data
}
=
res
...
...
src/pages/transaction/components/orderPayModal/index.tsx
View file @
3615c547
...
...
@@ -332,7 +332,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
id
:
Number
(
id
),
paymentInformationId
:
PayInfoObj
.
id
,
// 大于100为账期月结 id固定为-1
payTypeId
:
checked
.
id
>=
100
&&
-
1
,
payTypeId
:
checked
.
id
>=
100
?
-
1
:
checked
.
id
,
payType
:
checked
.
channel
,
}
...
...
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