fix: '巡检反馈支持业务划分支持多选'

src/pages/bsmanager/base/tablemanager/filedConfig/PerviewPrase.jsx

@@ -16,7 +16,7 @@ const PerviewPrase = props => {
           overflow: 'hidden',
         }}
         width="1800px"
-        style={{ marginTop: '-80px' }}
+        style={{ marginTop: '-80px', width: '75%' }}
         destroyOnClose
         maskClosable={false}
         footer={

src/pages/bsmanager/patrolMaintenance/maintenance/maintenance.jsx

@@ -324,9 +324,9 @@ const maintenance = () => {
               onClick={add}
               type="primary"
               style={{
-                marginLeft: '30px',
                 verticalAlign: 'middle',
                 marginTop: '10px',
+                marginRight: '20px',
               }}
             >
               <span style={{ marginTop: '-2px' }}>新增</span>
@@ -335,7 +335,6 @@ const maintenance = () => {
               icon={<OrderedListOutlined className={styles.icon} />}
               onClick={sort}
               style={{
-                marginLeft: '30px',
                 verticalAlign: 'middle',
                 marginTop: '10px',
               }}

src/pages/bsmanager/patrolMaintenance/patrolFeedback/AddModal.jsx

@@ -81,6 +81,8 @@ const AddModal = props => {
           console.log(res.data);
           if (!res.data.businessGroup) {
             form.setFieldsValue({ businessGroup: '区域巡检' });
+          } else {
+            form.setFieldsValue({ businessGroup: res.data.businessGroup.split(',') });
           }
           let aa = JSON.parse(res.data.mappingFields);
           getGetTaskSyncField(aa); // 获取字段名数据
@@ -319,6 +321,8 @@ const AddModal = props => {
                   }
                 });
               });
+            console.log(obj);
+            obj.businessGroup = obj.businessGroup.toString();
             if (type == 'add') {
               CM_Feedback_OperatePatrolFeedback({
                 ...obj,
@@ -682,7 +686,7 @@ const AddModal = props => {
           </Col>
           <Col span={23}>
             <Item label="业务划分" name="businessGroup" labelCol={{ span: 4 }}>
-              <Select placeholder="请选择业务划分" showSearch>
+              <Select placeholder="请选择业务划分" showSearch mode="multiple" allowClear>
                 <Option key="区域巡检" value="区域巡检">
                   区域巡检
                 </Option>

src/pages/bsmanager/patrolMaintenance/patrolFeedback/patrolFeedback.jsx

@@ -151,7 +151,7 @@ const patrolFeedback = () => {
       title: '字段集',
       dataIndex: 'fields',
       key: 'fields',
-      width: 50,
+      width: 80,
       align: 'center',
     },
     // {
@@ -223,6 +223,12 @@ const patrolFeedback = () => {
               area.push(i);
             } else if (i.businessGroup === 'DMA巡检') {
               dma.push(i);
+            } else if (
+              i.businessGroup === '区域巡检,DMA巡检' ||
+              i.businessGroup === 'DMA巡检,区域巡检'
+            ) {
+              area.push(i);
+              dma.push(i);
             } else {
               other.push(i);
             }
@@ -416,7 +422,6 @@ const patrolFeedback = () => {
                 onClick={add}
                 type="primary"
                 style={{
-                  marginLeft: '30px',
                   verticalAlign: 'middle',
                   marginTop: '10px',
                 }}
@@ -427,7 +432,6 @@ const patrolFeedback = () => {
                 icon={<OrderedListOutlined className={styles.icon} />}
                 onClick={sort}
                 style={{
-                  marginLeft: '30px',
                   verticalAlign: 'middle',
                   marginTop: '10px',
                 }}
@@ -437,7 +441,6 @@ const patrolFeedback = () => {
               <Button
                 icon={<DeleteOutlined className={styles.icon} />}
                 style={{
-                  marginLeft: '30px',
                   verticalAlign: 'middle',
                   marginTop: '10px',
                 }}

src/pages/platformCenter/messageManage/schemeDetail/schemeDetail.jsx

@@ -1106,7 +1106,7 @@ const EditModal = props => {
         <Row>
           <Col span={24}>
             <div style={{ marginTop: '1rem', display: 'flex', justifyContent: 'flex-end' }}>
-              <Button htmlType="button" onClick={back} style={{ marginRight: '2rem' }}>
+              <Button htmlType="button" onClick={back} style={{ marginRight: '20px' }}>
                 返回
               </Button>
               <Button type="primary" htmlType="submit">