Commit 0cfa57498545a1eab68edcb624a68a38700da1e3

Authored by 陈鑫涛
1 parent e5678ff6

公用方法调用

Showing 114 changed files with 647 additions and 153 deletions

Too many changes to show.

To preserve performance only 100 of 114 files are displayed.

src/components/Common/AssignmentField.js
... ... @@ -7,7 +7,7 @@ import { Modal } from 'antd-v4';
7 7 import styles from '@/index.less';
8 8 import * as commonUtils from '@/utils/utils';
9 9 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
10   -import * as commonBusiness from '@/components/Common/commonBusiness';
  10 +import commonBusiness from '@/components/Common/commonBusiness';
11 11 /* 单据业务功能 */
12 12 export default class AssignmentField extends Component {
13 13 /** 构造函数 */
... ...
src/components/Common/BoxDesignCompontent/index.js
... ... @@ -4,7 +4,7 @@ import { Select, Button, message, Input, Spin } from "antd-v4";
4 4 import { CompressOutlined, ExpandOutlined } from "@ant-design/icons";
5 5 import * as commonUtils from "@/utils/utils";
6 6 import * as commonFunc from "@/components/Common/commonFunc";
7   -import * as commonBusiness from "@/components/Common/commonBusiness";
  7 +import commonBusiness from "@/components/Common/commonBusiness";
8 8 import * as commonServices from "@/services/services";
9 9 import CommonBase from "@/components/Common/CommonBase";
10 10 import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
... ...
src/components/Common/CommonBase.js
... ... @@ -12,7 +12,7 @@ import commonConfig from '../../utils/config';
12 12 import * as commonUtils from '../../utils/utils';
13 13 import * as commonServices from '../../services/services';
14 14 import * as commonFunc from './commonFunc';
15   -import * as commonBusiness from './commonBusiness'; /* 通用单据方法 */
  15 +import commonBusinessess from './commonBusiness'; /* 通用单据方法 */
16 16 import instructSet from "@/components/Common/CommonInstructSet";
17 17  
18 18 export default (ChildComponent) => {
... ...
src/components/Common/CommonBill/index.js
... ... @@ -26,7 +26,7 @@ import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格
26 26 import styles from '@/index.less';
27 27 import CommonView from '@/components/Common/CommonView';
28 28 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
29   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  29 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
30 30 import commonConfig from '@/utils/config';
31 31 import * as commonUtils from '@/utils/utils';/* 通用方法 */
32 32 import * as commonServices from '@/services/services';/* 服务类 */
... ...
src/components/Common/CommonBillDeliver.js
... ... @@ -11,7 +11,7 @@ import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格
11 11 import styles from '@/index.less';
12 12 import CommonView from '@/components/Common/CommonView';
13 13 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
14   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  14 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
15 15 import commonConfig from '@/utils/config';
16 16 import * as commonUtils from '@/utils/utils';/* 通用方法 */
17 17 import * as commonServices from '@/services/services';/* 服务类 */
... ...
src/components/Common/CommonBillDeliverEvent.js
... ... @@ -6,7 +6,7 @@ import React, { Component } from 'react';
6 6 import { Modal, message } from 'antd-v4';
7 7 import moment from 'moment';
8 8 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
9   -import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
  9 +import commonBusiness from './commonBusiness'; /* 单据业务功能 */
10 10 import * as commonServices from '../../services/services'; /* 服务类 */
11 11 import commonConfig from '../../utils/config';
12 12 import * as commonFunc from './commonFunc';
... ...
src/components/Common/CommonBillEvent.js
... ... @@ -5,7 +5,7 @@ import { Modal, notification, Progress } from 'antd-v4';
5 5 import { message } from '@/utils/common/message';
6 6 import moment from 'moment';
7 7 import * as commonUtils from '@/utils/utils'; /* 通用方法 */
8   -import * as commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
  8 +import commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
9 9 import * as commonServices from '@/services/services'; /* 服务类 */
10 10 import commonConfig from '@/utils/config';
11 11 import * as commonFunc from '@/components/Common/commonFunc';
... ...
src/components/Common/CommonCheckBill/index.js
... ... @@ -27,7 +27,7 @@ import CommonView from '@/components/Common/CommonView';
27 27 import CommonViewFlex from '@/components/Common/CommonViewFlex';
28 28 import CommonViewTable from '@/components/Common/CommonViewTable';
29 29 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
30   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  30 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
31 31 import commonConfig from '@/utils/config';
32 32 import * as commonUtils from '@/utils/utils';/* 通用方法 */
33 33 import * as commonServices from '@/services/services';/* 服务类 */
... ...
src/components/Common/CommonCheckBillEvent.js
... ... @@ -4,7 +4,7 @@ import { Modal, Progress } from 'antd-v4';
4 4 import { message } from '@/utils/common/message';
5 5 import moment from 'moment';
6 6 import * as commonUtils from '@/utils/utils'; /* 通用方法 */
7   -import * as commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
  7 +import commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
8 8 import * as commonServices from '@/services/services'; /* 服务类 */
9 9 import commonConfig from '@/utils/config';
10 10 import * as commonFunc from '@/components/Common/commonFunc';
... ...
src/components/Common/CommonClassifyEvent.js
... ... @@ -3,7 +3,7 @@ import React, { Component } from 'react';
3 3 import moment from 'moment';
4 4 import { Modal, message } from 'antd-v4';
5 5 import * as commonFunc from './commonFunc';
6   -import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
  6 +import commonBusiness from './commonBusiness'; /* 单据业务功能 */
7 7 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
8 8 import commonConfig from '../../utils/config';
9 9 import * as commonServices from '../../services/services';
... ...
src/components/Common/CommonColumnList.js
... ... @@ -15,7 +15,7 @@ import Toolbar from '../Common/ToolBar/ToolBarNew';
15 15 import StaticEditTable from './CommonTable';/* 可编辑表格 */
16 16 import styles from '../../index.less';
17 17 import CommonBase from './CommonBase';/* 获取配置及数据 */
18   -import * as commonBusiness from './commonBusiness';/* 单据业务功能 */
  18 +import commonBusiness from './commonBusiness';/* 单据业务功能 */
19 19 import SearchComponent from './SearchComponent';/* 搜索组件 */
20 20 import commonConfig from '../../utils/config';
21 21 import * as commonUtils from '../../utils/utils';
... ...
src/components/Common/CommonCostomTabBill.js
... ... @@ -39,7 +39,7 @@ import AssignmentField from "./AssignmentField";
39 39 import CommonView from "@/components/Common/CommonView";
40 40 import CommonViewTable from "@/components/Common/CommonViewTable";
41 41 import CommonBase from "@/components/Common/CommonBase"; /* 获取配置及数据 */
42   -import * as commonBusiness from "@/components/Common/commonBusiness"; /* 单据业务功能 */
  42 +import commonBusiness from "@/components/Common/commonBusiness"; /* 单据业务功能 */
43 43 import commonConfig from "@/utils/config";
44 44 import * as commonUtils from "@/utils/utils"; /* 通用方法 */
45 45 import * as commonServices from "@/services/services"; /* 服务类 */
... ...
src/components/Common/CommonElementEvent.js
... ... @@ -3,7 +3,7 @@ import React, { Component } from 'react';
3 3 import { Modal, message } from 'antd-v4';
4 4 import commonConfig from '../../utils/config';
5 5 import * as commonFunc from './commonFunc';
6   -import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
  6 +import commonBusiness from './commonBusiness'; /* 单据业务功能 */
7 7 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
8 8 import * as commonServices from './../../services/services'; /* 服务类 */
9 9  
... ...
src/components/Common/CommonGroupBill.js
... ... @@ -15,7 +15,7 @@ import CommonView from '@/components/Common/CommonView';
15 15 import CommonViewTable from '@/components/Common/CommonViewTable';
16 16 import CommonViewDrag from '@/components/Common/CommonViewDrag';
17 17 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
18   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  18 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
19 19 import commonConfig from '@/utils/config';
20 20 import * as commonUtils from '@/utils/utils';/* 通用方法 */
21 21 import * as commonServices from '@/services/services';/* 服务类 */
... ...
src/components/Common/CommonGroupBillEvent.js
... ... @@ -3,7 +3,7 @@ import React, { Component } from 'react';
3 3 import { Modal, message } from 'antd-v4';
4 4 // import moment from 'moment';
5 5 import * as commonUtils from '@/utils/utils'; /* 通用方法 */
6   -import {commonBusiness} from '@/components/Common/commonBusiness'; /* 单据业务功能 */
  6 +import commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
7 7 import * as commonServices from '@/services/services'; /* 服务类 */
8 8 import commonConfig from '@/utils/config';
9 9 import * as commonFunc from '@/components/Common/commonFunc';
... ...
src/components/Common/CommonInstructSet.js
... ... @@ -8,7 +8,7 @@ import * as commonUtils from "@/utils/utils";
8 8 import * as commonFunc from "@/components/Common/commonFunc";
9 9 import commonConfig from "@/utils/config";
10 10 import * as commonServices from "@/services/services";
11   -import * as commonBusiness from "@/components/Common/commonBusiness";
  11 +import commonBusiness from "@/components/Common/commonBusiness";
12 12 import FaceDetect from "@/components/FaceDetect";
13 13  
14 14 let step = 1; // 步骤计数
... ...
src/components/Common/CommonJurisdictionNewEvent.js
... ... @@ -2,7 +2,7 @@
2 2 import React, { Component } from 'react';
3 3 import { Modal, message } from 'antd-v4';
4 4 import commonConfig from '../../utils/config';
5   -import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
  5 +import commonBusiness from './commonBusiness'; /* 单据业务功能 */
6 6 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
7 7 import * as commonServices from './../../services/services';
8 8 import * as commonFunc from './commonFunc'; /* 服务类 */
... ...
src/components/Common/CommonList.js
... ... @@ -10,7 +10,7 @@ import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格
10 10 // import StaticEditTableNew from '@/components/Common/CommonTableNew';/* 可编辑表格 */
11 11 import styles from '@/index.less';
12 12 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
13   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
14 14 import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
15 15 import commonConfig from '@/utils/config';
16 16 import * as commonUtils from '@/utils/utils';
... ...
src/components/Common/CommonListA.js
... ... @@ -9,7 +9,7 @@ import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
9 9 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
10 10 import styles from '@/index.less';
11 11 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
12   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  12 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
13 13 import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
14 14 import commonConfig from '@/utils/config';
15 15 import * as commonUtils from '@/utils/utils';
... ...
src/components/Common/CommonListEdit.js
... ... @@ -8,7 +8,7 @@ import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
8 8 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
9 9 import styles from '@/index.less';
10 10 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
11   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  11 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
12 12 import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
13 13 import commonConfig from '@/utils/config';
14 14 import * as commonUtils from '@/utils/utils';
... ...
src/components/Common/CommonListEditEvent.js
... ... @@ -9,7 +9,7 @@ import * as commonUtils from '../../utils/utils'; /* 通用方法 */
9 9 import * as commonFunc from './commonFunc'; /* 通用单据方法 */
10 10 import commonConfig from '../../utils/config';
11 11 import * as commonServices from '../../services/services';
12   -import * as commonBusiness from './commonBusiness';
  12 +import commonBusiness from './commonBusiness';
13 13  
14 14 const { confirm } = Modal;
15 15  
... ...
src/components/Common/CommonListEvent.js
... ... @@ -9,7 +9,7 @@ import * as commonUtils from '../../utils/utils'; /* 通用方法 */
9 9 import * as commonFunc from './commonFunc'; /* 通用单据方法 */
10 10 import commonConfig from '../../utils/config';
11 11 import * as commonServices from '../../services/services';
12   -import * as commonBusiness from './commonBusiness';
  12 +import commonBusiness from './commonBusiness';
13 13  
14 14 const { confirm } = Modal;
15 15  
... ...
src/components/Common/CommonListLeft/index.js
... ... @@ -10,7 +10,7 @@ import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
10 10 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
11 11 import styles from '@/index.less';
12 12 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
13   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
14 14 import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
15 15 import commonConfig from '@/utils/config';
16 16 import * as commonUtils from '@/utils/utils';
... ...
src/components/Common/CommonListSelect/index.js
... ... @@ -8,7 +8,7 @@ import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销å”
8 8 import * as commonFunc from '@/components/Common/commonFunc';/* é€šç”¨å•æ®æ–¹æ³• */ /* é€šç”¨å•æ®æ–¹æ³• */
9 9 import StaticEditTable from '@/components/Common/CommonTable';/* å¯ç¼–辑表格 */
10 10 import CommonBase from '@/components/Common/CommonBase';/* 获å–é…ç½®åŠæ•°æ® */
11   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 啿®ä¸šåŠ¡åŠŸèƒ½ */
  11 +import commonBusiness from '@/components/Common/commonBusiness';/* 啿®ä¸šåŠ¡åŠŸèƒ½ */
12 12 import SearchComponent from '@/components/Common/SearchComponent';/* æœç´¢ç»„ä»¶ */
13 13 import config from '@/utils/config';
14 14 import * as commonUtils from '@/utils/utils';
... ...
src/components/Common/CommonListSelectAssignment.js
... ... @@ -13,7 +13,7 @@ import StaticEditTable from './CommonTable';/* 可编辑表格 */
13 13 import StaticEditTree from '../Common/Tree/StaticTree';
14 14 import styles from '../../index.less';
15 15 import CommonBase from './CommonBase';/* 获取配置及数据 */
16   -import * as commonBusiness from './commonBusiness';/* 单据业务功能 */
  16 +import commonBusiness from './commonBusiness';/* 单据业务功能 */
17 17 import SearchComponent from './SearchComponent';
18 18 import AntdDraggableModal from './AntdDraggableModal';
19 19 import * as commonUtils from '../../utils/utils';
... ...
src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx
... ... @@ -7,7 +7,7 @@ import * as commonFunc from "@/components/Common/commonFunc"; /* 通用单据方
7 7 import StaticEditTable from "@/components/Common//CommonTable"; /* 可编辑表格 */
8 8 import StaticEditTree from "@/components/Common/Tree/StaticTree";
9 9 import CommonBase from "@/components/Common/CommonBase"; /* 获取配置及数据 */
10   -import * as commonBusiness from "@/components/Common//commonBusiness"; /* 单据业务功能 */
  10 +import commonBusiness from "@/components/Common//commonBusiness"; /* 单据业务功能 */
11 11 import SearchComponent from "@/components/Common/SearchComponent";
12 12 import * as commonUtils from "@/utils/utils";
13 13 import CommonListEvent from "@/components/Common/CommonListEvent";
... ...
src/components/Common/CommonListSelectFlex/index.js
... ... @@ -6,7 +6,7 @@ import * as commonFunc from '@/components/Common/commonFunc';/* é€šç”¨å•æ®æ–¹æ
6 6 import StaticEditTable from '@/components/Common//CommonTable';/* å¯ç¼–辑表格 */
7 7 import StaticEditTree from '@/components/Common/Tree/StaticTree';
8 8 import CommonBase from '@/components/Common/CommonBase';/* 获å–é…ç½®åŠæ•°æ® */
9   -import * as commonBusiness from '@/components/Common//commonBusiness';/* 啿®ä¸šåŠ¡åŠŸèƒ½ */
  9 +import commonBusiness from '@/components/Common//commonBusiness';/* 啿®ä¸šåŠ¡åŠŸèƒ½ */
10 10 import SearchComponent from '@/components/Common/SearchComponent';
11 11 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
12 12 import * as commonUtils from '@/utils/utils';
... ...
src/components/Common/CommonListSelectMulti/index.js
... ... @@ -10,7 +10,7 @@ import * as commonFunc from '@/components/Common//commonFunc';/* 通用单据方
10 10 import StaticEditTable from '@/components/Common//CommonTable';/* 可编辑表格 */
11 11 import StaticEditTree from '@/components/Common/Tree/StaticTree';
12 12 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
13   -import * as commonBusiness from '@/components/Common//commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '@/components/Common//commonBusiness';/* 单据业务功能 */
14 14 import SearchComponent from '@/components/Common/SearchComponent';
15 15 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
16 16 import * as commonUtils from '@/utils/utils';
... ...
src/components/Common/CommonListSelectParam/index.js
... ... @@ -5,7 +5,7 @@ import { Form } from '@ant-design/compatible';
5 5 import { Spin, Tabs, message, Modal, Tooltip } from 'antd-v4';
6 6 import * as commonUtils from '@/utils/utils';/* 通用方法 */
7 7 // import * as commonUtils from '../../utils/utils'; /* 通用方法 */
8   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  8 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
9 9 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
10 10 import * as commonFunc from '@/components/Common/commonFunc';
11 11 import ShowType from '@/components/Common/CommonComponent';
... ...
src/components/Common/CommonListSelectProductMaterial.js
... ... @@ -13,7 +13,7 @@ import CommonListEvent from './CommonListEvent';/* 继承销售模å—业务功èƒ
13 13 import * as commonFunc from './commonFunc';/* é€šç”¨å•æ®æ–¹æ³• */ /* é€šç”¨å•æ®æ–¹æ³• */
14 14 import StaticEditTable from './CommonTable';/* å¯ç¼–辑表格 */
15 15 import CommonBase from './CommonBase';/* 获å–é…ç½®åŠæ•°æ® */
16   -import * as commonBusiness from './commonBusiness';/* 啿®ä¸šåŠ¡åŠŸèƒ½ */
  16 +import commonBusiness from './commonBusiness';/* 啿®ä¸šåŠ¡åŠŸèƒ½ */
17 17 import SearchComponent from './SearchComponent';/* æœç´¢ç»„ä»¶ */
18 18 // import * as commonConfig from '../../utils/config';
19 19 import config from '../../utils/config';
... ...
src/components/Common/CommonListSelectTree/index.js
... ... @@ -10,7 +10,7 @@ import * as commonFunc from '@/components/Common//commonFunc';/* 通用单据方
10 10 import StaticEditTable from '@/components/Common//CommonTable';/* 可编辑表格 */
11 11 import StaticEditTree from '@/components/Common/Tree/StaticTree';
12 12 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
13   -import * as commonBusiness from '@/components/Common//commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '@/components/Common//commonBusiness';/* 单据业务功能 */
14 14 import SearchComponent from '@/components/Common/SearchComponent';
15 15 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
16 16 import * as commonUtils from '@/utils/utils';
... ...
src/components/Common/CommonListTab/index.js
... ... @@ -10,7 +10,7 @@ import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格
10 10 import styles from '@/index.less';
11 11 import customStyles from './index.less';
12 12 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
13   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
14 14 import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
15 15 import commonConfig from '@/utils/config';
16 16 import * as commonUtils from '@/utils/utils';
... ...
src/components/Common/CommonListTabEvent.js
... ... @@ -9,7 +9,7 @@ import * as commonUtils from '../../utils/utils'; /* 通用方法 */
9 9 import * as commonFunc from './commonFunc'; /* 通用单据方法 */
10 10 import commonConfig from '../../utils/config';
11 11 import * as commonServices from '../../services/services';
12   -import * as commonBusiness from './commonBusiness';
  12 +import commonBusiness from './commonBusiness';
13 13  
14 14 const { confirm } = Modal;
15 15  
... ...
src/components/Common/CommonListTree/index.js
... ... @@ -16,7 +16,7 @@ import Toolbar from '../ToolBar/ToolBarNew';
16 16 import StaticEditTable from '../CommonTable';/* 可编辑表格 */
17 17 import styles from '../../../index.less';
18 18 import CommonBase from '../CommonBase';/* 获取配置及数据 */
19   -import * as commonBusiness from '../commonBusiness';/* 单据业务功能 */
  19 +import commonBusiness from '../commonBusiness';/* 单据业务功能 */
20 20 import SearchComponent from '../SearchComponent';/* 搜索组件 */
21 21 import commonConfig from '../../../utils/config';
22 22 import * as commonUtils from '../../../utils/utils'; /* 通用方法 */
... ...
src/components/Common/CommonListTreeEvent.js
... ... @@ -8,7 +8,7 @@ import * as commonUtils from '../../utils/utils'; /* 通用方法 */
8 8 import * as commonFunc from './commonFunc'; /* 通用单据方法 */
9 9 import commonConfig from '../../utils/config';
10 10 import * as commonServices from '../../services/services';
11   -import * as commonBusiness from './commonBusiness';
  11 +import commonBusiness from './commonBusiness';
12 12  
13 13 const { confirm } = Modal;
14 14 /* 该组件作用是两层通用结构commonListTree事件层,功能如物料需求计划,两层都可以配制独立的数据源 */
... ...
src/components/Common/CommonListTreeSelect/index.js
... ... @@ -10,7 +10,7 @@ import CommonListTreeEvent from '@/components/Common/CommonListTreeEvent';/* 继
10 10 import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
11 11 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
12 12 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
13   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
14 14 import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
15 15 import config from '@/utils/config';
16 16 import * as commonUtils from '@/utils/utils';
... ...
src/components/Common/CommonNewBill.js
... ... @@ -15,7 +15,7 @@ import AssignmentField from './AssignmentField';
15 15 import CommonView from '@/components/Common/CommonView';
16 16 import CommonViewTable from '@/components/Common/CommonViewTable';
17 17 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
18   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  18 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
19 19 import commonConfig from '@/utils/config';
20 20 import * as commonUtils from '@/utils/utils';/* 通用方法 */
21 21 import * as commonServices from '@/services/services';/* 服务类 */
... ...
src/components/Common/CommonNewBillEvent.js
... ... @@ -4,7 +4,7 @@ import { Modal, Progress } from 'antd-v4';
4 4 import { message } from '@/utils/common/message';
5 5 // import moment from 'moment';
6 6 import * as commonUtils from '@/utils/utils'; /* 通用方法 */
7   -import * as commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
  7 +import commonBusiness from '@/components/Common/commonBusiness'; /* 单据业务功能 */
8 8 import * as commonServices from '@/services/services'; /* 服务类 */
9 9 import commonConfig from '@/utils/config';
10 10 import * as commonFunc from '@/components/Common/commonFunc';
... ...
src/components/Common/CommonNewListBill.js
... ... @@ -14,7 +14,7 @@ import AssignmentField from './AssignmentField';
14 14 import CommonView from '@/components/Common/CommonView';
15 15 import CommonViewTable from '@/components/Common/CommonViewTable';
16 16 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
17   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  17 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
18 18 import commonConfig from '@/utils/config';
19 19 import * as commonUtils from '@/utils/utils';/* 通用方法 */
20 20 import * as commonServices from '@/services/services';/* 服务类 */
... ...
src/components/Common/CommonNewTabBill.js
... ... @@ -14,7 +14,7 @@ import AssignmentField from './AssignmentField';
14 14 import CommonView from '@/components/Common/CommonView';
15 15 import CommonViewTable from '@/components/Common/CommonViewTable';
16 16 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
17   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  17 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
18 18 import commonConfig from '@/utils/config';
19 19 import * as commonUtils from '@/utils/utils';/* 通用方法 */
20 20 import * as commonServices from '@/services/services';/* 服务类 */
... ...
src/components/Common/CommonNewTabBillEvent.js
... ... @@ -3,7 +3,7 @@ import React, { Component } from 'react';
3 3 import { Modal, message, Progress } from 'antd-v4';
4 4 // import moment from 'moment';
5 5 import * as commonUtils from '@/utils/utils'; /* 通用方法 */
6   -import {commonBusiness} from '@/components/Common/commonBusiness'; /* 单据业务功能 */
  6 +import commonBusiness from "./commonBusiness"; /* 单据业务功能 */
7 7 import * as commonServices from '@/services/services'; /* 服务类 */
8 8 import commonConfig from '@/utils/config';
9 9 import * as commonFunc from '@/components/Common/commonFunc';
... ...
src/components/Common/CommonProductionPlanEvent.js
... ... @@ -4,7 +4,7 @@ import { message } from 'antd-v4'; // Form, Modal, InputNumber
4 4 // import reactComponentDebounce from 'react-component-debounce';
5 5 import moment from 'moment';
6 6 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
7   -import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
  7 +import commonBusiness from './commonBusiness'; /* 单据业务功能 */
8 8 import * as commonServices from '../../services/services'; /* 服务类 */
9 9 import commonConfig from '../../utils/config';
10 10 import * as commonFunc from './commonFunc'; /* 通用单据方法 */
... ...
src/components/Common/CommonProductionPlanOutsideEvent.js
... ... @@ -6,7 +6,7 @@ import React, { Component } from 'react';
6 6 import { message } from 'antd-v4'; // Form, Modal, InputNumber
7 7 // import reactComponentDebounce from 'react-component-debounce';
8 8 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
9   -import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
  9 +import commonBusiness from './commonBusiness'; /* 单据业务功能 */
10 10 import * as commonServices from '../../services/services'; /* 服务类 */
11 11 import commonConfig from '../../utils/config';
12 12 import * as commonFunc from './commonFunc'; /* 通用单据方法 */
... ...
src/components/Common/CommonProductionPlanTreeEvent.js
... ... @@ -7,7 +7,7 @@ import React, { Component } from 'react';
7 7 import { message } from 'antd-v4'; // Form, Modal, InputNumber
8 8 // import reactComponentDebounce from 'react-component-debounce';
9 9 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
10   -import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
  10 +import commonBusiness from './commonBusiness'; /* 单据业务功能 */
11 11 import * as commonServices from '../../services/services'; /* 服务类 */
12 12 import commonConfig from '../../utils/config';
13 13 import * as commonFunc from './commonFunc'; /* 通用单据方法 */
... ...
src/components/Common/CommonProductionmMainPlanEvent.js
... ... @@ -3,7 +3,7 @@
3 3 import React, { Component } from 'react';
4 4 import { message } from 'antd-v4'; // InputNumber Form, Modal,
5 5 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
6   -import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
  6 +import commonBusiness from './commonBusiness'; /* 单据业务功能 */
7 7 import * as commonServices from '../../services/services'; /* 服务类 */
8 8 import commonConfig from '../../utils/config';
9 9 import * as commonFunc from './commonFunc'; /* 通用单据方法 */
... ...
src/components/Common/CommonSubBill.js
... ... @@ -14,7 +14,7 @@ import styles from '@/index.less';
14 14 import CommonView from '@/components/Common/CommonView';
15 15 import CommonViewTable from '@/components/Common/CommonViewTable';
16 16 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
17   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  17 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
18 18 import commonConfig from '@/utils/config';
19 19 import * as commonUtils from '@/utils/utils';/* 通用方法 */
20 20 import * as commonServices from '@/services/services';/* 服务类 */
... ...
src/components/Common/CommonSubBillEvent.js
... ... @@ -9,7 +9,7 @@ import { message } from '@/utils/common/message';
9 9 import {Progress} from 'antd-v4'
10 10 import moment from 'moment';
11 11 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
12   -import {commonBusiness} from './commonBusiness'; /* 单据业务功能 */
  12 +import commonBusiness from './commonBusiness'; /* 单据业务功能 */
13 13 import * as commonServices from '../../services/services'; /* 服务类 */
14 14 import commonConfig from '../../utils/config';
15 15 import * as commonFunc from './commonFunc';
... ...
src/components/Common/CommonSystemSettingEvent.js
... ... @@ -3,7 +3,7 @@ import moment from 'moment';
3 3 import React, { Component } from 'react';
4 4 import { Modal, message } from 'antd-v4';
5 5 import * as commonFunc from './commonFunc';
6   -import * as commonBusiness from './commonBusiness'; /* 单据业务功能 */
  6 +import commonBusiness from './commonBusiness'; /* 单据业务功能 */
7 7 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
8 8 import commonConfig from '../../utils/config';
9 9 import * as commonServices from '../../services/services';
... ...
src/components/Common/CommonViewDrag/index.js
... ... @@ -5,7 +5,7 @@ import { Col, Tabs, Tooltip } from "antd-v4";
5 5 import ShowType from "@/components/Common/CommonComponent";
6 6 import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
7 7 import CommonListSelectTree from "@/components/Common/CommonListSelectTree";
8   -import * as commonBusiness from "@/components/Common/commonBusiness"; /* 单据业务功能 */
  8 +import commonBusiness from "@/components/Common/commonBusiness"; /* 单据业务功能 */
9 9 import StaticEditTable from "@/components/Common/CommonTable"; /* 可编辑表格 */
10 10 import * as commonFunc from "@/components/Common/commonFunc";
11 11 import * as commonUtils from "@/utils/utils"; /* 通用方法 */
... ...
src/components/Common/CommonViewDragable/index.js
... ... @@ -9,7 +9,7 @@ import React, {
9 9 import "@ant-design/compatible/assets/index.css";
10 10 import { Tabs, Tooltip, message } from "antd-v4";
11 11 import ShowType from "@/components/Common/CommonComponent";
12   -import * as commonBusiness from "@/components/Common/commonBusiness";
  12 +import commonBusiness from "@/components/Common/commonBusiness";
13 13 import StaticEditTable from "@/components/Common/CommonTable";
14 14 import * as commonUtils from "@/utils/utils";
15 15 import * as rglUtils from "./rglUtils";
... ...
src/components/Common/FileImposition/index.js
... ... @@ -11,7 +11,7 @@ import {
11 11 } from "antd-v4";
12 12 import { UploadOutlined } from "@ant-design/icons";
13 13 import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
14   -import * as commonBusiness from "@/components/Common/commonBusiness";
  14 +import commonBusiness from "@/components/Common/commonBusiness";
15 15 import * as commonFunc from "@/components/Common/commonFunc";
16 16 import StaticEditTable from "@/components/Common/CommonTable";
17 17 import * as commonUtils from "@/utils/utils";
... ...
src/components/Common/Gatte/CommonGatte.js
... ... @@ -8,7 +8,7 @@ import Toolbar from '../ToolBar/ToolBarNew';
8 8 import styles from '../../../index.less';
9 9 import GanttStyles from './index.less';
10 10 import CommonBase from '../CommonBase';/* 获取配置及数据 */
11   -import * as commonBusiness from '../commonBusiness';/* 单据业务功能 */
  11 +import commonBusiness from '../commonBusiness';/* 单据业务功能 */
12 12 import SearchComponent from '../SearchComponent';/* 搜索组件 */
13 13 import * as commonUtils from '../../../utils/utils';
14 14 // import SlaveMemo from './SlaveMemo';
... ...
src/components/Common/MakeUpPDF/index.js 0 → 100644
  1 +/* eslint-disable */
  2 +import React, { useRef, useState, useEffect } from "react";
  3 +import { Tabs, Button, message } from "antd-v4";
  4 +import { CompressOutlined, ExpandOutlined } from "@ant-design/icons";
  5 +import * as commonUtils from "@/utils/utils";
  6 +import * as commonFunc from "@/components/Common/commonFunc";
  7 +import {commonBusiness} from "@/components/Common/commonBusiness";
  8 +import * as commonServices from "@/services/services";
  9 +import CommonBase from "@/components/Common/CommonBase";
  10 +import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
  11 +import CommonViewTable from "@/components/Common/CommonViewTable";
  12 +import StaticEditTable from "@/components/Common/CommonTable";
  13 +import jsPreviewPdf from "@js-preview/pdf";
  14 +import commonConfig from "@/utils/config";
  15 +
  16 +import styles from "./index.less";
  17 +
  18 +const MakeUpPDFEvent = props => {
  19 + const addState = {};
  20 +
  21 + const { formData = [], selectData = [], masterData, makeUpPDFRecord = {} } = props;
  22 + const [activeKey, setActiveKey] = useState("100");
  23 + useEffect(
  24 + () => {
  25 + if (!formData.length) return;
  26 +
  27 + const getInitData = async () => {
  28 + const [masterConfig, slaveConfig] = formData;
  29 + const slaveColumn = commonFunc.getHeaderConfig(slaveConfig);
  30 +
  31 + const { sId, sMakeUpId = sId } = makeUpPDFRecord;
  32 + let resultData = {};
  33 + let masterDefaultData = {};
  34 + if (sMakeUpId) {
  35 + resultData = await props.handleGetDataOne({ name: "master", configData: masterConfig, condition: { sId: sMakeUpId }, isWait: true });
  36 + const sParentId = resultData?.masterData?.sId;
  37 + resultData = {
  38 + ...resultData,
  39 + ...(await props.handleGetDataSet({
  40 + name: "slave",
  41 + configData: slaveConfig,
  42 + condition: { sSqlCondition: { sParentId } },
  43 + clearSelectData: true,
  44 + isWait: true,
  45 + })),
  46 + };
  47 + } else {
  48 + const defaultData = commonFunc.getDefaultData(masterConfig);
  49 + const { sPageMaterialsId, sPageMaterialsName, sPageMaterialsNo } = selectData[0];
  50 + masterDefaultData = {
  51 + ...defaultData,
  52 + dTimes: selectData.length * 20,
  53 + sPageMaterialsId,
  54 + sPageMaterialsName,
  55 + sPageMaterialsNo,
  56 + };
  57 + }
  58 +
  59 + props.onSaveState({
  60 + masterConfig,
  61 + masterData: { handleType: "add", ...commonFunc.getDefaultData(masterConfig), ...masterDefaultData },
  62 + // masterData: { sId: commonUtils.createSid(), handleType: "add", ...commonFunc.getDefaultData(masterConfig) },
  63 + slaveConfig,
  64 + slaveColumn,
  65 + slaveData: selectData,
  66 + ...resultData,
  67 + });
  68 + };
  69 +
  70 + getInitData();
  71 + },
  72 + [formData.length]
  73 + );
  74 + const handleResult = async (url, body) => {
  75 + const { app } = props;
  76 + let { masterData } = props;
  77 + const dataReturn = (await commonServices.postValueService(app.token, body, url)).data;
  78 + if (dataReturn.code === 1) {
  79 + /* 成功 */
  80 + const [masterNewData] = dataReturn.dataset.rows[0].dataSet;
  81 + masterData = { ...masterData, ...masterNewData };
  82 + if (commonUtils.isNotEmptyObject(masterData)) {
  83 + props.onSaveState({
  84 + masterData,
  85 + });
  86 + }
  87 + } else {
  88 + /* 失败 */
  89 + message.error(dataReturn.msg);
  90 + return false;
  91 + }
  92 + };
  93 + /* 生成拼版任务 */
  94 + addState.onSend = () => {
  95 + props.onSaveState({ bRefreshTable: true });
  96 + setActiveKey("200");
  97 + setMakeUpProcessList([]);
  98 + const { app, masterData, slaveData } = props;
  99 + const { userinfo } = app;
  100 + const url = `${commonConfig.server_host}makeup/makeupcreate`;
  101 + const body = {
  102 + ...userinfo,
  103 + sUserId: userinfo.sId,
  104 + sMakePerson: userinfo.sUserName,
  105 + masterData: [masterData],
  106 + slaveData,
  107 + };
  108 + handleResult(url, body);
  109 + // commonServices.postValueService(app.token, body, url);
  110 + };
  111 + /* 暂停 */
  112 + addState.onStop = () => {
  113 + setActiveKey("200");
  114 + const { app, masterData, slaveData } = props;
  115 + const { userinfo } = app;
  116 + const url = `${commonConfig.server_host}makeup/makeupstop`;
  117 + const body = {
  118 + ...userinfo,
  119 + sUserId: userinfo.sId,
  120 + sMakePerson: userinfo.sUserName,
  121 + sBillNo: commonUtils.isNotEmptyObject(masterData) ? masterData.sBillNo : "",
  122 + sId: commonUtils.isNotEmptyObject(masterData) ? masterData.sId : "",
  123 + sOrderSlaveId: slaveData[0].sOrderSlaveId,
  124 + };
  125 + handleResult(url, body);
  126 + };
  127 + /* 生产工单 */
  128 + addState.onCreateWorkOrder = () => {
  129 + setActiveKey("200");
  130 + const { app, masterData, slaveData } = props;
  131 + const { userinfo } = app;
  132 + let sId = masterData?.sId;
  133 + if (commonUtils.isEmptyObject(sId)) {
  134 + message.warn("拼版还未完成,请等待...");
  135 + return;
  136 + }
  137 + const url = `${commonConfig.server_host}makeup/makeuptowork`;
  138 + const body = {
  139 + ...userinfo,
  140 + sUserId: userinfo.sId,
  141 + sMakePerson: userinfo.sUserName,
  142 + sBillNo: commonUtils.isNotEmptyObject(masterData) ? masterData.sBillNo : "",
  143 + sId,
  144 + sOrderSlaveId: slaveData[0].sOrderSlaveId,
  145 + };
  146 + handleResult(url, body);
  147 + };
  148 + const [makeUpProcessList, setMakeUpProcessList] = useState([]);
  149 + const [makeUpData, setMakeUpData] = useState({});
  150 + const [slaveDataNew, setSlaveDataNew] = useState([]);
  151 + // 获取ws消息
  152 + useEffect(() => {
  153 + window.tempWsAction = ({ data } = {}) => {
  154 + const { msg, action } = commonUtils.convertStrToObj(data);
  155 + console.log("=====data", data);
  156 + if (action === "showMakeUpProcess") {
  157 + setMakeUpProcessList(pre => [...pre, msg]);
  158 + } else if (action === "showMakeUpView") {
  159 + setMakeUpData(pre => ({ ...pre, sViewPdf: msg }));
  160 + } else if (action === "sendMakeUpData") {
  161 + setMakeUpData(pre => ({ ...pre, ...msg }));
  162 + } else if (action === "sendMakeUpSlaveData") {
  163 + setSlaveDataNew(msg);
  164 + }
  165 + };
  166 +
  167 + return () => {
  168 + window.tempWsAction = null;
  169 + };
  170 + }, []);
  171 +
  172 + useEffect(
  173 + () => {
  174 + props.onSaveState({
  175 + masterData: { ...masterData, ...makeUpData },
  176 + });
  177 + },
  178 + [makeUpData]
  179 + );
  180 +
  181 + useEffect(
  182 + () => {
  183 + if (!slaveDataNew.length) return;
  184 + const slaveData = props.slaveData.map(item => {
  185 + const extraData = slaveDataNew.find(i => i.sOrderSlaveId === item.sOrderSlaveId) || {};
  186 + return {
  187 + ...item,
  188 + ...extraData,
  189 + };
  190 + });
  191 + props.onSaveState({ slaveData });
  192 + },
  193 + [slaveDataNew]
  194 + );
  195 +
  196 + return {
  197 + ...props,
  198 + ...addState,
  199 + activeKey,
  200 + setActiveKey,
  201 + makeUpProcessList,
  202 + };
  203 +};
  204 +const MakeUpPDF = baseProps => {
  205 + const { pdfMakeUpVisible } = baseProps;
  206 + if (!pdfMakeUpVisible) return "";
  207 +
  208 + const props = MakeUpPDFEvent(baseProps);
  209 + const { onCancel, onOk, title, app, masterConfig, masterData = {}, bFullScreen } = props;
  210 + if (!masterConfig) return "";
  211 +
  212 + const ableConfigs = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible && !item.sControlName);
  213 +
  214 + const viewProps = {
  215 + ...props,
  216 + viewConfigs: ableConfigs,
  217 + tableConfig: masterConfig,
  218 + iColValueView: 24,
  219 + viewRow: masterData,
  220 + tableName: "master",
  221 + onDataChange: props.onChange,
  222 + onViewClick: (...args) => {
  223 + props.onViewClick(...args);
  224 + props.onCancel();
  225 + },
  226 + };
  227 +
  228 + const tabsConfig = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible && item.sControlName);
  229 +
  230 + return (
  231 + <AntdDraggableModal
  232 + width="100%"
  233 + height="calc(100vh - 50px)"
  234 + title={title}
  235 + visible={pdfMakeUpVisible}
  236 + onCancel={onCancel.bind(this, props.bRefreshTable)}
  237 + onOk={onOk}
  238 + bodyStyle={{
  239 + height: "calc(100vh - 105px)",
  240 + overflowY: "auto",
  241 + display: "flex",
  242 + flexDirection: "column",
  243 + }}
  244 + style={{
  245 + top: 50,
  246 + }}
  247 + footer={[]}
  248 + >
  249 + <div className={`searchMainForm ${styles.viewTable} ${bFullScreen ? styles.viewTableHide : ""}`}>
  250 + <CommonViewTable {...viewProps} />
  251 + </div>
  252 + <Tabs
  253 + type="card"
  254 + className={`noXlyTabs ${styles.tabs} ${bFullScreen ? styles.tabsHide : ""}`}
  255 + activeKey={props.activeKey}
  256 + onChange={props.setActiveKey}
  257 + tabBarExtraContent={{
  258 + right: (
  259 + <div className={styles.btns}>
  260 + <Button type="primary" size="large" className={styles.btnSend} onClick={props.onSend}>
  261 + {masterConfig.gdsconfigformslave.find(item => item.sControlName === "BtnSend")?.showName || "发送"}
  262 + </Button>
  263 + <Button type="primary" size="large" className={styles.btnPause} onClick={props.onStop}>
  264 + {masterConfig.gdsconfigformslave.find(item => item.sControlName === "BtnPause")?.showName || "暂停"}
  265 + </Button>
  266 + <Button type="primary" size="large" className={styles.btnPause} onClick={props.onCreateWorkOrder}>
  267 + {masterConfig.gdsconfigformslave.find(item => item.sControlName === "BtnCreateWorkOrder")?.showName || "生成工单"}
  268 + </Button>
  269 + </div>
  270 + ),
  271 + }}
  272 + items={[
  273 + { label: "订单信息", key: "100", children: <SlaveComponent {...props} /> },
  274 + { label: "拼板进度", key: "200", children: <ProcessComponent {...props} /> },
  275 + ...tabsConfig.map((config, index) => {
  276 + const { showName, sName } = config;
  277 + const fileUrl = masterData[sName];
  278 + const pdfUrl = `${commonConfig.file_host}file/downloadView?savePathStr=${encodeURIComponent(fileUrl)}&sModelsId=100&token=${app.token}`;
  279 + const pdfProps = {
  280 + ...props,
  281 + pdfUrl,
  282 + };
  283 +
  284 + return {
  285 + label: showName,
  286 + key: index,
  287 + children: (() => {
  288 + if (!fileUrl) {
  289 + return <div>暂无内容</div>;
  290 + } else if (fileUrl.toLowerCase().endsWith(".pdf")) {
  291 + return <PDFPreviewerComponent {...pdfProps} />;
  292 + } else if (fileUrl.toLowerCase().endsWith(".svg")) {
  293 + return <img src={pdfUrl} alt="" style={{ width: "100%", height: "100%" }} />;
  294 + }
  295 + })(),
  296 + };
  297 + }),
  298 + ]}
  299 + />
  300 + </AntdDraggableModal>
  301 + );
  302 +};
  303 +
  304 +const PDFPreviewerComponent = props => {
  305 + const { pdfUrl, bFullScreen } = props;
  306 +
  307 + const handleSwitchFullScreen = () => {
  308 + props.onSaveState({ bFullScreen: !bFullScreen });
  309 + };
  310 +
  311 + return (
  312 + <div style={{ width: "100%", height: "100%", position: "relative" }}>
  313 + <Button
  314 + className={styles.fullScreen}
  315 + type="primary"
  316 + size="large"
  317 + icon={bFullScreen ? <CompressOutlined /> : <ExpandOutlined />}
  318 + onClick={handleSwitchFullScreen}
  319 + />
  320 + <iframe src={pdfUrl} style={{ width: "100%", height: "100%" }} frameBorder="0" />
  321 + </div>
  322 + );
  323 +};
  324 +
  325 +const SlaveComponent = props => {
  326 + const { masterData = {}, slaveData = [] } = props;
  327 + const tableRef = useRef(null);
  328 + const [tableHeight, setTableHeight] = useState("100px");
  329 +
  330 + useEffect(() => {
  331 + const { height } = tableRef.current.parentNode.getBoundingClientRect();
  332 + setTableHeight(`${height - 40}px`);
  333 + }, []);
  334 +
  335 + const slaveDataOne = slaveData[0] || {};
  336 + const { sPageMaterialsId, sPageMaterialsName, sPageMaterialsNo } = masterData;
  337 + // 监听主表纸张变化
  338 + useEffect(
  339 + () => {
  340 + if (sPageMaterialsId && sPageMaterialsId !== slaveDataOne.sPageMaterialsId) {
  341 + props.onSaveState({
  342 + slaveData: slaveData.map(item => ({
  343 + ...item,
  344 + sPageMaterialsId,
  345 + sPageMaterialsName,
  346 + sPageMaterialsNo,
  347 + handleType: item.handleType || "update",
  348 + })),
  349 + });
  350 + }
  351 + },
  352 + [sPageMaterialsId]
  353 + );
  354 +
  355 + const slaveTableProps = {
  356 + ...commonBusiness.getTableTypes("slave", props),
  357 + tableProps: {
  358 + rowSelection: null,
  359 + },
  360 + fixedHeight: tableHeight,
  361 + };
  362 +
  363 + return (
  364 + <div className="xly-bill-list" style={{ height: "100%", width: "100%", padding: 0 }} ref={tableRef}>
  365 + <StaticEditTable {...slaveTableProps} />
  366 + </div>
  367 + );
  368 +};
  369 +
  370 +const ProcessComponent = props => {
  371 + const { app, makeUpProcessList = [], masterData = {} } = props;
  372 + const { sViewPdf } = masterData;
  373 + const imgUrl = sViewPdf
  374 + ? `${commonConfig.file_host}file/downloadView?savePathStr=${encodeURIComponent(sViewPdf)}&sModelsId=100&token=${app.token}`
  375 + : "";
  376 +
  377 + const processRef = useRef(null);
  378 + const [processHeight, setProcessHeight] = useState("100%");
  379 +
  380 + useEffect(() => {
  381 + const { height } = processRef.current.parentNode.getBoundingClientRect();
  382 + setProcessHeight(`${height}px`);
  383 + }, []);
  384 +
  385 + const processContentRef = useRef(null);
  386 + useEffect(
  387 + () => {
  388 + if (!processContentRef.current) return;
  389 + processContentRef.current.scrollTop = 999999999;
  390 + },
  391 + [makeUpProcessList.length]
  392 + );
  393 +
  394 + return (
  395 + <div className={styles.process} ref={processRef} style={{ height: processHeight }}>
  396 + {processHeight !== "100%" && (
  397 + <>
  398 + <div className={styles.processContent} ref={processContentRef}>
  399 + {makeUpProcessList.map(item => (
  400 + <div>{item}</div>
  401 + ))}
  402 + </div>
  403 + <div className={styles.processImg}>
  404 + <img src={imgUrl} alt="" />
  405 + </div>
  406 + </>
  407 + )}
  408 + </div>
  409 + );
  410 +};
  411 +
  412 +export default CommonBase(MakeUpPDF);
... ...
src/components/Common/MakeUpPDF/index.less 0 → 100644
  1 +.viewTable {
  2 + width: 100%;
  3 + height: auto;
  4 +}
  5 +
  6 +.viewTableHide {
  7 + display: none;
  8 +}
  9 +
  10 +.tabs {
  11 + height: auto;
  12 + flex: 1;
  13 +
  14 + :global {
  15 + .ant-tabs-tabpane {
  16 + height: 100%;
  17 + }
  18 + }
  19 +}
  20 +
  21 +.tabsHide {
  22 + :global {
  23 + .ant-tabs-nav {
  24 + display: none;
  25 + }
  26 + }
  27 +}
  28 +
  29 +.btns {
  30 + margin-right: 20px;
  31 + width: 210px;
  32 + display: flex;
  33 + justify-content: space-between;
  34 +
  35 + :global {
  36 + button {
  37 + border-radius: 5px;
  38 + }
  39 +
  40 + button:first-child {
  41 + background-color: #53b637;
  42 + border-color: #53b637;
  43 + }
  44 + }
  45 +}
  46 +
  47 +.process {
  48 + width: 100%;
  49 + height: 100%;
  50 + background: #25292e;
  51 + color: #e57c84;
  52 + display: flex;
  53 +
  54 + .processContent {
  55 + flex: 1;
  56 + width: auto;
  57 + height: 100%;
  58 + overflow: auto;
  59 + border-right: 1px solid #d9d9d9;
  60 + }
  61 +
  62 + .processImg {
  63 + width: 400px;
  64 + height: 100%;
  65 + display: flex;
  66 + justify-content: center;
  67 + align-items: center;
  68 +
  69 + // 图片居中,长宽自适应
  70 + img {
  71 + max-width: 100%;
  72 + max-height: 100%;
  73 + }
  74 + }
  75 +}
  76 +
  77 +.fullScreen {
  78 + position: absolute;
  79 + top: 11.5px;
  80 + right: 126px;
  81 + background: transparent !important;
  82 + border: transparent !important;
  83 +}
0 84 \ No newline at end of file
... ...
src/components/Common/MaterialRequirementsPlanning.js
... ... @@ -15,7 +15,7 @@ import Toolbar from &#39;../Common/ToolBar/ToolBarNew&#39;;
15 15 import StaticEditTable from './CommonTable';/* 可编辑表格 */
16 16 import styles from '../../index.less';
17 17 import CommonBase from './CommonBase';/* 获取配置及数据 */
18   -import * as commonBusiness from './commonBusiness';/* 单据业务功能 */
  18 +import commonBusiness from './commonBusiness';/* 单据业务功能 */
19 19 import SearchComponent from './SearchComponent';/* 搜索组件 */
20 20 import commonConfig from '../../utils/config';
21 21 import * as commonUtils from '../../utils/utils';/* 通用方法 */
... ...
src/components/Common/PersonCenter/PersonCenter.js
... ... @@ -20,7 +20,7 @@ import { Button, Input, Modal, Menu, Badge, message, Dropdown, Space, Popover, T
20 20 import styles from '@/routes/indexPage.less';
21 21 import config from '@/utils/config';
22 22 import * as commonUtils from '@/utils/utils';
23   -import * as commonBusiness from '@/components/Common/commonBusiness';
  23 +import commonBusiness from '@/components/Common/commonBusiness';
24 24 import * as commonFunc from '@/components/Common/commonFunc';/* 单据业务功能 */
25 25 import FaceDetect from '@/components/FaceDetect';
26 26 import logoAbout from '@/assets/logo.png';
... ...
src/components/Common/SearchComponent/index.js
... ... @@ -11,7 +11,7 @@ import * as commonFunc from &#39;@/components/Common/commonFunc&#39;;
11 11 import * as commonServices from '@/services/services';
12 12 import ShowType from '@/components/Common/CommonComponent';
13 13 import StaticEditTable from '@/components//Common/CommonTable';
14   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  14 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
15 15 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
16 16 import styles from './index.less';
17 17 import SvgIcon from "../../SvgIcon";
... ...
src/components/Common/ToolBar/ToolBarNew.js
... ... @@ -14,7 +14,7 @@ import FilfileManageInfo from &#39;@/components/CommonElementEvent/FilfileManageInfo
14 14 import BatchPriceUpdate from '@/components/CommonElementEvent/BatchPriceUpdate';
15 15 import BatchNPriceUpdate from '@/components/CommonElementEvent/BatchNPriceUpdate';/* 产品单价价格批量更新 */
16 16 import AffixMenu from '@/routes/common/AffixMenu';
17   -import * as commonBusiness from '@/components/Common/commonBusiness';
  17 +import commonBusiness from '@/components/Common/commonBusiness';
18 18 import * as commonFunc from '@/components/Common/commonFunc';
19 19 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
20 20 import SlaveMemo from '@/components/Common/SlaveMemo';
... ...
src/components/Common/commonBusiness.js
... ... @@ -1929,45 +1929,44 @@ export function handleGetMsg(str) {
1929 1929 }
1930 1930 return divStr;
1931 1931 }
1932   -export function commonBusiness() {
1933   - const commonBusinessData = {
1934   - validateTable,
1935   - validateMaster,
1936   - validateField,
1937   - handleAddIcon,
1938   - handleCheckIcon,
1939   - queryWidth,
1940   - saveData,
1941   - mergeData,
1942   - getTableTypes,
1943   - getGeyPayDate,
1944   - getCalculateByPrice,
1945   - getCalculateByPriceNew,
1946   - getCalculatedLossMoney,
1947   - getCalculatedReserveBags1,
1948   - getCalculatedReserveBags,
1949   - getCalculateMoney,
1950   - getCalculateMoneyNew,
1951   - getCalculateNoTaxPrice,
1952   - getCalculateNoTaxMoney,
1953   - getCalculateTaxMoney,
1954   - getCalculateMoneyByLossMoney,
1955   - getKeyUpEvent,
1956   - getCalculateAllMoney,
1957   - handleUnitType,
1958   - getMaterialsQty,
1959   - getAuxiliaryQty,
1960   - getFormulaValue,
1961   - getOutSideProcessFormula,
1962   - getShowTableSelectTypes,
1963   - getTreeTypes,
1964   - getWriteTypes,
1965   - clearSocketData,
1966   - createMemoProps,
1967   - getCharTypes,
1968   - getCharConfig,
1969   - validatePramsNotEmpty,
1970   - handleGetMsg
1971   - }
1972   - return commonBusinessData
1973   -}
1974 1932 \ No newline at end of file
  1933 +const commonBusiness = {
  1934 + validateTable,
  1935 + validateMaster,
  1936 + validateField,
  1937 + handleAddIcon,
  1938 + handleCheckIcon,
  1939 + queryWidth,
  1940 + saveData,
  1941 + mergeData,
  1942 + getTableTypes,
  1943 + getGeyPayDate,
  1944 + getCalculateByPrice,
  1945 + getCalculateByPriceNew,
  1946 + getCalculatedLossMoney,
  1947 + getCalculatedReserveBags1,
  1948 + getCalculatedReserveBags,
  1949 + getCalculateMoney,
  1950 + getCalculateMoneyNew,
  1951 + getCalculateNoTaxPrice,
  1952 + getCalculateNoTaxMoney,
  1953 + getCalculateTaxMoney,
  1954 + getCalculateMoneyByLossMoney,
  1955 + getKeyUpEvent,
  1956 + getCalculateAllMoney,
  1957 + handleUnitType,
  1958 + getMaterialsQty,
  1959 + getAuxiliaryQty,
  1960 + getFormulaValue,
  1961 + getOutSideProcessFormula,
  1962 + getShowTableSelectTypes,
  1963 + getTreeTypes,
  1964 + getWriteTypes,
  1965 + clearSocketData,
  1966 + createMemoProps,
  1967 + getCharTypes,
  1968 + getCharConfig,
  1969 + validatePramsNotEmpty,
  1970 + handleGetMsg
  1971 +};
  1972 +
  1973 +export default commonBusiness;
1975 1974 \ No newline at end of file
... ...
src/components/CommonClassifyEvent/CommonClassify.js
... ... @@ -9,7 +9,7 @@ import Toolbar from &#39;@/components/Common/ToolBar/ToolBarNew&#39;;
9 9 import CommonBase from '@/components/Common/CommonBase';
10 10 import CommonClassifyEvent from '@/components/Common/CommonClassifyEvent';
11 11 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
12   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  12 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
13 13 import SearchComponent from '@/components/Common/SearchComponent';/* 搜索组件 */
14 14 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
15 15 import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
... ...
src/components/CommonElementEvent/BatchNPriceUpdate.js
... ... @@ -5,7 +5,7 @@
5 5 import React, { Component } from 'react';
6 6 import { Input, message } from 'antd-v4';
7 7 import styles from '../../index.less';
8   -import * as commonBusiness from '../Common/commonBusiness';
  8 +import commonBusiness from '../Common/commonBusiness';
9 9 import * as commonServices from '../../services/services'; /* 服务类 */
10 10 import commonConfig from '../../utils/config';
11 11 import * as commonUtils from '../../utils/utils';
... ...
src/components/CommonElementEvent/BatchPriceUpdate.js
... ... @@ -5,7 +5,7 @@
5 5 import React, { Component } from 'react';
6 6 import { Input, message } from 'antd-v4';
7 7 import styles from '../../index.less';
8   -import * as commonBusiness from '../Common/commonBusiness';
  8 +import commonBusiness from '../Common/commonBusiness';
9 9 import * as commonServices from '../../services/services'; /* 服务类 */
10 10 import commonConfig from '../../utils/config';
11 11 import * as commonUtils from '../../utils/utils';
... ...
src/components/CommonElementEvent/BatchWorkListPriceUpdate.js
... ... @@ -5,7 +5,7 @@
5 5 import React, { Component } from 'react';
6 6 import { Input, message, Radio } from 'antd-v4';
7 7 import styles from '../../index.less';
8   -import * as commonBusiness from '../Common/commonBusiness';
  8 +import commonBusiness from '../Common/commonBusiness';
9 9 import * as commonServices from '../../services/services'; /* 服务类 */
10 10 import commonConfig from '../../utils/config';
11 11 import * as commonUtils from '../../utils/utils';
... ...
src/components/CommonElementEvent/CheckModelInfo.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
10 10 import CommonElementEvent from '../Common/CommonElementEvent';
11 11 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '../Common/CommonView';
13   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
14 14  
15 15 const { Header, Content } = Layout;
16 16 const { TabPane } = Tabs;
... ...
src/components/CommonElementEvent/CheckPhaseInfo.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
10 10 import CommonElementEvent from '../Common/CommonElementEvent';
11 11 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '../Common/CommonView';
13   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
14 14  
15 15 const { Header, Content } = Layout;
16 16 const { TabPane } = Tabs;
... ...
src/components/CommonElementEvent/CustomerInfo.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
10 10 import CommonElementEvent from '../Common/CommonElementEvent';
11 11 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '../Common/CommonView';
13   -import * as commonBusiness from '../Common/commonBusiness';
  13 +import commonBusiness from '../Common/commonBusiness';
14 14 import * as commonUtils from '../../utils/utils';/* 单据业务功能 */
15 15  
16 16 const { Header, Content } = Layout;
... ...
src/components/CommonElementEvent/ElemachineInfo.js
... ... @@ -11,7 +11,7 @@ import CommonElementEvent from &#39;../Common/CommonElementEvent&#39;;
11 11 import CommonView from '../Common/CommonView';
12 12 import * as commonUtils from '../../utils/utils';
13 13 import StaticEditTable from '../Common/CommonTable';
14   -import * as commonBusiness from '../Common/commonBusiness';
  14 +import commonBusiness from '../Common/commonBusiness';
15 15  
16 16 import commonConfig from '../../utils/config';/* 通用方法 */
17 17  
... ...
src/components/CommonElementEvent/EleteamInfo.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
10 10 import CommonElementEvent from '../Common/CommonElementEvent';
11 11 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '../Common/CommonView';
13   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
14 14 import * as commonUtils from '../../utils/utils';/* 通用方法 */
15 15  
16 16 const { Header, Content } = Layout;
... ...
src/components/CommonElementEvent/FilfileManageInfo.js
... ... @@ -7,7 +7,7 @@ import { Form } from &#39;@ant-design/compatible&#39;;
7 7 import '@ant-design/compatible/assets/index.css';
8 8 import { Button, Layout, message, Spin } from 'antd-v4';
9 9 import StaticEditTable from '../Common/CommonTable';
10   -import * as commonBusiness from '../Common/commonBusiness';
  10 +import commonBusiness from '../Common/commonBusiness';
11 11 import CommonBase from '../Common/CommonBase';
12 12 import CommonClassifyEvent from '../Common/CommonClassifyEvent';
13 13 import * as commonFunc from '../Common/commonFunc';
... ...
src/components/CommonElementEvent/KnifeMouldInfo.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
10 10 import CommonElementEvent from '../Common/CommonElementEvent';
11 11 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '../Common/CommonView';
13   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
14 14  
15 15 const { Header, Content } = Layout;
16 16 const { TabPane } = Tabs;
... ...
src/components/CommonElementEvent/MaterialsInfo.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
10 10 import CommonElementEvent from '../Common/CommonElementEvent';
11 11 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '../Common/CommonView';
13   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
14 14  
15 15 const { Header, Content } = Layout;
16 16 const { TabPane } = Tabs;
... ...
src/components/CommonElementEvent/PaymentTermsInfo.js
... ... @@ -9,7 +9,7 @@ import * as commonFunc from &#39;../Common/commonFunc&#39;;
9 9 import CommonView from '../Common/CommonViewNew';
10 10 import CommonBase from '../Common/CommonBase';
11 11 import CommonElementEvent from '../Common/CommonElementEvent';
12   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  12 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
13 13 import * as commonUtils from '../../utils/utils';/* 通用方法 */
14 14  
15 15 const { Header, Content } = Layout;
... ...
src/components/CommonElementEvent/PrintInfo.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;@/components/Common/CommonBase&#39;;
10 10 import CommonElementEvent from '@/components/Common/CommonElementEvent';
11 11 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '@/components/Common/CommonView';
13   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
14 14 import commonConfig from '@/utils/config';
15 15 import * as commonUtils from '@/utils/utils';/* 通用方法 */
16 16  
... ...
src/components/CommonElementEvent/ProcessInfo.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
10 10 import CommonElementEvent from '../Common/CommonElementEvent';
11 11 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '../Common/CommonView';
13   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
14 14 import * as commonUtils from '../../utils/utils';/* 通用方法 */
15 15  
16 16 const { Header, Content } = Layout;
... ...
src/components/CommonElementEvent/ProductClassifyInfo.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
10 10 import CommonElementEvent from '../Common/CommonElementEvent';
11 11 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '../Common/CommonView';
13   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
14 14 import * as commonUtils from '../../utils/utils';/* 通用方法 */
15 15  
16 16 const { Header, Content } = Layout;
... ...
src/components/CommonElementEvent/SftLoginInfo.js
... ... @@ -11,7 +11,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
11 11 import CommonElementEvent from '../Common/CommonElementEvent';
12 12 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
13 13 import CommonView from '../Common/CommonView';
14   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  14 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
15 15  
16 16 const { Header, Content } = Layout;
17 17 const { TabPane } = Tabs;
... ...
src/components/CommonElementEvent/SisCommonStyle.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
10 10 import CommonElementEvent from '../Common/CommonElementEvent';
11 11 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '../Common/CommonView';
13   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
14 14  
15 15 const { Header, Content } = Layout;
16 16 const { TabPane } = Tabs;
... ...
src/components/CommonElementEvent/SisformulaInfo.js
... ... @@ -12,7 +12,7 @@ import CommonElementEvent from &#39;@/components/Common/CommonElementEvent&#39;;
12 12 import CommonView from '@/components/Common/CommonView';
13 13 import TabCounter from '@/components/Common/CommonCalculator';
14 14 import TabParam from '@/components/Common/commonParam';
15   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  15 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
16 16 import ShowTypeNew from '@/components/Common/CommonComponent';
17 17 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
18 18  
... ...
src/components/CommonElementEvent/StatementInfo.js
... ... @@ -17,7 +17,7 @@ import { Modal, Upload, message } from &#39;antd-v4&#39;;
17 17 import * as commonUtils from '../../utils/utils';
18 18 import * as commonServices from '../../services/services';
19 19 import commonConfig from '../../utils/config';
20   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  20 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
21 21 import StaticEditTable from '../Common/CommonTable';
22 22 import * as commonFunc from '../Common/commonFunc';
23 23 import AntdDraggableModal from '../Common/AntdDraggableModal';
... ...
src/components/CommonElementEvent/SupplyInfo.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
10 10 import CommonElementEvent from '../Common/CommonElementEvent';
11 11 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '../Common/CommonView';
13   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
14 14 import * as commonUtils from '../../utils/utils';/* 通用方法 */
15 15  
16 16 const { Header, Content } = Layout;
... ...
src/components/CommonElementEvent/TestStandInfo.js
... ... @@ -10,7 +10,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;
10 10 import CommonElementEvent from '../Common/CommonElementEvent';
11 11 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
12 12 import CommonView from '../Common/CommonView';
13   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  13 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
14 14  
15 15 const { Header, Content } = Layout;
16 16 const { TabPane } = Tabs;
... ...
src/components/CommonImportDataEvent/importDataInfo.js
... ... @@ -9,7 +9,7 @@ import CommonBase from &#39;@/components/Common/CommonBase&#39;;
9 9 import CommonImportDataComponet from '@/components/Common/CommonImportDataEvent';
10 10 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
11 11 import CommonView from '@/components/Common/CommonViewNew';
12   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  12 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
13 13  
14 14 /* 通用方法 */
15 15 const { Content } = Layout;
... ...
src/components/CommonSystemSettingEvent/CommonSystemSetting.js
... ... @@ -8,7 +8,7 @@ import * as commonUtils from &#39;@/utils/utils&#39;;/* 通用方法 */
8 8 import CommonBase from '@/components/Common/CommonBase';
9 9 import CommonSystemSettingEvent from '@/components/Common/CommonSystemSettingEvent';
10 10 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
11   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  11 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
12 12 import * as commonFunc from '@/components/Common/commonFunc';
13 13 import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
14 14 import selfStyles from './index.less';
... ...
src/components/CommonSystemSettingEvent/TabFinancePeriod.js
... ... @@ -4,7 +4,7 @@ import { Form } from &#39;@ant-design/compatible&#39;;
4 4 import '@ant-design/compatible/assets/index.css';
5 5 import { Row, Col, message, DatePicker, Button } from 'antd-v4';
6 6 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
7   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  7 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
8 8 import styles from '@/index.less';
9 9 import commonConfig from '@/utils/config';
10 10 import * as commonServices from '@/services/services';
... ...
src/components/JurisdictionAllotEvent/SystemPermissionInfo.js
... ... @@ -9,7 +9,7 @@ import Toolbar from &#39;../Common/ToolBar/ToolBarNew&#39;;
9 9 import * as commonFunc from '../Common/commonFunc';
10 10 import CommonBase from '../Common/CommonBase';
11 11 import CommonJurisdictionEvent from '../Common/CommonJurisdictionNewEvent';
12   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  12 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
13 13 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
14 14 import StaticEditTree from '../Common/Tree/StaticTree';
15 15 import AntdDraggableModal from '../Common/AntdDraggableModal';
... ...
src/components/Manufacture/CommonPackEvent.js
1 1 /* eslint-disable */
2 2 import React, { useEffect, useState, useRef } from "react";
3 3 import { Button, message } from "antd-v4";
4   -import * as commonBusiness from "@/components/Common/commonBusiness";
  4 +import commonBusiness from "@/components/Common/commonBusiness";
5 5 import * as commonUtils from "@/utils/utils";
6 6 import * as commonFunc from "@/components/Common/commonFunc";
7 7 import commonConfig from "@/utils/config";
... ...
src/components/Manufacture/ProcessCard/ProcessCard.js
... ... @@ -24,7 +24,7 @@ import selfstyles from &#39;../index.less&#39;;
24 24 import CommonView from '../../Common/CommonView';
25 25 import CommonBase from '../../Common/CommonBase';/* 获取配置及数据 */
26 26 import * as commonUtils from '../../../utils/utils';/* 通用方法 */
27   -import * as commonBusiness from '../../Common/commonBusiness';/* 单据业务功能 */
  27 +import commonBusiness from '../../Common/commonBusiness';/* 单据业务功能 */
28 28 import commonConfig from '../../../utils/config';
29 29 import * as commonServices from '../../../services/services';/* 服务类 */
30 30 import CommonListSelect from '../../Common/CommonListSelect';
... ...
src/components/Manufacture/ProcessCardPack/ProcessCardPack.js
... ... @@ -37,7 +37,7 @@ import selfstyles from &#39;../index.less&#39;;
37 37 import CommonView from '../../Common/CommonView';
38 38 import CommonBase from '../../Common/CommonBase'; /* 获取配置及数据 */
39 39 import * as commonUtils from '../../../utils/utils'; /* 通用方法 */
40   -import * as commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
  40 +import commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
41 41 import commonConfig from '../../../utils/config';
42 42 import * as commonServices from '../../../services/services'; /* 服务类 */
43 43 import CommonListSelect from '../../Common/CommonListSelect';
... ...
src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js
... ... @@ -39,7 +39,7 @@ import selfstyles from &#39;../index.less&#39;;
39 39 import CommonView from '../../Common/CommonView';
40 40 import CommonBase from '../../Common/CommonBase'; /* 获取配置及数据 */
41 41 import * as commonUtils from '../../../utils/utils'; /* 通用方法 */
42   -import * as commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
  42 +import commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
43 43 import commonConfig from '../../../utils/config';
44 44 import * as commonServices from '../../../services/services'; /* 服务类 */
45 45 import CommonListSelect from '../../Common/CommonListSelect';
... ...
src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
... ... @@ -7,7 +7,7 @@ import { Form } from &quot;@ant-design/compatible&quot;;
7 7 import CommonBase from "@/components/Common/CommonBase";
8 8 import CommonSales from "@/components/Common/CommonBillEvent";
9 9 import { CommonPackEvent, CommonModal } from "../CommonPackEvent";
10   -import * as commonBusiness from "@/components/Common/commonBusiness";
  10 +import commonBusiness from "@/components/Common/commonBusiness";
11 11 import * as commonUtils from "@/utils/utils";
12 12 import * as commonFunc from "@/components/Common/commonFunc";
13 13 import commonConfig from "@/utils/config";
... ...
src/components/Manufacture/WorkOrder/WorkOrder.js
... ... @@ -45,7 +45,7 @@ import styles from &#39;@/index.less&#39;;
45 45 import CommonView from '@/components/Common/CommonView';
46 46 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
47 47 import * as commonUtils from '@/utils/utils';/* 通用方法 */
48   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  48 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
49 49 import commonConfig from '@/utils/config';
50 50 import * as commonServices from '@/services/services';/* 服务类 */
51 51 import CommonListSelect from '@/components/Common/CommonListSelect';/* 选择界面 */
... ...
src/components/Manufacture/WorkOrderPack/WorkOrderPack.js
... ... @@ -49,7 +49,7 @@ import styles from &#39;@/index.less&#39;;
49 49 import CommonView from '@/components/Common/CommonView';
50 50 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
51 51 import * as commonUtils from '@/utils/utils';/* 通用方法 */
52   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  52 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
53 53 import commonConfig from '@/utils/config';
54 54 import * as commonServices from '@/services/services';/* 服务类 */
55 55 import CommonListSelect from '@/components/Common/CommonListSelect';/* 选择界面 */
... ...
src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
... ... @@ -55,7 +55,7 @@ import styles from &#39;@/index.less&#39;;
55 55 import CommonView from '@/components/Common/CommonView';
56 56 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
57 57 import * as commonUtils from '@/utils/utils';/* 通用方法 */
58   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  58 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
59 59 import commonConfig from '@/utils/config';
60 60 import * as commonServices from '@/services/services';/* 服务类 */
61 61 import EjectRight from '@/assets/eject.svg';/* 弹出图标 */
... ...
src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js
... ... @@ -56,7 +56,7 @@ import styles from &#39;@/index.less&#39;;
56 56 import CommonView from '@/components/Common/CommonView';
57 57 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
58 58 import * as commonUtils from '@/utils/utils';/* 通用方法 */
59   -import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
  59 +import commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
60 60 import commonConfig from '@/utils/config';
61 61 import * as commonServices from '@/services/services';/* 服务类 */
62 62 import EjectRight from '@/assets/eject.svg';/* 弹出图标 */
... ...
src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
... ... @@ -7,7 +7,7 @@ import { Form } from &quot;@ant-design/compatible&quot;;
7 7 import CommonBase from "@/components/Common/CommonBase";
8 8 import CommonSales from "@/components/Common/CommonBillEvent";
9 9 import { CommonPackEvent, CommonModal } from "../CommonPackEvent";
10   -import * as commonBusiness from "@/components/Common/commonBusiness";
  10 +import commonBusiness from "@/components/Common/commonBusiness";
11 11 import * as commonUtils from "@/utils/utils";
12 12 import * as commonFunc from "@/components/Common/commonFunc";
13 13 import commonConfig from "@/utils/config";
... ...
src/components/ProductionPlan/ProductionPlan.js
... ... @@ -23,7 +23,7 @@ import CommonBase from &#39;../Common/CommonBase&#39;;/* 获取配置及数据 */
23 23 import * as commonUtils from '../../utils/utils';/* 通用方法 */
24 24 import * as commonFunc from '../../components/Common/commonFunc';
25 25 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
26   -import * as commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
  26 +import commonBusiness from '../Common/commonBusiness';/* 单据业务功能 */
27 27 import AntdDraggableModal from '../Common/AntdDraggableModal';
28 28  
29 29 const {
... ...
src/components/ProductionReport/ProductionReport.js
... ... @@ -28,7 +28,7 @@ import styles from &#39;./../../index.less&#39;;
28 28 import CommonView from './../Common/CommonView';
29 29 import CommonBase from './../Common/CommonBase';/* 获取配置及数据 */
30 30 import * as commonUtils from './../../utils/utils';/* 通用方法 */
31   -import * as commonBusiness from './../Common/commonBusiness';/* 单据业务功能 */
  31 +import commonBusiness from './../Common/commonBusiness';/* 单据业务功能 */
32 32 import commonConfig from './../../utils/config';
33 33 import * as commonServices from './../../services/services';
34 34 import AntdDraggableModal from '../Common/AntdDraggableModal';/* 服务类 */
... ...
src/components/QuickQuote/index.jsx
... ... @@ -7,7 +7,7 @@ import commonConfig from &quot;@/utils/config&quot;;
7 7 import * as commonUtils from "@/utils/utils";
8 8 import * as commonServices from "@/services/services";
9 9 import * as commonFunc from "@/components/Common/commonFunc";
10   -import * as commonBusiness from "@/components/Common/commonBusiness";
  10 +import commonBusiness from "@/components/Common/commonBusiness";
11 11 import CommonViewTable from "@/components/Common/CommonViewTable";
12 12 import StaticEditTable from "@/components/Common/CommonTable";
13 13 import ShowImgM from "@/components/Common/BoxShowImgMaterial";
... ...
src/components/QuoQuotation/Quotation/Quotation.js
... ... @@ -26,7 +26,7 @@ import CommonView from &#39;../../Common/CommonView&#39;;
26 26 import SplitPaste from './SplitPasteQuotation';
27 27 import CommonBase from '../../Common/CommonBase';/* 获取配置及数据 */
28 28 import * as commonUtils from '../../../utils/utils';/* 通用方法 */
29   -import * as commonBusiness from '../../Common/commonBusiness';/* 单据业务功能 */
  29 +import commonBusiness from '../../Common/commonBusiness';/* 单据业务功能 */
30 30 import commonConfig from '../../../utils/config';
31 31 import * as commonServices from '../../../services/services';/* 服务类 */
32 32 import CommonListSelect from '../../Common/CommonListSelect';/* 选择界面 */
... ...
src/components/QuoQuotation/QuotationPack/QuotationPack.js
... ... @@ -31,7 +31,7 @@ import CommonView from &#39;../../Common/CommonView&#39;;
31 31 import SplitPaste from '../Quotation/SplitPasteQuotation';
32 32 import CommonBase from '../../Common/CommonBase'; /* 获取配置及数据 */
33 33 import * as commonUtils from '../../../utils/utils'; /* 通用方法 */
34   -import * as commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
  34 +import commonBusiness from '../../Common/commonBusiness'; /* 单据业务功能 */
35 35 import commonConfig from '../../../utils/config';
36 36 import * as commonServices from '../../../services/services'; /* 服务类 */
37 37 import CommonListSelect from '../../Common/CommonListSelect'; /* 选择界面 */
... ...