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
adad797b
Commit
adad797b
authored
Aug 07, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2
parents
29f50b81
02df26b7
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
17 additions
and
13 deletions
+17
-13
index.tsx
src/pages/channel/channelInfo/index.tsx
+3
-3
FormList.tsx
src/pages/contract/manage/add/components/FormList.tsx
+2
-2
Fromtable.tsx
src/pages/contract/manage/add/components/Fromtable.tsx
+2
-2
Information.tsx
src/pages/contract/manage/add/components/Information.tsx
+2
-2
index.tsx
...ngsPanel/propsSettings/components/AdvertSetting/index.tsx
+1
-0
index.tsx
...ingsPanel/propsSettings/components/BrandSetting/index.tsx
+1
-0
index.tsx
...opsSettings/components/CategoryreCommendSetting/index.tsx
+1
-0
index.tsx
...ingsPanel/propsSettings/components/GoodsSetting/index.tsx
+1
-1
index.tsx
...tingsPanel/propsSettings/components/ShopSetting/index.tsx
+1
-0
index.tsx
src/pages/shop/shopInfo/index.tsx
+3
-3
No files found.
src/pages/channel/channelInfo/index.tsx
View file @
adad797b
...
...
@@ -49,18 +49,16 @@ const ChannelInfo: React.FC<ShopInfoPropsType> = (props) => {
const
PDFList
=
[
'application/pdf'
]
const
isPDF
=
PDFList
.
includes
(
file
.
type
)
if
(
!
isLt50M
)
{
setFileLoading
(
true
);
message
.
error
(
'上传文件大小不超过 50M!'
);
}
if
(
!
isPDF
)
{
setFileLoading
(
true
);
message
.
error
(
'请上传pdf格式文件'
);
}
return
isLt50M
&&
isPDF
;
}
const
handleChange
=
({
file
})
=>
{
setFileLoading
(
true
);
if
(
file
.
response
)
{
setFileLoading
(
true
);
if
(
file
.
response
.
code
!==
1000
)
{
setFileLoading
(
false
);
return
...
...
@@ -70,6 +68,8 @@ const ChannelInfo: React.FC<ShopInfoPropsType> = (props) => {
albumName
:
file
.
name
,
albumUrl
:
file
.
response
.
data
,
})
}
else
{
setFileLoading
(
false
);
}
}
const
fileRemove
=
()
=>
{
...
...
src/pages/contract/manage/add/components/FormList.tsx
View file @
adad797b
...
...
@@ -140,7 +140,7 @@ const FormList = (props: any) => {
associatedGoods
:
_filter
(
sourceType
,
item
,
[
''
,
'productAttributeJson'
,
'commodityAttribute'
,
''
]),
//关联
associatedMaterielNo
:
_filter
(
sourceType
,
item
,
[
''
,
'number'
,
'commodityCode'
]),
// 关联物料编号
associatedMaterielName
:
_filter
(
sourceType
,
item
,
[
''
,
'productName'
,
'commodityName'
]),
// 关联商品名称
associatedType
:
_filter
(
sourceType
,
item
,
[
''
,
'productAttributeJson'
,
'commodityCategory'
,
''
]).
split
(
'-'
)[
1
]
,
//规格型号
associatedType
:
sourceType
==
1
?
_filter
(
sourceType
,
item
,
[
''
,
'productAttributeJson'
,
'commodityCategory'
,
''
]).
split
(
'-'
)[
1
]
:
_filter
(
sourceType
,
item
,
[
''
,
'productAttributeJson'
,
'commodityCategory'
,
''
])
,
//规格型号
associatedCategory
:
_filter
(
sourceType
,
item
,
[
''
,
'productAttributeJson'
,
'commodityCategory'
,
''
]),
// 关联商品品类
associatedBrand
:
_filter
(
sourceType
,
item
,
[
''
,
'productBrand'
,
'commodityBrand'
,
''
]),
// 关联品牌
rowId
:
index
,
...
...
@@ -322,7 +322,7 @@ const FormList = (props: any) => {
purchaseCount
:
item
.
purchaseCount
,
price
:
Number
(
item
.
price
),
bidCount
:
item
.
bidCount
,
bidAmount
:
item
.
bidCount
&&
item
.
price
?
Number
(
item
.
bidCount
)
*
Number
(
item
.
price
)
:
''
,
bidAmount
:
item
.
bidCount
&&
item
.
price
?
(
Number
(
item
.
bidCount
)
*
Number
(
item
.
price
)).
toFixed
(
2
)
:
''
,
associatedMaterielName
:
Object
.
keys
(
Row
).
length
===
0
?
''
:
item
.
associatedMaterielName
,
associatedGoods
:
Object
.
keys
(
Row
).
length
===
0
?
''
:
item
.
associatedGoods
,
associatedDataId
:
Object
.
keys
(
Row
).
length
===
0
?
''
:
item
.
associatedDataId
,
...
...
src/pages/contract/manage/add/components/Fromtable.tsx
View file @
adad797b
...
...
@@ -91,7 +91,7 @@ const FormList = (props: any) => {
width
:
130
,
}
}
placeholder=
""
value=
{
item
.
payAmount
}
value=
{
Number
(
item
.
payAmount
).
toFixed
(
2
)
}
onChange=
{
(
e
)
=>
onSelectChange
(
e
,
'payAmount'
,
index
)
}
/>
</
div
>
...
...
@@ -224,7 +224,7 @@ const FormList = (props: any) => {
PlanList
.
map
(
item
=>
{
item
.
payNum
=
Number
(
item
.
payNum
)
item
.
payRatio
=
Number
(
item
.
payRatio
)
item
.
payAmount
=
Number
(
item
.
payAmount
)
item
.
payAmount
=
Number
(
item
.
payAmount
)
.
toFixed
(
2
)
item
.
payWay
=
Number
(
item
.
payWay
)
item
.
payParam
=
Number
(
item
.
payParam
)
// 付款方式: 1 - 账期,2 - 月结,3 - 现结
...
...
src/pages/contract/manage/add/components/Information.tsx
View file @
adad797b
...
...
@@ -104,7 +104,7 @@ const Information = (props: any) => {
basicsVO
.
partyBName
=
Row
.
partyBName
?
Row
.
partyBName
:
''
;
basicsVO
.
sourceNo
=
Row
.
sourceNo
?
Row
.
sourceNo
:
''
;
basicsVO
.
sourceId
=
Row
.
sourceId
?
Row
.
sourceId
:
''
;
basicsVO
.
totalAmount
=
Row
.
totalAmount
?
Row
.
totalAmount
:
''
;
basicsVO
.
totalAmount
=
Row
.
totalAmount
?
Number
(
Row
.
totalAmount
).
toFixed
(
2
)
:
''
;
basicsVO
.
partyBMemberId
=
sourceType
===
'1'
?
Row
.
awardRoleId
?
Row
.
awardMemberId
:
''
:
Row
.
partyBMemberId
;
basicsVO
.
partyBRoleId
=
sourceType
===
'1'
?
Row
.
awardRoleId
?
Row
.
awardRoleId
:
''
:
Row
.
partyBRoleId
;
console
.
log
(
Row
,
basicsVO
)
...
...
@@ -183,7 +183,7 @@ const Information = (props: any) => {
default
:
break
;
}
basicsVO
.
totalAmount
=
totalAmount
;
basicsVO
.
totalAmount
=
Number
(
totalAmount
).
toFixed
(
2
)
;
basicsVO
.
sourceId
=
sourceId
;
basicsVO
.
partyBName
=
partyBName
;
basicsVO
.
partyBMemberId
=
partyBMemberId
;
...
...
src/pages/editor/settingsPanel/propsSettings/components/AdvertSetting/index.tsx
View file @
adad797b
...
...
@@ -192,6 +192,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
const
handleConfirmSave
=
useCallback
((
e
:
any
)
=>
{
e
.
preventDefault
();
if
(
JSON
.
stringify
(
props
)
===
JSON
.
stringify
(
newProps
))
{
clearSelectedStatus
()
return
}
setConfirmLoading
(
true
)
...
...
src/pages/editor/settingsPanel/propsSettings/components/BrandSetting/index.tsx
View file @
adad797b
...
...
@@ -105,6 +105,7 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
const
handleConfirmSave
=
()
=>
{
if
(
JSON
.
stringify
(
brandList
)
===
JSON
.
stringify
(
selectBrandList
))
{
clearSelectedStatus
()
return
}
// if (selectBrandList.length <= 0) {
...
...
src/pages/editor/settingsPanel/propsSettings/components/CategoryreCommendSetting/index.tsx
View file @
adad797b
...
...
@@ -79,6 +79,7 @@ const CategoryRecommendSetting: React.FC<CategoryRecommendSettingPropsType> = (p
const
handleConfirmSave
=
useCallback
((
e
:
any
)
=>
{
e
.
preventDefault
();
if
(
JSON
.
stringify
(
props
)
===
JSON
.
stringify
(
newProps
))
{
clearSelectedStatus
()
return
}
...
...
src/pages/editor/settingsPanel/propsSettings/components/GoodsSetting/index.tsx
View file @
adad797b
...
...
@@ -190,8 +190,8 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
}
const
handleConfirmSave
=
()
=>
{
console
.
log
(
'handleConfirmSave1'
)
if
(
JSON
.
stringify
(
goodsList
)
===
JSON
.
stringify
(
selectGoodsList
))
{
clearSelectedStatus
()
return
}
// console.log('handleConfirmSave2')
...
...
src/pages/editor/settingsPanel/propsSettings/components/ShopSetting/index.tsx
View file @
adad797b
...
...
@@ -106,6 +106,7 @@ const ShopSetting: React.FC<ShopSettingPropsType> = (props) => {
const
handleConfirmSave
=
()
=>
{
if
(
JSON
.
stringify
(
shopsList
)
===
JSON
.
stringify
(
selectShopsList
))
{
clearSelectedStatus
()
return
}
...
...
src/pages/shop/shopInfo/index.tsx
View file @
adad797b
...
...
@@ -49,18 +49,16 @@ const ShopInfo: React.FC<ShopInfoPropsType> = (props) => {
const
PDFList
=
[
'application/pdf'
]
const
isPDF
=
PDFList
.
includes
(
file
.
type
)
if
(
!
isLt50M
)
{
setFileLoading
(
true
);
message
.
error
(
'上传文件大小不超过 50M!'
);
}
if
(
!
isPDF
)
{
setFileLoading
(
true
);
message
.
error
(
'请上传pdf格式文件'
);
}
return
isLt50M
&&
isPDF
;
}
const
handleChange
=
({
file
})
=>
{
setFileLoading
(
true
);
if
(
file
.
response
)
{
setFileLoading
(
true
);
if
(
file
.
response
.
code
!==
1000
)
{
setFileLoading
(
false
);
return
...
...
@@ -70,6 +68,8 @@ const ShopInfo: React.FC<ShopInfoPropsType> = (props) => {
albumName
:
file
.
name
,
albumUrl
:
file
.
response
.
data
,
})
}
else
{
setFileLoading
(
false
);
}
}
const
fileRemove
=
()
=>
{
...
...
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