diff --git a/src/components/Common/AssignmentField.js b/src/components/Common/AssignmentField.js
index 757e0e5..7b93e9f 100644
--- a/src/components/Common/AssignmentField.js
+++ b/src/components/Common/AssignmentField.js
@@ -7,7 +7,7 @@ import { Modal } from 'antd-v4';
import styles from '@/index.less';
import * as commonUtils from '@/utils/utils';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
-import * as commonBusiness from '@/components/Common/commonBusiness';
+import commonBusiness from '@/components/Common/commonBusiness';
/* 单据业务功能 */
export default class AssignmentField extends Component {
/** 构造函数 */
diff --git a/src/components/Common/BoxDesignCompontent/index.js b/src/components/Common/BoxDesignCompontent/index.js
index 487be66..75bebab 100644
--- a/src/components/Common/BoxDesignCompontent/index.js
+++ b/src/components/Common/BoxDesignCompontent/index.js
@@ -4,7 +4,7 @@ import { Select, Button, message, Input, Spin } from "antd-v4";
import { CompressOutlined, ExpandOutlined } from "@ant-design/icons";
import * as commonUtils from "@/utils/utils";
import * as commonFunc from "@/components/Common/commonFunc";
-import * as commonBusiness from "@/components/Common/commonBusiness";
+import commonBusiness from "@/components/Common/commonBusiness";
import * as commonServices from "@/services/services";
import CommonBase from "@/components/Common/CommonBase";
import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
diff --git a/src/components/Common/CommonBase.js b/src/components/Common/CommonBase.js
index 9826031..1b21cd6 100644
--- a/src/components/Common/CommonBase.js
+++ b/src/components/Common/CommonBase.js
@@ -12,7 +12,7 @@ import commonConfig from '../../utils/config';
import * as commonUtils from '../../utils/utils';
import * as commonServices from '../../services/services';
import * as commonFunc from './commonFunc';
-import * as commonBusiness from './commonBusiness'; /* 通用单据方法 */
+import commonBusinessess from './commonBusiness'; /* 通用单据方法 */
import instructSet from "@/components/Common/CommonInstructSet";
export default (ChildComponent) => {
diff --git a/src/components/Common/CommonBill/index.js b/src/components/Common/CommonBill/index.js
index fc4a522..a374609 100644
--- a/src/components/Common/CommonBill/index.js
+++ b/src/components/Common/CommonBill/index.js
@@ -26,7 +26,7 @@ import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格
import styles from '@/index.less';
import CommonView from '@/components/Common/CommonView';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
import * as commonServices from '@/services/services';/* 服务类 */
diff --git a/src/components/Common/CommonBillDeliver.js b/src/components/Common/CommonBillDeliver.js
index 7ec8f52..6afed50 100644
--- a/src/components/Common/CommonBillDeliver.js
+++ b/src/components/Common/CommonBillDeliver.js
@@ -11,7 +11,7 @@ import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格
import styles from '@/index.less';
import CommonView from '@/components/Common/CommonView';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
import * as commonServices from '@/services/services';/* 服务类 */
diff --git a/src/components/Common/CommonBillDeliverEvent.js b/src/components/Common/CommonBillDeliverEvent.js
index 6892d7e..d8a3f96 100644
--- a/src/components/Common/CommonBillDeliverEvent.js
+++ b/src/components/Common/CommonBillDeliverEvent.js
@@ -6,7 +6,7 @@ import React, { Component } from 'react';
import { Modal, message } from 'antd-v4';
import moment from 'moment';
import * as commonUtils from '../../utils/utils'; /* 通用方法 */
-import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
+import commonBusiness from './commonBusiness'; /* 单据业务功能 */
import * as commonServices from '../../services/services'; /* 服务类 */
import commonConfig from '../../utils/config';
import * as commonFunc from './commonFunc';
diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js
index 767e6cc..4a4623d 100644
--- a/src/components/Common/CommonBillEvent.js
+++ b/src/components/Common/CommonBillEvent.js
@@ -5,7 +5,7 @@ import { Modal, notification, Progress } from 'antd-v4';
import { message } from '@/utils/common/message';
import moment from 'moment';
import * as commonUtils from '@/utils/utils'; /* 通用方法 */
-import * as commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
import * as commonServices from '@/services/services'; /* 服务类 */
import commonConfig from '@/utils/config';
import * as commonFunc from '@/components/Common/commonFunc';
diff --git a/src/components/Common/CommonCheckBill/index.js b/src/components/Common/CommonCheckBill/index.js
index ff23f1b..2bcb458 100644
--- a/src/components/Common/CommonCheckBill/index.js
+++ b/src/components/Common/CommonCheckBill/index.js
@@ -27,7 +27,7 @@ import CommonView from '@/components/Common/CommonView';
import CommonViewFlex from '@/components/Common/CommonViewFlex';
import CommonViewTable from '@/components/Common/CommonViewTable';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
import * as commonServices from '@/services/services';/* 服务类 */
diff --git a/src/components/Common/CommonCheckBillEvent.js b/src/components/Common/CommonCheckBillEvent.js
index 070396b..c9b33f1 100644
--- a/src/components/Common/CommonCheckBillEvent.js
+++ b/src/components/Common/CommonCheckBillEvent.js
@@ -4,7 +4,7 @@ import { Modal, Progress } from 'antd-v4';
import { message } from '@/utils/common/message';
import moment from 'moment';
import * as commonUtils from '@/utils/utils'; /* 通用方法 */
-import * as commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
import * as commonServices from '@/services/services'; /* 服务类 */
import commonConfig from '@/utils/config';
import * as commonFunc from '@/components/Common/commonFunc';
diff --git a/src/components/Common/CommonClassifyEvent.js b/src/components/Common/CommonClassifyEvent.js
index 7468007..b6d4c76 100644
--- a/src/components/Common/CommonClassifyEvent.js
+++ b/src/components/Common/CommonClassifyEvent.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
import moment from 'moment';
import { Modal, message } from 'antd-v4';
import * as commonFunc from './commonFunc';
-import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
+import commonBusiness from './commonBusiness'; /* 单据业务功能 */
import * as commonUtils from '../../utils/utils'; /* 通用方法 */
import commonConfig from '../../utils/config';
import * as commonServices from '../../services/services';
diff --git a/src/components/Common/CommonColumnList.js b/src/components/Common/CommonColumnList.js
index 31dc1fb..be9c4a2 100644
--- a/src/components/Common/CommonColumnList.js
+++ b/src/components/Common/CommonColumnList.js
@@ -15,7 +15,7 @@ import Toolbar from '../Common/ToolBar/ToolBarNew';
import StaticEditTable from './CommonTable';/* 可编辑表格 */
import styles from '../../index.less';
import CommonBase from './CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from './commonBusiness';/* 单据业务功能 */
+import commonBusiness from './commonBusiness';/* 单据业务功能 */
import SearchComponent from './SearchComponent';/* 搜索组件 */
import commonConfig from '../../utils/config';
import * as commonUtils from '../../utils/utils';
diff --git a/src/components/Common/CommonCostomTabBill.js b/src/components/Common/CommonCostomTabBill.js
index 7edf4a7..f130a4a 100644
--- a/src/components/Common/CommonCostomTabBill.js
+++ b/src/components/Common/CommonCostomTabBill.js
@@ -39,7 +39,7 @@ import AssignmentField from "./AssignmentField";
import CommonView from "@/components/Common/CommonView";
import CommonViewTable from "@/components/Common/CommonViewTable";
import CommonBase from "@/components/Common/CommonBase"; /* 获取配置及数据 */
-import * as commonBusiness from "@/components/Common/commonBusiness"; /* 单据业务功能 */
+import commonBusiness from "@/components/Common/commonBusiness"; /* 单据业务功能 */
import commonConfig from "@/utils/config";
import * as commonUtils from "@/utils/utils"; /* 通用方法 */
import * as commonServices from "@/services/services"; /* 服务类 */
diff --git a/src/components/Common/CommonElementEvent.js b/src/components/Common/CommonElementEvent.js
index a278786..6e05e6a 100644
--- a/src/components/Common/CommonElementEvent.js
+++ b/src/components/Common/CommonElementEvent.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
import { Modal, message } from 'antd-v4';
import commonConfig from '../../utils/config';
import * as commonFunc from './commonFunc';
-import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
+import commonBusiness from './commonBusiness'; /* 单据业务功能 */
import * as commonUtils from '../../utils/utils'; /* 通用方法 */
import * as commonServices from './../../services/services'; /* 服务类 */
diff --git a/src/components/Common/CommonGroupBill.js b/src/components/Common/CommonGroupBill.js
index 87d9031..a82d930 100644
--- a/src/components/Common/CommonGroupBill.js
+++ b/src/components/Common/CommonGroupBill.js
@@ -15,7 +15,7 @@ import CommonView from '@/components/Common/CommonView';
import CommonViewTable from '@/components/Common/CommonViewTable';
import CommonViewDrag from '@/components/Common/CommonViewDrag';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
import * as commonServices from '@/services/services';/* 服务类 */
diff --git a/src/components/Common/CommonGroupBillEvent.js b/src/components/Common/CommonGroupBillEvent.js
index 3111706..8fdc813 100644
--- a/src/components/Common/CommonGroupBillEvent.js
+++ b/src/components/Common/CommonGroupBillEvent.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
import { Modal, message } from 'antd-v4';
// import moment from 'moment';
import * as commonUtils from '@/utils/utils'; /* 通用方法 */
-import {commonBusiness} from '@/components/Common/commonBusiness'; /* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
import * as commonServices from '@/services/services'; /* 服务类 */
import commonConfig from '@/utils/config';
import * as commonFunc from '@/components/Common/commonFunc';
diff --git a/src/components/Common/CommonInstructSet.js b/src/components/Common/CommonInstructSet.js
index c7c4e41..9dfd96a 100644
--- a/src/components/Common/CommonInstructSet.js
+++ b/src/components/Common/CommonInstructSet.js
@@ -8,7 +8,7 @@ import * as commonUtils from "@/utils/utils";
import * as commonFunc from "@/components/Common/commonFunc";
import commonConfig from "@/utils/config";
import * as commonServices from "@/services/services";
-import * as commonBusiness from "@/components/Common/commonBusiness";
+import commonBusiness from "@/components/Common/commonBusiness";
import FaceDetect from "@/components/FaceDetect";
let step = 1; // 步骤计数
diff --git a/src/components/Common/CommonJurisdictionNewEvent.js b/src/components/Common/CommonJurisdictionNewEvent.js
index 6a6eda3..1934b17 100644
--- a/src/components/Common/CommonJurisdictionNewEvent.js
+++ b/src/components/Common/CommonJurisdictionNewEvent.js
@@ -2,7 +2,7 @@
import React, { Component } from 'react';
import { Modal, message } from 'antd-v4';
import commonConfig from '../../utils/config';
-import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
+import commonBusiness from './commonBusiness'; /* 单据业务功能 */
import * as commonUtils from '../../utils/utils'; /* 通用方法 */
import * as commonServices from './../../services/services';
import * as commonFunc from './commonFunc'; /* 服务类 */
diff --git a/src/components/Common/CommonList.js b/src/components/Common/CommonList.js
index 376ddf9..fde22e1 100644
--- a/src/components/Common/CommonList.js
+++ b/src/components/Common/CommonList.js
@@ -10,7 +10,7 @@ import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格
// import StaticEditTableNew from '@/components/Common/CommonTableNew';/* 可编辑表格 */
import styles from '@/index.less';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';
diff --git a/src/components/Common/CommonListA.js b/src/components/Common/CommonListA.js
index 090f3bd..176a66b 100644
--- a/src/components/Common/CommonListA.js
+++ b/src/components/Common/CommonListA.js
@@ -9,7 +9,7 @@ import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import styles from '@/index.less';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';
diff --git a/src/components/Common/CommonListEdit.js b/src/components/Common/CommonListEdit.js
index a612e33..9b0c972 100644
--- a/src/components/Common/CommonListEdit.js
+++ b/src/components/Common/CommonListEdit.js
@@ -8,7 +8,7 @@ import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import styles from '@/index.less';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';
diff --git a/src/components/Common/CommonListEditEvent.js b/src/components/Common/CommonListEditEvent.js
index d7dac24..31ffc48 100644
--- a/src/components/Common/CommonListEditEvent.js
+++ b/src/components/Common/CommonListEditEvent.js
@@ -9,7 +9,7 @@ import * as commonUtils from '../../utils/utils'; /* 通用方法 */
import * as commonFunc from './commonFunc'; /* 通用单据方法 */
import commonConfig from '../../utils/config';
import * as commonServices from '../../services/services';
-import * as commonBusiness from './commonBusiness';
+import commonBusiness from './commonBusiness';
const { confirm } = Modal;
diff --git a/src/components/Common/CommonListEvent.js b/src/components/Common/CommonListEvent.js
index 53837a1..d834c95 100644
--- a/src/components/Common/CommonListEvent.js
+++ b/src/components/Common/CommonListEvent.js
@@ -9,7 +9,7 @@ import * as commonUtils from '../../utils/utils'; /* 通用方法 */
import * as commonFunc from './commonFunc'; /* 通用单据方法 */
import commonConfig from '../../utils/config';
import * as commonServices from '../../services/services';
-import * as commonBusiness from './commonBusiness';
+import commonBusiness from './commonBusiness';
const { confirm } = Modal;
diff --git a/src/components/Common/CommonListLeft/index.js b/src/components/Common/CommonListLeft/index.js
index a6623cd..dd86364 100644
--- a/src/components/Common/CommonListLeft/index.js
+++ b/src/components/Common/CommonListLeft/index.js
@@ -10,7 +10,7 @@ import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import styles from '@/index.less';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';
diff --git a/src/components/Common/CommonListSelect/index.js b/src/components/Common/CommonListSelect/index.js
index 26dac06..fa10c12 100644
--- a/src/components/Common/CommonListSelect/index.js
+++ b/src/components/Common/CommonListSelect/index.js
@@ -8,7 +8,7 @@ import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销
import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
import config from '@/utils/config';
import * as commonUtils from '@/utils/utils';
diff --git a/src/components/Common/CommonListSelectAssignment.js b/src/components/Common/CommonListSelectAssignment.js
index 4020eae..a0cb18d 100644
--- a/src/components/Common/CommonListSelectAssignment.js
+++ b/src/components/Common/CommonListSelectAssignment.js
@@ -13,7 +13,7 @@ import StaticEditTable from './CommonTable';/* 可编辑表格 */
import StaticEditTree from '../Common/Tree/StaticTree';
import styles from '../../index.less';
import CommonBase from './CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from './commonBusiness';/* 单据业务功能 */
+import commonBusiness from './commonBusiness';/* 单据业务功能 */
import SearchComponent from './SearchComponent';
import AntdDraggableModal from './AntdDraggableModal';
import * as commonUtils from '../../utils/utils';
diff --git a/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx b/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx
index d82a502..33472b0 100644
--- a/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx
+++ b/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx
@@ -7,7 +7,7 @@ import * as commonFunc from "@/components/Common/commonFunc"; /* 通用单据方
import StaticEditTable from "@/components/Common//CommonTable"; /* 可编辑表格 */
import StaticEditTree from "@/components/Common/Tree/StaticTree";
import CommonBase from "@/components/Common/CommonBase"; /* 获取配置及数据 */
-import * as commonBusiness from "@/components/Common//commonBusiness"; /* 单据业务功能 */
+import commonBusiness from "@/components/Common//commonBusiness"; /* 单据业务功能 */
import SearchComponent from "@/components/Common/SearchComponent";
import * as commonUtils from "@/utils/utils";
import CommonListEvent from "@/components/Common/CommonListEvent";
diff --git a/src/components/Common/CommonListSelectFlex/index.js b/src/components/Common/CommonListSelectFlex/index.js
index 83d1790..4cb886c 100644
--- a/src/components/Common/CommonListSelectFlex/index.js
+++ b/src/components/Common/CommonListSelectFlex/index.js
@@ -6,7 +6,7 @@ import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方
import StaticEditTable from '@/components/Common//CommonTable';/* 可编辑表格 */
import StaticEditTree from '@/components/Common/Tree/StaticTree';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common//commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common//commonBusiness';/* 单据业务功能 */
import SearchComponent from '@/components/Common/SearchComponent';
import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
import * as commonUtils from '@/utils/utils';
diff --git a/src/components/Common/CommonListSelectMulti/index.js b/src/components/Common/CommonListSelectMulti/index.js
index bcceeaf..3b3d170 100644
--- a/src/components/Common/CommonListSelectMulti/index.js
+++ b/src/components/Common/CommonListSelectMulti/index.js
@@ -10,7 +10,7 @@ import * as commonFunc from '@/components/Common//commonFunc';/* 通用单据方
import StaticEditTable from '@/components/Common//CommonTable';/* 可编辑表格 */
import StaticEditTree from '@/components/Common/Tree/StaticTree';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common//commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common//commonBusiness';/* 单据业务功能 */
import SearchComponent from '@/components/Common/SearchComponent';
import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
import * as commonUtils from '@/utils/utils';
diff --git a/src/components/Common/CommonListSelectParam/index.js b/src/components/Common/CommonListSelectParam/index.js
index e5d86d6..bb95f0c 100644
--- a/src/components/Common/CommonListSelectParam/index.js
+++ b/src/components/Common/CommonListSelectParam/index.js
@@ -5,7 +5,7 @@ import { Form } from '@ant-design/compatible';
import { Spin, Tabs, message, Modal, Tooltip } from 'antd-v4';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
// import * as commonUtils from '../../utils/utils'; /* 通用方法 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import * as commonFunc from '@/components/Common/commonFunc';
import ShowType from '@/components/Common/CommonComponent';
diff --git a/src/components/Common/CommonListSelectProductMaterial.js b/src/components/Common/CommonListSelectProductMaterial.js
index c1ad920..9b28d63 100644
--- a/src/components/Common/CommonListSelectProductMaterial.js
+++ b/src/components/Common/CommonListSelectProductMaterial.js
@@ -13,7 +13,7 @@ import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功
import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
import StaticEditTable from './CommonTable';/* 可编辑表格 */
import CommonBase from './CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from './commonBusiness';/* 单据业务功能 */
+import commonBusiness from './commonBusiness';/* 单据业务功能 */
import SearchComponent from './SearchComponent';/* 搜索组件 */
// import * as commonConfig from '../../utils/config';
import config from '../../utils/config';
diff --git a/src/components/Common/CommonListSelectTree/index.js b/src/components/Common/CommonListSelectTree/index.js
index af9d361..a91a328 100644
--- a/src/components/Common/CommonListSelectTree/index.js
+++ b/src/components/Common/CommonListSelectTree/index.js
@@ -10,7 +10,7 @@ import * as commonFunc from '@/components/Common//commonFunc';/* 通用单据方
import StaticEditTable from '@/components/Common//CommonTable';/* 可编辑表格 */
import StaticEditTree from '@/components/Common/Tree/StaticTree';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common//commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common//commonBusiness';/* 单据业务功能 */
import SearchComponent from '@/components/Common/SearchComponent';
import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
import * as commonUtils from '@/utils/utils';
diff --git a/src/components/Common/CommonListTab/index.js b/src/components/Common/CommonListTab/index.js
index 9b81ebd..9636cdb 100644
--- a/src/components/Common/CommonListTab/index.js
+++ b/src/components/Common/CommonListTab/index.js
@@ -10,7 +10,7 @@ import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格
import styles from '@/index.less';
import customStyles from './index.less';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';
diff --git a/src/components/Common/CommonListTabEvent.js b/src/components/Common/CommonListTabEvent.js
index 5f9fdad..0db1291 100644
--- a/src/components/Common/CommonListTabEvent.js
+++ b/src/components/Common/CommonListTabEvent.js
@@ -9,7 +9,7 @@ import * as commonUtils from '../../utils/utils'; /* 通用方法 */
import * as commonFunc from './commonFunc'; /* 通用单据方法 */
import commonConfig from '../../utils/config';
import * as commonServices from '../../services/services';
-import * as commonBusiness from './commonBusiness';
+import commonBusiness from './commonBusiness';
const { confirm } = Modal;
diff --git a/src/components/Common/CommonListTree/index.js b/src/components/Common/CommonListTree/index.js
index 910f5be..ec002ac 100644
--- a/src/components/Common/CommonListTree/index.js
+++ b/src/components/Common/CommonListTree/index.js
@@ -16,7 +16,7 @@ import Toolbar from '../ToolBar/ToolBarNew';
import StaticEditTable from '../CommonTable';/* 可编辑表格 */
import styles from '../../../index.less';
import CommonBase from '../CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '../commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../commonBusiness';/* 单据业务功能 */
import SearchComponent from '../SearchComponent';/* 搜索组件 */
import commonConfig from '../../../utils/config';
import * as commonUtils from '../../../utils/utils'; /* 通用方法 */
diff --git a/src/components/Common/CommonListTreeEvent.js b/src/components/Common/CommonListTreeEvent.js
index 50c8f2f..086352c 100644
--- a/src/components/Common/CommonListTreeEvent.js
+++ b/src/components/Common/CommonListTreeEvent.js
@@ -8,7 +8,7 @@ import * as commonUtils from '../../utils/utils'; /* 通用方法 */
import * as commonFunc from './commonFunc'; /* 通用单据方法 */
import commonConfig from '../../utils/config';
import * as commonServices from '../../services/services';
-import * as commonBusiness from './commonBusiness';
+import commonBusiness from './commonBusiness';
const { confirm } = Modal;
/* 该组件作用是两层通用结构commonListTree事件层,功能如物料需求计划,两层都可以配制独立的数据源 */
diff --git a/src/components/Common/CommonListTreeSelect/index.js b/src/components/Common/CommonListTreeSelect/index.js
index a1bc791..ac54e89 100644
--- a/src/components/Common/CommonListTreeSelect/index.js
+++ b/src/components/Common/CommonListTreeSelect/index.js
@@ -10,7 +10,7 @@ import CommonListTreeEvent from '@/components/Common/CommonListTreeEvent';/* 继
import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
import config from '@/utils/config';
import * as commonUtils from '@/utils/utils';
diff --git a/src/components/Common/CommonNewBill.js b/src/components/Common/CommonNewBill.js
index 9fde7ea..5d6faca 100644
--- a/src/components/Common/CommonNewBill.js
+++ b/src/components/Common/CommonNewBill.js
@@ -15,7 +15,7 @@ import AssignmentField from './AssignmentField';
import CommonView from '@/components/Common/CommonView';
import CommonViewTable from '@/components/Common/CommonViewTable';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
import * as commonServices from '@/services/services';/* 服务类 */
diff --git a/src/components/Common/CommonNewBillEvent.js b/src/components/Common/CommonNewBillEvent.js
index ce94333..2d224e3 100644
--- a/src/components/Common/CommonNewBillEvent.js
+++ b/src/components/Common/CommonNewBillEvent.js
@@ -4,7 +4,7 @@ import { Modal, Progress } from 'antd-v4';
import { message } from '@/utils/common/message';
// import moment from 'moment';
import * as commonUtils from '@/utils/utils'; /* 通用方法 */
-import * as commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
import * as commonServices from '@/services/services'; /* 服务类 */
import commonConfig from '@/utils/config';
import * as commonFunc from '@/components/Common/commonFunc';
diff --git a/src/components/Common/CommonNewListBill.js b/src/components/Common/CommonNewListBill.js
index 8564741..3bad007 100644
--- a/src/components/Common/CommonNewListBill.js
+++ b/src/components/Common/CommonNewListBill.js
@@ -14,7 +14,7 @@ import AssignmentField from './AssignmentField';
import CommonView from '@/components/Common/CommonView';
import CommonViewTable from '@/components/Common/CommonViewTable';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
import * as commonServices from '@/services/services';/* 服务类 */
diff --git a/src/components/Common/CommonNewTabBill.js b/src/components/Common/CommonNewTabBill.js
index 1361999..218c828 100644
--- a/src/components/Common/CommonNewTabBill.js
+++ b/src/components/Common/CommonNewTabBill.js
@@ -14,7 +14,7 @@ import AssignmentField from './AssignmentField';
import CommonView from '@/components/Common/CommonView';
import CommonViewTable from '@/components/Common/CommonViewTable';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
import * as commonServices from '@/services/services';/* 服务类 */
diff --git a/src/components/Common/CommonNewTabBillEvent.js b/src/components/Common/CommonNewTabBillEvent.js
index f46d8d9..0df8bfd 100644
--- a/src/components/Common/CommonNewTabBillEvent.js
+++ b/src/components/Common/CommonNewTabBillEvent.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
import { Modal, message, Progress } from 'antd-v4';
// import moment from 'moment';
import * as commonUtils from '@/utils/utils'; /* 通用方法 */
-import {commonBusiness} from '@/components/Common/commonBusiness'; /* 单据业务功能 */
+import commonBusiness from "./commonBusiness"; /* 单据业务功能 */
import * as commonServices from '@/services/services'; /* 服务类 */
import commonConfig from '@/utils/config';
import * as commonFunc from '@/components/Common/commonFunc';
diff --git a/src/components/Common/CommonProductionPlanEvent.js b/src/components/Common/CommonProductionPlanEvent.js
index 12effa7..59f83b8 100644
--- a/src/components/Common/CommonProductionPlanEvent.js
+++ b/src/components/Common/CommonProductionPlanEvent.js
@@ -4,7 +4,7 @@ import { message } from 'antd-v4'; // Form, Modal, InputNumber
// import reactComponentDebounce from 'react-component-debounce';
import moment from 'moment';
import * as commonUtils from '../../utils/utils'; /* 通用方法 */
-import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
+import commonBusiness from './commonBusiness'; /* 单据业务功能 */
import * as commonServices from '../../services/services'; /* 服务类 */
import commonConfig from '../../utils/config';
import * as commonFunc from './commonFunc'; /* 通用单据方法 */
diff --git a/src/components/Common/CommonProductionPlanOutsideEvent.js b/src/components/Common/CommonProductionPlanOutsideEvent.js
index f2b881e..1f4226f 100644
--- a/src/components/Common/CommonProductionPlanOutsideEvent.js
+++ b/src/components/Common/CommonProductionPlanOutsideEvent.js
@@ -6,7 +6,7 @@ import React, { Component } from 'react';
import { message } from 'antd-v4'; // Form, Modal, InputNumber
// import reactComponentDebounce from 'react-component-debounce';
import * as commonUtils from '../../utils/utils'; /* 通用方法 */
-import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
+import commonBusiness from './commonBusiness'; /* 单据业务功能 */
import * as commonServices from '../../services/services'; /* 服务类 */
import commonConfig from '../../utils/config';
import * as commonFunc from './commonFunc'; /* 通用单据方法 */
diff --git a/src/components/Common/CommonProductionPlanTreeEvent.js b/src/components/Common/CommonProductionPlanTreeEvent.js
index 0ed2ad5..cd37263 100644
--- a/src/components/Common/CommonProductionPlanTreeEvent.js
+++ b/src/components/Common/CommonProductionPlanTreeEvent.js
@@ -7,7 +7,7 @@ import React, { Component } from 'react';
import { message } from 'antd-v4'; // Form, Modal, InputNumber
// import reactComponentDebounce from 'react-component-debounce';
import * as commonUtils from '../../utils/utils'; /* 通用方法 */
-import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
+import commonBusiness from './commonBusiness'; /* 单据业务功能 */
import * as commonServices from '../../services/services'; /* 服务类 */
import commonConfig from '../../utils/config';
import * as commonFunc from './commonFunc'; /* 通用单据方法 */
diff --git a/src/components/Common/CommonProductionmMainPlanEvent.js b/src/components/Common/CommonProductionmMainPlanEvent.js
index ab1d40b..0306c92 100644
--- a/src/components/Common/CommonProductionmMainPlanEvent.js
+++ b/src/components/Common/CommonProductionmMainPlanEvent.js
@@ -3,7 +3,7 @@
import React, { Component } from 'react';
import { message } from 'antd-v4'; // InputNumber Form, Modal,
import * as commonUtils from '../../utils/utils'; /* 通用方法 */
-import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
+import commonBusiness from './commonBusiness'; /* 单据业务功能 */
import * as commonServices from '../../services/services'; /* 服务类 */
import commonConfig from '../../utils/config';
import * as commonFunc from './commonFunc'; /* 通用单据方法 */
diff --git a/src/components/Common/CommonSubBill.js b/src/components/Common/CommonSubBill.js
index 7f67805..9f415f7 100644
--- a/src/components/Common/CommonSubBill.js
+++ b/src/components/Common/CommonSubBill.js
@@ -14,7 +14,7 @@ import styles from '@/index.less';
import CommonView from '@/components/Common/CommonView';
import CommonViewTable from '@/components/Common/CommonViewTable';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
import * as commonServices from '@/services/services';/* 服务类 */
diff --git a/src/components/Common/CommonSubBillEvent.js b/src/components/Common/CommonSubBillEvent.js
index 06a1a87..d503cc1 100644
--- a/src/components/Common/CommonSubBillEvent.js
+++ b/src/components/Common/CommonSubBillEvent.js
@@ -9,7 +9,7 @@ import { message } from '@/utils/common/message';
import {Progress} from 'antd-v4'
import moment from 'moment';
import * as commonUtils from '../../utils/utils'; /* 通用方法 */
-import {commonBusiness} from './commonBusiness'; /* 单据业务功能 */
+import commonBusiness from './commonBusiness'; /* 单据业务功能 */
import * as commonServices from '../../services/services'; /* 服务类 */
import commonConfig from '../../utils/config';
import * as commonFunc from './commonFunc';
diff --git a/src/components/Common/CommonSystemSettingEvent.js b/src/components/Common/CommonSystemSettingEvent.js
index 99db9cc..081b368 100644
--- a/src/components/Common/CommonSystemSettingEvent.js
+++ b/src/components/Common/CommonSystemSettingEvent.js
@@ -3,7 +3,7 @@ import moment from 'moment';
import React, { Component } from 'react';
import { Modal, message } from 'antd-v4';
import * as commonFunc from './commonFunc';
-import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
+import commonBusiness from './commonBusiness'; /* 单据业务功能 */
import * as commonUtils from '../../utils/utils'; /* 通用方法 */
import commonConfig from '../../utils/config';
import * as commonServices from '../../services/services';
diff --git a/src/components/Common/CommonViewDrag/index.js b/src/components/Common/CommonViewDrag/index.js
index 663ad23..e9198a3 100644
--- a/src/components/Common/CommonViewDrag/index.js
+++ b/src/components/Common/CommonViewDrag/index.js
@@ -5,7 +5,7 @@ import { Col, Tabs, Tooltip } from "antd-v4";
import ShowType from "@/components/Common/CommonComponent";
import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
import CommonListSelectTree from "@/components/Common/CommonListSelectTree";
-import * as commonBusiness from "@/components/Common/commonBusiness"; /* 单据业务功能 */
+import commonBusiness from "@/components/Common/commonBusiness"; /* 单据业务功能 */
import StaticEditTable from "@/components/Common/CommonTable"; /* 可编辑表格 */
import * as commonFunc from "@/components/Common/commonFunc";
import * as commonUtils from "@/utils/utils"; /* 通用方法 */
diff --git a/src/components/Common/CommonViewDragable/index.js b/src/components/Common/CommonViewDragable/index.js
index 78dd322..305a5e1 100644
--- a/src/components/Common/CommonViewDragable/index.js
+++ b/src/components/Common/CommonViewDragable/index.js
@@ -9,7 +9,7 @@ import React, {
import "@ant-design/compatible/assets/index.css";
import { Tabs, Tooltip, message } from "antd-v4";
import ShowType from "@/components/Common/CommonComponent";
-import * as commonBusiness from "@/components/Common/commonBusiness";
+import commonBusiness from "@/components/Common/commonBusiness";
import StaticEditTable from "@/components/Common/CommonTable";
import * as commonUtils from "@/utils/utils";
import * as rglUtils from "./rglUtils";
diff --git a/src/components/Common/FileImposition/index.js b/src/components/Common/FileImposition/index.js
index 065307f..7ec195a 100644
--- a/src/components/Common/FileImposition/index.js
+++ b/src/components/Common/FileImposition/index.js
@@ -11,7 +11,7 @@ import {
} from "antd-v4";
import { UploadOutlined } from "@ant-design/icons";
import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
-import * as commonBusiness from "@/components/Common/commonBusiness";
+import commonBusiness from "@/components/Common/commonBusiness";
import * as commonFunc from "@/components/Common/commonFunc";
import StaticEditTable from "@/components/Common/CommonTable";
import * as commonUtils from "@/utils/utils";
diff --git a/src/components/Common/Gatte/CommonGatte.js b/src/components/Common/Gatte/CommonGatte.js
index f2ff629..a3e02a1 100644
--- a/src/components/Common/Gatte/CommonGatte.js
+++ b/src/components/Common/Gatte/CommonGatte.js
@@ -8,7 +8,7 @@ import Toolbar from '../ToolBar/ToolBarNew';
import styles from '../../../index.less';
import GanttStyles from './index.less';
import CommonBase from '../CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '../commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../commonBusiness';/* 单据业务功能 */
import SearchComponent from '../SearchComponent';/* 搜索组件 */
import * as commonUtils from '../../../utils/utils';
// import SlaveMemo from './SlaveMemo';
diff --git a/src/components/Common/MakeUpPDF/index.js b/src/components/Common/MakeUpPDF/index.js
new file mode 100644
index 0000000..6738cad
--- /dev/null
+++ b/src/components/Common/MakeUpPDF/index.js
@@ -0,0 +1,412 @@
+/* eslint-disable */
+import React, { useRef, useState, useEffect } from "react";
+import { Tabs, Button, message } from "antd-v4";
+import { CompressOutlined, ExpandOutlined } from "@ant-design/icons";
+import * as commonUtils from "@/utils/utils";
+import * as commonFunc from "@/components/Common/commonFunc";
+import {commonBusiness} from "@/components/Common/commonBusiness";
+import * as commonServices from "@/services/services";
+import CommonBase from "@/components/Common/CommonBase";
+import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
+import CommonViewTable from "@/components/Common/CommonViewTable";
+import StaticEditTable from "@/components/Common/CommonTable";
+import jsPreviewPdf from "@js-preview/pdf";
+import commonConfig from "@/utils/config";
+
+import styles from "./index.less";
+
+const MakeUpPDFEvent = props => {
+ const addState = {};
+
+ const { formData = [], selectData = [], masterData, makeUpPDFRecord = {} } = props;
+ const [activeKey, setActiveKey] = useState("100");
+ useEffect(
+ () => {
+ if (!formData.length) return;
+
+ const getInitData = async () => {
+ const [masterConfig, slaveConfig] = formData;
+ const slaveColumn = commonFunc.getHeaderConfig(slaveConfig);
+
+ const { sId, sMakeUpId = sId } = makeUpPDFRecord;
+ let resultData = {};
+ let masterDefaultData = {};
+ if (sMakeUpId) {
+ resultData = await props.handleGetDataOne({ name: "master", configData: masterConfig, condition: { sId: sMakeUpId }, isWait: true });
+ const sParentId = resultData?.masterData?.sId;
+ resultData = {
+ ...resultData,
+ ...(await props.handleGetDataSet({
+ name: "slave",
+ configData: slaveConfig,
+ condition: { sSqlCondition: { sParentId } },
+ clearSelectData: true,
+ isWait: true,
+ })),
+ };
+ } else {
+ const defaultData = commonFunc.getDefaultData(masterConfig);
+ const { sPageMaterialsId, sPageMaterialsName, sPageMaterialsNo } = selectData[0];
+ masterDefaultData = {
+ ...defaultData,
+ dTimes: selectData.length * 20,
+ sPageMaterialsId,
+ sPageMaterialsName,
+ sPageMaterialsNo,
+ };
+ }
+
+ props.onSaveState({
+ masterConfig,
+ masterData: { handleType: "add", ...commonFunc.getDefaultData(masterConfig), ...masterDefaultData },
+ // masterData: { sId: commonUtils.createSid(), handleType: "add", ...commonFunc.getDefaultData(masterConfig) },
+ slaveConfig,
+ slaveColumn,
+ slaveData: selectData,
+ ...resultData,
+ });
+ };
+
+ getInitData();
+ },
+ [formData.length]
+ );
+ const handleResult = async (url, body) => {
+ const { app } = props;
+ let { masterData } = props;
+ const dataReturn = (await commonServices.postValueService(app.token, body, url)).data;
+ if (dataReturn.code === 1) {
+ /* 成功 */
+ const [masterNewData] = dataReturn.dataset.rows[0].dataSet;
+ masterData = { ...masterData, ...masterNewData };
+ if (commonUtils.isNotEmptyObject(masterData)) {
+ props.onSaveState({
+ masterData,
+ });
+ }
+ } else {
+ /* 失败 */
+ message.error(dataReturn.msg);
+ return false;
+ }
+ };
+ /* 生成拼版任务 */
+ addState.onSend = () => {
+ props.onSaveState({ bRefreshTable: true });
+ setActiveKey("200");
+ setMakeUpProcessList([]);
+ const { app, masterData, slaveData } = props;
+ const { userinfo } = app;
+ const url = `${commonConfig.server_host}makeup/makeupcreate`;
+ const body = {
+ ...userinfo,
+ sUserId: userinfo.sId,
+ sMakePerson: userinfo.sUserName,
+ masterData: [masterData],
+ slaveData,
+ };
+ handleResult(url, body);
+ // commonServices.postValueService(app.token, body, url);
+ };
+ /* 暂停 */
+ addState.onStop = () => {
+ setActiveKey("200");
+ const { app, masterData, slaveData } = props;
+ const { userinfo } = app;
+ const url = `${commonConfig.server_host}makeup/makeupstop`;
+ const body = {
+ ...userinfo,
+ sUserId: userinfo.sId,
+ sMakePerson: userinfo.sUserName,
+ sBillNo: commonUtils.isNotEmptyObject(masterData) ? masterData.sBillNo : "",
+ sId: commonUtils.isNotEmptyObject(masterData) ? masterData.sId : "",
+ sOrderSlaveId: slaveData[0].sOrderSlaveId,
+ };
+ handleResult(url, body);
+ };
+ /* 生产工单 */
+ addState.onCreateWorkOrder = () => {
+ setActiveKey("200");
+ const { app, masterData, slaveData } = props;
+ const { userinfo } = app;
+ let sId = masterData?.sId;
+ if (commonUtils.isEmptyObject(sId)) {
+ message.warn("拼版还未完成,请等待...");
+ return;
+ }
+ const url = `${commonConfig.server_host}makeup/makeuptowork`;
+ const body = {
+ ...userinfo,
+ sUserId: userinfo.sId,
+ sMakePerson: userinfo.sUserName,
+ sBillNo: commonUtils.isNotEmptyObject(masterData) ? masterData.sBillNo : "",
+ sId,
+ sOrderSlaveId: slaveData[0].sOrderSlaveId,
+ };
+ handleResult(url, body);
+ };
+ const [makeUpProcessList, setMakeUpProcessList] = useState([]);
+ const [makeUpData, setMakeUpData] = useState({});
+ const [slaveDataNew, setSlaveDataNew] = useState([]);
+ // 获取ws消息
+ useEffect(() => {
+ window.tempWsAction = ({ data } = {}) => {
+ const { msg, action } = commonUtils.convertStrToObj(data);
+ console.log("=====data", data);
+ if (action === "showMakeUpProcess") {
+ setMakeUpProcessList(pre => [...pre, msg]);
+ } else if (action === "showMakeUpView") {
+ setMakeUpData(pre => ({ ...pre, sViewPdf: msg }));
+ } else if (action === "sendMakeUpData") {
+ setMakeUpData(pre => ({ ...pre, ...msg }));
+ } else if (action === "sendMakeUpSlaveData") {
+ setSlaveDataNew(msg);
+ }
+ };
+
+ return () => {
+ window.tempWsAction = null;
+ };
+ }, []);
+
+ useEffect(
+ () => {
+ props.onSaveState({
+ masterData: { ...masterData, ...makeUpData },
+ });
+ },
+ [makeUpData]
+ );
+
+ useEffect(
+ () => {
+ if (!slaveDataNew.length) return;
+ const slaveData = props.slaveData.map(item => {
+ const extraData = slaveDataNew.find(i => i.sOrderSlaveId === item.sOrderSlaveId) || {};
+ return {
+ ...item,
+ ...extraData,
+ };
+ });
+ props.onSaveState({ slaveData });
+ },
+ [slaveDataNew]
+ );
+
+ return {
+ ...props,
+ ...addState,
+ activeKey,
+ setActiveKey,
+ makeUpProcessList,
+ };
+};
+const MakeUpPDF = baseProps => {
+ const { pdfMakeUpVisible } = baseProps;
+ if (!pdfMakeUpVisible) return "";
+
+ const props = MakeUpPDFEvent(baseProps);
+ const { onCancel, onOk, title, app, masterConfig, masterData = {}, bFullScreen } = props;
+ if (!masterConfig) return "";
+
+ const ableConfigs = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible && !item.sControlName);
+
+ const viewProps = {
+ ...props,
+ viewConfigs: ableConfigs,
+ tableConfig: masterConfig,
+ iColValueView: 24,
+ viewRow: masterData,
+ tableName: "master",
+ onDataChange: props.onChange,
+ onViewClick: (...args) => {
+ props.onViewClick(...args);
+ props.onCancel();
+ },
+ };
+
+ const tabsConfig = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible && item.sControlName);
+
+ return (
+
+
+
+
+
+
+
+
+
+ ),
+ }}
+ items={[
+ { label: "订单信息", key: "100", children: },
+ { label: "拼板进度", key: "200", children: },
+ ...tabsConfig.map((config, index) => {
+ const { showName, sName } = config;
+ const fileUrl = masterData[sName];
+ const pdfUrl = `${commonConfig.file_host}file/downloadView?savePathStr=${encodeURIComponent(fileUrl)}&sModelsId=100&token=${app.token}`;
+ const pdfProps = {
+ ...props,
+ pdfUrl,
+ };
+
+ return {
+ label: showName,
+ key: index,
+ children: (() => {
+ if (!fileUrl) {
+ return 暂无内容
;
+ } else if (fileUrl.toLowerCase().endsWith(".pdf")) {
+ return ;
+ } else if (fileUrl.toLowerCase().endsWith(".svg")) {
+ return
;
+ }
+ })(),
+ };
+ }),
+ ]}
+ />
+
+ );
+};
+
+const PDFPreviewerComponent = props => {
+ const { pdfUrl, bFullScreen } = props;
+
+ const handleSwitchFullScreen = () => {
+ props.onSaveState({ bFullScreen: !bFullScreen });
+ };
+
+ return (
+
+ : }
+ onClick={handleSwitchFullScreen}
+ />
+
+
+ );
+};
+
+const SlaveComponent = props => {
+ const { masterData = {}, slaveData = [] } = props;
+ const tableRef = useRef(null);
+ const [tableHeight, setTableHeight] = useState("100px");
+
+ useEffect(() => {
+ const { height } = tableRef.current.parentNode.getBoundingClientRect();
+ setTableHeight(`${height - 40}px`);
+ }, []);
+
+ const slaveDataOne = slaveData[0] || {};
+ const { sPageMaterialsId, sPageMaterialsName, sPageMaterialsNo } = masterData;
+ // 监听主表纸张变化
+ useEffect(
+ () => {
+ if (sPageMaterialsId && sPageMaterialsId !== slaveDataOne.sPageMaterialsId) {
+ props.onSaveState({
+ slaveData: slaveData.map(item => ({
+ ...item,
+ sPageMaterialsId,
+ sPageMaterialsName,
+ sPageMaterialsNo,
+ handleType: item.handleType || "update",
+ })),
+ });
+ }
+ },
+ [sPageMaterialsId]
+ );
+
+ const slaveTableProps = {
+ ...commonBusiness.getTableTypes("slave", props),
+ tableProps: {
+ rowSelection: null,
+ },
+ fixedHeight: tableHeight,
+ };
+
+ return (
+
+
+
+ );
+};
+
+const ProcessComponent = props => {
+ const { app, makeUpProcessList = [], masterData = {} } = props;
+ const { sViewPdf } = masterData;
+ const imgUrl = sViewPdf
+ ? `${commonConfig.file_host}file/downloadView?savePathStr=${encodeURIComponent(sViewPdf)}&sModelsId=100&token=${app.token}`
+ : "";
+
+ const processRef = useRef(null);
+ const [processHeight, setProcessHeight] = useState("100%");
+
+ useEffect(() => {
+ const { height } = processRef.current.parentNode.getBoundingClientRect();
+ setProcessHeight(`${height}px`);
+ }, []);
+
+ const processContentRef = useRef(null);
+ useEffect(
+ () => {
+ if (!processContentRef.current) return;
+ processContentRef.current.scrollTop = 999999999;
+ },
+ [makeUpProcessList.length]
+ );
+
+ return (
+
+ {processHeight !== "100%" && (
+ <>
+
+ {makeUpProcessList.map(item => (
+
{item}
+ ))}
+
+
+

+
+ >
+ )}
+
+ );
+};
+
+export default CommonBase(MakeUpPDF);
diff --git a/src/components/Common/MakeUpPDF/index.less b/src/components/Common/MakeUpPDF/index.less
new file mode 100644
index 0000000..40c18b3
--- /dev/null
+++ b/src/components/Common/MakeUpPDF/index.less
@@ -0,0 +1,83 @@
+.viewTable {
+ width: 100%;
+ height: auto;
+}
+
+.viewTableHide {
+ display: none;
+}
+
+.tabs {
+ height: auto;
+ flex: 1;
+
+ :global {
+ .ant-tabs-tabpane {
+ height: 100%;
+ }
+ }
+}
+
+.tabsHide {
+ :global {
+ .ant-tabs-nav {
+ display: none;
+ }
+ }
+}
+
+.btns {
+ margin-right: 20px;
+ width: 210px;
+ display: flex;
+ justify-content: space-between;
+
+ :global {
+ button {
+ border-radius: 5px;
+ }
+
+ button:first-child {
+ background-color: #53b637;
+ border-color: #53b637;
+ }
+ }
+}
+
+.process {
+ width: 100%;
+ height: 100%;
+ background: #25292e;
+ color: #e57c84;
+ display: flex;
+
+ .processContent {
+ flex: 1;
+ width: auto;
+ height: 100%;
+ overflow: auto;
+ border-right: 1px solid #d9d9d9;
+ }
+
+ .processImg {
+ width: 400px;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ // 图片居中,长宽自适应
+ img {
+ max-width: 100%;
+ max-height: 100%;
+ }
+ }
+}
+
+.fullScreen {
+ position: absolute;
+ top: 11.5px;
+ right: 126px;
+ background: transparent !important;
+ border: transparent !important;
+}
\ No newline at end of file
diff --git a/src/components/Common/MaterialRequirementsPlanning.js b/src/components/Common/MaterialRequirementsPlanning.js
index d6cf297..3e5a5b9 100644
--- a/src/components/Common/MaterialRequirementsPlanning.js
+++ b/src/components/Common/MaterialRequirementsPlanning.js
@@ -15,7 +15,7 @@ import Toolbar from '../Common/ToolBar/ToolBarNew';
import StaticEditTable from './CommonTable';/* 可编辑表格 */
import styles from '../../index.less';
import CommonBase from './CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from './commonBusiness';/* 单据业务功能 */
+import commonBusiness from './commonBusiness';/* 单据业务功能 */
import SearchComponent from './SearchComponent';/* 搜索组件 */
import commonConfig from '../../utils/config';
import * as commonUtils from '../../utils/utils';/* 通用方法 */
diff --git a/src/components/Common/PersonCenter/PersonCenter.js b/src/components/Common/PersonCenter/PersonCenter.js
index 7d87071..0eb4e1c 100644
--- a/src/components/Common/PersonCenter/PersonCenter.js
+++ b/src/components/Common/PersonCenter/PersonCenter.js
@@ -20,7 +20,7 @@ import { Button, Input, Modal, Menu, Badge, message, Dropdown, Space, Popover, T
import styles from '@/routes/indexPage.less';
import config from '@/utils/config';
import * as commonUtils from '@/utils/utils';
-import * as commonBusiness from '@/components/Common/commonBusiness';
+import commonBusiness from '@/components/Common/commonBusiness';
import * as commonFunc from '@/components/Common/commonFunc';/* 单据业务功能 */
import FaceDetect from '@/components/FaceDetect';
import logoAbout from '@/assets/logo.png';
diff --git a/src/components/Common/SearchComponent/index.js b/src/components/Common/SearchComponent/index.js
index 54cb389..39cb2e6 100644
--- a/src/components/Common/SearchComponent/index.js
+++ b/src/components/Common/SearchComponent/index.js
@@ -11,7 +11,7 @@ import * as commonFunc from '@/components/Common/commonFunc';
import * as commonServices from '@/services/services';
import ShowType from '@/components/Common/CommonComponent';
import StaticEditTable from '@/components//Common/CommonTable';
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
import styles from './index.less';
import SvgIcon from "../../SvgIcon";
diff --git a/src/components/Common/ToolBar/ToolBarNew.js b/src/components/Common/ToolBar/ToolBarNew.js
index aac011e..13b1b13 100644
--- a/src/components/Common/ToolBar/ToolBarNew.js
+++ b/src/components/Common/ToolBar/ToolBarNew.js
@@ -14,7 +14,7 @@ import FilfileManageInfo from '@/components/CommonElementEvent/FilfileManageInfo
import BatchPriceUpdate from '@/components/CommonElementEvent/BatchPriceUpdate';
import BatchNPriceUpdate from '@/components/CommonElementEvent/BatchNPriceUpdate';/* 产品单价价格批量更新 */
import AffixMenu from '@/routes/common/AffixMenu';
-import * as commonBusiness from '@/components/Common/commonBusiness';
+import commonBusiness from '@/components/Common/commonBusiness';
import * as commonFunc from '@/components/Common/commonFunc';
import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
import SlaveMemo from '@/components/Common/SlaveMemo';
diff --git a/src/components/Common/commonBusiness.js b/src/components/Common/commonBusiness.js
index 388155f..8ada29c 100644
--- a/src/components/Common/commonBusiness.js
+++ b/src/components/Common/commonBusiness.js
@@ -1929,45 +1929,44 @@ export function handleGetMsg(str) {
}
return divStr;
}
-export function commonBusiness() {
- const commonBusinessData = {
- validateTable,
- validateMaster,
- validateField,
- handleAddIcon,
- handleCheckIcon,
- queryWidth,
- saveData,
- mergeData,
- getTableTypes,
- getGeyPayDate,
- getCalculateByPrice,
- getCalculateByPriceNew,
- getCalculatedLossMoney,
- getCalculatedReserveBags1,
- getCalculatedReserveBags,
- getCalculateMoney,
- getCalculateMoneyNew,
- getCalculateNoTaxPrice,
- getCalculateNoTaxMoney,
- getCalculateTaxMoney,
- getCalculateMoneyByLossMoney,
- getKeyUpEvent,
- getCalculateAllMoney,
- handleUnitType,
- getMaterialsQty,
- getAuxiliaryQty,
- getFormulaValue,
- getOutSideProcessFormula,
- getShowTableSelectTypes,
- getTreeTypes,
- getWriteTypes,
- clearSocketData,
- createMemoProps,
- getCharTypes,
- getCharConfig,
- validatePramsNotEmpty,
- handleGetMsg
- }
- return commonBusinessData
-}
\ No newline at end of file
+const commonBusiness = {
+ validateTable,
+ validateMaster,
+ validateField,
+ handleAddIcon,
+ handleCheckIcon,
+ queryWidth,
+ saveData,
+ mergeData,
+ getTableTypes,
+ getGeyPayDate,
+ getCalculateByPrice,
+ getCalculateByPriceNew,
+ getCalculatedLossMoney,
+ getCalculatedReserveBags1,
+ getCalculatedReserveBags,
+ getCalculateMoney,
+ getCalculateMoneyNew,
+ getCalculateNoTaxPrice,
+ getCalculateNoTaxMoney,
+ getCalculateTaxMoney,
+ getCalculateMoneyByLossMoney,
+ getKeyUpEvent,
+ getCalculateAllMoney,
+ handleUnitType,
+ getMaterialsQty,
+ getAuxiliaryQty,
+ getFormulaValue,
+ getOutSideProcessFormula,
+ getShowTableSelectTypes,
+ getTreeTypes,
+ getWriteTypes,
+ clearSocketData,
+ createMemoProps,
+ getCharTypes,
+ getCharConfig,
+ validatePramsNotEmpty,
+ handleGetMsg
+};
+
+export default commonBusiness;
\ No newline at end of file
diff --git a/src/components/CommonClassifyEvent/CommonClassify.js b/src/components/CommonClassifyEvent/CommonClassify.js
index 359e814..ae2a3f4 100644
--- a/src/components/CommonClassifyEvent/CommonClassify.js
+++ b/src/components/CommonClassifyEvent/CommonClassify.js
@@ -9,7 +9,7 @@ import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
import CommonBase from '@/components/Common/CommonBase';
import CommonClassifyEvent from '@/components/Common/CommonClassifyEvent';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
diff --git a/src/components/CommonElementEvent/BatchNPriceUpdate.js b/src/components/CommonElementEvent/BatchNPriceUpdate.js
index 95c30d0..1afb8bf 100644
--- a/src/components/CommonElementEvent/BatchNPriceUpdate.js
+++ b/src/components/CommonElementEvent/BatchNPriceUpdate.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react';
import { Input, message } from 'antd-v4';
import styles from '../../index.less';
-import * as commonBusiness from '../Common/commonBusiness';
+import commonBusiness from '../Common/commonBusiness';
import * as commonServices from '../../services/services'; /* 服务类 */
import commonConfig from '../../utils/config';
import * as commonUtils from '../../utils/utils';
diff --git a/src/components/CommonElementEvent/BatchPriceUpdate.js b/src/components/CommonElementEvent/BatchPriceUpdate.js
index 3f84ea1..f028a1a 100644
--- a/src/components/CommonElementEvent/BatchPriceUpdate.js
+++ b/src/components/CommonElementEvent/BatchPriceUpdate.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react';
import { Input, message } from 'antd-v4';
import styles from '../../index.less';
-import * as commonBusiness from '../Common/commonBusiness';
+import commonBusiness from '../Common/commonBusiness';
import * as commonServices from '../../services/services'; /* 服务类 */
import commonConfig from '../../utils/config';
import * as commonUtils from '../../utils/utils';
diff --git a/src/components/CommonElementEvent/BatchWorkListPriceUpdate.js b/src/components/CommonElementEvent/BatchWorkListPriceUpdate.js
index d68f060..a3cbcfe 100644
--- a/src/components/CommonElementEvent/BatchWorkListPriceUpdate.js
+++ b/src/components/CommonElementEvent/BatchWorkListPriceUpdate.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react';
import { Input, message, Radio } from 'antd-v4';
import styles from '../../index.less';
-import * as commonBusiness from '../Common/commonBusiness';
+import commonBusiness from '../Common/commonBusiness';
import * as commonServices from '../../services/services'; /* 服务类 */
import commonConfig from '../../utils/config';
import * as commonUtils from '../../utils/utils';
diff --git a/src/components/CommonElementEvent/CheckModelInfo.js b/src/components/CommonElementEvent/CheckModelInfo.js
index 7fc52a9..1cc21bc 100644
--- a/src/components/CommonElementEvent/CheckModelInfo.js
+++ b/src/components/CommonElementEvent/CheckModelInfo.js
@@ -10,7 +10,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
const { Header, Content } = Layout;
const { TabPane } = Tabs;
diff --git a/src/components/CommonElementEvent/CheckPhaseInfo.js b/src/components/CommonElementEvent/CheckPhaseInfo.js
index 658f1f5..14cc5eb 100644
--- a/src/components/CommonElementEvent/CheckPhaseInfo.js
+++ b/src/components/CommonElementEvent/CheckPhaseInfo.js
@@ -10,7 +10,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
const { Header, Content } = Layout;
const { TabPane } = Tabs;
diff --git a/src/components/CommonElementEvent/CustomerInfo.js b/src/components/CommonElementEvent/CustomerInfo.js
index 106d013..b3830f0 100644
--- a/src/components/CommonElementEvent/CustomerInfo.js
+++ b/src/components/CommonElementEvent/CustomerInfo.js
@@ -10,7 +10,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';
+import commonBusiness from '../Common/commonBusiness';
import * as commonUtils from '../../utils/utils';/* 单据业务功能 */
const { Header, Content } = Layout;
diff --git a/src/components/CommonElementEvent/ElemachineInfo.js b/src/components/CommonElementEvent/ElemachineInfo.js
index 6dd4412..28f3bb8 100644
--- a/src/components/CommonElementEvent/ElemachineInfo.js
+++ b/src/components/CommonElementEvent/ElemachineInfo.js
@@ -11,7 +11,7 @@ import CommonElementEvent from '../Common/CommonElementEvent';
import CommonView from '../Common/CommonView';
import * as commonUtils from '../../utils/utils';
import StaticEditTable from '../Common/CommonTable';
-import * as commonBusiness from '../Common/commonBusiness';
+import commonBusiness from '../Common/commonBusiness';
import commonConfig from '../../utils/config';/* 通用方法 */
diff --git a/src/components/CommonElementEvent/EleteamInfo.js b/src/components/CommonElementEvent/EleteamInfo.js
index d4c2ede..af11ef8 100644
--- a/src/components/CommonElementEvent/EleteamInfo.js
+++ b/src/components/CommonElementEvent/EleteamInfo.js
@@ -10,7 +10,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import * as commonUtils from '../../utils/utils';/* 通用方法 */
const { Header, Content } = Layout;
diff --git a/src/components/CommonElementEvent/FilfileManageInfo.js b/src/components/CommonElementEvent/FilfileManageInfo.js
index e9bcd35..cf6f1b7 100644
--- a/src/components/CommonElementEvent/FilfileManageInfo.js
+++ b/src/components/CommonElementEvent/FilfileManageInfo.js
@@ -7,7 +7,7 @@ import { Form } from '@ant-design/compatible';
import '@ant-design/compatible/assets/index.css';
import { Button, Layout, message, Spin } from 'antd-v4';
import StaticEditTable from '../Common/CommonTable';
-import * as commonBusiness from '../Common/commonBusiness';
+import commonBusiness from '../Common/commonBusiness';
import CommonBase from '../Common/CommonBase';
import CommonClassifyEvent from '../Common/CommonClassifyEvent';
import * as commonFunc from '../Common/commonFunc';
diff --git a/src/components/CommonElementEvent/KnifeMouldInfo.js b/src/components/CommonElementEvent/KnifeMouldInfo.js
index 4b050fe..e096a0d 100644
--- a/src/components/CommonElementEvent/KnifeMouldInfo.js
+++ b/src/components/CommonElementEvent/KnifeMouldInfo.js
@@ -10,7 +10,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
const { Header, Content } = Layout;
const { TabPane } = Tabs;
diff --git a/src/components/CommonElementEvent/MaterialsInfo.js b/src/components/CommonElementEvent/MaterialsInfo.js
index 9bfe32b..10653f9 100644
--- a/src/components/CommonElementEvent/MaterialsInfo.js
+++ b/src/components/CommonElementEvent/MaterialsInfo.js
@@ -10,7 +10,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
const { Header, Content } = Layout;
const { TabPane } = Tabs;
diff --git a/src/components/CommonElementEvent/PaymentTermsInfo.js b/src/components/CommonElementEvent/PaymentTermsInfo.js
index b0293f2..113e45d 100644
--- a/src/components/CommonElementEvent/PaymentTermsInfo.js
+++ b/src/components/CommonElementEvent/PaymentTermsInfo.js
@@ -9,7 +9,7 @@ import * as commonFunc from '../Common/commonFunc';
import CommonView from '../Common/CommonViewNew';
import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import * as commonUtils from '../../utils/utils';/* 通用方法 */
const { Header, Content } = Layout;
diff --git a/src/components/CommonElementEvent/PrintInfo.js b/src/components/CommonElementEvent/PrintInfo.js
index acc7186..9cd0155 100644
--- a/src/components/CommonElementEvent/PrintInfo.js
+++ b/src/components/CommonElementEvent/PrintInfo.js
@@ -10,7 +10,7 @@ import CommonBase from '@/components/Common/CommonBase';
import CommonElementEvent from '@/components/Common/CommonElementEvent';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import CommonView from '@/components/Common/CommonView';
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonUtils from '@/utils/utils';/* 通用方法 */
diff --git a/src/components/CommonElementEvent/ProcessInfo.js b/src/components/CommonElementEvent/ProcessInfo.js
index 56ae6e0..854b813 100644
--- a/src/components/CommonElementEvent/ProcessInfo.js
+++ b/src/components/CommonElementEvent/ProcessInfo.js
@@ -10,7 +10,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import * as commonUtils from '../../utils/utils';/* 通用方法 */
const { Header, Content } = Layout;
diff --git a/src/components/CommonElementEvent/ProductClassifyInfo.js b/src/components/CommonElementEvent/ProductClassifyInfo.js
index 21bbd59..936d5e2 100644
--- a/src/components/CommonElementEvent/ProductClassifyInfo.js
+++ b/src/components/CommonElementEvent/ProductClassifyInfo.js
@@ -10,7 +10,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import * as commonUtils from '../../utils/utils';/* 通用方法 */
const { Header, Content } = Layout;
diff --git a/src/components/CommonElementEvent/SftLoginInfo.js b/src/components/CommonElementEvent/SftLoginInfo.js
index a994dca..79f6c56 100644
--- a/src/components/CommonElementEvent/SftLoginInfo.js
+++ b/src/components/CommonElementEvent/SftLoginInfo.js
@@ -11,7 +11,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
const { Header, Content } = Layout;
const { TabPane } = Tabs;
diff --git a/src/components/CommonElementEvent/SisCommonStyle.js b/src/components/CommonElementEvent/SisCommonStyle.js
index dd9c9cc..e01b3fe 100644
--- a/src/components/CommonElementEvent/SisCommonStyle.js
+++ b/src/components/CommonElementEvent/SisCommonStyle.js
@@ -10,7 +10,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
const { Header, Content } = Layout;
const { TabPane } = Tabs;
diff --git a/src/components/CommonElementEvent/SisformulaInfo.js b/src/components/CommonElementEvent/SisformulaInfo.js
index b7fcf2f..49bb104 100644
--- a/src/components/CommonElementEvent/SisformulaInfo.js
+++ b/src/components/CommonElementEvent/SisformulaInfo.js
@@ -12,7 +12,7 @@ import CommonElementEvent from '@/components/Common/CommonElementEvent';
import CommonView from '@/components/Common/CommonView';
import TabCounter from '@/components/Common/CommonCalculator';
import TabParam from '@/components/Common/commonParam';
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import ShowTypeNew from '@/components/Common/CommonComponent';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
diff --git a/src/components/CommonElementEvent/StatementInfo.js b/src/components/CommonElementEvent/StatementInfo.js
index 9dbc746..e30fcc6 100644
--- a/src/components/CommonElementEvent/StatementInfo.js
+++ b/src/components/CommonElementEvent/StatementInfo.js
@@ -17,7 +17,7 @@ import { Modal, Upload, message } from 'antd-v4';
import * as commonUtils from '../../utils/utils';
import * as commonServices from '../../services/services';
import commonConfig from '../../utils/config';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '../Common/CommonTable';
import * as commonFunc from '../Common/commonFunc';
import AntdDraggableModal from '../Common/AntdDraggableModal';
diff --git a/src/components/CommonElementEvent/SupplyInfo.js b/src/components/CommonElementEvent/SupplyInfo.js
index ab83db1..72ed251 100644
--- a/src/components/CommonElementEvent/SupplyInfo.js
+++ b/src/components/CommonElementEvent/SupplyInfo.js
@@ -10,7 +10,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import * as commonUtils from '../../utils/utils';/* 通用方法 */
const { Header, Content } = Layout;
diff --git a/src/components/CommonElementEvent/TestStandInfo.js b/src/components/CommonElementEvent/TestStandInfo.js
index d650c84..25a6209 100644
--- a/src/components/CommonElementEvent/TestStandInfo.js
+++ b/src/components/CommonElementEvent/TestStandInfo.js
@@ -10,7 +10,7 @@ import CommonBase from '../Common/CommonBase';
import CommonElementEvent from '../Common/CommonElementEvent';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonView from '../Common/CommonView';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
const { Header, Content } = Layout;
const { TabPane } = Tabs;
diff --git a/src/components/CommonImportDataEvent/importDataInfo.js b/src/components/CommonImportDataEvent/importDataInfo.js
index cd5d8b1..ec28b83 100644
--- a/src/components/CommonImportDataEvent/importDataInfo.js
+++ b/src/components/CommonImportDataEvent/importDataInfo.js
@@ -9,7 +9,7 @@ import CommonBase from '@/components/Common/CommonBase';
import CommonImportDataComponet from '@/components/Common/CommonImportDataEvent';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import CommonView from '@/components/Common/CommonViewNew';
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
/* 通用方法 */
const { Content } = Layout;
diff --git a/src/components/CommonSystemSettingEvent/CommonSystemSetting.js b/src/components/CommonSystemSettingEvent/CommonSystemSetting.js
index 9e6c10b..39a894f 100644
--- a/src/components/CommonSystemSettingEvent/CommonSystemSetting.js
+++ b/src/components/CommonSystemSettingEvent/CommonSystemSetting.js
@@ -8,7 +8,7 @@ import * as commonUtils from '@/utils/utils';/* 通用方法 */
import CommonBase from '@/components/Common/CommonBase';
import CommonSystemSettingEvent from '@/components/Common/CommonSystemSettingEvent';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import * as commonFunc from '@/components/Common/commonFunc';
import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
import selfStyles from './index.less';
diff --git a/src/components/CommonSystemSettingEvent/TabFinancePeriod.js b/src/components/CommonSystemSettingEvent/TabFinancePeriod.js
index 3c77239..578ff2a 100644
--- a/src/components/CommonSystemSettingEvent/TabFinancePeriod.js
+++ b/src/components/CommonSystemSettingEvent/TabFinancePeriod.js
@@ -4,7 +4,7 @@ import { Form } from '@ant-design/compatible';
import '@ant-design/compatible/assets/index.css';
import { Row, Col, message, DatePicker, Button } from 'antd-v4';
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import styles from '@/index.less';
import commonConfig from '@/utils/config';
import * as commonServices from '@/services/services';
diff --git a/src/components/JurisdictionAllotEvent/SystemPermissionInfo.js b/src/components/JurisdictionAllotEvent/SystemPermissionInfo.js
index d64aea3..19439fd 100644
--- a/src/components/JurisdictionAllotEvent/SystemPermissionInfo.js
+++ b/src/components/JurisdictionAllotEvent/SystemPermissionInfo.js
@@ -9,7 +9,7 @@ import Toolbar from '../Common/ToolBar/ToolBarNew';
import * as commonFunc from '../Common/commonFunc';
import CommonBase from '../Common/CommonBase';
import CommonJurisdictionEvent from '../Common/CommonJurisdictionNewEvent';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import StaticEditTree from '../Common/Tree/StaticTree';
import AntdDraggableModal from '../Common/AntdDraggableModal';
diff --git a/src/components/Manufacture/CommonPackEvent.js b/src/components/Manufacture/CommonPackEvent.js
index f359e2b..e6a1562 100644
--- a/src/components/Manufacture/CommonPackEvent.js
+++ b/src/components/Manufacture/CommonPackEvent.js
@@ -1,7 +1,7 @@
/* eslint-disable */
import React, { useEffect, useState, useRef } from "react";
import { Button, message } from "antd-v4";
-import * as commonBusiness from "@/components/Common/commonBusiness";
+import commonBusiness from "@/components/Common/commonBusiness";
import * as commonUtils from "@/utils/utils";
import * as commonFunc from "@/components/Common/commonFunc";
import commonConfig from "@/utils/config";
diff --git a/src/components/Manufacture/ProcessCard/ProcessCard.js b/src/components/Manufacture/ProcessCard/ProcessCard.js
index 35922a6..d64ae38 100644
--- a/src/components/Manufacture/ProcessCard/ProcessCard.js
+++ b/src/components/Manufacture/ProcessCard/ProcessCard.js
@@ -24,7 +24,7 @@ import selfstyles from '../index.less';
import CommonView from '../../Common/CommonView';
import CommonBase from '../../Common/CommonBase';/* 获取配置及数据 */
import * as commonUtils from '../../../utils/utils';/* 通用方法 */
-import * as commonBusiness from '../../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../../Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '../../../utils/config';
import * as commonServices from '../../../services/services';/* 服务类 */
import CommonListSelect from '../../Common/CommonListSelect';
diff --git a/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js b/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js
index f9ccc88..85fc123 100644
--- a/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js
+++ b/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js
@@ -37,7 +37,7 @@ import selfstyles from '../index.less';
import CommonView from '../../Common/CommonView';
import CommonBase from '../../Common/CommonBase'; /* 获取配置及数据 */
import * as commonUtils from '../../../utils/utils'; /* 通用方法 */
-import * as commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
+import commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
import commonConfig from '../../../utils/config';
import * as commonServices from '../../../services/services'; /* 服务类 */
import CommonListSelect from '../../Common/CommonListSelect';
diff --git a/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js b/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js
index a582e96..22e1c89 100644
--- a/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js
+++ b/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js
@@ -39,7 +39,7 @@ import selfstyles from '../index.less';
import CommonView from '../../Common/CommonView';
import CommonBase from '../../Common/CommonBase'; /* 获取配置及数据 */
import * as commonUtils from '../../../utils/utils'; /* 通用方法 */
-import * as commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
+import commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
import commonConfig from '../../../utils/config';
import * as commonServices from '../../../services/services'; /* 服务类 */
import CommonListSelect from '../../Common/CommonListSelect';
diff --git a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
index fe5df32..bd4115b 100644
--- a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
+++ b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
@@ -7,7 +7,7 @@ import { Form } from "@ant-design/compatible";
import CommonBase from "@/components/Common/CommonBase";
import CommonSales from "@/components/Common/CommonBillEvent";
import { CommonPackEvent, CommonModal } from "../CommonPackEvent";
-import * as commonBusiness from "@/components/Common/commonBusiness";
+import commonBusiness from "@/components/Common/commonBusiness";
import * as commonUtils from "@/utils/utils";
import * as commonFunc from "@/components/Common/commonFunc";
import commonConfig from "@/utils/config";
diff --git a/src/components/Manufacture/WorkOrder/WorkOrder.js b/src/components/Manufacture/WorkOrder/WorkOrder.js
index c270275..399257f 100644
--- a/src/components/Manufacture/WorkOrder/WorkOrder.js
+++ b/src/components/Manufacture/WorkOrder/WorkOrder.js
@@ -45,7 +45,7 @@ import styles from '@/index.less';
import CommonView from '@/components/Common/CommonView';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
import * as commonUtils from '@/utils/utils';/* 通用方法 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonServices from '@/services/services';/* 服务类 */
import CommonListSelect from '@/components/Common/CommonListSelect';/* 选择界面 */
diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js b/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js
index 6c40c77..26aab6d 100644
--- a/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js
+++ b/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js
@@ -49,7 +49,7 @@ import styles from '@/index.less';
import CommonView from '@/components/Common/CommonView';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
import * as commonUtils from '@/utils/utils';/* 通用方法 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonServices from '@/services/services';/* 服务类 */
import CommonListSelect from '@/components/Common/CommonListSelect';/* 选择界面 */
diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
index 3312f5d..65170e2 100644
--- a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
+++ b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
@@ -55,7 +55,7 @@ import styles from '@/index.less';
import CommonView from '@/components/Common/CommonView';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
import * as commonUtils from '@/utils/utils';/* 通用方法 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonServices from '@/services/services';/* 服务类 */
import EjectRight from '@/assets/eject.svg';/* 弹出图标 */
diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js b/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js
index 467d8a7..6cf5401 100644
--- a/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js
+++ b/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js
@@ -56,7 +56,7 @@ import styles from '@/index.less';
import CommonView from '@/components/Common/CommonView';
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
import * as commonUtils from '@/utils/utils';/* 通用方法 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '@/utils/config';
import * as commonServices from '@/services/services';/* 服务类 */
import EjectRight from '@/assets/eject.svg';/* 弹出图标 */
diff --git a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
index d582a3c..090a1e3 100644
--- a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
+++ b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
@@ -7,7 +7,7 @@ import { Form } from "@ant-design/compatible";
import CommonBase from "@/components/Common/CommonBase";
import CommonSales from "@/components/Common/CommonBillEvent";
import { CommonPackEvent, CommonModal } from "../CommonPackEvent";
-import * as commonBusiness from "@/components/Common/commonBusiness";
+import commonBusiness from "@/components/Common/commonBusiness";
import * as commonUtils from "@/utils/utils";
import * as commonFunc from "@/components/Common/commonFunc";
import commonConfig from "@/utils/config";
diff --git a/src/components/ProductionPlan/ProductionPlan.js b/src/components/ProductionPlan/ProductionPlan.js
index 36f32ae..e40c5e5 100644
--- a/src/components/ProductionPlan/ProductionPlan.js
+++ b/src/components/ProductionPlan/ProductionPlan.js
@@ -23,7 +23,7 @@ import CommonBase from '../Common/CommonBase';/* 获取配置及数据 */
import * as commonUtils from '../../utils/utils';/* 通用方法 */
import * as commonFunc from '../../components/Common/commonFunc';
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import AntdDraggableModal from '../Common/AntdDraggableModal';
const {
diff --git a/src/components/ProductionReport/ProductionReport.js b/src/components/ProductionReport/ProductionReport.js
index 15f6835..dc19df9 100644
--- a/src/components/ProductionReport/ProductionReport.js
+++ b/src/components/ProductionReport/ProductionReport.js
@@ -28,7 +28,7 @@ import styles from './../../index.less';
import CommonView from './../Common/CommonView';
import CommonBase from './../Common/CommonBase';/* 获取配置及数据 */
import * as commonUtils from './../../utils/utils';/* 通用方法 */
-import * as commonBusiness from './../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from './../Common/commonBusiness';/* 单据业务功能 */
import commonConfig from './../../utils/config';
import * as commonServices from './../../services/services';
import AntdDraggableModal from '../Common/AntdDraggableModal';/* 服务类 */
diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx
index a02e35a..b5e63ab 100644
--- a/src/components/QuickQuote/index.jsx
+++ b/src/components/QuickQuote/index.jsx
@@ -7,7 +7,7 @@ import commonConfig from "@/utils/config";
import * as commonUtils from "@/utils/utils";
import * as commonServices from "@/services/services";
import * as commonFunc from "@/components/Common/commonFunc";
-import * as commonBusiness from "@/components/Common/commonBusiness";
+import commonBusiness from "@/components/Common/commonBusiness";
import CommonViewTable from "@/components/Common/CommonViewTable";
import StaticEditTable from "@/components/Common/CommonTable";
import ShowImgM from "@/components/Common/BoxShowImgMaterial";
diff --git a/src/components/QuoQuotation/Quotation/Quotation.js b/src/components/QuoQuotation/Quotation/Quotation.js
index 99c96cb..f1f30d9 100644
--- a/src/components/QuoQuotation/Quotation/Quotation.js
+++ b/src/components/QuoQuotation/Quotation/Quotation.js
@@ -26,7 +26,7 @@ import CommonView from '../../Common/CommonView';
import SplitPaste from './SplitPasteQuotation';
import CommonBase from '../../Common/CommonBase';/* 获取配置及数据 */
import * as commonUtils from '../../../utils/utils';/* 通用方法 */
-import * as commonBusiness from '../../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../../Common/commonBusiness';/* 单据业务功能 */
import commonConfig from '../../../utils/config';
import * as commonServices from '../../../services/services';/* 服务类 */
import CommonListSelect from '../../Common/CommonListSelect';/* 选择界面 */
diff --git a/src/components/QuoQuotation/QuotationPack/QuotationPack.js b/src/components/QuoQuotation/QuotationPack/QuotationPack.js
index a9e204e..c724a76 100644
--- a/src/components/QuoQuotation/QuotationPack/QuotationPack.js
+++ b/src/components/QuoQuotation/QuotationPack/QuotationPack.js
@@ -31,7 +31,7 @@ import CommonView from '../../Common/CommonView';
import SplitPaste from '../Quotation/SplitPasteQuotation';
import CommonBase from '../../Common/CommonBase'; /* 获取配置及数据 */
import * as commonUtils from '../../../utils/utils'; /* 通用方法 */
-import * as commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
+import commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
import commonConfig from '../../../utils/config';
import * as commonServices from '../../../services/services'; /* 服务类 */
import CommonListSelect from '../../Common/CommonListSelect'; /* 选择界面 */
diff --git a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
index 2b755eb..20a5351 100644
--- a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
+++ b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
@@ -32,7 +32,7 @@ import CommonView from '../../Common/CommonView';
import SplitPaste from '../Quotation/SplitPasteQuotation';
import CommonBase from '../../Common/CommonBase'; /* 获取配置及数据 */
import * as commonUtils from '../../../utils/utils'; /* 通用方法 */
-import * as commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
+import commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
import commonConfig from '../../../utils/config';
import * as commonServices from '../../../services/services'; /* 服务类 */
import CommonListSelect from '../../Common/CommonListSelect'; /* 选择界面 */
diff --git a/src/components/productionMainPlan/productionMainPlan.js b/src/components/productionMainPlan/productionMainPlan.js
index 5eefc40..f27b1a3 100644
--- a/src/components/productionMainPlan/productionMainPlan.js
+++ b/src/components/productionMainPlan/productionMainPlan.js
@@ -6,7 +6,7 @@ import { Layout, Spin, Avatar, Tabs, Card, Row, Col, message } from 'antd-v4'; /
import styles from '@/index.less';
import * as commonFunc from '@/components/Common/commonFunc';
import CommonBase from '@/components/Common/CommonBase';
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
import CommonProductionMainPlanEvent from '@/components/Common/CommonProductionmMainPlanEvent';
diff --git a/src/components/productionMainPlan/productionUnifiedPlanning.js b/src/components/productionMainPlan/productionUnifiedPlanning.js
index 42ba6cd..4936372 100644
--- a/src/components/productionMainPlan/productionUnifiedPlanning.js
+++ b/src/components/productionMainPlan/productionUnifiedPlanning.js
@@ -6,7 +6,7 @@ import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销
import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
// import SearchComponent from '@/components/Common/SearchComponent'; /* 搜索组件 */
import commonConfig from '@/utils/config';
import CommonView from '@/components/Common/CommonViewNew';
diff --git a/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js b/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js
index 0dac436..ce9819c 100644
--- a/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js
+++ b/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js
@@ -7,7 +7,7 @@ import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功
import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
import StaticEditTable from './CommonTable';/* 可编辑表格 */
import CommonBase from './CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from './commonBusiness';/* 单据业务功能 */
+import commonBusiness from './commonBusiness';/* 单据业务功能 */
import SearchComponent from './SearchComponent';/* 搜索组件 */
import commonConfig from '../../utils/config';
diff --git a/src/components/productionPlanInfo/productionPlanInfo.js b/src/components/productionPlanInfo/productionPlanInfo.js
index 25b6b48..3300119 100644
--- a/src/components/productionPlanInfo/productionPlanInfo.js
+++ b/src/components/productionPlanInfo/productionPlanInfo.js
@@ -7,7 +7,7 @@ import styles from '../../index.less';
import selfstyles from '../productionMainPlan/index.less';
import * as commonFunc from '../Common/commonFunc';
import CommonBase from '../Common/CommonBase';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonProductionPlanEvent from '../Common/CommonProductionPlanEvent';
import Toolbar from '../Common/ToolBar/ToolBarNew';
diff --git a/src/components/productionPlanInfo/productionPlanInfo2.js b/src/components/productionPlanInfo/productionPlanInfo2.js
index 1317f4f..3d4e481 100644
--- a/src/components/productionPlanInfo/productionPlanInfo2.js
+++ b/src/components/productionPlanInfo/productionPlanInfo2.js
@@ -6,7 +6,7 @@ import { Layout, Spin, Select } from 'antd-v4'; // Switch
import styles from '../../index.less';
import * as commonFunc from '../Common/commonFunc';
import CommonBase from '../Common/CommonBase';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import SearchComponent from '../Common/SearchComponent';/* 搜索组件 */
import CommonProductionPlanEvent from '../Common/CommonProductionPlanEvent';
diff --git a/src/components/productionPlanInfo/productionPlanOutside.js b/src/components/productionPlanInfo/productionPlanOutside.js
index 49b465e..2df7045 100644
--- a/src/components/productionPlanInfo/productionPlanOutside.js
+++ b/src/components/productionPlanInfo/productionPlanOutside.js
@@ -7,7 +7,7 @@ import styles from '../../index.less';
import selfstyles from '../productionMainPlan/index.less';
import * as commonFunc from '../Common/commonFunc';
import CommonBase from '../Common/CommonBase';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import CommonProductionPlanEvent from '../Common/CommonProductionPlanEvent';
import Toolbar from '../Common/ToolBar/ToolBarNew';
diff --git a/src/components/productionSchedule/productionPlanChangeMacheInfo.js b/src/components/productionSchedule/productionPlanChangeMacheInfo.js
index 37a85e0..ce562ff 100644
--- a/src/components/productionSchedule/productionPlanChangeMacheInfo.js
+++ b/src/components/productionSchedule/productionPlanChangeMacheInfo.js
@@ -7,7 +7,7 @@ import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功
import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
import StaticEditTable from './CommonTable';/* 可编辑表格 */
import CommonBase from './CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from './commonBusiness';/* 单据业务功能 */
+import commonBusiness from './commonBusiness';/* 单据业务功能 */
import SearchComponent from './SearchComponent';/* 搜索组件 */
import * as commonConfig from '../../utils/config';
diff --git a/src/components/productionSchedule/productionPlanInfo2.js b/src/components/productionSchedule/productionPlanInfo2.js
index 4db664c..6778bcb 100644
--- a/src/components/productionSchedule/productionPlanInfo2.js
+++ b/src/components/productionSchedule/productionPlanInfo2.js
@@ -6,7 +6,7 @@ import { Layout, Spin, Select } from 'antd-v4'; // Switch
import styles from '../../index.less';
import * as commonFunc from '../Common/commonFunc';
import CommonBase from '../Common/CommonBase';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import SearchComponent from '../Common/SearchComponent';/* 搜索组件 */
import CommonProductionPlanEvent from '../Common/CommonProductionPlanEvent';
diff --git a/src/components/productionSchedule/productionSchedule.js b/src/components/productionSchedule/productionSchedule.js
index 17db1b6..0d61049 100644
--- a/src/components/productionSchedule/productionSchedule.js
+++ b/src/components/productionSchedule/productionSchedule.js
@@ -8,7 +8,7 @@ import styles from '@/index.less';
import selfstyles from '@/components/productionMainPlan/index.less';
import * as commonFunc from '@/components/Common/commonFunc';
import CommonBase from '@/components/Common/CommonBase';
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import CommonProductionPlanEvent from '@/components/Common/CommonProductionPlanEvent';
import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
diff --git a/src/components/productionScheduleTree/productionPlanChangeMacheInfo.js b/src/components/productionScheduleTree/productionPlanChangeMacheInfo.js
index 37a85e0..ce562ff 100644
--- a/src/components/productionScheduleTree/productionPlanChangeMacheInfo.js
+++ b/src/components/productionScheduleTree/productionPlanChangeMacheInfo.js
@@ -7,7 +7,7 @@ import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功
import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
import StaticEditTable from './CommonTable';/* 可编辑表格 */
import CommonBase from './CommonBase';/* 获取配置及数据 */
-import * as commonBusiness from './commonBusiness';/* 单据业务功能 */
+import commonBusiness from './commonBusiness';/* 单据业务功能 */
import SearchComponent from './SearchComponent';/* 搜索组件 */
import * as commonConfig from '../../utils/config';
diff --git a/src/components/productionScheduleTree/productionPlanInfo2.js b/src/components/productionScheduleTree/productionPlanInfo2.js
index 4db664c..6778bcb 100644
--- a/src/components/productionScheduleTree/productionPlanInfo2.js
+++ b/src/components/productionScheduleTree/productionPlanInfo2.js
@@ -6,7 +6,7 @@ import { Layout, Spin, Select } from 'antd-v4'; // Switch
import styles from '../../index.less';
import * as commonFunc from '../Common/commonFunc';
import CommonBase from '../Common/CommonBase';
-import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
import SearchComponent from '../Common/SearchComponent';/* 搜索组件 */
import CommonProductionPlanEvent from '../Common/CommonProductionPlanEvent';
diff --git a/src/components/productionScheduleTree/productionScheduleTree.js b/src/components/productionScheduleTree/productionScheduleTree.js
index dae6309..954d9db 100644
--- a/src/components/productionScheduleTree/productionScheduleTree.js
+++ b/src/components/productionScheduleTree/productionScheduleTree.js
@@ -9,7 +9,7 @@ import styles from '@/index.less';
import selfstyles from '@/components/productionMainPlan/index.less';
import * as commonFunc from '@/components/Common/commonFunc';
import CommonBase from '@/components/Common/CommonBase';
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import CommonProductionPlanTreeEvent from '@/components/Common/CommonProductionPlanTreeEvent';
import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
diff --git a/src/components/productionScheduleTree/productionScheduleTreeBack.js b/src/components/productionScheduleTree/productionScheduleTreeBack.js
index 02a4070..8da7e26 100644
--- a/src/components/productionScheduleTree/productionScheduleTreeBack.js
+++ b/src/components/productionScheduleTree/productionScheduleTreeBack.js
@@ -8,7 +8,7 @@ import styles from '@/index.less';
import selfstyles from '@/components/productionMainPlan/index.less';
import * as commonFunc from '@/components/Common/commonFunc';
import CommonBase from '@/components/Common/CommonBase';
-import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
+import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
import CommonProductionPlanTreeEvent from '@/components/Common/CommonProductionPlanTreeEvent';
import Toolbar from '@/components/Common/ToolBar/ToolBarNew';