Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

src/pages/platformCenter/bsmanager/workOrder/AddFlowsModal.jsx

@@ -42,6 +42,7 @@ const AddFlowsModal = props => {
             setFiled1({})
             form.resetFields();
         }else if(type==='edit'){
+            setStrr(record.FlowRoles)
             console.log(record)
             setInputValue({ 
                 Roles:record.FlowRoles
@@ -203,7 +204,7 @@ const AddFlowsModal = props => {
             CM_Event_EditEvenFlow({
                 eventTypeId: formObj.ID,
                 eventFlowId: record.ID,
-                roles: strr,
+                roles: strr
             })
                 .then(res => {
                     // setLoading(false);
@@ -290,7 +291,7 @@ const AddFlowsModal = props => {
                             labelCol={{ span: 4 }}
                         >
                             <Select
-                                style={{ width: '580px' }}
+                                style={{ width: '560px' }}
                                 placeholder="选择受理流程"
                                 placeholder={selectValue}
                                 disabled
@@ -306,7 +307,7 @@ const AddFlowsModal = props => {
                             labelCol={{ span: 4 }}
                         >
                             <Select
-                                style={{ width: '580px' }}
+                                style={{ width: '560px' }}
                                 placeholder="选择受理流程"
                             >
                                 {standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item}>{item}</Option> }) : ''}
@@ -324,7 +325,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.5rem' }} />
+                                <Button type="dashed" onClick={() => pickFiled1('Roles')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '3.2rem' }} />
                             </div>
                         </Item>
                     </Col>

src/pages/platformCenter/bsmanager/workOrder/AddViewModal.jsx

@@ -96,12 +96,18 @@ const AddViewModal = props => {
             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>
                     <Col span={23}>
                         <Item
                             label="前端标签"
                             name="WebLabel"
+                            rules={[
+                                {
+                                    required: true,
+                                    message: '请输入前端标签',
+                                },
+                            ]}
                         >
                             <Input style={{ width: '17rem' }} placeholder="请输入前端标签" />
                         </Item>
@@ -110,6 +116,12 @@ const AddViewModal = props => {
                         <Item
                             label="前端视图"
                             name="WebPage"
+                            rules={[
+                                {
+                                    required: true,
+                                    message: '请输入前端视图',
+                                },
+                            ]}
                         >
                             <Input style={{ width: '17rem' }} placeholder="请输入前端视图" />
                         </Item>
@@ -119,7 +131,7 @@ const AddViewModal = props => {
                             label="视图参数"
                             name="WebParam"
                         >
-                            <Input style={{ width: '17rem' }} placeholder="请输入视图参数" />
+                            <TextArea style={{ width: '17rem' }} placeholder="请输入视图参数" />
                         </Item>
                     </Col>
                     <Col span={23}>

src/pages/platformCenter/bsmanager/workOrder/ChangeImage.jsx

+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

src/pages/platformCenter/bsmanager/workOrder/ProcessModal.jsx

@@ -24,6 +24,7 @@ const ProcessModal = props => {
             dataIndex: 'FlowName',
             key: 'FlowName',
             width: 150,
+            ellipsis: true,
             render: item => (
                 <div
                     ref={r => {
@@ -39,7 +40,7 @@ const ProcessModal = props => {
             title: '受理权限',
             dataIndex: 'FlowRoles',
             key: 'FlowRoles',
-            width: 500,
+            width: 400,
             ellipsis: true,
             render: item => (
                 <div
@@ -153,6 +154,8 @@ const ProcessModal = props => {
                         color: '#1890FF',
                         fontSize: '25px',
                         verticalAlign: 'middle',
+                        marginLeft: '25px',
+                        marginBottom: '10px'
                     }}
                 />
             </Tooltip>
@@ -160,6 +163,7 @@ const ProcessModal = props => {
                 size="small"
                 rowKey='ID'
                 bordered
+                style={{ height: '15rem', overflowY: 'scroll', width: '700px', marginLeft: '25px' }}
                 onRow={record => {
                     return {
                       onDoubleClick: event => {event.stopPropagation(); editEventType(record)}, //双击
@@ -168,7 +172,6 @@ const ProcessModal = props => {
                 columns={columns}
                 dataSource={tableData}
                 pagination={false}
-                scroll={{ x: 'max-content' }}
             />
             <AddFlowsModal
                 visible={addVisible}

src/pages/platformCenter/bsmanager/workOrder/SortModal.jsx

@@ -45,9 +45,9 @@ const SortModal = props => {
             okText="确认"
             cancelText="取消"
         >
-            <div className={styles.cardContent}>
+            <div className={styles.cardContent} style={{width: '26rem', marginLeft:'24px'}}>
                 <div className={styles.doctorTable}>
-                    <table>
+                    <table style={{width: '104%', marginLeft: '-5px'}}>
                         <thead>
                             <tr>
                                 <td>事件名称</td>

src/pages/platformCenter/bsmanager/workOrder/ViewModal.jsx

@@ -22,6 +22,7 @@ const ViewModal = props => {
             dataIndex: 'WebLabel',
             key: 'WebLabel',
             width: 150,
+            ellipsis: true,
             render: item => (
                 <div
                     ref={r => {
@@ -119,7 +120,7 @@ const ViewModal = props => {
             title: '操作',
             key: 'action',
             aligin: 'center',
-            width: 150,
+            width: 50,
             render: record => (
                 <Space size="middle">
 
@@ -204,7 +205,7 @@ const ViewModal = props => {
            title={`${title2}的辅助视图`}
            visible={visible}
            onCancel={onCancel}
-           width="1300px"
+           width="1200px"
            onOk={onSumbit}
         >
            <Tooltip title="添加">
@@ -214,6 +215,8 @@ const ViewModal = props => {
                         color: '#1890FF',
                         fontSize: '25px',
                         verticalAlign: 'middle',
+                        marginLeft: '25px',
+                        marginBottom: '10px'
                     }}
                 />
             </Tooltip>
@@ -227,6 +230,7 @@ const ViewModal = props => {
                     };
                   }}
                 columns={columns}
+                style={{ height: '15rem', overflowY: 'scroll', marginLeft: '25px', marginRight: '25px' }}
                 dataSource={tableData}
                 pagination={false}
                 scroll={{ x: 'max-content'}}

src/pages/platformCenter/bsmanager/workOrder/changeAdd.jsx

 import React, { useState, useEffect, useCallback, useRef } from 'react';
-import { Form, Modal, Space, Divider, Radio, Checkbox } from 'antd';
+import { Form, Modal, Space, Divider, Radio, Checkbox, notification } from 'antd';
 
 import styles from './incident.less';
 import Sortable from 'sortablejs';
 const CheckboxGroup = Checkbox.Group;
 const AddModal = props => {
-    const { callBackSubmit = () => { }, isType, pickItem, visible, filed, filed1, characterValue, newCheckedList } = props;
+    const { callBackSubmit = () => { }, isType, pickItem, visible, filed, filed1, characterValue, newCheckedList, flag } = props;
     const [loading, setLoading] = useState(false);
     const [value, setValue] = useState('');
     const [checkValue, setCheckValue] = useState([]);
@@ -41,7 +41,7 @@ const AddModal = props => {
     };
 
     const onSubmit = () => {
-        isType === 'rule' ? callBackSubmit(`${value === '无' || value === '' ? '' : value + ','}${checkValue.join(',')}`) : callBackSubmit({ checkedList, str: selectData.join(","), pickItem });
+        isType === 'rule' ? callBackSubmit(`${value === '无' || value === '' ? '' : value + ','}${checkValue.join(',')}`) : callBackSubmit({ checkedList, str: selectData.join(","), pickItem, stt:selectData, title:title, filed22:filed1, isType:isType });
     }
     const onCheckAllChange = e => {
         const indeterminateArr = [...indeterminate]
@@ -67,7 +67,8 @@ const AddModal = props => {
     }
 
     useEffect(() => {
-        if (isType != ''&&isType==='add') {
+        if (isType != '' && isType === 'add') {
+            console.log(filed)
             let arr = Object.keys(filed)
             console.log(arr, 'arr')
             setTitle(arr)
@@ -91,7 +92,7 @@ const AddModal = props => {
             let newArr = characterValue.length ? characterValue.split(",") : []
             setSelectData(newArr)
             draftSort()
-        }else if(isType==='app'){
+        } else if (isType === 'app') {
             console.log(filed1)
             let arr = Object.keys(filed1)
             console.log(arr, 'arr')
@@ -138,10 +139,10 @@ const AddModal = props => {
         }
 
     }
-if(isType != 'app'){
+    if (isType != 'app') {
         return (
             <Modal
-            title={isType === 'app' ? '部门或角色' : '字段集选择'}
+                title='字段集选择'
                 bodyStyle={{ width: '100%', minHeight: '100px' }}
                 style={{ top: '10px' }}
                 width="700px"
@@ -152,7 +153,6 @@ if(isType != 'app'){
                 okText="确认"
                 cancelText="取消"
                 {...props}
-            onOk={() => onSubmit()}
                 forceRender={true}
                 getContainer={false}
             >
@@ -160,6 +160,22 @@ if(isType != 'app'){
                     <div className={styles.listCard}>
                         <div className={styles.cardItem} style={{ borderRight: '1px solid #99bbe8' }}>
                             <Divider orientation="left" style={{ margin: '0 0 10px 0', backgroundColor: '#dfe8f6' }}>待选字段列表</Divider>
+                            
+                            {flag === 0 ?
+                                <>
+                                <div className={styles.cardContent}>
+                                    <span style={{color: 'red',fontSize: '1rem', marginLeft: '25px'}}>请先选择事件主表</span>
+                                </div>
+                                </>:
+                                <>
+                                {JSON.stringify(filed) == "{}" ?
+                                  <>
+                                        <div className={styles.cardContent}>
+                                            <span style={{color: 'red',fontSize: '1rem', marginLeft: '25px'}}>表字段缺失请先配置表/字段</span>
+                                        </div>
+                                  </>
+                                  :
+                                  <>
                                       <div className={styles.cardContent}>
                                         {title.map((item, index) => {
                                             return <div className={styles.cardItemData} key={index}>
@@ -167,6 +183,13 @@ if(isType != 'app'){
                                                 <CheckboxGroup options={filed[item]} value={checkedList[index]} onChange={(e) => onChangeList(e, index, item)} /></div>
                                         })}
                                     </div>
+                                  </>
+                            }
+                                    
+                                </>
+                                
+                            }
+
                         </div>
                         <div className={styles.cardItem}>
                             <Divider orientation="left" style={{ margin: '0 0 10px 0', backgroundColor: '#dfe8f6' }}>已选字段列表</Divider>
@@ -199,10 +222,10 @@ if(isType != 'app'){
                 }
             </Modal>
         );
-}else if(isType ==='app'){
+    } else if (isType === 'app') {
         return (
             <Modal
-            title={isType === 'app' ? '部门或角色' : '字段集选择'}
+                title= '部门或角色'
                 bodyStyle={{ width: '100%', minHeight: '100px' }}
                 style={{ top: '10px' }}
                 width="700px"
@@ -213,7 +236,6 @@ if(isType != 'app'){
                 okText="确认"
                 cancelText="取消"
                 {...props}
-            onOk={() => onSubmit()}
                 forceRender={true}
                 getContainer={false}
             >
@@ -239,10 +261,10 @@ if(isType != 'app'){
                                                 <td>字段名</td>
                                             </tr>
                                         </thead>
-                                    <tbody id='doctor-drag-items'>
+                                        <tbody>
                                             {selectData && selectData.length > 0 ?
                                                 selectData.map((item, index) => {
-                                                return <tr drag-id={item} key={index} style={{ cursor: 'move' }}>
+                                                    return <tr key={index} >
                                                         <td><span title={item}>{item}</span></td>
                                                     </tr>
                                                 })
@@ -260,6 +282,6 @@ if(isType != 'app'){
                 }
             </Modal>
         );
-}
+    }
 };
 export default AddModal;
\ No newline at end of file

src/pages/platformCenter/bsmanager/workOrder/incident.jsx

@@ -51,6 +51,8 @@ const incident = () => {
     
    
     const [sortData,setSortData] = useState([])
+    const [rember, setRember] = useState(0)
+    const [rember1, setRember1] = useState()
 
     const [maxLength, setMaxLength] = useState(0);
     const [pickItem, setPickItem] = useState('');
@@ -301,7 +303,8 @@ const incident = () => {
                 let arrr = formateArrDataA(zz, 'businessType')
                 console.log(arrr)
                 setTableData(arrr)
-                setPickItem(newArr[0])
+                setPickItem(newArr[rember])
+                setRember1(newArr[0])
                 console.log(newArr, 'newArr');
                 setTreeData(newArr)
             }
@@ -473,7 +476,7 @@ const incident = () => {
                                         return <div className={classnames({
                                             [styles.listItem]: true,
                                             [styles.pickItem]: item === pickItem,
-                                        })} onClick={e => setPickItem(item)} key={index}>{item}（{tableData[item] ? tableData[item].length : ''}） {item === pickItem ? <RightOutlined /> : ''} </div>
+                                        })} onClick={e => {setPickItem(item);setRember(index);setRember1(item)}} key={index}>{item}（{tableData[item] ? tableData[item].length : ''}） {item === pickItem ? <RightOutlined /> : ''} </div>
                                     })
                                     )}
                         </div>
@@ -536,6 +539,7 @@ const incident = () => {
                     visible={addVisible}
                     type={isType} 
                     formObj={formObj} 
+                    rember1={rember1}
                     maxLength={maxLength}
                     onCancel={() => setAddvisible(false)}
                     treeData={treeData}

src/pages/platformCenter/bsmanager/workOrder/incident.less

+.ant-modal-close-x {
+    line-height: 35px;
+}
 .incidentContainer{
     .ant-card-body {
         padding: 12px 24px 24px 24px;
     }
+    
+    .linkDrowp{
+        position: absolute;
+        top: 0;
+        left: 93.5%;
+        width: 1rem;
+        height: 100%;
+        display: flex;
+        align-items: center;
+    }
     .listItem{
         display: flex;
         justify-content: space-between;
@@ -170,7 +183,7 @@
     .cardContent{
         height: 30rem;
         overflow-y: scroll;
-        width: 19.5rem;
+        width: 19rem;
     }
     .cardItemData{
         padding: 1rem;