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
a9084617
Commit
a9084617
authored
Aug 23, 2021
by
XieZhiXiong
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
18ec463d
def7f675
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
43 additions
and
34 deletions
+43
-34
index.ts
config/routes/index.ts
+2
-2
addProducts.tsx
src/pages/commodity/products/addProducts.tsx
+1
-1
priceAttributeForm.tsx
...commodity/products/addProductsItem/priceAttributeForm.tsx
+8
-5
productDescFormDefault.tsx
...odity/products/addProductsItem/productDescFormDefault.tsx
+14
-15
index.tsx
...commodity/products/components/dragSortImageList/index.tsx
+10
-4
viewProducts.tsx
src/pages/commodity/products/viewProducts.tsx
+4
-4
index.less
...s/readySubmitReport/components/remarkBidReport/index.less
+1
-0
index.tsx
...nsaction/purchaseOrder/orderCollectSrm/constant/index.tsx
+2
-2
index.ts
src/store/product/index.ts
+1
-1
No files found.
config/routes/index.ts
View file @
a9084617
...
...
@@ -14,14 +14,14 @@
// import AuthConfigRoute from './authConfigRoute'
// import AfterService from './afterServiceRoute' // 售后
// import HandlingRoute from './handlingRoute'; // 加工能力
import
DealAbilityRoute
from
'./dealAbilityRoute'
;
//
//
import DealAbilityRoute from './dealAbilityRoute'; //
import
asyncRoutes
from
'../router.config.json'
;
// import ProcurementRoute from './procurementRoute';
// import { callForBidsRoute } from './procurementRoute/callForBids';
// import { purchaseInquiryRoute } from './procurementRoute/purchaseInquiry';
// import contracRoute from './contracRoute';
// export const routes = [CommodityRoute, MemberRoute, ShopRoute, ChannelRoute, TranactionRoute, AfterService, PayandSettleRoute, LogisticsRoute, AuthConfigRoute, HandlingRoute, BalaceRoute]
import
marketingRoute
from
'./marketingRoute'
;
//
import marketingRoute from './marketingRoute';
const
memberCenterRoute
=
{
path
:
'/memberCenter'
,
...
...
src/pages/commodity/products/addProducts.tsx
View file @
a9084617
...
...
@@ -315,7 +315,7 @@ const AddProducts: React.FC<{}> = (props) => {
let
numberKeys
=
Object
.
keys
(
_params
).
map
(
_
=>
Number
(
_
)).
filter
(
Boolean
)
if
(
numberKeys
.
length
>
0
)
numberKeys
.
map
(
item
=>
delete
_params
[
item
])
console
.
log
(
_params
,
'params'
)
PublicApi
.
postProductCommoditySaveOrUpdateCommodity
(
_params
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setIsEnableCheck
(
false
)
...
...
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @
a9084617
...
...
@@ -719,8 +719,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
// initialValue={planPrice}
>
{
// disabled=
{
!
productInfoByEdit
.
isUpdateAttribute
}
history
.
location
.
query
?.
id
?
<
Radio
.
Group
onChange=
{
handlePlanPriceChange
}
>
history
.
location
.
query
?.
id
?
<
Radio
.
Group
onChange=
{
handlePlanPriceChange
}
disabled=
{
!
productInfoByEdit
.
isUpdateAttribute
}
>
<
Radio
value=
{
1
}
>
现货价格
</
Radio
>
<
Radio
value=
{
2
}
>
价格需要询价
</
Radio
>
<
Radio
value=
{
3
}
>
积分兑换商品
</
Radio
>
...
...
@@ -815,7 +814,9 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
</
Form
.
Item
>
}
{
ladderPrice
?
<
Form
.
Item
ladderPrice
?
<
Form
.
Item
name=
"ladderRange"
label=
""
shouldUpdate=
{
true
}
...
...
@@ -905,7 +906,9 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
);
}
}
</
Form
.
List
>
</
Form
.
Item
>
:
<
Form
.
Item
</
Form
.
Item
>
:
<
Form
.
Item
label=
{
planPrice
===
3
?
"所需积分"
:
"单价"
}
name=
"uniquePrice"
rules=
{
[
...
...
@@ -920,7 +923,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
}
]
}
>
<
InputNumber
min=
{
0
}
style=
{
{
width
:
'100%'
}
}
placeholder=
{
planPrice
===
3
?
"请输入积分"
:
"请输入价格"
}
/>
<
InputNumber
min=
{
0
}
style=
{
{
width
:
'100%'
,
overflow
:
'visible'
}
}
placeholder=
{
planPrice
===
3
?
"请输入积分"
:
"请输入价格"
}
/>
</
Form
.
Item
>
}
</
Form
>
...
...
src/pages/commodity/products/addProductsItem/productDescFormDefault.tsx
View file @
a9084617
...
...
@@ -22,7 +22,6 @@ const schemaActions = createFormActions()
const
ProductDescFormDefualt
:
React
.
FC
<
{}
>
=
()
=>
{
const
[
fileImageList
,
setFileImageList
]
=
useState
<
any
>
([])
const
[
videoList
,
setVideoList
]
=
useState
<
any
>
([])
const
[
hyperlinkList
,
setHyperlinkList
]
=
useState
<
any
>
([])
const
flagRef
=
useRef
<
boolean
>
(
false
)
const
currentRef
=
useRef
<
any
>
({})
const
[
isLoading
,
setIsLoading
]
=
useState
<
boolean
>
(
false
)
// 上传的加载状态
...
...
@@ -35,11 +34,11 @@ const ProductDescFormDefualt: React.FC<{}> = () => {
useEffect
(()
=>
{
if
(
history
.
location
.
query
?.
id
){
// 编辑状态下
setFileImageList
(
productInfoByEdit
.
commodityRemark
?.
image
)
setFileImageList
(
productInfoByEdit
.
commodityRemark
?.
image
List
)
setVideoList
(
productInfoByEdit
.
commodityRemark
?.
video
)
setProductDescription
({
video
:
productInfoByEdit
.
commodityRemark
?.
video
,
image
:
productInfoByEdit
.
commodityRemark
?.
image
,
image
List
:
productInfoByEdit
.
commodityRemark
?.
imageList
,
word
:
productInfoByEdit
.
commodityRemark
?.
word
})
}
...
...
@@ -58,14 +57,16 @@ const ProductDescFormDefualt: React.FC<{}> = () => {
},
[
selectCategoryId
])
useEffect
(()
=>
{
console
.
log
(
fileImageList
,
'fileImageList'
)
// 设置传输数据
setProductDescription
({
video
:
videoList
,
image
:
fileImageList
,
image
List
:
fileImageList
,
word
:
[]
})
},
[
fileImageList
,
videoList
])
/** 拖拽后 改变数据位置 */
const
changePosition
=
useCallback
((
dragIndex
:
number
,
hoverIndex
:
number
)
=>
{
const
dragImage
=
fileImageList
[
dragIndex
]
setFileImageList
(
...
...
@@ -78,10 +79,6 @@ const ProductDescFormDefualt: React.FC<{}> = () => {
)
},
[
fileImageList
])
// useEffect(() => {
// console.log(hyperlinkList)
// }, [hyperlinkList])
const
uploadImgProps
=
{
name
:
'file'
,
action
:
'/api/file/file/upload'
,
...
...
@@ -104,9 +101,9 @@ const ProductDescFormDefualt: React.FC<{}> = () => {
if
(
info
.
file
.
status
===
'done'
)
{
message
.
success
(
`
${
info
.
file
.
name
}
文件上传成功`
);
if
(
Array
.
isArray
(
fileImageList
)){
setFileImageList
([...
fileImageList
,
info
.
file
.
response
.
data
])
setFileImageList
([...
fileImageList
,
{
url
:
info
.
file
.
response
.
data
,
linkType
:
1
,
link
:
null
}
])
}
else
{
setFileImageList
([
info
.
file
.
response
.
data
])
setFileImageList
([
{
url
:
info
.
file
.
response
.
data
,
linkType
:
1
,
link
:
null
}
])
}
setIsLoading
(
false
)
}
else
if
(
info
.
file
.
status
===
'error'
)
{
...
...
@@ -165,9 +162,9 @@ const ProductDescFormDefualt: React.FC<{}> = () => {
}
const
handleAddHyperlink
=
(
idx
)
=>
{
console
.
log
(
'添加超链接'
)
currentRef
.
current
.
setVisible
(
true
)
schemaActions
.
setFieldValue
(
'idx'
,
idx
)
schemaActions
.
setFieldValue
(
'hyperlink'
,
fileImageList
[
idx
]?.
link
)
}
const
handleConfirm
=
()
=>
{
...
...
@@ -175,10 +172,12 @@ const ProductDescFormDefualt: React.FC<{}> = () => {
}
const
handleSubmit
=
async
(
value
)
=>
{
setHyperlinkList
(()
=>
{
let
url
=
[...
hyperlinkList
]
url
[
value
.
idx
]
=
value
.
hyperlink
return
url
console
.
log
(
value
)
const
{
idx
,
hyperlink
}
=
value
setFileImageList
(()
=>
{
let
list
=
[...
fileImageList
]
list
[
idx
][
'link'
]
=
hyperlink
return
list
})
currentRef
.
current
.
setVisible
(
false
)
}
...
...
src/pages/commodity/products/components/dragSortImageList/index.tsx
View file @
a9084617
...
...
@@ -13,7 +13,7 @@ interface RenderProps {
id
:
number
,
key
:
number
,
index
:
number
,
item
:
string
,
item
:
ImageItemProps
,
handleDelete
:
(
idx
:
number
)
=>
void
,
handleAddlink
:
(
idx
:
number
)
=>
void
,
changePosition
:
(
dragIdx
:
number
,
hoverIdx
:
number
)
=>
void
,
...
...
@@ -74,7 +74,7 @@ const ImageItem: React.FC<RenderProps> = (props) => {
drag
(
drop
(
ref
))
return
<
div
key=
{
index
}
className=
{
cx
(
styles
.
descriptBox
,
styles
.
mediaContentBox
)
}
ref=
{
ref
}
>
<
p
className=
{
styles
.
divImage
}
><
img
src=
{
item
}
/></
p
>
<
p
className=
{
styles
.
divImage
}
><
img
src=
{
item
[
'url'
]
}
/></
p
>
<
div
className=
{
styles
.
rightBtn
}
>
<
Tooltip
title=
"删除图片"
>
<
Button
size=
"small"
onClick=
{
()
=>
handleDelete
(
index
)
}
icon=
{
<
DeleteOutlined
/>
}
/>
...
...
@@ -89,8 +89,14 @@ const ImageItem: React.FC<RenderProps> = (props) => {
</
div
>
}
interface
ImageItemProps
{
url
:
string
,
linkType
:
number
,
link
:
string
,
}
interface
DragSortImageListProps
{
imageList
:
string
[],
imageList
:
ImageItemProps
[],
handleDelete
:
(
idx
:
number
)
=>
void
,
handleAddlink
:
(
idx
:
number
)
=>
void
,
changePosition
:
(
dragIdx
:
number
,
hoverIdx
:
number
)
=>
void
,
...
...
@@ -99,7 +105,7 @@ interface DragSortImageListProps {
const
DragSortImageList
:
React
.
FC
<
DragSortImageListProps
>
=
(
props
)
=>
{
const
{
imageList
,
handleDelete
,
handleAddlink
,
changePosition
}
=
props
const
renderImageList
=
(
item
,
index
)
=>
{
const
renderImageList
=
(
item
:
ImageItemProps
,
index
:
number
)
=>
{
return
<
ImageItem
id=
{
index
}
key=
{
index
}
...
...
src/pages/commodity/products/viewProducts.tsx
View file @
a9084617
...
...
@@ -587,17 +587,17 @@ const viewProducts: React.FC<{}> = () => {
}
{
/* 图片区块 */
}
{
productDetail
?.
commodityRemark
?.
image
?.
length
>
0
&&
productDetail
?.
commodityRemark
?.
image
List
?.
length
>
0
&&
<
div
className=
{
styles
.
descriptionBox
}
>
{
productDetail
?.
commodityRemark
?.
image
.
map
((
_item
,
_index
)
=>
_item
&&
<
div
key=
{
_index
}
className=
{
styles
.
imgItem
}
>
<
img
src=
{
_item
}
/>
productDetail
?.
commodityRemark
?.
image
List
.
map
((
_item
,
_index
)
=>
_item
&&
<
div
key=
{
_index
}
className=
{
styles
.
imgItem
}
>
<
img
src=
{
_item
.
url
}
/>
</
div
>)
}
</
div
>
}
{
productDetail
?.
commodityRemark
?.
image
?.
length
===
0
&&
productDetail
?.
commodityRemark
?.
video
?.
length
===
0
&&
productDetail
?.
commodityRemark
?.
word
?.
length
===
0
&&
productDetail
?.
commodityRemark
?.
image
List
?.
length
===
0
&&
productDetail
?.
commodityRemark
?.
video
?.
length
===
0
&&
productDetail
?.
commodityRemark
?.
word
?.
length
===
0
&&
<
p
className=
{
styles
.
descriptNull
}
>
暂无数据!
</
p
>
}
</
Card
>
...
...
src/pages/procurement/callForBids/readySubmitReport/components/remarkBidReport/index.less
View file @
a9084617
...
...
@@ -41,6 +41,7 @@
color: #909399;
}
.rankContainer {
width: 256px;
.levelCircle {
display: inline-block;
width: 20px;
...
...
src/pages/transaction/purchaseOrder/orderCollectSrm/constant/index.tsx
View file @
a9084617
...
...
@@ -300,7 +300,7 @@ export const materialInfoColumns: any[] = [
dataIndex
:
'name'
,
align
:
'center'
,
key
:
'name'
,
render
:
(
t
,
r
)
=>
`
${
t
}
/
${
r
.
type
}
`
render
:
(
t
,
r
)
=>
`
${
t
}
/
${
r
.
spec
}
`
},
{
title
:
'品类'
,
...
...
@@ -325,7 +325,7 @@ export const materialInfoColumns: any[] = [
dataIndex
:
'relevanceProductId'
,
align
:
'center'
,
key
:
'relevanceProductId'
,
render
:
(
t
,
r
)
=>
t
?
`
${
t
}
/
${
r
.
relevanceProductName
||
''
}
/
${
r
.
relevanceProduct
Type
||
''
}
/
${
r
.
relevanceProductCategory
||
''
}
/
${
r
.
relevanceProductBrand
||
''
}
`
:
''
render
:
(
t
,
r
)
=>
t
?
`
${
t
}
/
${
r
.
relevanceProductName
||
''
}
/
${
r
.
relevanceProduct
Spec
||
''
}
/
${
r
.
relevanceProductCategory
||
''
}
/
${
r
.
relevanceProductBrand
||
''
}
`
:
''
},
{
title
:
'单价'
,
...
...
src/store/product/index.ts
View file @
a9084617
...
...
@@ -9,7 +9,7 @@ export interface IPage {
export
interface
IDecsParams
{
id
?:
number
;
video
:
string
[];
image
:
string
[]
;
image
List
:
string
[]
;
word
:
string
[];
}
...
...
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