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
726a9867
Commit
726a9867
authored
Nov 18, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
7d539464
af1ef987
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
27 additions
and
12 deletions
+27
-12
package.json
package.json
+1
-0
priceAttributeForm.tsx
...commodity/products/addProductsItem/priceAttributeForm.tsx
+1
-2
productAttributeForm.tsx
...mmodity/products/addProductsItem/productAttributeForm.tsx
+1
-1
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+1
-1
index.tsx
...Mall/components/Filter/components/CommodityType/index.tsx
+6
-0
index.tsx
...ages/transaction/components/createElectronModal/index.tsx
+1
-0
index.tsx
...eOrder/orderCollect/components/demandModalTable/index.tsx
+4
-2
index.tsx
...Order/orderCollect/components/inquiryModalTable/index.tsx
+6
-3
index.tsx
...eOrder/orderCollect/components/memberModalTable/index.tsx
+2
-0
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+1
-1
useProductTable.tsx
...tion/purchaseOrder/orderCollect/model/useProductTable.tsx
+3
-2
No files found.
package.json
View file @
726a9867
...
...
@@ -19,6 +19,7 @@
"test"
:
"umi-test"
,
"test:coverage"
:
"umi-test --coverage"
,
"start:cross"
:
"cross-env SITE_ID=352 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.0.25:8100 yarn start"
,
"start:scm"
:
"cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-scm.wg.shushangyun.com USE_ROUTE_CONFIG=false SOCKET_URL=ws://lingxi-scm.wg.shushangyun.com yarn start"
,
"start:url"
:
"cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com USE_ROUTE_CONFIG=true SOCKET_URL=ws://lingxi-all.wg.shushangyun.com yarn start"
,
"start:10"
:
"cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 USE_ROUTE_CONFIG=true SOCKET_URL=ws://10.0.0.10:8100 yarn start"
},
...
...
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @
726a9867
...
...
@@ -323,14 +323,13 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
})
:
_tempObj
[
_attributeNameArr
[
i
]
||
_attributeNameArr
[
0
]]
=
_rowArr
// 当一项变动的时候 找_attributeNameArr可能会找不到 找不到的情况下置为索引0的那项
if
(
history
.
location
.
query
?.
id
){
// 编辑的时候,先指定数据中的货品id,如果是重新组合的不存在id就使用选择的货品中的第一个,如果没有置为0;同理,不存在单价就置为{}
// _tempObj['对应货品'] = selectedGoods[i] && selectedGoods[i]?.id || selectedGoods[0]?.id || 0
_tempObj
[
'对应货品'
]
=
selectedGoods
.
length
>
0
?
selectedGoods
[
0
].
id
:
0
if
(
updateFlag
.
current
){
// 初次渲染tab 再次进入tab采用缓存数据
_tempObj
[
'单价'
]
=
productInfoByEdit
.
unitPriceAndPicList
[
i
]?.
unitPrice
||
{}
}
else
{
_tempObj
[
'单价'
]
=
_tableDataSource
[
i
]
&&
tableDataSource
[
i
]
||
{}
_tempObj
[
'单价'
]
=
_tableDataSource
[
i
]
&&
tableDataSource
[
i
]
&&
tableDataSource
[
i
][
'单价'
]
||
{}
}
}
else
{
_tempObj
[
'对应货品'
]
=
selectedGoods
.
length
>
0
?
selectedGoods
[
0
].
id
:
0
...
...
src/pages/commodity/products/addProductsItem/productAttributeForm.tsx
View file @
726a9867
...
...
@@ -59,7 +59,7 @@ const ProductAttributeForm: React.FC<Iprops> = (props) => {
paramsArray
=
[]
setProductSelectAttribute
([])
attributeForm
.
resetFields
()
clearProductDetailsUnitPriceAndPicListInEdit
([])
// 清空商品编辑数据中的商品属性
*9.12*
clearProductDetailsUnitPriceAndPicListInEdit
([])
// 清空商品编辑数据中的商品属性
}
else
{
setIsClearFormAndDataInEdit
(
true
)
}
...
...
src/pages/lxMall/commodityDetail/index.tsx
View file @
726a9867
...
...
@@ -505,7 +505,7 @@ const CommodityDetail = (props) => {
orderList
:
[
buyCommodityInfo
]
}]
}
updateOrderInfo
(
buyOrderInfo
,
sessionKey
).
then
(()
=>
{
if
(
res
.
data
)
{
window
.
location
.
href
=
getOrderLink
(
sessionKey
,
priceType
)
...
...
src/pages/lxMall/components/Filter/components/CommodityType/index.tsx
View file @
726a9867
...
...
@@ -51,6 +51,12 @@ const CommodityType: React.FC<CommodityTypePropsType> = (props) => {
key
:
result
[
0
],
title
:
getItemText
(
result
[
0
])
})
}
else
{
onFilter
({
type
:
FILTER_TYPE
.
commodityType
,
key
:
[],
title
:
''
})
}
}
...
...
src/pages/transaction/components/createElectronModal/index.tsx
View file @
726a9867
...
...
@@ -186,6 +186,7 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
// $('onFormInit').subscribe(() =>
{
if
(
data
.
isElectronicContract
===
1
)
{
useAsyncSelect
(
'contractTemplateId'
,
async
()
=>
(
await
PublicApi
.
getOrderSelectListContractTemplate
()).
data
,
[
'name'
,
'id'
])
actions
.
setFieldValue
(
"contractTemplateId"
,
data
.
contractTemplateId
)
}
else
{
actions
.
setFieldState
(
'usingElectronicContracts'
,
state
=>
{
state
.
value
=
0
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/demandModalTable/index.tsx
View file @
726a9867
...
...
@@ -30,14 +30,16 @@ const DemandModalTable:React.FC<DemandModalTableProps> = (props) => {
const
handleConfirm
=
async
()
=>
{
const
item
=
rowSelectionCtl
.
selectRow
[
0
]
console
.
log
(
item
,
'看需求报价item有没有member信息'
)
if
(
item
)
{
schemaAction
.
setFieldValue
(
'quotationNo'
,
item
.
quotationNo
)
const
data
=
await
fetchOrderApi
.
getProductListByDemandOrderId
({
id
:
item
.
id
})
schemaAction
.
setFieldValue
(
'orderProductRequests'
,
data
)
schemaAction
.
setFieldValue
(
'supplyMembersName'
,
item
.
demandMembers
)
schemaAction
.
setFieldValue
(
'supplyMembersId'
,
item
.
demandMemberId
)
schemaAction
.
setFieldValue
(
'supplyMembersName'
,
item
.
offerMemberName
)
schemaAction
.
setFieldValue
(
'supplyMembersId'
,
item
.
offerMemberId
)
schemaAction
.
setFieldValue
(
'supplyMembersRoleId'
,
item
.
offerMemberRoleId
)
// 需求单回显订单明细
schemaAction
.
setFieldValue
(
'orderThe'
,
item
.
quotationSummary
)
}
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/inquiryModalTable/index.tsx
View file @
726a9867
...
...
@@ -30,6 +30,7 @@ const InquiryModalTable:React.FC<InquiryModalTableProps> = (props) => {
const
handleConfirm
=
async
()
=>
{
const
item
=
rowSelectionCtl
.
selectRow
[
0
]
console
.
log
(
item
,
'看询价报价item有没有member信息'
)
if
(
item
)
{
schemaAction
.
setFieldValue
(
'quotationNo'
,
item
.
quotationNo
)
const
data
=
await
fetchOrderApi
.
getProductListByQuotationOrderId
({
...
...
@@ -37,11 +38,13 @@ const InquiryModalTable:React.FC<InquiryModalTableProps> = (props) => {
})
// 将询价报价单的id字段 冗余给商品列表
schemaAction
.
setFieldValue
(
'orderProductRequests'
,
data
.
map
((
v
:
any
)
=>
{
v
.
memberId
=
item
.
m
emberId
v
.
memberRoleId
=
item
.
m
emberRoleId
v
.
memberId
=
item
.
offerM
emberId
v
.
memberRoleId
=
item
.
offerM
emberRoleId
return
v
}))
schemaAction
.
setFieldValue
(
'supplyMembersName'
,
item
.
memberName
||
'后端没有返回会员名称'
)
schemaAction
.
setFieldValue
(
'supplyMembersName'
,
item
.
offerMemberName
)
schemaAction
.
setFieldValue
(
'supplyMembersId'
,
item
.
offerMemberId
)
schemaAction
.
setFieldValue
(
'supplyMembersRoleId'
,
item
.
offerMemberRoleId
)
// 询价单回显订单明细
schemaAction
.
setFieldValue
(
'orderThe'
,
item
.
details
)
}
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/memberModalTable/index.tsx
View file @
726a9867
...
...
@@ -28,9 +28,11 @@ const MemberModalTable:React.FC<MemberModalTableProps> = (props) => {
const
handleConfirm
=
()
=>
{
const
rowItem
=
rowSelectionCtl
.
selectRow
[
0
]
console
.
log
(
rowItem
,
'看会员item有没有member信息'
)
if
(
rowItem
)
{
schemaAction
.
setFieldValue
(
'supplyMembersName'
,
rowItem
.
name
)
schemaAction
.
setFieldValue
(
'supplyMembersId'
,
rowItem
.
memberId
)
schemaAction
.
setFieldValue
(
'supplyMembersRoleId'
,
rowItem
.
roleId
)
}
confirmModal
&&
confirmModal
()
setVisible
(
false
)
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
726a9867
...
...
@@ -213,7 +213,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
}
// logistics render字段字符串化
params
.
orderProductRequests
=
params
.
orderProductRequests
.
map
(
item
=>
{
let
logs
:
any
=
{
...
item
.
logistics
,
render
:
JSON
.
stringify
(
item
.
logistics
.
render
)
};
let
logs
:
any
=
{
...
item
.
logistics
,
render
:
item
.
logistics
?.
render
?
JSON
.
stringify
(
item
.
logistics
.
render
)
:
''
};
return
{
...
item
,
logistics
:
logs
...
...
src/pages/transaction/purchaseOrder/orderCollect/model/useProductTable.tsx
View file @
726a9867
...
...
@@ -8,6 +8,7 @@ import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
export
const
getUnitPriceTotal
=
(
record
)
=>
{
const
purchaseCount
=
Number
(
record
[
'purchaseCount'
])
||
0
console
.
log
(
record
,
purchaseCount
,
'rrr'
)
// fix 当没有传递unitPrice字段时 自动容错, 单价显示为0
record
.
unitPrice
=
record
.
unitPrice
||
record
.
price
||
0
if
(
typeof
record
.
unitPrice
===
'number'
)
{
...
...
@@ -20,8 +21,8 @@ export const getUnitPriceTotal = (record) => {
unitPrice
=
Number
(
value
)
return
false
}
if
(
purchaseCount
>=
min
&&
purchaseCount
<=
max
)
{
// 处于该区间
if
(
(
purchaseCount
>=
min
&&
purchaseCount
<=
max
)
||
(
purchaseCount
>
max
)
)
{
// 处于该区间
或者大于该区间
unitPrice
=
Number
(
value
)
return
false
}
...
...
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