Commit 8dfc4424 authored by 皮倩雯's avatar 皮倩雯

事件管理新增验证

parent f9560ad6
Pipeline #34148 skipped with stages
...@@ -42,6 +42,7 @@ const AddFlowsModal = props => { ...@@ -42,6 +42,7 @@ const AddFlowsModal = props => {
setFiled1({}) setFiled1({})
form.resetFields(); form.resetFields();
}else if(type==='edit'){ }else if(type==='edit'){
setStrr(record.FlowRoles)
console.log(record) console.log(record)
setInputValue({ setInputValue({
Roles:record.FlowRoles Roles:record.FlowRoles
...@@ -203,7 +204,7 @@ const AddFlowsModal = props => { ...@@ -203,7 +204,7 @@ const AddFlowsModal = props => {
CM_Event_EditEvenFlow({ CM_Event_EditEvenFlow({
eventTypeId: formObj.ID, eventTypeId: formObj.ID,
eventFlowId: record.ID, eventFlowId: record.ID,
roles: strr, roles: strr
}) })
.then(res => { .then(res => {
// setLoading(false); // setLoading(false);
...@@ -290,7 +291,7 @@ const AddFlowsModal = props => { ...@@ -290,7 +291,7 @@ const AddFlowsModal = props => {
labelCol={{ span: 4 }} labelCol={{ span: 4 }}
> >
<Select <Select
style={{ width: '580px' }} style={{ width: '560px' }}
placeholder="选择受理流程" placeholder="选择受理流程"
placeholder={selectValue} placeholder={selectValue}
disabled disabled
...@@ -306,7 +307,7 @@ const AddFlowsModal = props => { ...@@ -306,7 +307,7 @@ const AddFlowsModal = props => {
labelCol={{ span: 4 }} labelCol={{ span: 4 }}
> >
<Select <Select
style={{ width: '580px' }} style={{ width: '560px' }}
placeholder="选择受理流程" placeholder="选择受理流程"
> >
{standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item}>{item}</Option> }) : ''} {standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item}>{item}</Option> }) : ''}
...@@ -324,7 +325,7 @@ const AddFlowsModal = props => { ...@@ -324,7 +325,7 @@ const AddFlowsModal = props => {
> >
<div className={styles.filed_listItem} > <div className={styles.filed_listItem} >
<Input style={{ width: '500px' }} placeholder="请选择受理权限" onChange={(e) => changeText(e, 'Roles')} value={inputValue.Roles} allowClear /> <Input style={{ width: '500px' }} placeholder="请选择受理权限" onChange={(e) => changeText(e, 'Roles')} value={inputValue.Roles} allowClear />
<Button type="dashed" onClick={() => pickFiled1('Roles')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '3.5rem' }} /> <Button type="dashed" onClick={() => pickFiled1('Roles')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '3.2rem' }} />
</div> </div>
</Item> </Item>
</Col> </Col>
......
...@@ -96,12 +96,18 @@ const AddViewModal = props => { ...@@ -96,12 +96,18 @@ const AddViewModal = props => {
onOk={() => onSubmit()} onOk={() => onSubmit()}
> >
<Form form={form} labelCol={{ span: 7 }} style={{ height: '23rem', overflowY: 'scroll' }}> <Form form={form} labelCol={{ span: 7 }} style={{ height: '24rem', overflowY: 'scroll' }}>
<Row> <Row>
<Col span={23}> <Col span={23}>
<Item <Item
label="前端标签" label="前端标签"
name="WebLabel" name="WebLabel"
rules={[
{
required: true,
message: '请输入前端标签',
},
]}
> >
<Input style={{ width: '17rem' }} placeholder="请输入前端标签" /> <Input style={{ width: '17rem' }} placeholder="请输入前端标签" />
</Item> </Item>
...@@ -110,6 +116,12 @@ const AddViewModal = props => { ...@@ -110,6 +116,12 @@ const AddViewModal = props => {
<Item <Item
label="前端视图" label="前端视图"
name="WebPage" name="WebPage"
rules={[
{
required: true,
message: '请输入前端视图',
},
]}
> >
<Input style={{ width: '17rem' }} placeholder="请输入前端视图" /> <Input style={{ width: '17rem' }} placeholder="请输入前端视图" />
</Item> </Item>
...@@ -119,7 +131,7 @@ const AddViewModal = props => { ...@@ -119,7 +131,7 @@ const AddViewModal = props => {
label="视图参数" label="视图参数"
name="WebParam" name="WebParam"
> >
<Input style={{ width: '17rem' }} placeholder="请输入视图参数" /> <TextArea style={{ width: '17rem' }} placeholder="请输入视图参数" />
</Item> </Item>
</Col> </Col>
<Col span={23}> <Col span={23}>
......
import React, { useState, useEffect, useCallback, useRef } from 'react';
import { Form, Modal, Space, Divider, Radio, Checkbox, notification } from 'antd';
import styles from './incident.less';
const ChangeImageModal = props => {
const { callBackSubmit = () => { }, isType, pickItem, visible, filed, filed1, characterValue, newCheckedList } = props;
const onSubmit = () =>{
callBackSubmit({ });
}
return (
<Modal
visible={visible}
title='点击选择图片文件'
bodyStyle={{ width: '100%', minHeight: '100px' }}
style={{ top: '10px' }}
width="700px"
destroyOnClose
okText="确认"
cancelText="取消"
{...props}
onOk={onSubmit}
>
</Modal>
)
}
export default ChangeImageModal;
\ No newline at end of file
...@@ -24,6 +24,7 @@ const ProcessModal = props => { ...@@ -24,6 +24,7 @@ const ProcessModal = props => {
dataIndex: 'FlowName', dataIndex: 'FlowName',
key: 'FlowName', key: 'FlowName',
width: 150, width: 150,
ellipsis: true,
render: item => ( render: item => (
<div <div
ref={r => { ref={r => {
...@@ -39,7 +40,7 @@ const ProcessModal = props => { ...@@ -39,7 +40,7 @@ const ProcessModal = props => {
title: '受理权限', title: '受理权限',
dataIndex: 'FlowRoles', dataIndex: 'FlowRoles',
key: 'FlowRoles', key: 'FlowRoles',
width: 500, width: 400,
ellipsis: true, ellipsis: true,
render: item => ( render: item => (
<div <div
...@@ -144,7 +145,7 @@ const ProcessModal = props => { ...@@ -144,7 +145,7 @@ const ProcessModal = props => {
width="800px" width="800px"
onCancel={onCancel} onCancel={onCancel}
onOk={onSumbit} onOk={onSumbit}
> >
<Tooltip title="添加事件类型"> <Tooltip title="添加事件类型">
<PlusSquareFilled <PlusSquareFilled
...@@ -153,6 +154,7 @@ const ProcessModal = props => { ...@@ -153,6 +154,7 @@ const ProcessModal = props => {
color: '#1890FF', color: '#1890FF',
fontSize: '25px', fontSize: '25px',
verticalAlign: 'middle', verticalAlign: 'middle',
marginLeft: '25px'
}} }}
/> />
</Tooltip> </Tooltip>
...@@ -160,6 +162,7 @@ const ProcessModal = props => { ...@@ -160,6 +162,7 @@ const ProcessModal = props => {
size="small" size="small"
rowKey='ID' rowKey='ID'
bordered bordered
style={{ height: '15rem', overflowY: 'scroll', width: '700px', marginLeft: '25px' }}
onRow={record => { onRow={record => {
return { return {
onDoubleClick: event => {event.stopPropagation(); editEventType(record)}, //双击 onDoubleClick: event => {event.stopPropagation(); editEventType(record)}, //双击
...@@ -168,7 +171,6 @@ const ProcessModal = props => { ...@@ -168,7 +171,6 @@ const ProcessModal = props => {
columns={columns} columns={columns}
dataSource={tableData} dataSource={tableData}
pagination={false} pagination={false}
scroll={{ x: 'max-content' }}
/> />
<AddFlowsModal <AddFlowsModal
visible={addVisible} visible={addVisible}
......
...@@ -45,7 +45,7 @@ const SortModal = props => { ...@@ -45,7 +45,7 @@ const SortModal = props => {
okText="确认" okText="确认"
cancelText="取消" cancelText="取消"
> >
<div className={styles.cardContent}> <div className={styles.cardContent} style={{width: '26rem', marginLeft:'24px'}}>
<div className={styles.doctorTable}> <div className={styles.doctorTable}>
<table> <table>
<thead> <thead>
......
...@@ -22,6 +22,7 @@ const ViewModal = props => { ...@@ -22,6 +22,7 @@ const ViewModal = props => {
dataIndex: 'WebLabel', dataIndex: 'WebLabel',
key: 'WebLabel', key: 'WebLabel',
width: 150, width: 150,
ellipsis: true,
render: item => ( render: item => (
<div <div
ref={r => { ref={r => {
...@@ -119,7 +120,7 @@ const ViewModal = props => { ...@@ -119,7 +120,7 @@ const ViewModal = props => {
title: '操作', title: '操作',
key: 'action', key: 'action',
aligin: 'center', aligin: 'center',
width: 150, width: 50,
render: record => ( render: record => (
<Space size="middle"> <Space size="middle">
...@@ -204,7 +205,7 @@ const ViewModal = props => { ...@@ -204,7 +205,7 @@ const ViewModal = props => {
title={`${title2}的辅助视图`} title={`${title2}的辅助视图`}
visible={visible} visible={visible}
onCancel={onCancel} onCancel={onCancel}
width="1300px" width="1200px"
onOk={onSumbit} onOk={onSumbit}
> >
<Tooltip title="添加"> <Tooltip title="添加">
...@@ -214,6 +215,7 @@ const ViewModal = props => { ...@@ -214,6 +215,7 @@ const ViewModal = props => {
color: '#1890FF', color: '#1890FF',
fontSize: '25px', fontSize: '25px',
verticalAlign: 'middle', verticalAlign: 'middle',
marginLeft: '25px'
}} }}
/> />
</Tooltip> </Tooltip>
...@@ -227,6 +229,7 @@ const ViewModal = props => { ...@@ -227,6 +229,7 @@ const ViewModal = props => {
}; };
}} }}
columns={columns} columns={columns}
style={{ height: '15rem', overflowY: 'scroll', marginLeft: '25px', marginRight: '25px' }}
dataSource={tableData} dataSource={tableData}
pagination={false} pagination={false}
scroll={{ x: 'max-content'}} scroll={{ x: 'max-content'}}
......
.ant-modal-close-x {
line-height: 35px;
}
.incidentContainer{ .incidentContainer{
.ant-card-body { .ant-card-body {
padding: 12px 24px 24px 24px; padding: 12px 24px 24px 24px;
} }
.linkDrowp{
position: absolute;
top: 0;
left: 93.5%;
width: 1rem;
height: 100%;
display: flex;
align-items: center;
}
.listItem{ .listItem{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -170,7 +183,7 @@ ...@@ -170,7 +183,7 @@
.cardContent{ .cardContent{
height: 30rem; height: 30rem;
overflow-y: scroll; overflow-y: scroll;
width: 19.5rem; width: 19rem;
} }
.cardItemData{ .cardItemData{
padding: 1rem; padding: 1rem;
......
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