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
9d905ee2
Commit
9d905ee2
authored
Dec 30, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 商家营销活动管理:去掉外部工作流
parent
ab940b15
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
40 deletions
+40
-40
index.tsx
...nsaction/marketingAbility/selfManagement/detail/index.tsx
+23
-23
index.tsx
...nsaction/marketingAbility/selfManagement/search/index.tsx
+17
-17
No files found.
src/pages/transaction/marketingAbility/selfManagement/detail/index.tsx
View file @
9d905ee2
...
...
@@ -86,16 +86,16 @@ const DetialLayout = () => {
let
interiorLogStates
:
any
=
[];
let
externalLogs
:
any
=
[];
let
interiorLogs
:
any
=
[];
(
data
.
outerTaskList
||
[]).
forEach
((
item
:
any
)
=>
{
externalLogStates
.
push
({
state
:
item
.
step
,
stateName
:
null
,
isExecute
:
item
.
isExecute
,
operationalProcess
:
item
.
taskName
,
roleName
:
item
.
roleName
,
})
})
data
.
externalLogStates
=
externalLogStates
;
//
(data.outerTaskList || []).forEach((item: any) => {
//
externalLogStates.push({
//
state: item.step,
//
stateName: null,
//
isExecute: item.isExecute,
//
operationalProcess: item.taskName,
//
roleName: item.roleName,
//
})
//
})
//
data.externalLogStates = externalLogStates;
(
data
.
innerTaskList
||
[]).
forEach
((
item
:
any
)
=>
{
interiorLogStates
.
push
({
state
:
item
.
step
,
...
...
@@ -106,19 +106,19 @@ const DetialLayout = () => {
})
})
data
.
interiorLogStates
=
interiorLogStates
;
(
data
.
outerRecordDOList
||
[]).
forEach
((
item
:
any
,
index
:
number
)
=>
{
externalLogs
.
push
({
operation
:
item
.
operate
,
createTime
:
item
.
operateTime
,
roleName
:
item
.
roleName
,
auditOpinion
:
item
.
opinion
,
stateName
:
item
.
statusName
,
id
:
index
+
1
,
state
:
item
.
status
,
step
:
index
,
})
})
data
.
externalLogs
=
externalLogs
;
//
(data.outerRecordDOList || []).forEach((item: any, index: number) => {
//
externalLogs.push({
//
operation: item.operate,
//
createTime: item.operateTime,
//
roleName: item.roleName,
//
auditOpinion: item.opinion,
//
stateName: item.statusName,
//
id: index + 1,
//
state: item.status,
//
step: index,
//
})
//
})
//
data.externalLogs = externalLogs;
(
data
.
innerRecordDOList
||
[]).
forEach
((
item
:
any
,
index
:
number
)
=>
{
interiorLogs
.
push
({
auditOpinion
:
item
.
opinion
,
...
...
src/pages/transaction/marketingAbility/selfManagement/search/index.tsx
View file @
9d905ee2
...
...
@@ -132,13 +132,13 @@ const Search = () => {
}).
catch
(
err
=>
{
console
.
warn
(
err
)
})
/** 外部状态 */
getMarketingMerchantActivityGetOuterStatusList
().
then
(
res
=>
{
const
_enum
=
res
.
data
.
map
((
item
)
=>
{
return
{
label
:
item
.
name
,
value
:
item
.
status
}
});
linkage
.
enum
(
'outerStatus'
,
_enum
);
}).
catch
(
err
=>
{
console
.
warn
(
err
)
})
/
/ /
** 外部状态 */
//
getMarketingMerchantActivityGetOuterStatusList().then(res => {
//
const _enum = res.data.map((item) => { return { label: item.name, value: item.status } });
//
linkage.enum('outerStatus', _enum);
//
}).catch(err => {
//
console.warn(err)
//
})
/** 内部状态 */
getMarketingMerchantActivityGetInnerStatusList
().
then
(
res
=>
{
const
_enum
=
res
.
data
.
map
((
item
)
=>
{
return
{
label
:
item
.
name
,
value
:
item
.
status
}
})
...
...
@@ -241,16 +241,16 @@ const Search = () => {
},
enum
:
[],
},
outerStatus
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
`${intl.formatMessage({ id: 'selfManagement.externalState' })}`
,
style
:
{
width
:
160
,
},
},
enum
:
[],
},
//
outerStatus:
{
//
type: 'string',
//
'x-component-props':
{
//
placeholder: `$
{
intl
.
formatMessage
({
id
:
'selfManagement.externalState'
})}
`,
//
style: {
//
width: 160,
//
},
//
},
//
enum: [],
//
},
innerStatus: {
type: 'string',
'x-component-props': {
...
...
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