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
8a815c51
Commit
8a815c51
authored
Nov 25, 2022
by
邓超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 节点配置交互修改
parent
cd11ca18
Pipeline
#64541
passed with stages
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
20 deletions
+40
-20
AddModal.jsx
src/pages/bsmanager/workOrder/incident/AddModal.jsx
+1
-1
incident.jsx
src/pages/bsmanager/workOrder/incident/incident.jsx
+11
-11
FlowChart.jsx
...r/workOrder/workflowEdit/workFlowComponents/FlowChart.jsx
+1
-1
FlowModal.jsx
...r/workOrder/workflowEdit/workFlowComponents/FlowModal.jsx
+11
-2
NodeModal.jsx
...Edit/workFlowComponents/flowChartComponents/NodeModal.jsx
+1
-0
NodeModal.less
...dit/workFlowComponents/flowChartComponents/NodeModal.less
+1
-1
ConfigOperate.jsx
...flowChartComponents/nodeModalComponents/ConfigOperate.jsx
+14
-4
No files found.
src/pages/bsmanager/workOrder/incident/AddModal.jsx
View file @
8a815c51
...
...
@@ -611,7 +611,7 @@ const AddModal = props => {
setType1
(
rember1
);
form
.
setFieldsValue
({
BusinessType
:
rember1
});
setReportFromWeb
(
true
);
setChee
(
0
);
setChee
(
1
);
setValue
(
0
);
getEventData
();
setSelectValue
(
selectData
[
0
]);
...
...
src/pages/bsmanager/workOrder/incident/incident.jsx
View file @
8a815c51
...
...
@@ -252,17 +252,6 @@ const incident = () => {
<
Tooltip
title=
"编辑事件类型"
>
<
EditTwoTone
onClick=
{
()
=>
editEventType
(
record
)
}
style=
{
{
fontSize
:
'16px'
}
}
/>
</
Tooltip
>
<
Tooltip
title=
"删除事件类型"
>
<
Popconfirm
placement=
"bottomRight"
title=
{
<
p
>
即将删除事件类型表,是否确认删除?
</
p
>
}
okText=
"确认"
cancelText=
"取消"
onConfirm=
{
()
=>
deleteEventType
(
record
)
}
>
<
DeleteOutlined
style=
{
{
fontSize
:
'16px'
,
color
:
'#e86060'
}
}
/>
</
Popconfirm
>
</
Tooltip
>
<
Tooltip
title=
"受理流程"
>
<
ApartmentOutlined
onClick=
{
()
=>
process1
(
record
)
}
...
...
@@ -275,6 +264,17 @@ const incident = () => {
style=
{
{
fontSize
:
'16px'
,
color
:
'#1890FF'
}
}
/>
</
Tooltip
>
<
Tooltip
title=
"删除事件类型"
>
<
Popconfirm
placement=
"bottomRight"
title=
{
<
p
>
即将删除事件类型表,是否确认删除?
</
p
>
}
okText=
"确认"
cancelText=
"取消"
onConfirm=
{
()
=>
deleteEventType
(
record
)
}
>
<
DeleteOutlined
style=
{
{
fontSize
:
'16px'
,
color
:
'#e86060'
}
}
/>
</
Popconfirm
>
</
Tooltip
>
</
Space
>
),
},
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChart.jsx
View file @
8a815c51
...
...
@@ -53,7 +53,7 @@ const FlowChart = props => {
const
[
buttonLoading
,
setButtonLoading
]
=
useState
();
// 发布按钮保存loading
const
[
flag
,
setFlag
]
=
useState
(
0
);
const
currentNode
=
useRef
();
const
afterNodes
=
useRef
(
new
Map
([]));
const
afterNodes
=
useRef
(
new
Map
([]));
// 当前节点后所有节点
const
objGo
=
go
.
GraphObject
.
make
;
useEffect
(()
=>
{
if
(
treeVisible
)
{
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowModal.jsx
View file @
8a815c51
...
...
@@ -106,7 +106,16 @@ const FlowModal = props => {
>
<
Input
placeholder=
"请输入流程名称"
/>
</
Form
.
Item
>
<
Form
.
Item
label=
"分组信息"
name=
"Type"
>
<
Form
.
Item
label=
"分组信息"
name=
"Type"
rules=
{
[
{
required
:
true
,
message
:
'请选择分组'
,
},
]
}
>
<
Select
showSearch
filterOption=
{
false
}
...
...
@@ -150,7 +159,7 @@ const FlowModal = props => {
<
Form
.
Item
label=
"前端样式"
name=
"WebPage"
initialValue=
"多表显示"
initialValue=
"多表
在办
显示"
rules=
{
[{
required
:
true
,
message
:
'请选择前端样式'
}]
}
>
<
Select
placeholder=
"请选择前端样式"
>
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/NodeModal.jsx
View file @
8a815c51
...
...
@@ -123,6 +123,7 @@ const NodeModal = props => {
<
div
style=
{
{
display
:
editMsg
.
NodeType
===
'1'
||
editMsg
.
NodeType
===
'20'
||
editMsg
.
NodeType
===
'21'
||
editMsg
.
NodeType
===
'22'
||
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/NodeModal.less
View file @
8a815c51
...
...
@@ -153,7 +153,7 @@
justify-content: space-between;
align-items: center;
margin-bottom: 15px;
padding-left: 15px;
//
padding-left: 15px;
.label {
white-space: nowrap;
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/ConfigOperate.jsx
View file @
8a815c51
...
...
@@ -118,10 +118,10 @@ const ConfigOperate = (props, ref) => {
style=
{
{
marginBottom
:
'0'
,
padding
:
'2px'
,
borderBottom
:
'1px solid #ccc'
}
}
label=
{
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
<
Tooltip
title=
"开始节点不允许转
单
"
>
<
Tooltip
title=
"开始节点不允许转
办
"
>
<
InfoCircleOutlined
style=
{
{
color
:
'#1890ff'
,
marginRight
:
'3px'
}
}
/>
</
Tooltip
>
<
span
>
转
单
</
span
>
<
span
>
转
办
</
span
>
</
div
>
}
name=
"Transferable"
...
...
@@ -137,7 +137,12 @@ const ConfigOperate = (props, ref) => {
<
Switch
checkedChildren=
"是"
unCheckedChildren=
"否"
/>
</
Form
.
Item
>
<
Form
.
Item
style=
{
{
marginBottom
:
'0'
,
padding
:
'2px'
,
borderBottom
:
'1px solid #ccc'
}
}
style=
{
{
marginBottom
:
'0'
,
padding
:
'2px'
,
borderBottom
:
'1px solid #ccc'
,
display
:
editMsg
.
NodeType
===
'0'
?
'flex'
:
'none'
,
}
}
valuePropName=
"checked"
label=
{
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
...
...
@@ -156,7 +161,12 @@ const ConfigOperate = (props, ref) => {
/>
</
Form
.
Item
>
<
Form
.
Item
style=
{
{
marginBottom
:
'0'
,
padding
:
'2px'
,
borderBottom
:
'1px solid #ccc'
}
}
style=
{
{
marginBottom
:
'0'
,
padding
:
'2px'
,
borderBottom
:
'1px solid #ccc'
,
display
:
editMsg
.
NodeType
===
'2'
?
'flex'
:
'none'
,
}
}
valuePropName=
"checked"
label=
{
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
...
...
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