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
shenshaokai
jinfa-platform
Commits
01ad84c9
Commit
01ad84c9
authored
Mar 15, 2022
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2-220318' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2-220318
parents
82b4fc75
0c0ca00d
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
52 additions
and
24 deletions
+52
-24
commodity.ts
src/locales/en-US/commodity.ts
+1
-1
commodity.ts
src/locales/ko-KR/commodity.ts
+1
-1
commodity.ts
src/locales/zh-CN/commodity.ts
+1
-1
index.tsx
src/pages/classAndProperty/attribute/index.tsx
+1
-1
index.tsx
src/pages/classAndProperty/propertyValue/index.tsx
+1
-1
addProducts.tsx
src/pages/commodity/products/addProducts.tsx
+11
-10
priceAttributeForm.tsx
...commodity/products/addProductsItem/priceAttributeForm.tsx
+1
-0
index.tsx
...es/transaction/dealAbility/inquiryOffer/preview/index.tsx
+19
-5
index.tsx
...s/transaction/dealAbility/productInquiry/detail/index.tsx
+16
-3
index.ts
src/store/product/index.ts
+0
-1
No files found.
src/locales/en-US/commodity.ts
View file @
01ad84c9
...
@@ -1078,7 +1078,7 @@ export default {
...
@@ -1078,7 +1078,7 @@ export default {
'commodity.checkProductDetail.card.title2'
:
'essential information'
,
'commodity.checkProductDetail.card.title2'
:
'essential information'
,
'commodity.checkProductDetail.card2.p.1'
:
'Product slogan:'
,
'commodity.checkProductDetail.card2.p.1'
:
'Product slogan:'
,
'commodity.checkProductDetail.card2.p.2'
:
'Selling points:'
,
'commodity.checkProductDetail.card2.p.2'
:
'Selling points:'
,
'commodity.checkProductDetail.card2.p.3'
:
'
City of Ownership
:'
,
'commodity.checkProductDetail.card2.p.3'
:
'
Distribution area
:'
,
'commodity.checkProductDetail.card2.p.quanguo'
:
'nationwide'
,
'commodity.checkProductDetail.card2.p.quanguo'
:
'nationwide'
,
'commodity.checkProductDetail.card2.p.4'
:
'Shopping mall:'
,
'commodity.checkProductDetail.card2.p.4'
:
'Shopping mall:'
,
'commodity.checkProductDetail.card.title3'
:
'logistics information'
,
'commodity.checkProductDetail.card.title3'
:
'logistics information'
,
...
...
src/locales/ko-KR/commodity.ts
View file @
01ad84c9
...
@@ -1079,7 +1079,7 @@ export default {
...
@@ -1079,7 +1079,7 @@ export default {
'commodity.checkProductDetail.card.title2'
:
'기본 정보'
,
'commodity.checkProductDetail.card.title2'
:
'기본 정보'
,
'commodity.checkProductDetail.card2.p.1'
:
'상품표어:'
,
'commodity.checkProductDetail.card2.p.1'
:
'상품표어:'
,
'commodity.checkProductDetail.card2.p.2'
:
'판매 포인트:'
,
'commodity.checkProductDetail.card2.p.2'
:
'판매 포인트:'
,
'commodity.checkProductDetail.card2.p.3'
:
'
관할지시
:'
,
'commodity.checkProductDetail.card2.p.3'
:
'
배송 지역
:'
,
'commodity.checkProductDetail.card2.p.quanguo'
:
'전국'
,
'commodity.checkProductDetail.card2.p.quanguo'
:
'전국'
,
'commodity.checkProductDetail.card2.p.4'
:
'오픈마켓:'
,
'commodity.checkProductDetail.card2.p.4'
:
'오픈마켓:'
,
'commodity.checkProductDetail.card.title3'
:
'물류정보'
,
'commodity.checkProductDetail.card.title3'
:
'물류정보'
,
...
...
src/locales/zh-CN/commodity.ts
View file @
01ad84c9
...
@@ -1076,7 +1076,7 @@ export default {
...
@@ -1076,7 +1076,7 @@ export default {
'commodity.checkProductDetail.card.title2'
:
'基本信息'
,
'commodity.checkProductDetail.card.title2'
:
'基本信息'
,
'commodity.checkProductDetail.card2.p.1'
:
'商品标语:'
,
'commodity.checkProductDetail.card2.p.1'
:
'商品标语:'
,
'commodity.checkProductDetail.card2.p.2'
:
'商品卖点:'
,
'commodity.checkProductDetail.card2.p.2'
:
'商品卖点:'
,
'commodity.checkProductDetail.card2.p.3'
:
'
归属地市
:'
,
'commodity.checkProductDetail.card2.p.3'
:
'
配送区域
:'
,
'commodity.checkProductDetail.card2.p.quanguo'
:
'全国'
,
'commodity.checkProductDetail.card2.p.quanguo'
:
'全国'
,
'commodity.checkProductDetail.card2.p.4'
:
'上架商城:'
,
'commodity.checkProductDetail.card2.p.4'
:
'上架商城:'
,
'commodity.checkProductDetail.card.title3'
:
'物流信息'
,
'commodity.checkProductDetail.card.title3'
:
'物流信息'
,
...
...
src/pages/classAndProperty/attribute/index.tsx
View file @
01ad84c9
...
@@ -193,7 +193,7 @@ const Attribute: React.FC<{}> = () => {
...
@@ -193,7 +193,7 @@ const Attribute: React.FC<{}> = () => {
];
];
const
handleSee
=
(
record
)
=>
{
const
handleSee
=
(
record
)
=>
{
history
.
push
(
`/memberCenter/commodityAbility/classAndProperty/attribute/detail?id=
${
record
.
id
}
&isSee=true`
)
history
.
push
(
`/memberCenter/commodityAbility/classAndProperty/attribute/detail?id=
${
record
.
id
}
&isSee=true
&isMultiple=
${
isMultiple
}
`
)
}
}
const
confirm
=
(
record
)
=>
{
const
confirm
=
(
record
)
=>
{
...
...
src/pages/classAndProperty/propertyValue/index.tsx
View file @
01ad84c9
...
@@ -178,7 +178,7 @@ const PropertyValue: React.FC<{}> = () => {
...
@@ -178,7 +178,7 @@ const PropertyValue: React.FC<{}> = () => {
}
}
const
handleSee
=
(
record
:
any
)
=>
{
const
handleSee
=
(
record
:
any
)
=>
{
history
.
push
(
`/memberCenter/commodityAbility/classAndProperty/propertyValue/detail?attrId=
${
selectKey
}
&attrName=
${
record
.
customerAttribute
.
name
}
&attrValueId=
${
record
.
id
}
&isSee=true&type=
${
record
.
type
}
`
)
history
.
push
(
`/memberCenter/commodityAbility/classAndProperty/propertyValue/detail?attrId=
${
selectKey
}
&attrName=
${
record
.
customerAttribute
.
name
}
&attrValueId=
${
record
.
id
}
&isSee=true&type=
${
record
.
type
}
&isMultiple=
${
isMultiple
}
`
)
}
}
const
columns
:
ColumnType
<
any
>
[]
=
[
const
columns
:
ColumnType
<
any
>
[]
=
[
...
...
src/pages/commodity/products/addProducts.tsx
View file @
01ad84c9
...
@@ -163,12 +163,17 @@ const AddProducts: React.FC<{}> = (props) => {
...
@@ -163,12 +163,17 @@ const AddProducts: React.FC<{}> = (props) => {
)
)
})
})
Promise
.
all
(
data
).
then
((
values
)
=>
{
Promise
.
all
(
data
).
then
((
values
)
=>
{
let
_productSelectAttribute
=
[]
// 提交的数据进行处理
// 提交的数据进行处理
productSelectAttribute
.
length
>
0
&&
productSelectAttribute
.
map
(
_itme
=>
{
if
(
productSelectAttribute
.
length
)
{
_itme
.
customerAttribute
=
{
id
:
_itme
.
customerAttributeId
}
_productSelectAttribute
=
productSelectAttribute
.
map
(
_item
=>
{
delete
_itme
.
attributeName
let
obj
=
{...
_item
}
delete
_itme
.
isPrice
obj
.
customerAttribute
=
{
id
:
obj
.
customerAttributeId
}
})
delete
obj
.
attributeName
delete
obj
.
isPrice
return
obj
})
}
let
_bacsicForm
=
{
...
values
[
0
]
}
let
_bacsicForm
=
{
...
values
[
0
]
}
if
(
values
.
length
>
0
)
{
if
(
values
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
values
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
values
.
length
;
i
++
)
{
...
@@ -195,7 +200,7 @@ const AddProducts: React.FC<{}> = (props) => {
...
@@ -195,7 +200,7 @@ const AddProducts: React.FC<{}> = (props) => {
}
}
let
_params
=
{
let
_params
=
{
...
_bacsicForm
,
...
_bacsicForm
,
commodityAttributeList
:
productSelectAttribute
,
commodityAttributeList
:
_
productSelectAttribute
,
commodityRemark
:
_productDescription
,
commodityRemark
:
_productDescription
,
isAllAttributePic
:
isAllAttributePic
,
isAllAttributePic
:
isAllAttributePic
,
isUpdateAttribute
:
true
,
isUpdateAttribute
:
true
,
...
@@ -366,10 +371,6 @@ const AddProducts: React.FC<{}> = (props) => {
...
@@ -366,10 +371,6 @@ const AddProducts: React.FC<{}> = (props) => {
setIsDisableSaveBtn
(
false
)
setIsDisableSaveBtn
(
false
)
message
.
error
(
e
.
message
||
intl
.
formatMessage
({
id
:
'commodity.products.addProducts.onSave.error.2'
}))
message
.
error
(
e
.
message
||
intl
.
formatMessage
({
id
:
'commodity.products.addProducts.onSave.error.2'
}))
}
}
// 新增不先填价格 清空属性form
if
(
childFormRefs
.
current
[
1
].
current
.
__INTERNAL__
.
name
===
'attribute-form'
&&
!
productInfoByEdit
)
{
childFormRefs
.
current
[
1
].
current
.
resetFields
()
}
console
.
log
(
e
,
'e'
)
console
.
log
(
e
,
'e'
)
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
console
.
log
(
error
,
'_error'
)
console
.
log
(
error
,
'_error'
)
...
...
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @
01ad84c9
...
@@ -316,6 +316,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
...
@@ -316,6 +316,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
// 生成表格dataSource
// 生成表格dataSource
let
combineArray
=
SKUCombine
(
_attributeValueArr
)
let
combineArray
=
SKUCombine
(
_attributeValueArr
)
// console.log(combineArray, 'combineArray')
// console.log(combineArray, 'combineArray')
setCombineAttributeArray
(
combineArray
)
setCombineAttributeArray
(
combineArray
)
setAttributeObjArr
(
_temp_attributeObjArr
)
setAttributeObjArr
(
_temp_attributeObjArr
)
setAttributeValObjArr
(
_temp_attributeValObjArr
)
setAttributeValObjArr
(
_temp_attributeValObjArr
)
...
...
src/pages/transaction/dealAbility/inquiryOffer/preview/index.tsx
View file @
01ad84c9
...
@@ -16,6 +16,7 @@ import EyePreview from '@/components/EyePreview';
...
@@ -16,6 +16,7 @@ import EyePreview from '@/components/EyePreview';
import
{
ENTERPRISE_CENTER_URL
}
from
'@/constants'
;
import
{
ENTERPRISE_CENTER_URL
}
from
'@/constants'
;
import
{
GlobalConfig
}
from
'@/global/config'
;
import
{
GlobalConfig
}
from
'@/global/config'
;
import
{
getTransactionProductInquiryDetails
}
from
'@/services/TransactionV2Api'
;
import
{
getTransactionProductInquiryDetails
}
from
'@/services/TransactionV2Api'
;
import
{
postManageWebShopWebAll
}
from
'@/services/ManageV2Api'
;
const
intl
=
getIntl
();
const
intl
=
getIntl
();
const
TABLINK
=
[
const
TABLINK
=
[
{
id
:
'progressLayout'
,
title
:
intl
.
formatMessage
({
id
:
'dealAbility.liuzhuanjindu'
})
},
{
id
:
'progressLayout'
,
title
:
intl
.
formatMessage
({
id
:
'dealAbility.liuzhuanjindu'
})
},
...
@@ -42,13 +43,14 @@ const InquiryOfferPreview = () => {
...
@@ -42,13 +43,14 @@ const InquiryOfferPreview = () => {
const
[
conditionEffect
,
setConditionEffect
]
=
useState
<
any
>
([]);
const
[
conditionEffect
,
setConditionEffect
]
=
useState
<
any
>
([]);
const
[
fileEffect
,
setFileEffect
]
=
useState
<
any
>
([]);
const
[
fileEffect
,
setFileEffect
]
=
useState
<
any
>
([]);
const
handleBasicEffect
=
(
data
:
any
)
=>
{
const
handleBasicEffect
=
(
data
:
any
,
shopInfo
:
any
[])
=>
{
console
.
log
(
data
,
shopInfo
,
10086
)
setBasicEffect
([
setBasicEffect
([
{
{
col
:
[
col
:
[
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiadanhao'
}),
extra
:
data
.
inquiryListNo
},
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiadanhao'
}),
extra
:
data
.
inquiryListNo
},
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiazhaiyao'
}),
extra
:
data
.
details
},
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiazhaiyao'
}),
extra
:
data
.
details
},
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiashangcheng'
}),
extra
:
GlobalConfig
.
web
.
shopInfo
.
map
(
item
=>
{
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiashangcheng'
}),
extra
:
shopInfo
.
map
(
item
=>
{
if
(
item
.
id
===
data
.
shopId
)
{
if
(
item
.
id
===
data
.
shopId
)
{
return
item
.
name
return
item
.
name
}
}
...
@@ -130,10 +132,22 @@ const InquiryOfferPreview = () => {
...
@@ -130,10 +132,22 @@ const InquiryOfferPreview = () => {
return
;
return
;
}
}
const
{
data
}
=
res
;
const
{
data
}
=
res
;
data
.
externalLogStates
=
[...
data
.
externalInquiryListStateResponses
];
data
.
externalLogStates
=
data
.
externalInquiryListStateResponses
?
[...
data
.
externalInquiryListStateResponses
]
:
[];
data
.
externalLogs
=
[...
data
.
externalInquiryListLogResponses
];
data
.
externalLogs
=
data
.
externalInquiryListLogResponses
?
[...
data
.
externalInquiryListLogResponses
]
:
[];
postManageWebShopWebAll
({
siteId
:
GlobalConfig
.
global
.
siteInfo
.
id
,
environment
:
1
,
hasMemberType
:
1
,
memberId
:
data
.
memberId
,
roleId
:
data
.
memberRoleId
,
},
{
ctlType
:
'none'
}).
then
(
res
=>
{
if
(
res
.
code
!==
1000
)
{
return
}
handleBasicEffect
(
data
,
res
.
data
);
})
setDataSource
(
data
);
setDataSource
(
data
);
handleBasicEffect
(
data
);
//
handleBasicEffect(data);
handleConditionEffect
(
data
);
handleConditionEffect
(
data
);
handleFileEffect
(
data
);
handleFileEffect
(
data
);
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
...
...
src/pages/transaction/dealAbility/productInquiry/detail/index.tsx
View file @
01ad84c9
...
@@ -17,6 +17,7 @@ import ModalOperate from '@/pages/transaction/components/modalOperate';
...
@@ -17,6 +17,7 @@ import ModalOperate from '@/pages/transaction/components/modalOperate';
import
{
ENTERPRISE_CENTER_URL
}
from
'@/constants'
;
import
{
ENTERPRISE_CENTER_URL
}
from
'@/constants'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
{
getTransactionInquiryListDetails
,
postTransactionInquiryDocumentsReview
,
postTransactionInquiryDocumentsReviewTwo
}
from
'@/services/TransactionV2Api'
;
import
{
getTransactionInquiryListDetails
,
postTransactionInquiryDocumentsReview
,
postTransactionInquiryDocumentsReviewTwo
}
from
'@/services/TransactionV2Api'
;
import
{
postManageWebShopWebAll
}
from
'@/services/ManageV2Api'
;
const
intl
=
getIntl
();
const
intl
=
getIntl
();
const
TABLINK
=
[
const
TABLINK
=
[
{
id
:
'progressLayout'
,
title
:
intl
.
formatMessage
({
id
:
'dealAbility.liuzhuanjindu'
})
},
{
id
:
'progressLayout'
,
title
:
intl
.
formatMessage
({
id
:
'dealAbility.liuzhuanjindu'
})
},
...
@@ -45,14 +46,14 @@ const ProductInquiryDetail = () => {
...
@@ -45,14 +46,14 @@ const ProductInquiryDetail = () => {
const
[
fileEffect
,
setFileEffect
]
=
useState
<
any
>
([]);
const
[
fileEffect
,
setFileEffect
]
=
useState
<
any
>
([]);
const
[
visible
,
setVisible
]
=
useState
<
boolean
>
(
false
);
const
[
visible
,
setVisible
]
=
useState
<
boolean
>
(
false
);
const
handleBasicEffect
=
(
data
:
any
)
=>
{
const
handleBasicEffect
=
(
data
:
any
,
shopInfo
:
any
[]
)
=>
{
setBasicEffect
([
setBasicEffect
([
{
{
col
:
[
col
:
[
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiadanhao'
}),
extra
:
data
.
inquiryListNo
},
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiadanhao'
}),
extra
:
data
.
inquiryListNo
},
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiazhaiyao'
}),
extra
:
data
.
details
},
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiazhaiyao'
}),
extra
:
data
.
details
},
{
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiashangcheng'
}),
extra
:
GlobalConfig
.
web
.
shopInfo
.
map
(
item
=>
{
label
:
intl
.
formatMessage
({
id
:
'dealAbility.xunjiashangcheng'
}),
extra
:
shopInfo
.
map
(
item
=>
{
if
(
item
.
id
===
data
.
shopId
)
{
if
(
item
.
id
===
data
.
shopId
)
{
return
item
.
name
return
item
.
name
}
}
...
@@ -139,8 +140,20 @@ const ProductInquiryDetail = () => {
...
@@ -139,8 +140,20 @@ const ProductInquiryDetail = () => {
data
.
interiorLogStates
=
data
.
interiorRequisitionFormStateResponses
?
[...
data
.
interiorRequisitionFormStateResponses
]
:
null
;
data
.
interiorLogStates
=
data
.
interiorRequisitionFormStateResponses
?
[...
data
.
interiorRequisitionFormStateResponses
]
:
null
;
data
.
externalLogs
=
data
.
externalInquiryListLogResponses
?
[...
data
.
externalInquiryListLogResponses
]
:
null
;
data
.
externalLogs
=
data
.
externalInquiryListLogResponses
?
[...
data
.
externalInquiryListLogResponses
]
:
null
;
data
.
interiorLogs
=
data
.
interiorInquiryListLogResponses
?
[...
data
.
interiorInquiryListLogResponses
]
:
null
;
data
.
interiorLogs
=
data
.
interiorInquiryListLogResponses
?
[...
data
.
interiorInquiryListLogResponses
]
:
null
;
postManageWebShopWebAll
({
siteId
:
GlobalConfig
.
global
.
siteInfo
.
id
,
environment
:
1
,
hasMemberType
:
1
,
memberId
:
data
.
memberId
,
roleId
:
data
.
memberRoleId
,
},
{
ctlType
:
'none'
}).
then
(
res
=>
{
if
(
res
.
code
!==
1000
)
{
return
}
handleBasicEffect
(
data
,
res
.
data
);
})
setDataSource
(
data
);
setDataSource
(
data
);
handleBasicEffect
(
data
);
//
handleBasicEffect(data);
handleConditionEffect
(
data
);
handleConditionEffect
(
data
);
handleFileEffect
(
data
);
handleFileEffect
(
data
);
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
...
...
src/store/product/index.ts
View file @
01ad84c9
...
@@ -131,7 +131,6 @@ class ProductStore implements IProductModule {
...
@@ -131,7 +131,6 @@ class ProductStore implements IProductModule {
@
action
.
bound
@
action
.
bound
public
setProductSelectAttribute
(
list
:
any
[])
{
public
setProductSelectAttribute
(
list
:
any
[])
{
// console.log(list, 'mobx')
this
.
productSelectAttribute
=
list
;
this
.
productSelectAttribute
=
list
;
}
}
...
...
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