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
4de21424
Commit
4de21424
authored
Nov 21, 2023
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '修改事件描述,流程中心编辑流程禁止流程名称和编码前缀'
parent
c2a47831
Pipeline
#82011
passed with stages
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
57 additions
and
34 deletions
+57
-34
AddModal.jsx
src/pages/bsmanager/workOrder/incident/AddModal.jsx
+21
-13
incident.jsx
src/pages/bsmanager/workOrder/incident/incident.jsx
+34
-20
FlowModal.jsx
...r/workOrder/workflowEdit/workFlowComponents/FlowModal.jsx
+2
-1
No files found.
src/pages/bsmanager/workOrder/incident/AddModal.jsx
View file @
4de21424
...
...
@@ -627,7 +627,7 @@ const AddModal = props => {
useEffect
(()
=>
{
setValue
(
''
);
setModalLoading
(
true
)
setModalLoading
(
true
)
;
// 关闭时不会调用
if
(
visible
)
{
getRole
();
...
...
@@ -651,7 +651,7 @@ const AddModal = props => {
`
${
window
.
location
.
origin
}
/civweb4/assets/images/caseCenter/events/通用问题1.png`
,
);
setIm
(
'assets/images/caseCenter/events/通用问题1.png'
);
setModalLoading
(
false
)
setModalLoading
(
false
)
;
}
else
if
(
type
===
'edit'
)
{
setChee
();
getEventData1
();
...
...
@@ -689,7 +689,7 @@ const AddModal = props => {
if
(
res
.
data
.
root
)
{
setNu
(
res
.
data
.
root
);
setFiled
(
formateArrDataA
(
res
.
data
.
root
,
'group'
));
setModalLoading
(
false
)
setModalLoading
(
false
)
;
}
});
// 外部字段逻辑处理
...
...
@@ -1407,7 +1407,7 @@ const AddModal = props => {
return
(
<
Drawer
title=
{
type
===
'add'
?
'添加事件
类型'
:
'编辑事件类型
'
}
title=
{
type
===
'add'
?
'添加事件
'
:
'编辑事件
'
}
width=
"600px"
destroyOnClose
{
...
props
}
...
...
@@ -1421,7 +1421,8 @@ const AddModal = props => {
// confirmLoading={loading}
>
<
Spin
tip=
"loading..."
spinning=
{
modalLoading
}
>
{
modalLoading
?
null
:
<
Form
form=
{
form
}
>
{
modalLoading
?
null
:
(
<
Form
form=
{
form
}
>
<
Row
>
{
/* <Col span={24}>
<Item
...
...
@@ -1457,7 +1458,7 @@ const AddModal = props => {
onClick=
{
()
=>
onChange2
(
1
)
}
style=
{
{
width
:
'100%'
,
flex
:
1
flex
:
1
,
}
}
src=
{
value
===
1
?
caseChooseImg
:
caseImg
}
alt=
""
...
...
@@ -1468,7 +1469,7 @@ const AddModal = props => {
onClick=
{
()
=>
onChange2
(
0
)
}
style=
{
{
flex
:
1
,
width
:
'100%'
width
:
'100%'
,
}
}
src=
{
value
===
0
?
eventChooseImg
:
eventImg
}
alt=
""
...
...
@@ -1479,19 +1480,19 @@ const AddModal = props => {
</
Col
>
<
Col
span=
{
15
}
>
<
Item
label=
"事件类型
"
label=
"事件名称
"
labelCol=
{
{
span
:
8
}
}
name=
"Name"
rules=
{
[
{
required
:
true
,
message
:
'请输入事件类型
'
,
message
:
'请输入事件名称
'
,
},
]
}
>
<
Input
onChange=
{
prefix
}
placeholder=
"请输入事件类型
"
placeholder=
"请输入事件名称
"
style=
{
{
marginLeft
:
'-3px'
}
}
/>
</
Item
>
...
...
@@ -1967,7 +1968,14 @@ const AddModal = props => {
label=
{
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
<
Tooltip
title
=
{<
div
>
标准使用,使用标准工单系统,可通过勾选 前端/手持,来控制是否展示事件的填报入口,勾选即展示;
<
br
/>
内置使用,使用第三方完整功能,仅调用接口、表结构和流程,工单系统中无法使用
</
div
>
}
title=
{
<
div
>
标准使用,使用标准工单系统,可通过勾选
前端/手持,来控制是否展示事件的填报入口,勾选即展示;
<
br
/>
内置使用,使用第三方完整功能,仅调用接口、表结构和流程,工单系统中无法使用
</
div
>
}
// title="标准使用,使用标准工单系统,可通过勾选 前端/手持,来控制是否展示事件的填报入口,勾选即展示;
// 内置使用,使用第三方完整功能,仅调用接口、表结构和流程,工单系统中无法使用。"
>
...
...
@@ -2136,8 +2144,8 @@ const AddModal = props => {
</Item>
</Col> */
}
</
Row
>
</
Form
>
}
</
Form
>
)
}
</
Spin
>
{
/* <ChangeAdd
visible={isVisible}
...
...
src/pages/bsmanager/workOrder/incident/incident.jsx
View file @
4de21424
...
...
@@ -93,11 +93,11 @@ const incident = () => {
const
columns
=
[
{
title
:
'事件
类型
'
,
title
:
'事件
名称
'
,
dataIndex
:
'name'
,
key
:
'name'
,
width
:
150
,
render
:
(
text
,
record
)
=>
(
render
:
(
text
,
record
)
=>
(
<
Tooltip
placement=
"topLeft"
title=
{
text
}
>
{
searchStyle
(
text
)
}
</
Tooltip
>
...
...
@@ -143,7 +143,7 @@ const incident = () => {
width
:
80
,
render
:
record
=>
(
<
Tooltip
placement=
"topLeft"
title=
{
record
}
>
<
span
style=
{
{
color
:
record
==
'(无)'
?
'grey'
:
'black'
}
}
>
{
record
}
</
span
>
<
span
style=
{
{
color
:
record
==
'(无)'
?
'grey'
:
'black'
}
}
>
{
record
}
</
span
>
</
Tooltip
>
),
},
...
...
@@ -232,14 +232,24 @@ const incident = () => {
width
:
80
,
render
:
item
=>
{
if
(
item
===
'均可'
)
{
return
<
span
><
Tag
color=
"processing"
>
前端
</
Tag
><
Tag
color=
"processing"
>
手持
</
Tag
></
span
>;
}
if
(
item
===
''
||
item
===
'否'
)
{
return
(
<
span
>
<
Tag
color=
"processing"
>
前端
</
Tag
>
<
Tag
color=
"processing"
>
手持
</
Tag
>
</
span
>
);
}
if
(
item
===
''
||
item
===
'否'
)
{
return
<
Tag
color=
"warning"
>
内置
</
Tag
>;
}
if
(
item
===
'是'
)
{
return
<
span
style=
{
{
color
:
'grey'
}
}
>
(无)
</
span
>;
}
return
<
span
><
Tag
color=
"processing"
>
{
item
}
</
Tag
></
span
>;
if
(
item
===
'是'
)
{
return
<
span
style=
{
{
color
:
'grey'
}
}
>
(无)
</
span
>;
}
return
(
<
span
>
<
Tag
color=
"processing"
>
{
item
}
</
Tag
>
</
span
>
);
},
},
{
...
...
@@ -281,7 +291,7 @@ const incident = () => {
width
:
150
,
render
:
record
=>
(
<
Space
size=
"middle"
>
<
Tooltip
title=
"编辑事件
类型
"
>
<
Tooltip
title=
"编辑事件"
>
<
EditTwoTone
onClick=
{
()
=>
editEventType
(
record
)
}
style=
{
{
fontSize
:
'16px'
}
}
/>
</
Tooltip
>
<
Tooltip
title=
"受理流程"
>
...
...
@@ -302,7 +312,7 @@ const incident = () => {
style=
{
{
fontSize
:
'16px'
,
color
:
'#1890FF'
}
}
/>
</
Tooltip
>
<
Tooltip
title=
"删除事件
类型
"
>
<
Tooltip
title=
"删除事件"
>
<
Popconfirm
placement=
"bottomRight"
title=
{
<
p
>
即将删除事件类型表,是否确认删除?
</
p
>
}
...
...
@@ -321,7 +331,7 @@ const incident = () => {
useEffect
(()
=>
{
setTreeLoading
(
true
);
GetCM_Event_LoadEventTable
({
filter
:
searchValue
filter
:
searchValue
,
}).
then
(
res
=>
{
setTreeLoading
(
false
);
if
(
res
.
code
===
0
)
{
...
...
@@ -381,10 +391,10 @@ const incident = () => {
console
.
log
(
rember
);
console
.
log
(
newArr
[
rember
]);
console
.
log
(
newArr
,
'newArr'
);
if
(
!
newArr
[
rember
])
{
setRember
(
0
)
if
(
!
newArr
[
rember
])
{
setRember
(
0
)
;
setPickItem
(
newArr
[
0
]);
setRember1
(
newArr
[
0
])
setRember1
(
newArr
[
0
])
;
}
setTreeData
(
newArr
);
}
else
{
...
...
@@ -637,7 +647,7 @@ const incident = () => {
>
事件列表
</
span
>
<
Tooltip
title=
"添加事件
类型
"
>
<
Tooltip
title=
"添加事件"
>
<
PlusSquareFilled
onClick=
{
()
=>
addIncident
()
}
style=
{
{
...
...
@@ -714,22 +724,26 @@ const incident = () => {
})
}
>
<
div
style=
{
{
height
:
'50px'
,
lineHeight
:
'50px'
}
}
>
{
pickItem
?<
span
><
span
className=
{
styles
.
titleName
}
>
【
{
pickItem
}
】
</
span
>
{
pickItem
?
(
<
span
>
<
span
className=
{
styles
.
titleName
}
>
【
{
pickItem
}
】
</
span
>
<
span
>
<
Tooltip
title=
"编辑业务类型名称"
>
<
FormOutlined
className=
{
styles
.
iconSize
}
onClick=
{
editBusiness
}
/>
</
Tooltip
>
</
span
></
span
>:
null
}
</
span
>
</
span
>
)
:
null
}
<
span
>
<
span
style=
{
{
marginLeft
:
'20px'
,
marginRight
:
'5px'
}
}
>
快速检索
</
span
>
<
Search
allowClear
placeholder=
'请输入事件类型或事件主表'
placeholder=
"请输入事件类型或事件主表"
onSearch=
{
handleSearch
}
onChange=
{
handleChange
}
value=
{
searchValue
}
enterButton
style=
{
{
width
:
'300px'
,
marginTop
:
'10px'
}
}
style=
{
{
width
:
'300px'
,
marginTop
:
'10px'
}
}
/>
</
span
>
<
span
className=
{
styles
.
buttonList
}
>
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowModal.jsx
View file @
4de21424
...
...
@@ -564,6 +564,7 @@ const FlowModal = props => {
onChange=
{
e
=>
{
prefix
(
e
.
target
.
value
);
}
}
disabled=
{
modalType
===
'edit'
}
/>
</
Form
.
Item
>
<
Form
.
Item
...
...
@@ -612,7 +613,7 @@ const FlowModal = props => {
},
]
}
>
<
Input
placeholder=
"请输入编码前缀"
maxLength=
{
6
}
/>
<
Input
placeholder=
"请输入编码前缀"
maxLength=
{
6
}
disabled=
{
modalType
===
'edit'
}
/>
</
Form
.
Item
>
<
Form
.
Item
label=
"流程描述"
name=
"Text"
>
<
Input
placeholder=
"请输入流程描述"
/>
...
...
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