增加组织调整功能

src/components/CustomPages/FM/ChangeCompany.js

@@ -0,0 +1,160 @@
+import { message } from "antd/lib/index";
+import { Layout,Descriptions, Tabs, Steps, Button, Popconfirm, Row, Col, Form, Input, Select, Table, Drawer ,Icon} from 'antd';
+import React from 'react';
+import { PlusOutlined } from '@ant-design/icons';
+import ReactToPrint from "react-to-print";
+import styles from '../HI/StepForm.css';
+import config from "../../../config";
+import XLSX from 'xlsx';
+import { connect } from 'dva';
+import moment from 'moment';
+const { Header, Footer, Sider, Content } = Layout;
+const TabPane = Tabs.TabPane;
+const { TextArea } = Input;
+const { Step } = Steps;
+import {
+    extend,
+    extendRule,
+    initFilter,
+    initQueryFilter,
+    getOnlyPropertyData,
+    extendInclude,
+    empty,
+    getDataFieldValue, guid, initFilterGroup, extendGroupRule
+} from "../../../utils/common";
+import FormPage from '../../FormPage'
+class ChangeCompany extends React.Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            title: '选择公司',
+            data: {},
+            userData: [],
+            selectUserId: '',
+        }
+    };
+    componentDidMount() {
+        if (this.props.data?.id)
+            this.loadData(this.props.data?.id);
+    }
+
+    componentWillReceiveProps(NextProps) {
+        if (NextProps.data?.id && this.props.data?.id != NextProps.data?.id) {
+            this.loadData(NextProps.data?.id);
+        }
+    }
+
+    BtnClose = () => {
+        if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
+                this.props.data.onCancel();
+    }
+
+    selectChange = (e) => {
+        // const jsonUser = initFilter(this.props.login.OrgId, '', '', 0, 1)
+        // extendRule(jsonUser, "NAME", 1, e);
+        // this.props.dispatch({
+        //     type: 'app/getDataByPost',
+        //     url: 'FM/User/OrderEntities',
+        //     payload: jsonUser,
+        //     onlyData: false,
+        //     onComplete: (ret) => {
+        //         this.setState({
+        //             userData: ret.Data
+        //         });
+        //     }
+        // });
+        this.setState({
+            selectUserId: e
+        })
+    }
+    onComplaint = (e) => {
+        if (this.state.selectUserId === '') {
+            message.error("请选择新公司");
+            return;
+        }
+        const json = initFilter(this.props.login.OrgId, this.props.data.id, '', 0, 1, this.state.selectUserId)
+        this.props.dispatch({
+            type: 'app/getDataByPost',
+            url: 'FM/User/ChangeCompany',
+            payload: json,
+            onlyData: false,
+            onComplete: (re) => {
+                if (re && re.IsSuccessful) {
+                    this.setState({
+                        // userData: [],
+                        selectUserId: '',
+                    });
+                    this.BtnClose();
+                    message.success("执行成功");
+                } 
+                // else {
+                //     // message.error("转办失败");
+                // }
+            }
+        })
+    }
+    loadData() {
+        const jsonUser = initFilter(this.props.login.OrgId)
+        jsonUser.Limit=1000;
+        this.props.dispatch({
+            type: 'app/getDataByPost',
+            url: 'FM/Organization/JTOrderEntities',
+            payload: jsonUser,
+            onlyData: false,
+            onComplete: (ret) => {
+                if (ret) {
+                    this.setState({
+                        userData: ret.Data,
+                    });
+                }
+            }
+        });
+    }
+
+    render() {
+        const { userData } = this.state;
+        const formItemLayout = {
+            labelCol: { span: 3 },
+            wrapperCol: { span: 20 },
+        };
+        return (
+            <Layout style={{backgroundColor:"#fff",marginLeft:"500px",marginTop:"200px"}}>
+                 <Form layout="vertical" hideRequiredMark>
+            <Row gutter={16}>
+                <Col span={12}>
+                    <Form.Item
+                        label={'公司'}
+                        {...formItemLayout}
+                    >
+                        <Select
+                            showSearch
+                            style={{ width: 200 }}
+                            placeholder='选择公司'
+                            onChange={this.selectChange}
+                            filterOption={(input, option) =>option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+                        >
+
+                            {
+                                userData
+                                    ? userData.map(t => {
+                                        return <Option value={t.ID} key={t.ID}>{t.NAME}</Option>
+                                    }) : null
+                            }
+                        </Select>
+                    </Form.Item>
+                </Col>
+
+            </Row>
+            <Row gutter={16}>
+                <Col span={2} style={{ textAlign: 'right' }}>
+                    <Form.Item span={4}>
+                        <Button type="primary" htmlType="complaint" icon="issues-close" onClick={this.onComplaint}>确认修改</Button>
+                    </Form.Item>
+                </Col>
+            </Row>
+        </Form>
+        </Layout>
+        )
+    }
+}
+export default connect(({ login, app }) => ({ login, app }))(Form.create()(ChangeCompany))

src/files/edit/SK004.js

@@ -745,8 +745,19 @@ export default {
               }
               else
               {
-                message.error("当前生产单元未找到对应检查类型，请到系统管理维护");
+                let temp={
-            return;
+                  ID: guid(),
+                  NUM:x.NUM,
+                  CHECK_TYPE :x.DEPARTMENT_TYPE,
+                  DEPARTMENT_ID:x.DEPARTMENT_ID,
+                  Nav_Department:x.Nav_Department,
+                  CHECK_TYPE_ID:null,
+                  Nav_CheckType:null,
+                  CHECK_CYCLE:checkCycle
+                }
+                temps.push(temp)
+                // message.error("当前生产单元未找到对应检查类型，请到系统管理维护");
+                // return;
               }
             })
           }

src/utils/customConfig.js

@@ -85,6 +85,7 @@ const PFCommonApproveView = createLoadableComponent(() => import('../components/
 
 const PFTodayReminder = createLoadableComponent(() => import('../components/CustomPages/PF/PFTodayReminder'));
 const SelectUser = createLoadableComponent(() => import('../components/CustomPages/FM/SelectUser'));
+const ChangeCompany = createLoadableComponent(() => import('../components/CustomPages/FM/ChangeCompany'));
 const FO003ShowPrint = createLoadableComponent(() => import('../components/CustomPages/FO/FO003ShowPrint'));
 const FO003ShowPrintJD = createLoadableComponent(() => import('../components/CustomPages/FO/FO003ShowPrintJD'));
 const FO005ShowPrint = createLoadableComponent(() => import('../components/CustomPages/FO/FO005ShowPrint'));
@@ -375,7 +376,7 @@ export default function (componentName, formId, formParam, data, formCode, formD
     PFCommonApproveView: <PFCommonApproveView formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     PFTodayReminder: <PFTodayReminder formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SelectUser: <SelectUser formId={formId} formParam={formParam} data={data} formCode={formCode} />,
-
+    ChangeCompany: <ChangeCompany formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     FileViewerShow: <FileViewerShow formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     PreMeetingTask: <PreMeetingTask formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     PreOperSchTask: <PreOperSchTask formId={formId} formParam={formParam} data={data} formCode={formCode} />,