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
4c6e3ded
Commit
4c6e3ded
authored
Jul 03, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-srm' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev-srm
parents
a045b56a
7750933c
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
808 additions
and
697 deletions
+808
-697
add.tsx
...pages/member/memberRectification/rectificationAdd/add.tsx
+28
-7
index.tsx
...rocurement/callForBids/callForBidsSearch/detail/index.tsx
+18
-18
index.tsx
...rement/callForBids/readyQualifityChecked/detail/index.tsx
+8
-8
index.tsx
...ges/procurement/callForBids/tenderSearch/detail/index.tsx
+4
-4
index.tsx
src/pages/procurement/components/descriptionsInfo/index.tsx
+2
-2
index.tsx
src/pages/procurement/constants/index.tsx
+3
-3
index.ts
src/pages/procurement/tender/addBidRegister/schema/index.ts
+2
-2
index.tsx
...procurement/tender/readyQualifityChecked/detail/index.tsx
+10
-10
index.tsx
src/pages/transaction/components/TableModal/index.tsx
+1
-1
index.less
...ges/transaction/confirmInquiryQuote/components/index.less
+57
-58
index.tsx
...s/transaction/dealAbility/productInquiry/detail/index.tsx
+1
-1
basicInfo.tsx
...ty/productInquiry/waitAddInquiry/components/basicInfo.tsx
+34
-7
inquiryProduct.tsx
...oductInquiry/waitAddInquiry/components/inquiryProduct.tsx
+76
-7
index.less
src/pages/transaction/demandPosts/components/index.less
+94
-94
index.less
src/pages/transaction/enquiryOffer/components/index.less
+118
-119
index.less
src/pages/transaction/enquiryOffer/enquirySearch/index.less
+118
-119
index.less
...ges/transaction/enquiryOfferConfirm/components/index.less
+118
-119
index.less
src/pages/transaction/goodsOffer/components/index.less
+57
-58
index.less
src/pages/transaction/inquiryQuote/components/index.less
+57
-58
index.tsx
...rder/orderCollect/components/materialModalTable/index.tsx
+2
-2
No files found.
src/pages/member/memberRectification/rectificationAdd/add.tsx
View file @
4c6e3ded
...
...
@@ -42,26 +42,40 @@ type SubmitData = {
const
formActions
=
createFormActions
()
const
format
=
'YYYY-MM-DD'
;
const
InspectionAdd
=
(
props
)
=>
{
const
{
location
}
=
props
;
const
{
id
,
memberId
,
memberName
,
roleId
}
=
usePageStatus
();
const
{
visible
,
toggle
}
=
useModal
()
const
{
memberColumns
,
memberSchema
,
handleFetchData
}
=
useGetCommonSubMember
(
PublicApi
.
getMemberInspectMembers
)
const
[
memberModalValue
,
setMemberModalValue
]
=
useState
([])
const
[
memberModalValue
,
setMemberModalValue
]
=
useState
<
{
subMemberId
:
number
,
subRoleId
:
number
,
name
:
string
}[]
>
([])
const
[
submitLoading
,
setSubmitLoading
]
=
useState
<
boolean
>
(
false
)
const
isPreview
=
location
.
pathname
.
includes
(
'/memberCenter/memberAbility/memberRectification/rectificationAdd/view'
);
const
{
id
}
=
usePageStatus
();
const
isEdit
=
useMemo
(()
=>
id
&&
typeof
id
===
'string'
,
[
id
]);
const
params
=
useMemo
(()
=>
{
return
id
?
{
id
:
id
.
toString
()
}
:
null
},
[
id
]);
const
{
loading
,
initialValue
}
=
useInitialValue
<
GetMemberRectifyWaitAddGetResponse
,
{
id
:
string
}
>
(
PublicApi
.
getMemberRectifyWaitAddGet
,
params
)
const
[
unsaved
,
setUnsaved
]
=
useState
(
false
);
/** 从会员信息列表设置默认会员 */
const
shouldSetInitiialMember
=
useMemo
(()
=>
{
if
(
memberId
&&
roleId
)
{
return
{
subMemberId
:
memberId
,
name
:
memberName
,
subRoleId
:
roleId
}
}
return
null
},
[
memberId
,
memberName
,
roleId
])
console
.
log
(
memberId
,
memberName
,
roleId
,
shouldSetInitiialMember
)
/**
/**
* 格式化初始化值
*/
const
formatedInitialValue
=
useMemo
(()
=>
{
if
(
!
isEdit
&&
shouldSetInitiialMember
!==
null
)
{
return
shouldSetInitiialMember
;
}
if
(
!
isEdit
||
!
initialValue
)
{
return
{}
}
...
...
@@ -71,9 +85,16 @@ const InspectionAdd = (props) => {
rectifyDayEnd
:
moment
(
rectifyDayEnd
,
'YYYY-MM-DD'
),
...
rest
,
}
},
[
initialValue
])
},
[
initialValue
,
isEdit
,
shouldSetInitiialMember
])
useEffect
(()
=>
{
if
(
!
isEdit
&&
shouldSetInitiialMember
!==
null
)
{
setMemberModalValue
([{
subMemberId
:
shouldSetInitiialMember
.
subMemberId
,
subRoleId
:
shouldSetInitiialMember
.
subRoleId
,
name
:
shouldSetInitiialMember
.
name
}])
}
if
(
initialValue
)
{
setMemberModalValue
([{
subMemberId
:
initialValue
.
subMemberId
,
...
...
@@ -81,7 +102,7 @@ const InspectionAdd = (props) => {
name
:
initialValue
.
name
}])
}
},
[
initialValue
])
},
[
initialValue
,
isEdit
,
shouldSetInitiialMember
])
const
handleSubmit
=
useCallback
(
async
(
value
:
SubmitData
)
=>
{
const
{
name
,
rectifyDayStart
,
rectifyDayEnd
,
attachments
,
...
rest
}
=
value
;
...
...
src/pages/procurement/callForBids/callForBidsSearch/detail/index.tsx
View file @
4c6e3ded
...
...
@@ -30,27 +30,27 @@ const CallForBidsSearchDetail: React.FC = () => {
{
title
:
'流转记录'
,
id
:
'transferRecord'
,
componentName
:
"BidTransformRecord"
},
]
//
已经报名 才有报名信息
if
(
data
?.
inviteTenderOutStatus
<
BidOuterWorkState
.
Not_Submitted_Qualifications_Check
)
{
anchorTitleList
.
splice
(
5
,
1
)
}
//
// 已经报名 才有报名信息 @注释原因:无法通过状态判断
//
if(data?.inviteTenderOutStatus < BidOuterWorkState.Not_Submitted_Qualifications_Check) {
//
anchorTitleList.splice(5, 1)
//
}
// 已经资格预审 才有资格预审信息
if
(
data
?.
inviteTenderOutStatus
<
BidOuterWorkState
.
Not_Submit_Tender
&&
!
data
?.
isQualificationCheck
)
{
// anchorTitleList.splice(7, 1)
anchorTitleList
.
forEach
((
ele
,
index
)
=>
ele
[
'title'
]
===
'资格预审信息'
&&
anchorTitleList
.
splice
(
index
,
1
))
}
//
//
已经资格预审 才有资格预审信息
//
if(data?.inviteTenderOutStatus < BidOuterWorkState.Not_Submit_Tender && !data?.isQualificationCheck) {
//
// anchorTitleList.splice(7, 1)
//
anchorTitleList.forEach((ele, index) => ele['title'] === '资格预审信息' && anchorTitleList.splice(index, 1))
//
}
// 已经评标 才有评标报告
if
(
data
?.
inviteTenderOutStatus
<
BidOuterWorkState
.
Not_Finish_Notice
)
{
// anchorTitleList.splice(9, 1)
anchorTitleList
.
forEach
((
ele
,
index
)
=>
ele
[
'title'
]
===
'评标报告'
&&
anchorTitleList
.
splice
(
index
,
1
))
}
//
//
已经评标 才有评标报告
//
if(data?.inviteTenderOutStatus < BidOuterWorkState.Not_Finish_Notice) {
//
// anchorTitleList.splice(9, 1)
//
anchorTitleList.forEach((ele, index) => ele['title'] === '评标报告' && anchorTitleList.splice(index, 1))
//
}
// 已经完成招标 才有招标结果
if
(
data
?.
inviteTenderOutStatus
<
BidOuterWorkState
.
Finish_Invite_Tender
)
{
anchorTitleList
.
splice
(
-
2
,
1
)
}
//
//
已经完成招标 才有招标结果
//
if(data?.inviteTenderOutStatus < BidOuterWorkState.Finish_Invite_Tender) {
//
anchorTitleList.splice(-2, 1)
//
}
return
(
<
div
>
...
...
src/pages/procurement/callForBids/readyQualifityChecked/detail/index.tsx
View file @
4c6e3ded
...
...
@@ -139,15 +139,15 @@ const ReadyQualifityCheckedDetail: React.FC = () => {
<
div
id=
"transferProcess"
>
<
TransferProcess
cardTitle=
"流转进度"
customTitleKey=
'
operationalProcess
'
customKey=
'
state
'
outerVerifyCurrent=
{
findLastIndexFlowState
(
formContext
.
data
?.
externalWorkflowFlowRecordLogResponses
||
[])
}
innerVerifyCurrent=
{
findLastIndexFlowState
(
formContext
.
data
?.
interiorWorkflowFlowRecordLogResponses
||
[])
}
customTitleKey=
'
name
'
customKey=
'
id
'
outerVerifyCurrent=
{
findLastIndexFlowState
(
formContext
?.
externalWorkflowFlowRecordLogResponses
||
[])
}
innerVerifyCurrent=
{
findLastIndexFlowState
(
formContext
?.
interiorWorkflowFlowRecordLogResponses
||
[])
}
outerVerifySteps=
{
formContext
.
data
?.
externalWorkflowFlowRecordLogResponses
?
formContext
.
data
.
externalWorkflowFlowRecordLogResponses
.
map
(
item
=>
({
formContext
?.
externalWorkflowFlowRecordLogResponses
?
formContext
.
externalWorkflowFlowRecordLogResponses
.
map
(
item
=>
({
...
item
,
status
:
item
.
is
Execut
e
?
'finish'
:
'wait'
,
status
:
item
.
is
Activ
e
?
'finish'
:
'wait'
,
}))
:
[]
}
...
...
@@ -155,7 +155,7 @@ const ReadyQualifityCheckedDetail: React.FC = () => {
formContext
.
data
?.
interiorWorkflowFlowRecordLogResponses
?
formContext
.
data
.
interiorWorkflowFlowRecordLogResponses
.
map
(
item
=>
({
...
item
,
status
:
item
.
is
Execut
e
?
'finish'
:
'wait'
,
status
:
item
.
is
Activ
e
?
'finish'
:
'wait'
,
}))
:
[]
}
...
...
src/pages/procurement/callForBids/tenderSearch/detail/index.tsx
View file @
4c6e3ded
...
...
@@ -26,10 +26,10 @@ const TenderSearchDetail: React.FC = () => {
{
title
:
'流转记录'
,
id
:
'transferRecord'
,
componentName
:
"BidTransformRecord"
},
]
//
没有完成的标 隐藏中标结果、中标明细
if
(
data
?.
inviteTender
?.
inviteTenderOutStatus
!==
BidOuterWorkState
.
Finish_Invite_Tender
)
{
anchorTitleList
.
splice
(
1
,
2
)
}
//
// 没有完成的标 隐藏中标结果、中标明细 @注释原因:无法通过状态判断
//
if(data?.inviteTender?.inviteTenderOutStatus !== BidOuterWorkState.Finish_Invite_Tender) {
//
anchorTitleList.splice(1, 2)
//
}
return
(
<
div
>
...
...
src/pages/procurement/components/descriptionsInfo/index.tsx
View file @
4c6e3ded
...
...
@@ -48,8 +48,8 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
span
:
8
,
fieldList
:
[
{
title
:
'招标编号:'
,
name
:
'code'
},
{
title
:
'外部状态:'
,
name
:
'inviteTenderOutStatus
'
,
render
:
(
text
)
=>
BidOutStateTexts
[
text
]
},
{
title
:
'内部状态:'
,
name
:
'inviteTenderInStatus
'
,
render
:
(
text
)
=>
BidInStateTexts
[
text
]
},
{
title
:
'外部状态:'
,
name
:
'inviteTenderOutStatus
Value'
},
{
title
:
'内部状态:'
,
name
:
'inviteTenderInStatus
Value'
},
{
title
:
'发布时间:'
,
name
:
'createTime'
,
render
:
(
text
)
=>
formatTimeString
(
text
)
},
]
},
...
...
src/pages/procurement/constants/index.tsx
View file @
4c6e3ded
...
...
@@ -25,15 +25,15 @@ export const processLogResponses = (resData) => {
const
externalLogs
=
externalTasks
.
map
(
item
=>
({
id
:
item
.
taskStep
,
name
:
item
.
taskName
,
operationRole
:
item
.
us
erRoleName
,
isActive
:
item
.
taskStep
<
=
currentOuterStep
operationRole
:
item
.
memb
erRoleName
,
isActive
:
item
.
taskStep
<
currentOuterStep
}))
const
subTasks
=
externalTasks
.
filter
(
item
=>
item
.
taskStep
===
currentOuterStep
)
const
interiorLogs
=
subTasks
.
length
?
subTasks
[
0
][
'subTasks'
].
map
(
item
=>
({
id
:
item
.
taskStep
,
name
:
item
.
taskName
,
operationRole
:
item
.
userRoleName
,
isActive
:
item
.
taskStep
<=
currentInnerStep
isActive
:
currentInnerStep
===
0
?
true
:
(
item
.
taskStep
<
currentInnerStep
)
}))
:
null
return
{
interiorLogs
,
...
...
src/pages/procurement/tender/addBidRegister/schema/index.ts
View file @
4c6e3ded
...
...
@@ -157,7 +157,7 @@ export const formSchema: ISchema = {
type
:
'object'
,
'x-component'
:
'Mega-Layout'
,
'x-component-props'
:
{
label
:
'
注册手机
'
,
label
:
'
联系人电话
'
,
required
:
true
,
wrapperCol
:
24
,
className
:
"clearParentMargin"
...
...
@@ -218,7 +218,7 @@ export const formSchema: ISchema = {
type
:
'object'
,
'x-component'
:
'Mega-Layout'
,
'x-component-props'
:
{
label
:
'
投标单位
地址'
,
label
:
'地址'
,
required
:
true
,
wrapperCol
:
24
,
},
...
...
src/pages/procurement/tender/readyQualifityChecked/detail/index.tsx
View file @
4c6e3ded
...
...
@@ -176,23 +176,23 @@ const ReadyQualifityCheckedDetail: React.FC = () => {
<
div
id=
"transferProcess"
>
<
TransferProcess
cardTitle=
"流转进度"
customTitleKey=
'
operationalProcess
'
customKey=
'
state
'
outerVerifyCurrent=
{
findLastIndexFlowState
(
formContext
.
data
?.
externalWorkflowFlowRecordLogResponses
||
[])
}
innerVerifyCurrent=
{
findLastIndexFlowState
(
formContext
.
data
?.
interiorWorkflowFlowRecordLogResponses
||
[])
}
customTitleKey=
'
name
'
customKey=
'
id
'
outerVerifyCurrent=
{
findLastIndexFlowState
(
formContext
?.
externalWorkflowFlowRecordLogResponses
||
[])
}
innerVerifyCurrent=
{
findLastIndexFlowState
(
formContext
?.
interiorWorkflowFlowRecordLogResponses
||
[])
}
outerVerifySteps=
{
formContext
.
data
?.
externalWorkflowFlowRecordLogResponses
?
formContext
.
data
.
externalWorkflowFlowRecordLogResponses
.
map
(
item
=>
({
formContext
?.
externalWorkflowFlowRecordLogResponses
?
formContext
.
externalWorkflowFlowRecordLogResponses
.
map
(
item
=>
({
...
item
,
status
:
item
.
is
Execut
e
?
'finish'
:
'wait'
,
status
:
item
.
is
Activ
e
?
'finish'
:
'wait'
,
}))
:
[]
}
innerVerifySteps=
{
formContext
.
data
?.
interiorWorkflowFlowRecordLogResponses
?
formContext
.
data
.
interiorWorkflowFlowRecordLogResponses
.
map
(
item
=>
({
formContext
?.
interiorWorkflowFlowRecordLogResponses
?
formContext
.
interiorWorkflowFlowRecordLogResponses
.
map
(
item
=>
({
...
item
,
status
:
item
.
is
Execut
e
?
'finish'
:
'wait'
,
status
:
item
.
is
Activ
e
?
'finish'
:
'wait'
,
}))
:
[]
}
...
...
src/pages/transaction/components/TableModal/index.tsx
View file @
4c6e3ded
...
...
@@ -151,7 +151,7 @@ const TableModal: React.FC<Iprops> = (props: Iprops) => {
hideSelectAll
:
customizeRadio
,
}
}
formRender=
{
(
child
,
ps
)
=>
<
Row
justify=
'space-between'
style=
{
{
marginBottom
:
16
}
}
>
<
Col
s
pan=
{
18
}
s
tyle=
{
{
zIndex
:
99
}
}
>
{
child
}
</
Col
>
<
Col
style=
{
{
zIndex
:
99
}
}
>
{
child
}
</
Col
>
<
Col
style=
{
{
marginTop
:
4
}
}
>
{
ps
}
</
Col
>
</
Row
>
}
controlRender=
{
...
...
src/pages/transaction/confirmInquiryQuote/components/index.less
View file @
4c6e3ded
@import "../../../member/components/index.less";
.item_wrap {
margin-bottom: 24px;
background-color: #FFF;
border-radius: 8px;
padding: 24px;
&:last-child {
margin-bottom: 0px;
}
.mainCol_title {
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #303133;
padding: 0px 0 20px;
}
:global {
.ant-tabs-nav {
&::before {
border-bottom-color: #FFF;
}
}
}
}
.header {
:global {
.ant-page-header {
padding: 24px 24px !important;
}
}
}
.upload_item {
width: 498px;
padding: 5px 8px;
margin-bottom: 16px;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #FAFBFC;
.upload_left {
display: flex;
align-items: center;
color: #00B37A;
cursor: pointer;
:global {
.anticon-link {
color: #00B37A;
font-size: 16px;
margin-right: 8px;
}
}
}
}
\ No newline at end of file
// @import "../../../member/components/index.less";
.item_wrap {
margin-bottom: 24px;
background-color: #FFF;
border-radius: 8px;
padding: 24px;
&:last-child {
margin-bottom: 0px;
}
.mainCol_title {
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #303133;
padding: 0px 0 20px;
}
:global {
.ant-tabs-nav {
&::before {
border-bottom-color: #FFF;
}
}
}
}
.header {
:global {
.ant-page-header {
padding: 24px 24px !important;
}
}
}
.upload_item {
width: 498px;
padding: 5px 8px;
margin-bottom: 16px;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #FAFBFC;
.upload_left {
display: flex;
align-items: center;
color: #00B37A;
cursor: pointer;
:global {
.anticon-link {
color: #00B37A;
font-size: 16px;
margin-right: 8px;
}
}
}
}
src/pages/transaction/dealAbility/productInquiry/detail/index.tsx
View file @
4c6e3ded
...
...
@@ -98,7 +98,7 @@ const ProductInquiryDetail = () => {
{
label
:
'附件'
,
extra
:
<>
{
data
.
enclosureUrls
.
map
((
item
:
any
,
index
:
number
)
=>
(
{
data
.
enclosureUrls
&&
data
.
enclosureUrls
.
map
((
item
:
any
,
index
:
number
)
=>
(
<
Typography
.
Link
style=
{
{
display
:
'block'
,
paddingBottom
:
'8px'
}
}
key=
{
`link_${index + 1}`
}
...
...
src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/components/basicInfo.tsx
View file @
4c6e3ded
...
...
@@ -6,6 +6,8 @@ import TableModal from '@/pages/transaction/components/TableModal';
import
{
PublicApi
}
from
'@/services/api'
;
import
style
from
'./index.less'
;
import
{
isEmpty
}
from
'@formily/shared'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
interface
BasicInfoLayoutProps
{
/** 获取询价会员 */
...
...
@@ -111,16 +113,41 @@ const BasicInfoLayout: React.FC<BasicInfoLayoutProps> = (props: any) => {
onClose=
{
()
=>
toggle
(
false
)
}
onOk=
{
handleLogisticOnOk
}
columns=
{
columns
}
effects=
{
(
$
,
actions
)
=>
{
actions
.
reset
()
useStateFilterSearchLinkageEffect
(
$
,
actions
,
"name"
,
FORM_FILTER_PATH
)
}
}
schema=
{
{
type
:
'object'
,
type
:
"object"
,
properties
:
{
name
:
{
type
:
'string'
,
"x-component"
:
'Search'
,
"x-component-props"
:
{
placeholder
:
'请输入会员名称'
,
advanced
:
false
megalayout
:
{
type
:
"object"
,
"x-component"
:
"mega-layout"
,
properties
:
{
name
:
{
type
:
"string"
,
"x-component"
:
"Search"
,
"x-mega-props"
:
{},
"x-component-props"
:
{
placeholder
:
"会员名称"
,
advanced
:
false
,
align
:
"flex-left"
,
}
}
}
},
[
FORM_FILTER_PATH
]:
{
type
:
"object"
,
"x-component"
:
"flex-layout"
,
"x-component-props"
:
{
rowStyle
:
{
justifyContent
:
"flex-start"
,
flexWrap
:
"nowrap"
},
colStyle
:
{
//改变间隔
marginRight
:
20
}
},
}
}
}
}
...
...
src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/components/inquiryProduct.tsx
View file @
4c6e3ded
...
...
@@ -6,6 +6,8 @@ import { ColumnType } from 'antd/lib/table/interface';
import
TableModal
from
'@/pages/transaction/components/TableModal'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
isEmpty
}
from
'lodash'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
interface
InquiryProductLayoutProps
{
/** 获得询价商品 */
...
...
@@ -133,7 +135,7 @@ const InquiryProductLayout: React.FC<InquiryProductLayoutProps> = (props: any) =
purchaseCount
:
1
,
logistics
:
v
.
logistics
,
memberId
:
v
.
memberId
,
memberRoleId
:
v
.
r
oleId
,
memberRoleId
:
v
.
memberR
oleId
,
imgUrl
:
v
.
mainPic
})
})
...
...
@@ -197,15 +199,82 @@ const InquiryProductLayout: React.FC<InquiryProductLayoutProps> = (props: any) =
onClose=
{
()
=>
toggle
(
false
)
}
onOk=
{
handleLogisticOnOk
}
columns=
{
productColumns
}
effects=
{
(
$
,
actions
)
=>
{
actions
.
reset
()
useStateFilterSearchLinkageEffect
(
$
,
actions
,
"name"
,
FORM_FILTER_PATH
)
}
}
schema=
{
{
type
:
'object'
,
type
:
"object"
,
properties
:
{
name
:
{
type
:
'string'
,
"x-component"
:
'Search'
,
megalayout
:
{
type
:
"object"
,
"x-component"
:
"mega-layout"
,
properties
:
{
name
:
{
type
:
"string"
,
"x-component"
:
"Search"
,
"x-mega-props"
:
{},
"x-component-props"
:
{
placeholder
:
"商品名称"
,
align
:
"flex-left"
,
}
}
}
},
[
FORM_FILTER_PATH
]:
{
type
:
"object"
,
"x-component"
:
"flex-layout"
,
"x-component-props"
:
{
placeholder
:
'请输入会员名称'
,
advanced
:
false
rowStyle
:
{
justifyContent
:
"flex-start"
,
flexWrap
:
"nowrap"
},
colStyle
:
{
//改变间隔
marginRight
:
20
}
},
properties
:
{
PRO_LAYOUT
:
{
type
:
"object"
,
"x-component"
:
"mega-layout"
,
"x-mega-props"
:
{
span
:
5
},
"x-component-props"
:
{
inline
:
true
},
properties
:
{
customerCategoryId
:
{
type
:
"string"
,
"x-component-props"
:
{
placeholder
:
"请选择品类"
,
style
:
{
width
:
160
}
},
enum
:
[]
},
brandId
:
{
type
:
"string"
,
"x-component-props"
:
{
placeholder
:
"请选择品牌"
,
style
:
{
width
:
160
}
},
enum
:
[]
},
}
},
sumbit
:
{
"x-component"
:
"Submit"
,
"x-mega-props"
:
{
span
:
1
},
"x-component-props"
:
{
children
:
"查询"
}
}
}
}
}
...
...
src/pages/transaction/demandPosts/components/index.less
View file @
4c6e3ded
.item_wrap {
margin-bottom: 24px;
background-color: #FFF;
border-radius: 8px;
padding: 24px;
&:last-child {
margin-bottom: 0px;
}
.mainCol_title {
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #303133;
padding: 0px 0 20px;
}
:global {
.ant-tabs-nav {
&::before {
border-bottom-color: #FFF;
}
}
}
}
.header {
:global {
.ant-page-header {
padding: 24px 24px !important;
}
}
}
.upload_item {
width: 498px;
padding: 5px 8px;
margin-bottom: 16px;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #FAFBFC;
.upload_left {
display: flex;
align-items: center;
color: #00B37A;
cursor: pointer;
:global {
.anticon-link {
color: #00B37A;
font-size: 16px;
margin-right: 8px;
}
}
}
}
.checkbox_wrap_style {
width: 100%;
:global {
.ant-checkbox-wrapper {
width: 100%;
border: 1px solid #ccc;
padding: 8px 18px;
.ant-checkbox {
display: none;
}
> span {
display: flex;
align-items: center;
padding: 0px 0px;
.checkbox_avatar {
width: 32px;
height: 32px;
margin-right: 8px;
}
}
}
.ant-checkbox-wrapper-checked {
border-color: #00b37a!important;
color: #00b37a;
position: relative;
&:after {
content: "";
position: absolute;
width: 12px;
height: 11px;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAALCAYAAABLcGxfAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAADKADAAQAAAABAAAACwAAAAChLCZNAAAA6klEQVQoFWNgIAVsruliJkr9/1XMDCZqcxkY/mczEtSwv4GD4euvlQz/GfxAavFr2N3Bz/Dz8yaG///tYAbj1rC1QYLh/+8dQMX6MMW4bdjSoMTA8Gs30BlAGhUwoXKBvM21QBN/H0VWbMovzXDSOgOsFFXD1mo7Bsa/B5U5BSVgBoEUrzaOZMi5shkshAjWLTWgUNgINJlnh1k8AysTEzhEQIpDzy5nOP3xKVgDxNNbqxIY/jHMAYqADRBi5WTYY5HEIMbGzRB4ZilcMUgHI8PWqlKg4i6wdiRCgIWDQYSNi+HOt3dIogwMANgLQif9hMeFAAAAAElFTkSuQmCC);
right: 0;
bottom: 0;
}
}
}
}
@import "../../../member/components/index.less";
.item_wrap {
margin-bottom: 24px;
background-color: #FFF;
border-radius: 8px;
padding: 24px;
&:last-child {
margin-bottom: 0px;
}
.mainCol_title {
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #303133;
padding: 0px 0 20px;
}
:global {
.ant-tabs-nav {
&::before {
border-bottom-color: #FFF;
}
}
}
}
.header {
:global {
.ant-page-header {
padding: 24px 24px !important;
}
}
}
.upload_item {
width: 498px;
padding: 5px 8px;
margin-bottom: 16px;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #FAFBFC;
.upload_left {
display: flex;
align-items: center;
color: #00B37A;
cursor: pointer;
:global {
.anticon-link {
color: #00B37A;
font-size: 16px;
margin-right: 8px;
}
}
}
}
.checkbox_wrap_style {
width: 100%;
:global {
.ant-checkbox-wrapper {
width: 100%;
border: 1px solid #ccc;
padding: 8px 18px;
.ant-checkbox {
display: none;
}
> span {
display: flex;
align-items: center;
padding: 0px 0px;
.checkbox_avatar {
width: 32px;
height: 32px;
margin-right: 8px;
}
}
}
.ant-checkbox-wrapper-checked {
border-color: #00b37a!important;
color: #00b37a;
position: relative;
&:after {
content: "";
position: absolute;
width: 12px;
height: 11px;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAALCAYAAABLcGxfAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAADKADAAQAAAABAAAACwAAAAChLCZNAAAA6klEQVQoFWNgIAVsruliJkr9/1XMDCZqcxkY/mczEtSwv4GD4euvlQz/GfxAavFr2N3Bz/Dz8yaG///tYAbj1rC1QYLh/+8dQMX6MMW4bdjSoMTA8Gs30BlAGhUwoXKBvM21QBN/H0VWbMovzXDSOgOsFFXD1mo7Bsa/B5U5BSVgBoEUrzaOZMi5shkshAjWLTWgUNgINJlnh1k8AysTEzhEQIpDzy5nOP3xKVgDxNNbqxIY/jHMAYqADRBi5WTYY5HEIMbGzRB4ZilcMUgHI8PWqlKg4i6wdiRCgIWDQYSNi+HOt3dIogwMANgLQif9hMeFAAAAAElFTkSuQmCC);
right: 0;
bottom: 0;
}
}
}
}
// @import "../../../member/components/index.less";
src/pages/transaction/enquiryOffer/components/index.less
View file @
4c6e3ded
@import "../../../member/components/index.less";
.count{
font-size: 24px;
color: #303133;
font-weight: 500;
}
.add-btn{
margin-bottom: 24px;
padding: 6px 0;
text-align: center;
background: #FAFBFC;
}
.alignCenter{
text-align: center;
}
.alignLeft{
text-align: left;
}
.hidden{
display: none;
}
.block{
display: block;
}
.selectBtn {
margin: 0 16px;
}
.filter-btn{
width : 112px;
margin: 0 0 0 16px;
}
.select {
width : 160px;
&:nth-last-of-type(1) {
margin-right: 0;
}
}
.mainCol {
background-color: #fff;
margin-bottom : 24px;
padding : 0 24px;
box-sizing : border-box;
&-title {
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #303133;
padding : 20px 0;
}
&:nth-last-of-type(1) {
margin: 0;
}
&-row {
display : flex;
flex-wrap : wrap;
padding-bottom: 16px;
&-col {
display: flex;
width : calc(100% / 3);
padding: 16px 0;
&-option {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
&-rows {
display : flex;
padding-bottom: 16px;
&-cols {
flex: 1;
.cols-main {
display: flex;
padding: 16px 0;
&:nth-last-of-type(1) {
padding-bottom: 0;
}
&-options {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
}
}
\ No newline at end of file
// @import "../../../member/components/index.less";
.count{
font-size: 24px;
color: #303133;
font-weight: 500;
}
.add-btn{
margin-bottom: 24px;
padding: 6px 0;
text-align: center;
background: #FAFBFC;
}
.alignCenter{
text-align: center;
}
.alignLeft{
text-align: left;
}
.hidden{
display: none;
}
.block{
display: block;
}
.selectBtn {
margin: 0 16px;
}
.filter-btn{
width : 112px;
margin: 0 0 0 16px;
}
.select {
width : 160px;
&:nth-last-of-type(1) {
margin-right: 0;
}
}
.mainCol {
background-color: #fff;
margin-bottom : 24px;
padding : 0 24px;
box-sizing : border-box;
&-title {
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #303133;
padding : 20px 0;
}
&:nth-last-of-type(1) {
margin: 0;
}
&-row {
display : flex;
flex-wrap : wrap;
padding-bottom: 16px;
&-col {
display: flex;
width : calc(100% / 3);
padding: 16px 0;
&-option {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
&-rows {
display : flex;
padding-bottom: 16px;
&-cols {
flex: 1;
.cols-main {
display: flex;
padding: 16px 0;
&:nth-last-of-type(1) {
padding-bottom: 0;
}
&-options {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
}
}
src/pages/transaction/enquiryOffer/enquirySearch/index.less
View file @
4c6e3ded
@import "../../../member/components/index.less";
.count{
font-size: 24px;
color: #303133;
font-weight: 500;
}
.add-btn{
margin-bottom: 24px;
padding: 6px 0;
text-align: center;
background: #FAFBFC;
}
.alignCenter{
text-align: center;
}
.alignLeft{
text-align: left;
}
.hidden{
display: none;
}
.block{
display: block;
}
.selectBtn {
margin: 0 16px;
}
.filter-btn{
width : 112px;
margin: 0 0 0 16px;
}
.select {
width : 160px;
&:nth-last-of-type(1) {
margin-right: 0;
}
}
.mainCol {
background-color: #fff;
margin-bottom : 24px;
padding : 0 24px;
box-sizing : border-box;
&-title {
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #303133;
padding : 20px 0;
}
&:nth-last-of-type(1) {
margin: 0;
}
&-row {
display : flex;
flex-wrap : wrap;
padding-bottom: 16px;
&-col {
display: flex;
width : calc(100% / 3);
padding: 16px 0;
&-option {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
&-rows {
display : flex;
padding-bottom: 16px;
&-cols {
flex: 1;
.cols-main {
display: flex;
padding: 16px 0;
&:nth-last-of-type(1) {
padding-bottom: 0;
}
&-options {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
}
}
\ No newline at end of file
// @import "../../../member/components/index.less";
.count{
font-size: 24px;
color: #303133;
font-weight: 500;
}
.add-btn{
margin-bottom: 24px;
padding: 6px 0;
text-align: center;
background: #FAFBFC;
}
.alignCenter{
text-align: center;
}
.alignLeft{
text-align: left;
}
.hidden{
display: none;
}
.block{
display: block;
}
.selectBtn {
margin: 0 16px;
}
.filter-btn{
width : 112px;
margin: 0 0 0 16px;
}
.select {
width : 160px;
&:nth-last-of-type(1) {
margin-right: 0;
}
}
.mainCol {
background-color: #fff;
margin-bottom : 24px;
padding : 0 24px;
box-sizing : border-box;
&-title {
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #303133;
padding : 20px 0;
}
&:nth-last-of-type(1) {
margin: 0;
}
&-row {
display : flex;
flex-wrap : wrap;
padding-bottom: 16px;
&-col {
display: flex;
width : calc(100% / 3);
padding: 16px 0;
&-option {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
&-rows {
display : flex;
padding-bottom: 16px;
&-cols {
flex: 1;
.cols-main {
display: flex;
padding: 16px 0;
&:nth-last-of-type(1) {
padding-bottom: 0;
}
&-options {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
}
}
src/pages/transaction/enquiryOfferConfirm/components/index.less
View file @
4c6e3ded
@import "../../../member/components/index.less";
.count{
font-size: 24px;
color: #303133;
font-weight: 500;
}
.add-btn{
margin-bottom: 24px;
padding: 6px 0;
text-align: center;
background: #FAFBFC;
}
.alignCenter{
text-align: center;
}
.alignLeft{
text-align: left;
}
.hidden{
display: none;
}
.block{
display: block;
}
.selectBtn {
margin: 0 16px;
}
.filter-btn{
width : 112px;
margin: 0 0 0 16px;
}
.select {
width : 160px;
&:nth-last-of-type(1) {
margin-right: 0;
}
}
.mainCol {
background-color: #fff;
margin-bottom : 24px;
padding : 0 24px;
box-sizing : border-box;
&-title {
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #303133;
padding : 20px 0;
}
&:nth-last-of-type(1) {
margin: 0;
}
&-row {
display : flex;
flex-wrap : wrap;
padding-bottom: 16px;
&-col {
display: flex;
width : calc(100% / 3);
padding: 16px 0;
&-option {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
&-rows {
display : flex;
padding-bottom: 16px;
&-cols {
flex: 1;
.cols-main {
display: flex;
padding: 16px 0;
&:nth-last-of-type(1) {
padding-bottom: 0;
}
&-options {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
}
}
\ No newline at end of file
// @import "../../../member/components/index.less";
.count{
font-size: 24px;
color: #303133;
font-weight: 500;
}
.add-btn{
margin-bottom: 24px;
padding: 6px 0;
text-align: center;
background: #FAFBFC;
}
.alignCenter{
text-align: center;
}
.alignLeft{
text-align: left;
}
.hidden{
display: none;
}
.block{
display: block;
}
.selectBtn {
margin: 0 16px;
}
.filter-btn{
width : 112px;
margin: 0 0 0 16px;
}
.select {
width : 160px;
&:nth-last-of-type(1) {
margin-right: 0;
}
}
.mainCol {
background-color: #fff;
margin-bottom : 24px;
padding : 0 24px;
box-sizing : border-box;
&-title {
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #303133;
padding : 20px 0;
}
&:nth-last-of-type(1) {
margin: 0;
}
&-row {
display : flex;
flex-wrap : wrap;
padding-bottom: 16px;
&-col {
display: flex;
width : calc(100% / 3);
padding: 16px 0;
&-option {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
&-rows {
display : flex;
padding-bottom: 16px;
&-cols {
flex: 1;
.cols-main {
display: flex;
padding: 16px 0;
&:nth-last-of-type(1) {
padding-bottom: 0;
}
&-options {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
}
}
src/pages/transaction/goodsOffer/components/index.less
View file @
4c6e3ded
.item_wrap {
margin-bottom: 24px;
background-color: #FFF;
border-radius: 8px;
padding: 24px;
&:last-child {
margin-bottom: 0px;
}
.mainCol_title {
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #303133;
padding: 0px 0 20px;
}
:global {
.ant-tabs-nav {
&::before {
border-bottom-color: #FFF;
}
}
}
}
.header {
:global {
.ant-page-header {
padding: 24px 24px !important;
}
}
}
.upload_item {
width: 498px;
padding: 5px 8px;
margin-bottom: 16px;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #FAFBFC;
.upload_left {
display: flex;
align-items: center;
color: #00B37A;
cursor: pointer;
:global {
.anticon-link {
color: #00B37A;
font-size: 16px;
margin-right: 8px;
}
}
}
}
@import "../../../member/components/index.less";
\ No newline at end of file
.item_wrap {
margin-bottom: 24px;
background-color: #FFF;
border-radius: 8px;
padding: 24px;
&:last-child {
margin-bottom: 0px;
}
.mainCol_title {
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #303133;
padding: 0px 0 20px;
}
:global {
.ant-tabs-nav {
&::before {
border-bottom-color: #FFF;
}
}
}
}
.header {
:global {
.ant-page-header {
padding: 24px 24px !important;
}
}
}
.upload_item {
width: 498px;
padding: 5px 8px;
margin-bottom: 16px;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #FAFBFC;
.upload_left {
display: flex;
align-items: center;
color: #00B37A;
cursor: pointer;
:global {
.anticon-link {
color: #00B37A;
font-size: 16px;
margin-right: 8px;
}
}
}
}
// @import "../../../member/components/index.less";
src/pages/transaction/inquiryQuote/components/index.less
View file @
4c6e3ded
@import "../../../member/components/index.less";
.item_wrap {
margin-bottom: 24px;
background-color: #FFF;
border-radius: 8px;
padding: 24px;
&:last-child {
margin-bottom: 0px;
}
.mainCol_title {
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #303133;
padding: 0px 0 20px;
}
:global {
.ant-tabs-nav {
&::before {
border-bottom-color: #FFF;
}
}
}
}
.header {
:global {
.ant-page-header {
padding: 24px 24px !important;
}
}
}
.upload_item {
width: 498px;
padding: 5px 8px;
margin-bottom: 16px;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #FAFBFC;
.upload_left {
display: flex;
align-items: center;
color: #00B37A;
cursor: pointer;
:global {
.anticon-link {
color: #00B37A;
font-size: 16px;
margin-right: 8px;
}
}
}
}
\ No newline at end of file
// @import "../../../member/components/index.less";
.item_wrap {
margin-bottom: 24px;
background-color: #FFF;
border-radius: 8px;
padding: 24px;
&:last-child {
margin-bottom: 0px;
}
.mainCol_title {
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #303133;
padding: 0px 0 20px;
}
:global {
.ant-tabs-nav {
&::before {
border-bottom-color: #FFF;
}
}
}
}
.header {
:global {
.ant-page-header {
padding: 24px 24px !important;
}
}
}
.upload_item {
width: 498px;
padding: 5px 8px;
margin-bottom: 16px;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #FAFBFC;
.upload_left {
display: flex;
align-items: center;
color: #00B37A;
cursor: pointer;
:global {
.anticon-link {
color: #00B37A;
font-size: 16px;
margin-right: 8px;
}
}
}
}
src/pages/transaction/purchaseOrder/orderCollect/components/materialModalTable/index.tsx
View file @
4c6e3ded
...
...
@@ -64,9 +64,9 @@ export const materialColumns: any[] = [
},
{
title
:
'供方库存'
,
dataIndex
:
'
bidCount
'
,
dataIndex
:
'
supplierInventory
'
,
align
:
'center'
,
key
:
'
bidCount
'
key
:
'
supplierInventory
'
},
]
...
...
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