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
7b15f19b
Commit
7b15f19b
authored
Jul 08, 2021
by
前端-钟卫鹏
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
46ce0f8b
c11dbaa0
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
32 additions
and
24 deletions
+32
-24
index.tsx
src/pages/member/components/MemberDocCategory/index.tsx
+8
-4
index.less
src/pages/member/components/ModifyClassifyDrawer/index.less
+2
-0
index.tsx
src/pages/member/components/ModifyClassifyDrawer/index.tsx
+6
-1
constant.tsx
src/pages/member/constant.tsx
+1
-1
index.tsx
src/pages/member/memberMaintain/index.tsx
+0
-3
index.less
...ComingClassify/components/ComingClassifyDrawer/index.less
+2
-0
index.tsx
...rComingClassify/components/ComingClassifyDrawer/index.tsx
+2
-2
verify.tsx
src/pages/member/memberPrComingClassify/verify.tsx
+1
-1
index.tsx
...ifyComingData/components/VerifyComingDataDrawer/index.tsx
+2
-3
add.tsx
...ages/transaction/purchaseAbility/offter/addOffter/add.tsx
+2
-0
basic.tsx
...ion/purchaseAbility/offter/addOffter/components/basic.tsx
+2
-2
offer.tsx
...ion/purchaseAbility/offter/addOffter/components/offer.tsx
+3
-2
index.tsx
...saction/purchaseAbility/purchasDoor/purchasInfo/index.tsx
+1
-5
No files found.
src/pages/member/components/MemberDocCategory/index.tsx
View file @
7b15f19b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Author: XieZhiXiong
* @Date: 2021-05-21 16:10:47
* @Date: 2021-05-21 16:10:47
* @LastEditors: XieZhiXiong
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-07-0
7 16:49:2
3
* @LastEditTime: 2021-07-0
8 10:05:0
3
* @Description: 会员分类信息
* @Description: 会员分类信息
*/
*/
import
React
,
{
useState
}
from
'react'
;
import
React
,
{
useState
}
from
'react'
;
...
@@ -83,7 +83,8 @@ const MemberDocCategory: React.FC<IProps> = (props: IProps) => {
...
@@ -83,7 +83,8 @@ const MemberDocCategory: React.FC<IProps> = (props: IProps) => {
}
=
props
;
}
=
props
;
const
[
visibleDrawer
,
setVisibleDrawer
]
=
useState
(
false
);
const
[
visibleDrawer
,
setVisibleDrawer
]
=
useState
(
false
);
const
[
classifyInfo
,
setClassifyInfo
]
=
useState
<
FormValueType
&
{
partnerTypes
:
PartnerTypesItem
[]
}
>
();
const
[
classifyInfo
,
setClassifyInfo
]
=
useState
<
FormValueType
>
();
const
[
partnerTypes
,
setPartnerTypes
]
=
useState
<
PartnerTypesItem
[]
>
([]);
const
[
infoLoading
,
setInfoLoading
]
=
useState
(
false
);
const
[
infoLoading
,
setInfoLoading
]
=
useState
(
false
);
const
[
submitLoading
,
setSubmitLoading
]
=
useState
(
false
);
const
[
submitLoading
,
setSubmitLoading
]
=
useState
(
false
);
...
@@ -111,8 +112,11 @@ const MemberDocCategory: React.FC<IProps> = (props: IProps) => {
...
@@ -111,8 +112,11 @@ const MemberDocCategory: React.FC<IProps> = (props: IProps) => {
taxPoint
:
+
taxPoint
,
taxPoint
:
+
taxPoint
,
...
rest
...
rest
})),
})),
partnerTypes
:
res
.
data
.
partnerTypes
,
});
});
setPartnerTypes
(
res
.
data
.
partnerTypes
.
map
((
item
)
=>
({
value
:
item
.
id
,
label
:
item
.
text
,
})));
handleVisibleDrawer
(
true
);
handleVisibleDrawer
(
true
);
}
}
}).
finally
(()
=>
{
}).
finally
(()
=>
{
...
@@ -212,7 +216,7 @@ const MemberDocCategory: React.FC<IProps> = (props: IProps) => {
...
@@ -212,7 +216,7 @@ const MemberDocCategory: React.FC<IProps> = (props: IProps) => {
onClose=
{
()
=>
handleVisibleDrawer
(
false
)
}
onClose=
{
()
=>
handleVisibleDrawer
(
false
)
}
onSubmit=
{
handleSubmit
}
onSubmit=
{
handleSubmit
}
submitLoading=
{
submitLoading
}
submitLoading=
{
submitLoading
}
partnerTypes=
{
classifyInfo
?.
partnerTypes
}
partnerTypes=
{
partnerTypes
}
value=
{
classifyInfo
}
value=
{
classifyInfo
}
/>
/>
</>
</>
...
...
src/pages/member/components/ModifyClassifyDrawer/index.less
View file @
7b15f19b
...
@@ -2,4 +2,5 @@
...
@@ -2,4 +2,5 @@
.description {
.description {
color: @text-color-secondary;
color: @text-color-secondary;
margin-bottom: @margin-md;
}
}
\ No newline at end of file
src/pages/member/components/ModifyClassifyDrawer/index.tsx
View file @
7b15f19b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Author: XieZhiXiong
* @Date: 2021-07-07 15:21:00
* @Date: 2021-07-07 15:21:00
* @LastEditors: XieZhiXiong
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-07-0
7 18:12:33
* @LastEditTime: 2021-07-0
8 09:59:57
* @Description: 修改入库分类信息 抽屉
* @Description: 修改入库分类信息 抽屉
*/
*/
import
React
,
{
useEffect
}
from
'react'
;
import
React
,
{
useEffect
}
from
'react'
;
...
@@ -173,6 +173,9 @@ interface IProps {
...
@@ -173,6 +173,9 @@ interface IProps {
* 合作关系
* 合作关系
*/
*/
partnerTypes
:
PartnerTypesItem
[],
partnerTypes
:
PartnerTypesItem
[],
/**
* 值
*/
value
:
FormValueType
,
value
:
FormValueType
,
/**
/**
* 确认按钮 loading
* 确认按钮 loading
...
@@ -193,6 +196,7 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
...
@@ -193,6 +196,7 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
onSubmit
,
onSubmit
,
onClose
,
onClose
,
partnerTypes
,
partnerTypes
,
value
,
submitLoading
,
submitLoading
,
}
=
props
;
}
=
props
;
...
@@ -310,6 +314,7 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
...
@@ -310,6 +314,7 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
>
>
<
NiceForm
<
NiceForm
previewPlaceholder=
"' '"
previewPlaceholder=
"' '"
initialValues=
{
value
}
components=
{
{
components=
{
{
ArrayCards
,
ArrayCards
,
CascaderFormItem
,
CascaderFormItem
,
...
...
src/pages/member/constant.tsx
View file @
7b15f19b
...
@@ -136,7 +136,7 @@ export const MEMBER_OUTER_COLUMNS: EditableColumns[] = [
...
@@ -136,7 +136,7 @@ export const MEMBER_OUTER_COLUMNS: EditableColumns[] = [
dataIndex
:
'outerStatusName'
,
dataIndex
:
'outerStatusName'
,
align
:
'center'
,
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
render
:
(
text
,
record
)
=>
(
<
StatusTag
type=
{
MEMBER_
INNER_STATUS_BADGE_COLOR
[
record
.
outerStatus
]
}
title=
{
text
}
/>
<
StatusTag
type=
{
MEMBER_
OUTER_STATUS_TYPE
[
record
.
outerStatus
]
}
title=
{
text
}
/>
),
),
},
},
{
{
...
...
src/pages/member/memberMaintain/index.tsx
View file @
7b15f19b
...
@@ -95,9 +95,6 @@ const MemberMaintain: React.FC<[]> = () => {
...
@@ -95,9 +95,6 @@ const MemberMaintain: React.FC<[]> = () => {
filters
:
[],
filters
:
[],
align
:
'center'
,
align
:
'center'
,
onFilter
:
(
value
,
record
)
=>
record
.
status
===
value
,
onFilter
:
(
value
,
record
)
=>
record
.
status
===
value
,
render
:
(
text
,
record
)
=>
(
<
StatusTag
type=
{
MEMBER_STATUS_TAG_MAP
[
record
.
status
]
}
title=
{
text
}
/>
),
},
},
{
{
title
:
'外部状态'
,
title
:
'外部状态'
,
...
...
src/pages/member/memberPrComingClassify/components/ComingClassifyDrawer/index.less
View file @
7b15f19b
...
@@ -2,4 +2,5 @@
...
@@ -2,4 +2,5 @@
.description {
.description {
color: @text-color-secondary;
color: @text-color-secondary;
margin-bottom: @margin-md;
}
}
\ No newline at end of file
src/pages/member/memberPrComingClassify/components/ComingClassifyDrawer/index.tsx
View file @
7b15f19b
...
@@ -28,7 +28,7 @@ type CategoriesType = {
...
@@ -28,7 +28,7 @@ type CategoriesType = {
/**
/**
* 品类名称
* 品类名称
*/
*/
name
:
string
,
name
s
:
string
[]
,
/**
/**
* 付款周期(天)
* 付款周期(天)
*/
*/
...
@@ -224,7 +224,7 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
...
@@ -224,7 +224,7 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
if
(
onSubmit
)
{
if
(
onSubmit
)
{
const
{
maxAmount
,
categories
,
...
rest
}
=
values
;
const
{
maxAmount
,
categories
,
...
rest
}
=
values
;
const
formated
=
categories
.
map
((
item
)
=>
({
const
formated
=
categories
.
map
((
item
)
=>
({
name
:
item
.
category
.
join
(
'-'
)
,
name
s
:
item
.
category
,
paymentDay
:
+
item
.
paymentDay
,
paymentDay
:
+
item
.
paymentDay
,
invoiceTypeName
:
item
.
invoiceTypeName
,
invoiceTypeName
:
item
.
invoiceTypeName
,
taxPoint
:
+
item
.
taxPoint
,
taxPoint
:
+
item
.
taxPoint
,
...
...
src/pages/member/memberPrComingClassify/verify.tsx
View file @
7b15f19b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Author: XieZhiXiong
* @Date: 2021-05-25 14:36:14
* @Date: 2021-05-25 14:36:14
* @LastEditors: XieZhiXiong
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-0
6-18 17:15:48
* @LastEditTime: 2021-0
7-08 11:46:29
* @Description: 入库分类
* @Description: 入库分类
*/
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
React
,
{
useState
,
useEffect
}
from
'react'
;
...
...
src/pages/member/memberPrVerifyComingData/components/VerifyComingDataDrawer/index.tsx
View file @
7b15f19b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Author: XieZhiXiong
* @Date: 2021-05-24 17:47:32
* @Date: 2021-05-24 17:47:32
* @LastEditors: XieZhiXiong
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-07-0
6 17:43:13
* @LastEditTime: 2021-07-0
8 11:03:50
* @Description: 审核Form抽屉
* @Description: 审核Form抽屉
*/
*/
import
React
,
{
useEffect
}
from
'react'
;
import
React
,
{
useEffect
}
from
'react'
;
...
@@ -187,10 +187,9 @@ const VerifyComingDataDrawer: React.FC<IProps> = (props: IProps) => {
...
@@ -187,10 +187,9 @@ const VerifyComingDataDrawer: React.FC<IProps> = (props: IProps) => {
}
}
const
{
const
{
channelLevel
,
channelLevel
,
channelTypeId
,
}
=
channelValue
;
}
=
channelValue
;
if
(
channel
TypeI
d
&&
!
channelLevel
)
{
if
(
channel
Level
!==
undefine
d
&&
!
channelLevel
)
{
formActions
.
setFieldState
(
'INVESTIGATE_INFO'
,
state
=>
{
formActions
.
setFieldState
(
'INVESTIGATE_INFO'
,
state
=>
{
FormPath
.
setIn
(
state
,
'visible'
,
false
);
FormPath
.
setIn
(
state
,
'visible'
,
false
);
});
});
...
...
src/pages/transaction/purchaseAbility/offter/addOffter/add.tsx
View file @
7b15f19b
...
@@ -63,6 +63,8 @@ const AddForm = () => {
...
@@ -63,6 +63,8 @@ const AddForm = () => {
basicInfo
.
offerEndTime
=
params
.
offerEndTime
;
basicInfo
.
offerEndTime
=
params
.
offerEndTime
;
basicInfo
.
createTime
=
params
.
createTime
;
basicInfo
.
createTime
=
params
.
createTime
;
basicInfo
.
externalState
=
params
.
externalState
;
basicInfo
.
externalState
=
params
.
externalState
;
basicInfo
.
interiorStateName
=
params
.
interiorStateName
;
basicInfo
.
externalStateName
=
params
.
externalStateName
;
basicInfo
.
interiorState
=
params
.
interiorState
;
basicInfo
.
interiorState
=
params
.
interiorState
;
offerInfo
.
id
=
params
.
id
;
offerInfo
.
id
=
params
.
id
;
if
(
path
===
'edit'
)
{
if
(
path
===
'edit'
)
{
...
...
src/pages/transaction/purchaseAbility/offter/addOffter/components/basic.tsx
View file @
7b15f19b
...
@@ -166,13 +166,13 @@ const BasicInfo: React.FC<IProps> = (props: any) => {
...
@@ -166,13 +166,13 @@ const BasicInfo: React.FC<IProps> = (props: any) => {
label=
'外部状态'
label=
'外部状态'
name=
'externalState'
name=
'externalState'
>
>
{
fetchdata
&&
<
Tag
color=
{
OFFTER_EXTERNALSTATE_COLOR
[
fetchdata
.
externalState
]
}
>
{
OFFTER_EXTERNALSTATE
[
fetchdata
.
externalState
]
}
</
Tag
>
}
{
fetchdata
&&
<
Tag
color=
{
OFFTER_EXTERNALSTATE_COLOR
[
fetchdata
.
externalState
]
}
>
{
fetchdata
.
externalStateName
}
</
Tag
>
}
</
Form
.
Item
>
</
Form
.
Item
>
<
Form
.
Item
<
Form
.
Item
label=
'内部状态'
label=
'内部状态'
name=
'interiorState'
name=
'interiorState'
>
>
{
fetchdata
&&
<
Badge
status=
{
OFFTER_INTERNALSTATE_COLOR
[
fetchdata
.
interiorState
]
}
text=
{
OFFTER_INTERNALSTATE
[
fetchdata
.
interiorState
]
}
/>
}
{
fetchdata
&&
<
Badge
status=
{
OFFTER_INTERNALSTATE_COLOR
[
fetchdata
.
interiorState
]
}
text=
{
fetchdata
.
interiorStateName
}
/>
}
</
Form
.
Item
>
</
Form
.
Item
>
</
Form
>
</
Form
>
...
...
src/pages/transaction/purchaseAbility/offter/addOffter/components/offer.tsx
View file @
7b15f19b
...
@@ -128,6 +128,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
...
@@ -128,6 +128,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
name=
{
`isTax${index}`
}
name=
{
`isTax${index}`
}
style=
{
{
margin
:
0
}
}
style=
{
{
margin
:
0
}
}
rules=
{
[{
required
:
true
,
message
:
'请选择'
}]
}
rules=
{
[{
required
:
true
,
message
:
'请选择'
}]
}
initialValue=
{
text
}
>
>
<
Select
<
Select
style=
{
{
width
:
100
}
}
style=
{
{
width
:
100
}
}
...
@@ -223,7 +224,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
...
@@ -223,7 +224,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
console
.
log
(
params
,
123
)
console
.
log
(
params
,
123
)
params
.
forEach
((
it
:
any
,
i
:
number
)
=>
{
params
.
forEach
((
it
:
any
,
i
:
number
)
=>
{
form
.
setFieldsValue
({
form
.
setFieldsValue
({
[
'isTax'
+
i
]:
it
.
isTax
?
it
.
isTax
:
1
,
[
'isTax'
+
i
]:
(
it
.
isTax
||
it
.
isTax
===
0
)
?
it
.
isTax
:
1
,
[
'taxProbability'
+
i
]:
it
.
taxProbability
,
[
'taxProbability'
+
i
]:
it
.
taxProbability
,
[
'taxUnitPrice'
+
i
]:
it
.
taxUnitPrice
[
'taxUnitPrice'
+
i
]:
it
.
taxUnitPrice
})
})
...
@@ -299,7 +300,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
...
@@ -299,7 +300,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
detailss
.
push
({
detailss
.
push
({
purchaseInquiryDetailsId
:
name
===
'quote'
?
item
.
id
:
item
.
purchaseInquiryDetailsId
,
purchaseInquiryDetailsId
:
name
===
'quote'
?
item
.
id
:
item
.
purchaseInquiryDetailsId
,
taxUnitPrice
:
item
.
taxUnitPrice
,
taxUnitPrice
:
item
.
taxUnitPrice
,
isTax
:
item
.
isTax
?
item
.
isTax
:
1
,
isTax
:
(
item
.
isTax
||
item
.
isTax
===
0
)
?
item
.
isTax
:
1
,
taxProbability
:
item
.
taxProbability
,
taxProbability
:
item
.
taxProbability
,
productName
:
item
.
productName
,
productName
:
item
.
productName
,
productId
:
item
.
productId
,
productId
:
item
.
productId
,
...
...
src/pages/transaction/purchaseAbility/purchasDoor/purchasInfo/index.tsx
View file @
7b15f19b
...
@@ -78,11 +78,7 @@ const PurchasInfo: React.FC<PurchasInfoPropsType> = (props) => {
...
@@ -78,11 +78,7 @@ const PurchasInfo: React.FC<PurchasInfoPropsType> = (props) => {
// 根据站点获取商城信息
// 根据站点获取商城信息
const
fetchAllShop
=
()
=>
{
const
fetchAllShop
=
()
=>
{
const
param
:
any
=
{
PublicApi
.
getManageShopFindByDoorType
({
doorType
:
'3'
}).
then
(
res
=>
{
siteId
,
type
:
3
}
PublicApi
.
getManageShopFindShopsBySiteId
(
param
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setAllMallList
(
res
.
data
)
setAllMallList
(
res
.
data
)
}
}
...
...
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