Commit 4de21424 authored by 皮倩雯's avatar 皮倩雯

fix: '修改事件描述,流程中心编辑流程禁止流程名称和编码前缀'

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