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
3167c11a
Commit
3167c11a
authored
Sep 09, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 处理批量新增仓位提示选择商品异常,处理商品直接修改价格属性tab提交报错问题,内外部流转记录组件添加默认显示类型参数
parent
3ff2dd5d
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
17 deletions
+29
-17
index.tsx
src/components/AuditProcess/index.tsx
+12
-6
addProducts.tsx
src/pages/commodity/products/addProducts.tsx
+3
-1
priceAttributeForm.tsx
...commodity/products/addProductsItem/priceAttributeForm.tsx
+10
-6
batchPositionSetting.tsx
src/pages/repositories/components/batchPositionSetting.tsx
+3
-2
index.tsx
...pages/transaction/components/orderDetailSection/index.tsx
+1
-0
index.ts
...ransaction/purchaseOrder/orderCollectB2b/effects/index.ts
+0
-1
usePaymentInfo.tsx
...on/purchaseOrder/orderCollectB2b/model/usePaymentInfo.tsx
+0
-1
No files found.
src/components/AuditProcess/index.tsx
View file @
3167c11a
/*
* @Author: XieZhiXiong
* @Date: 2020-09-15 17:48:36
* @LastEditors:
XieZhiXiong
* @LastEditTime: 2021-0
7-05 18
:18:12
* @Description: 内外部流转记录组件
* @LastEditors:
zwp
* @LastEditTime: 2021-0
9-0 11
:18:12
* @Description: 内外部流转记录组件
最后编辑-添加自定义默认的Radio显示类型
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
{
...
...
@@ -33,6 +33,8 @@ export interface StepsItem {
status
?:
'wait'
|
'process'
|
'finish'
|
'error'
,
}
type
radioItem
=
'inner'
|
'outer'
interface
AuditProcessProp
extends
Omit
<
ButtonTabsProps
,
'options'
>
{
/**
* 当前外部流程步骤
...
...
@@ -61,7 +63,11 @@ interface AuditProcessProp extends Omit<ButtonTabsProps, 'options'> {
/**
* 是否省略title超出的内容,默认为 false
*/
ellipsis
?:
boolean
ellipsis
?:
boolean
,
/**
* 初始radio值
*/
initRadioValue
?:
radioItem
,
};
const
AuditProcess
:
React
.
FC
<
AuditProcessProp
>
=
({
...
...
@@ -72,9 +78,10 @@ const AuditProcess: React.FC<AuditProcessProp> = ({
customTitleKey
,
customKey
,
ellipsis
=
false
,
initRadioValue
=
'inner'
,
...
rest
})
=>
{
const
[
radioValue
,
setRadioValue
]
=
useState
<
(
'inner'
|
'outer'
)
>
(
'inner'
);
const
[
radioValue
,
setRadioValue
]
=
useState
<
radioItem
>
(
initRadioValue
);
useEffect
(()
=>
{
// 这里判断如果只有外部步骤,没有内部步骤的时候,默认设置 radioValue 为 outer
...
...
@@ -123,7 +130,6 @@ const AuditProcess: React.FC<AuditProcessProp> = ({
<
ButtonTabs
options=
{
options
}
extra=
"流转进度"
defaultValue=
"inner"
onChange=
{
handleRadioChange
}
value=
{
radioValue
}
{
...
rest
}
...
...
src/pages/commodity/products/addProducts.tsx
View file @
3167c11a
...
...
@@ -172,7 +172,7 @@ const AddProducts: React.FC<{}> = (props) => {
}
}
if
(
productInfoByEdit
?.
type
===
CommodityType
.
UPPER_SUPPORTER_COMMODITY
)
{
// @ 上游商品 直接
去
原信息中的品类品牌id
// @ 上游商品 直接
取
原信息中的品类品牌id
_bacsicForm
.
customerCategoryId
=
productInfoByEdit
?.
customerCategory
.
fullId
.
split
(
'.'
).
map
(
item
=>
Number
(
item
)
+
''
)
_bacsicForm
.
brandId
=
productInfoByEdit
?.
brand
.
id
}
...
...
@@ -254,6 +254,7 @@ const AddProducts: React.FC<{}> = (props) => {
return
e
}
_params
.
unitPriceAndPicList
=
_productAttributeAndImageParams
console
.
log
(
_productAttributeAndImageParams
,
productAttributeAndImageParams
,
'001'
)
}
else
{
// 编辑时没有点击商品图片(新增没有点击也就没有数据)
if
(
productInfoByEdit
){
_params
.
unitPriceAndPicList
=
productInfoByEdit
.
unitPriceAndPicList
...
...
@@ -270,6 +271,7 @@ const AddProducts: React.FC<{}> = (props) => {
}
})
}
console
.
log
(
_params
.
unitPriceAndPicList
,
priceAttributeParams
,
'001'
)
}
}
...
...
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @
3167c11a
...
...
@@ -415,6 +415,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
/* 生成传输数据 */
const
constructedPrarams
=
()
=>
{
let
_paramsArray
:
any
[]
=
[];
console
.
log
(
combineAttributeArray
,
'combineAttributeArray'
)
Array
.
isArray
(
combineAttributeArray
)
?
combineAttributeArray
.
map
((
item
,
index
)
=>
{
// 非数组情况下默认无组合 从table数据中获取 // 当属性减少的时候 这个combine数组还是之前的 /* code1 */
let
_tempArr
:
any
=
[]
Array
.
isArray
(
item
)
?
item
.
map
((
_item
,
_index
)
=>
{
/* code2 */
...
...
@@ -424,16 +425,19 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
id
:
attributeObjArr
[
_index
].
customerAttributeId
,
name
:
attributeObjArr
[
_index
].
attributeName
}
//
console.log(attributeObjArr, attributeValObjArr, item, index, _item, _index, _tableDataSource, '调试属性')
console
.
log
(
attributeObjArr
,
attributeValObjArr
,
item
,
index
,
_item
,
_index
,
_tableDataSource
,
'调试属性'
)
// @fixed bug: 属性名称相同的情况下 只找第一个元素 会出现id异常
let
filterData
=
attributeValObjArr
.
map
((
__item
,
__index
)
=>
{
if
(
_index
===
__index
)
{
return
__item
.
find
(
_
=>
_
.
value
===
_item
)
let
filterData
=
null
for
(
let
i
=
0
;
i
<
attributeValObjArr
.
length
;
i
++
)
{
const
element
=
attributeValObjArr
[
i
]
filterData
=
element
.
find
(
ele
=>
ele
.
value
===
_item
)
if
(
filterData
)
{
break
;
}
}).
filter
(
__
=>
__
)[
0
]
}
console
.
log
(
filterData
,
'fff'
)
_tempObject
.
customerAttributeValue
=
{
// @fixed bug: 属性名称相同的情况下 只找第一个元素 会出现id异常
// id: attributeValObjArr.map(__item => __item.find(_ => _.value===_item)).filter(__ => __)[0].id,
id
:
filterData
?.
id
?
filterData
.
id
:
null
,
value
:
item
[
_index
]
}
...
...
src/pages/repositories/components/batchPositionSetting.tsx
View file @
3167c11a
...
...
@@ -144,12 +144,13 @@ const BatchPositionSetting:React.FC<BatchPositionSettingProps> = (props) => {
const
handleAddMemberBtn
=
()
=>
{
const
shopType
=
addSchemaAction
.
getFieldValue
(
'shopType'
);
const
itemNo
=
addSchemaAction
.
getFieldValue
(
'productId'
);
const
itemNo
=
addSchemaAction
.
getFieldValue
(
'commodityList'
);
console
.
log
(
shopType
,
itemNo
,
'iii'
)
if
(
!
shopType
)
{
message
.
error
(
'请先选择商城类型'
);
return
;
}
if
(
CANAL
.
includes
(
shopType
)
&&
!
itemNo
)
{
if
(
CANAL
.
includes
(
shopType
)
&&
!
itemNo
?.
length
)
{
message
.
error
(
'请先选择商品'
);
return
;
}
...
...
src/pages/transaction/components/orderDetailSection/index.tsx
View file @
3167c11a
...
...
@@ -20,6 +20,7 @@ const OrderDetailSection:React.FC<OrderDetailSectionProps> = ({formContext, type
<
AuditProcess
customTitleKey=
'stepName'
customKey=
'step'
initRadioValue=
'outer'
outerVerifyCurrent=
{
formContext
.
data
.
currentOuterStep
}
innerVerifyCurrent=
{
formContext
.
data
.
currentInnerStep
}
outerVerifySteps=
{
...
...
src/pages/transaction/purchaseOrder/orderCollectB2b/effects/index.ts
View file @
3167c11a
...
...
@@ -73,7 +73,6 @@ export const useProductTableChangeForPay = (ctx: ISchemaFormActions | ISchemaFor
}
else
{
ctx
.
setFieldState
(
'deliveryAddresId'
,
state
=>
state
.
visible
=
true
)
}
fetchOrderApi
.
getPayInfoList
({
products
:
products
,
memberId
:
productItem
?.
memberId
,
...
...
src/pages/transaction/purchaseOrder/orderCollectB2b/model/usePaymentInfo.tsx
View file @
3167c11a
...
...
@@ -40,7 +40,6 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
}
const
getPayLists
=
(
memberId
,
memberRoleId
)
=>
{
console
.
log
(
'1'
)
PublicApi
.
postOrderBuyerCreateB2bPaymentFind
({
memberId
,
roleId
:
memberRoleId
,
...
...
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