Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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-admin
Commits
0b5fbb83
Commit
0b5fbb83
authored
Mar 04, 2022
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-system
into v2
parents
ab702c78
73cce2ec
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
RuleSetting.tsx
...SettingManage/procurementRules/components/RuleSetting.tsx
+1
-2
index.tsx
...nage/procurementRules/components/selectProcesss/index.tsx
+2
-1
No files found.
src/pages/systemManage/ruleSettingManage/procurementRules/components/RuleSetting.tsx
View file @
0b5fbb83
...
@@ -18,7 +18,7 @@ import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect'
...
@@ -18,7 +18,7 @@ import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect'
import
SelectProcesss
from
'./selectProcesss'
import
SelectProcesss
from
'./selectProcesss'
import
ModalTable
from
'@/components/ModalTable'
import
ModalTable
from
'@/components/ModalTable'
import
{
getMemberManageLowerConsumerMemberPage
,
getMemberManagePageitems
}
from
'@/services/MemberV2Api'
import
{
getMemberManageLowerConsumerMemberPage
,
getMemberManagePageitems
}
from
'@/services/MemberV2Api'
import
{
getOrderPlatformPurchaseProcessMemberPage
}
from
'@/services/OrderNewV2Api'
import
{
getOrderPlatformPurchaseProcess
Get
,
getOrderPlatformPurchaseProcess
MemberPage
}
from
'@/services/OrderNewV2Api'
export
interface
RuleSettingProps
{
export
interface
RuleSettingProps
{
addSchemaAction
:
ISchemaFormActions
,
addSchemaAction
:
ISchemaFormActions
,
...
@@ -260,7 +260,6 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
...
@@ -260,7 +260,6 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
useEffect
(()
=>
{
useEffect
(()
=>
{
async
function
getInitValue
()
{
async
function
getInitValue
()
{
// @ts-ignore
const
{
data
}
=
await
getOrderPlatformPurchaseProcessGet
({
processId
:
id
});
const
{
data
}
=
await
getOrderPlatformPurchaseProcessGet
({
processId
:
id
});
if
(
!
data
.
allMembers
)
{
if
(
!
data
.
allMembers
)
{
const
res
=
await
getBindingMembers
({
id
:
id
.
toString
(),
current
:
'1'
,
pageSize
:
'10'
})
const
res
=
await
getBindingMembers
({
id
:
id
.
toString
(),
current
:
'1'
,
pageSize
:
'10'
})
...
...
src/pages/systemManage/ruleSettingManage/procurementRules/components/selectProcesss/index.tsx
View file @
0b5fbb83
...
@@ -46,7 +46,8 @@ enum ProcessTagType {
...
@@ -46,7 +46,8 @@ enum ProcessTagType {
'订单交易流程'
,
'订单交易流程'
,
'售后换货流程'
,
'售后换货流程'
,
'售后退货流程'
,
'售后退货流程'
,
'售后维修流程'
'售后维修流程'
,
'请购单下单流程'
}
}
...
...
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