修改事件管理界面UI

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

@@ -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
+                Roles: record.FlowRoles
             })
             setSelectValue(record.FlowName)
             console.log(selectValue)
@@ -165,8 +166,8 @@ const AddFlowsModal = props => {
         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,
@@ -261,6 +262,32 @@ const AddFlowsModal = props => {
         setVisible1(true)
     }
     const onOKk = prop => {
+        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
@@ -270,6 +297,8 @@ const AddFlowsModal = props => {
             setCheckedList1(prop.checkedList)
             setInputValue(inputText)
         }
+
+    }
     return (
         <Modal
             title={type === 'add' ? '添加受理流程' : '编辑受理流程'}
@@ -283,7 +312,7 @@ const AddFlowsModal = props => {
             <Form form={form} labelCol={{ span: 7 }} style={{ height: '8rem', overflowY: 'scroll' }}>
                 <Row>
                     <Col span={24}>
-                        {type === 'edit'?
+                        {type === 'edit' ?
                             <>
                                 <Item
                                     label="受理流程"
@@ -300,7 +329,7 @@ const AddFlowsModal = props => {
                                     </Select>
                                 </Item>
                             </>
-                        :<>
+                            : <>
                                 <Item
                                     label="受理流程"
                                     name="FlowName"
@@ -315,7 +344,6 @@ const AddFlowsModal = props => {
                                 </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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

 .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;