Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
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
ReactWeb5
CivManage
Commits
ec0fa8c4
Commit
ec0fa8c4
authored
Dec 29, 2023
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '运维工作流节点增加开启挂起开关'
parent
4a754bef
Pipeline
#83649
failed with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
0 deletions
+32
-0
FlowChart.jsx
...r/workOrder/workflowEdit/workFlowComponents/FlowChart.jsx
+1
-0
FlowChartRt.jsx
...workOrder/workflowEdit/workFlowComponents/FlowChartRt.jsx
+1
-0
ConfigOperate.jsx
...flowChartComponents/nodeModalComponents/ConfigOperate.jsx
+30
-0
No files found.
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChart.jsx
View file @
ec0fa8c4
...
@@ -386,6 +386,7 @@ const FlowChart = props => {
...
@@ -386,6 +386,7 @@ const FlowChart = props => {
IsSave
:
0
,
IsSave
:
0
,
AutoClose
:
'否'
,
AutoClose
:
'否'
,
HalfwayClose
:
0
,
HalfwayClose
:
0
,
IsSuspend
:
0
,
RollbackNode
:
'(上一节点)'
,
RollbackNode
:
'(上一节点)'
,
Rollbackable
:
false
,
Rollbackable
:
false
,
};
};
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChartRt.jsx
View file @
ec0fa8c4
...
@@ -459,6 +459,7 @@ const FlowChart = props => {
...
@@ -459,6 +459,7 @@ const FlowChart = props => {
IsSave
:
0
,
IsSave
:
0
,
AutoClose
:
'否'
,
AutoClose
:
'否'
,
HalfwayClose
:
0
,
HalfwayClose
:
0
,
IsSuspend
:
0
,
RollbackNode
:
'(上一节点)'
,
RollbackNode
:
'(上一节点)'
,
Rollbackable
:
false
,
Rollbackable
:
false
,
};
};
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/ConfigOperate.jsx
View file @
ec0fa8c4
...
@@ -19,6 +19,7 @@ const ConfigOperate = (props, ref) => {
...
@@ -19,6 +19,7 @@ const ConfigOperate = (props, ref) => {
IsSave
,
IsSave
,
AutoClose
,
AutoClose
,
HalfwayClose
,
HalfwayClose
,
IsSuspend
,
}
=
editMsg
;
}
=
editMsg
;
let
newBtnAliasNameConfig
;
let
newBtnAliasNameConfig
;
let
newHalfwayCloseBtnAliasName
;
let
newHalfwayCloseBtnAliasName
;
...
@@ -41,6 +42,7 @@ const ConfigOperate = (props, ref) => {
...
@@ -41,6 +42,7 @@ const ConfigOperate = (props, ref) => {
IsSave
:
IsSave
===
1
,
IsSave
:
IsSave
===
1
,
AutoClose
:
AutoClose
===
'是'
,
AutoClose
:
AutoClose
===
'是'
,
HalfwayClose
:
HalfwayClose
===
1
,
HalfwayClose
:
HalfwayClose
===
1
,
IsSuspend
:
IsSuspend
===
1
,
};
};
form
.
setFieldsValue
({
...
editMsg
,
...
obj
});
form
.
setFieldsValue
({
...
editMsg
,
...
obj
});
...
@@ -58,6 +60,7 @@ const ConfigOperate = (props, ref) => {
...
@@ -58,6 +60,7 @@ const ConfigOperate = (props, ref) => {
obj
.
IsSave
=
obj
.
Transferable
?
1
:
0
;
obj
.
IsSave
=
obj
.
Transferable
?
1
:
0
;
obj
.
AutoClose
=
obj
.
Transferable
?
1
:
0
;
obj
.
AutoClose
=
obj
.
Transferable
?
1
:
0
;
obj
.
HalfwayClose
=
obj
.
Transferable
?
1
:
0
;
obj
.
HalfwayClose
=
obj
.
Transferable
?
1
:
0
;
obj
.
IsSuspend
=
obj
.
Transferable
?
1
:
0
;
return
obj
;
return
obj
;
};
};
// 加载修改流程节点配置允许退回列表
// 加载修改流程节点配置允许退回列表
...
@@ -93,6 +96,9 @@ const ConfigOperate = (props, ref) => {
...
@@ -93,6 +96,9 @@ const ConfigOperate = (props, ref) => {
case
'HalfwayClose'
:
case
'HalfwayClose'
:
value
=
changedFields
[
0
].
value
?
1
:
0
;
value
=
changedFields
[
0
].
value
?
1
:
0
;
break
;
break
;
case
'IsSuspend'
:
value
=
changedFields
[
0
].
value
?
1
:
0
;
break
;
default
:
default
:
value
=
changedFields
[
0
].
value
;
value
=
changedFields
[
0
].
value
;
}
}
...
@@ -298,6 +304,30 @@ const ConfigOperate = (props, ref) => {
...
@@ -298,6 +304,30 @@ const ConfigOperate = (props, ref) => {
/>
/>
</
Form
.
Item
>
</
Form
.
Item
>
</
div
>
</
div
>
<
Form
.
Item
labelCol=
{
{
span
:
5
}
}
wrapperCol=
{
{
span
:
19
}
}
style=
{
{
marginBottom
:
'0'
,
padding
:
'2px'
,
borderBottom
:
'1px solid #ccc'
,
display
:
editMsg
.
NodeType
===
'0'
?
'flex'
:
'none'
,
}
}
label=
{
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
<
span
>
挂起
</
span
>
</
div
>
}
>
<
Form
.
Item
name=
"IsSuspend"
valuePropName=
"checked"
style=
{
{
marginBottom
:
'0'
}
}
>
<
Switch
disabled=
{
editMsg
.
NodeType
===
'1'
}
checkedChildren=
"是"
unCheckedChildren=
"否"
style=
{
{
marginLeft
:
'190px'
}
}
/>
</
Form
.
Item
>
</
Form
.
Item
>
{
/* <Form.Item
{
/* <Form.Item
valuePropName="checked"
valuePropName="checked"
style={{ marginBottom: '0', padding: '2px', borderBottom: '1px solid #ccc' }}
style={{ marginBottom: '0', padding: '2px', borderBottom: '1px solid #ccc' }}
...
...
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