Skip to content

C
CivManage
Commit ad97f550 authored by 皮倩雯's avatar 皮倩雯
Browse files
Options

修改事件管理界面UI

parent ae17a709
Pipeline #34302 skipped with stages
        Hide whitespace changes
        Inline Side-by-side
        Showing with 115 additions and 81 deletions
        src/pages/platformCenter/bsmanager/workOrder/AddFlowsModal.jsx
        View file @ ad97f550
        ......@@ -7,7 +7,7 @@ import styles from './incident.less';
        const { Option } = Select;
        const AddFlowsModal = props => {
        const { callBackSubmit = () => { }, type, visible, onCancel, formObj, obj, maxLength, record } = props;
        const { callBackSubmit = () => { }, type, visible, onCancel, formObj, obj, maxLength, record } = props;
        const [form] = Form.useForm();
        const { Item } = Form;
        ......@@ -25,6 +25,7 @@ const AddFlowsModal = props => {
        useEffect(() => {
        getRole()
        console.log(obj)
        CM_Event_ReloadFlows({ eventTypeId: obj }).then(res => {
        if (res.msg === 'Ok') {
        console.log(res.data)
        ......@@ -41,11 +42,11 @@ const AddFlowsModal = props => {
        setInputValue({ Roles: '' })
        setFiled1({})
        form.resetFields();
        }else if(type==='edit'){
        } else if (type === 'edit') {
        setStrr(record.FlowRoles)
        console.log(record)
        setInputValue({
        Roles:record.FlowRoles
        setInputValue({
        Roles: record.FlowRoles
        })
        setSelectValue(record.FlowName)
        console.log(selectValue)
        ......@@ -160,13 +161,13 @@ const AddFlowsModal = props => {
        callBackSubmit();
        // setLoading(true);
        let aa = form.getFieldsValue().FlowName
        console.log(aa)
        console.log(inputValue)
        console.log(strr)
        if (type == 'add') {
        let index=aa.lastIndexOf("\\");
        aa=aa.substring(index+1,aa.length);
        let index = aa.lastIndexOf("\\");
        aa = aa.substring(index + 1, aa.length);
        CM_Event_AddEvenFlow({
        eventTypeId: formObj.ID,
        flowName: aa,
        ......@@ -233,7 +234,7 @@ const AddFlowsModal = props => {
        setLoading(false);
        });
        }
        };
        ......@@ -261,14 +262,42 @@ const AddFlowsModal = props => {
        setVisible1(true)
        }
        const onOKk = prop => {
        setVisible1(false)
        let inputText = { ...inputValue }
        inputText[prop.pickItem] = prop.str
        console.log(prop.str)
        console.log(inputText)
        setStrr(prop.str)
        setCheckedList1(prop.checkedList)
        setInputValue(inputText)
        let title = prop.title
        let selectData = prop.stt
        let ff = prop.filed22
        let aa = []
        let bb = 0
        title.map((item, index) => {
        console.log(ff[item])
        aa=[]
        selectData.map((item1, index1) => {
        console.log(item1)
        if (ff[item].indexOf(item1) != -1) {
        aa.push(item1)
        }
        })
        console.log(aa)
        if(aa.length == 0){
        bb = 1
        }
        })
        console.log(aa)
        if (bb == 1) {
        notification.error({
        message: '提示',
        description: '权限角色部门必须都选至少一项',
        });
        } else {
        setVisible1(false)
        let inputText = { ...inputValue }
        inputText[prop.pickItem] = prop.str
        console.log(prop.str)
        console.log(inputText)
        setStrr(prop.str)
        setCheckedList1(prop.checkedList)
        setInputValue(inputText)
        }
        }
        return (
        <Modal
        ......@@ -283,39 +312,38 @@ const AddFlowsModal = props => {
        <Form form={form} labelCol={{ span: 7 }} style={{ height: '8rem', overflowY: 'scroll' }}>
        <Row>
        <Col span={24}>
        {type === 'edit'?
        <>
        <Item
        label="受理流程"
        name="FlowName"
        labelCol={{ span: 4 }}
        >
        <Select
        style={{ width: '560px' }}
        placeholder="选择受理流程"
        placeholder={selectValue}
        disabled
        >
        {standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item}>{item}</Option> }) : ''}
        </Select>
        </Item>
        </>
        :<>
        <Item
        label="受理流程"
        name="FlowName"
        labelCol={{ span: 4 }}
        >
        <Select
        style={{ width: '560px' }}
        placeholder="选择受理流程"
        >
        {standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item}>{item}</Option> }) : ''}
        </Select>
        </Item>
        </>
        }
        {type === 'edit' ?
        <>
        <Item
        label="受理流程"
        name="FlowName"
        labelCol={{ span: 4 }}
        >
        <Select
        style={{ width: '560px' }}
        placeholder="选择受理流程"
        placeholder={selectValue}
        disabled
        >
        {standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item}>{item}</Option> }) : ''}
        </Select>
        </Item>
        </>
        : <>
        <Item
        label="受理流程"
        name="FlowName"
        labelCol={{ span: 4 }}
        >
        <Select
        style={{ width: '560px' }}
        placeholder="选择受理流程"
        >
        {standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item}>{item}</Option> }) : ''}
        </Select>
        </Item>
        </>
        }
        </Col>
        <Col span={24}>
        <Item
        ......@@ -325,7 +353,7 @@ const AddFlowsModal = props => {
        >
        <div className={styles.filed_listItem} >
        <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.2rem' }} />
        <Button type="dashed" onClick={() => pickFiled1('Roles')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', width: '3.2rem' }} />
        </div>
        </Item>
        </Col>
        ......
        src/pages/platformCenter/bsmanager/workOrder/AddModal.jsx
        View file @ ad97f550
        ......@@ -47,6 +47,7 @@ const AddModal = props => {
        const [types, setTypes] = useState(''); // 弹窗类型
        const [Order, setOrder] = useState(''); // 弹窗类型
        const [Type1, setType1] = useState('')
        const [number, setNumber] = useState('')
        const [isVisible, setIsVisible] = useState(false); // 弹窗
        const [isVisible1, setIsVisible1] = useState(false); // 弹窗
        ......@@ -446,22 +447,24 @@ const AddModal = props => {
        let title = prop.title
        let selectData = prop.stt
        let ff = prop.filed22
        let aa = 0
        let aa = []
        let bb = 0
        title.map((item, index) => {
        console.log(ff[item])
        aa=[]
        selectData.map((item1, index1) => {
        console.log(item1)
        if (ff[item].indexOf(item1) != -1) {
        aa = 1
        console.log(222)
        } else {
        console.log(12121212)
        aa = 0
        }
        aa.push(item1)
        }
        })
        console.log(aa)
        if(aa.length == 0){
        bb = 1
        }
        })
        console.log(aa)
        if (aa == 0) {
        if (bb == 1) {
        notification.error({
        message: '提示',
        description: '权限角色部门必须都选至少一项',
        ......@@ -787,7 +790,7 @@ const AddModal = props => {
        >
        <div className={styles.filed_listItem} >
        <Input style={{ width: '500px' }} placeholder="请选择摘要字段" onChange={(e) => changeText(e, 'SummaryFields')} value={inputValue.SummaryFields} allowClear />
        <Button type="dashed" onClick={() => pickFiled('SummaryFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
        <Button type="dashed" onClick={() => pickFiled('SummaryFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', width: '4rem' }} />
        </div>
        </Item>
        ......@@ -811,7 +814,7 @@ const AddModal = props => {
        >
        <div className={styles.filed_listItem} >
        <Input style={{ width: '500px' }} placeholder="请选择上报字段" onChange={(e) => changeText(e, 'ReportFields')} value={inputValue.ReportFields} allowClear />
        <Button type="dashed" onClick={() => pickFiled('ReportFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
        <Button type="dashed" onClick={() => pickFiled('ReportFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', width: '4rem' }} />
        </div>
        </Item>
        </Col>
        ......@@ -834,7 +837,7 @@ const AddModal = props => {
        >
        <div className={styles.filed_listItem} >
        <Input style={{ width: '500px' }} placeholder="请选择显示字段" onChange={(e) => changeText(e, 'DisplayFields')} value={inputValue.DisplayFields} allowClear />
        <Button type="dashed" onClick={() => pickFiled('DisplayFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
        <Button type="dashed" onClick={() => pickFiled('DisplayFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', width: '4rem' }} />
        </div>
        </Item>
        </Col>
        ......@@ -857,7 +860,7 @@ const AddModal = props => {
        >
        <div className={styles.filed_listItem} >
        <Input style={{ width: '500px' }} placeholder="请选择编辑字段" onChange={(e) => changeText(e, 'EditableFields')} value={inputValue.EditableFields} allowClear />
        <Button type="dashed" onClick={() => pickFiled('EditableFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
        <Button type="dashed" onClick={() => pickFiled('EditableFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', width: '4rem' }} />
        </div>
        </Item>
        </Col>
        ......@@ -869,7 +872,7 @@ const AddModal = props => {
        >
        <div className={styles.filed_listItem} >
        <Input style={{ width: '500px' }} placeholder="请选择转单字段" onChange={(e) => changeText(e, 'TransitFields')} value={inputValue.TransitFields} allowClear />
        <Button type="dashed" onClick={() => pickFiled('TransitFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
        <Button type="dashed" onClick={() => pickFiled('TransitFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', width: '4rem' }} />
        </div>
        </Item>
        </Col>
        ......@@ -881,7 +884,7 @@ const AddModal = props => {
        >
        <div className={styles.filed_listItem} >
        <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: '4rem' }} />
        <Button type="dashed" onClick={() => pickFiled1('Roles')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', width: '4rem' }} />
        </div>
        </Item>
        </Col>
        ......@@ -929,7 +932,7 @@ const AddModal = props => {
        >
        <div className={styles.filed_listItem} >
        <Input style={{ width: '500px' }} placeholder="请选择关联字段" onChange={(e) => changeText(e, 'RelatedEventFields')} value={inputValue.RelatedEventFields} allowClear />
        <Button type="dashed" onClick={() => pickFiled('RelatedEventFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
        <Button type="dashed" onClick={() => pickFiled('RelatedEventFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', width: '4rem' }} />
        </div>
        </Item>
        </Col>
        ......@@ -950,7 +953,7 @@ const AddModal = props => {
        >
        <div className={styles.filed_listItem} >
        <Input style={{ width: '500px' }} placeholder="请选择图片表达" onChange={(e) => changeText(e, 'pictureFields')} value={inputValue.pictureFields} allowClear />
        <Button type="dashed" onClick={() => pickFiled2('pictureFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
        <Button type="dashed" onClick={() => pickFiled2('pictureFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', width: '4rem' }} />
        </div>
        </Item>
        </Col>
        ......
        src/pages/platformCenter/bsmanager/workOrder/ChangeAddFlows.jsx
        View file @ ad97f550
        ......@@ -34,7 +34,7 @@ const ChangeAddFlows = props =>{
        console.log(selectData.join(","))
        console.log(pickItem)
        console.log(checkedList)
        callBackSubmit({ checkedList, str: selectData.join(","), pickItem });
        callBackSubmit({ checkedList, str: selectData.join(","), pickItem, stt:selectData, title:title, filed22:filed1 });
        }
        const onCheckAllChange = e => {
        const indeterminateArr = [...indeterminate]
        ......
        src/pages/platformCenter/bsmanager/workOrder/ProcessModal.jsx
        View file @ ad97f550
        ......@@ -20,7 +20,7 @@ const ProcessModal = props => {
        const columns = [
        {
        title: '流程名称',
        title: () => (<span style={{fontWeight:'bold'}}>流程名称</span>),
        dataIndex: 'FlowName',
        key: 'FlowName',
        width: 150,
        ......@@ -37,7 +37,7 @@ const ProcessModal = props => {
        }
        ,
        {
        title: '受理权限',
        title: () => (<span style={{fontWeight:'bold'}}>受理权限</span>),
        dataIndex: 'FlowRoles',
        key: 'FlowRoles',
        width: 400,
        ......@@ -53,7 +53,7 @@ const ProcessModal = props => {
        )
        },
        {
        title: '操作',
        title: () => (<span style={{fontWeight:'bold'}}>操作</span>),
        key: 'action',
        aligin: 'center',
        render: record => (
        ......
        src/pages/platformCenter/bsmanager/workOrder/ViewModal.jsx
        View file @ ad97f550
        ......@@ -18,7 +18,7 @@ const ViewModal = props => {
        const columns = [
        {
        title: '视图标签',
        title: () => (<span style={{fontWeight:'bold'}}>视图标签</span>),
        dataIndex: 'WebLabel',
        key: 'WebLabel',
        width: 150,
        ......@@ -35,7 +35,7 @@ const ViewModal = props => {
        }
        ,
        {
        title: '视图模块',
        title: () => (<span style={{fontWeight:'bold'}}>视图模块</span>),
        dataIndex: 'WebPage',
        key: 'WebPage',
        width: 150,
        ......@@ -51,7 +51,7 @@ const ViewModal = props => {
        )
        },
        {
        title: '视图参数',
        title: () => (<span style={{fontWeight:'bold'}}>视图参数</span>),
        dataIndex: 'WebParam',
        key: 'WebParam',
        width: 150,
        ......@@ -68,7 +68,7 @@ const ViewModal = props => {
        },
        ,
        {
        title: '手持视图标签',
        title: () => (<span style={{fontWeight:'bold'}}>手持视图标签</span>),
        dataIndex: 'MobileLabel',
        key: 'MobileLabel',
        width: 150,
        ......@@ -84,7 +84,7 @@ const ViewModal = props => {
        )
        },
        {
        title: '手持视图模块',
        title: () => (<span style={{fontWeight:'bold'}}>手持视图模块</span>),
        dataIndex: 'MobilePage',
        key: 'MobilePage',
        width: 150,
        ......@@ -101,7 +101,7 @@ const ViewModal = props => {
        },
        ,
        {
        title: '手持视图参数',
        title: () => (<span style={{fontWeight:'bold'}}>手持视图参数</span>),
        dataIndex: 'MobileParam',
        key: 'MobileParam',
        width: 150,
        ......@@ -117,7 +117,7 @@ const ViewModal = props => {
        )
        },
        {
        title: '操作',
        title: () => (<span style={{fontWeight:'bold'}}>操作</span>),
        key: 'action',
        aligin: 'center',
        width: 50,
        ......
        src/pages/platformCenter/bsmanager/workOrder/changeAdd.jsx
        View file @ ad97f550
        ......@@ -261,10 +261,10 @@ const AddModal = props => {
        <td>字段名</td>
        </tr>
        </thead>
        <tbody>
        <tbody id='doctor-drag-items'>
        {selectData && selectData.length > 0 ?
        selectData.map((item, index) => {
        return <tr key={index} >
        return <tr drag-id={item} key={index} style={{ cursor: 'move' }}>
        <td><span title={item}>{item}</span></td>
        </tr>
        })
        ......
        src/pages/platformCenter/bsmanager/workOrder/incident.jsx
        View file @ ad97f550
        ......@@ -218,13 +218,13 @@ const incident = () => {
        render: record => (
        <Space size="middle">
        <Tooltip title="编辑用户">
        <Tooltip title="编辑事件类型">
        <EditTwoTone
        onClick={() => editEventType(record)}
        style={{ fontSize: '16px' }}
        />
        </Tooltip>
        <Tooltip title="删除">
        <Tooltip title="删除事件类型">
        <Popconfirm
        placement="bottomRight"
        title={
        ......
        src/pages/platformCenter/bsmanager/workOrder/incident.less
        View file @ ad97f550
        .ant-modal-close-x {
        line-height: 35px;
        }
        .ant-btn .anticon.anticon-plus > svg {
        margin-top:-5px;
        }
        .incidentContainer{
        .ant-card-body {
        padding: 12px 24px 24px 24px;
        ......
        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