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
847f3b7c
Commit
847f3b7c
authored
Feb 24, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 禁用采购下单积分类型
parent
f453f17b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
4 deletions
+19
-4
setPrice.tsx
src/pages/commodity/products/addChannelItem/setPrice.tsx
+12
-1
addBrand.tsx
src/pages/trademark/addBrand.tsx
+1
-1
index.ts
...s/transaction/purchaseOrder/orderCollect/effects/index.ts
+4
-0
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+1
-1
index.ts
...es/transaction/purchaseOrder/orderCollect/schema/index.ts
+1
-1
No files found.
src/pages/commodity/products/addChannelItem/setPrice.tsx
View file @
847f3b7c
...
...
@@ -61,6 +61,7 @@ const SetPrice:React.FC<IProps> = (props) => {
const
[
curretSetPriceRow
,
setCurrentSetPriceRow
]
=
useState
<
any
>
()
const
[
ladderPrice
,
setLadderPrice
]
=
useState
(
false
)
const
[
loading
,
setLoading
]
=
useState
<
boolean
>
(
false
)
const
[
disabledMemberPrice
,
setDisabledMemberPrice
]
=
useState
<
boolean
>
(
false
)
const
{
ChannelProudctStore
}
=
store
const
{
...
...
@@ -81,6 +82,16 @@ const SetPrice:React.FC<IProps> = (props) => {
},
[
priceTableData
])
useEffect
(()
=>
{
if
(
productSelectRowInStore
.
priceType
===
3
)
{
// 积分
formPrice
.
setFieldsValue
({
isMemberPrice
:
false
})
setDisabledMemberPrice
(
true
)
}
else
{
setDisabledMemberPrice
(
false
)
}
},
[
productSelectRowInStore
])
useEffect
(()
=>
{
if
(
visibleAddSpec
)
fetchSpecData
()
},
[
visibleAddSpec
])
...
...
@@ -333,7 +344,7 @@ const SetPrice:React.FC<IProps> = (props) => {
}
valuePropName=
"checked"
>
<
Checkbox
>
允许使用会员折扣价购买
</
Checkbox
>
<
Checkbox
disabled=
{
disabledMemberPrice
}
>
允许使用会员折扣价购买
</
Checkbox
>
</
Form
.
Item
>
</
Form
>
<
Button
onClick=
{
handleAddButton
}
style=
{
{
width
:
'100%'
,
marginBottom
:
24
,
backgroundColor
:
'#fafbfc'
}
}
>
...
...
src/pages/trademark/addBrand.tsx
View file @
847f3b7c
...
...
@@ -155,7 +155,7 @@ const AddBrand: React.FC<{}> = () => {
const
handleApplyCheck
=
()
=>
{
setDisabledCheck
(
true
)
PublicApi
.
postProductBrandApplyCheckBrand
({
id
:
responseId
}).
then
(
res
=>
{
setDisabledCheck
(
false
)
//
setDisabledCheck(false)
setCurrentStep
(
1
)
setTimeout
(()
=>
{
history
.
goBack
()
...
...
src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts
View file @
847f3b7c
...
...
@@ -167,6 +167,10 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
if
(
orderCombination
.
queryPageOrderModal
.
includes
(
assign
.
value
)
&&
typeEnums
!==
assign
.
value
)
{
assign
.
disabled
=
true
}
// 禁用积分
if
(
assign
.
value
===
24
||
assign
.
value
===
25
)
{
assign
.
disabled
=
true
}
}
else
{
assign
.
disabled
=
true
}
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
847f3b7c
...
...
@@ -505,7 +505,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
}
ctx
.
reset
({
validate
:
false
,
selector
:
'*(quotationNo,supplyMembersName,orderProductRequests,orderThe)'
selector
:
'*(quotationNo,supplyMembersName,
supplyMembersId,
orderProductRequests,orderThe)'
})
// 清空弹窗所选的值
productRef
.
current
.
rowSelectionCtl
.
setSelectRow
([])
...
...
src/pages/transaction/purchaseOrder/orderCollect/schema/index.ts
View file @
847f3b7c
...
...
@@ -79,7 +79,7 @@ const basicInfo: ISchema = {
orderModel
:
{
type
:
'string'
,
required
:
true
,
enum
:
GlobalConfig
.
web
.
orderMode
.
map
(
v
=>
{
delete
v
.
platformType
;
return
v
}),
enum
:
GlobalConfig
.
web
.
orderMode
.
map
(
v
=>
{
delete
v
.
platformType
;
return
v
}),
title
:
'下单模式'
,
"x-linkages"
:
[
// 联动显示单据字段
...
...
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