From 0cfa57498545a1eab68edcb624a68a38700da1e3 Mon Sep 17 00:00:00 2001 From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com> Date: Tue, 20 May 2025 17:16:41 +0800 Subject: [PATCH] 公用方法调用 --- src/components/Common/AssignmentField.js | 2 +- src/components/Common/BoxDesignCompontent/index.js | 2 +- src/components/Common/CommonBase.js | 2 +- src/components/Common/CommonBill/index.js | 2 +- src/components/Common/CommonBillDeliver.js | 2 +- src/components/Common/CommonBillDeliverEvent.js | 2 +- src/components/Common/CommonBillEvent.js | 2 +- src/components/Common/CommonCheckBill/index.js | 2 +- src/components/Common/CommonCheckBillEvent.js | 2 +- src/components/Common/CommonClassifyEvent.js | 2 +- src/components/Common/CommonColumnList.js | 2 +- src/components/Common/CommonCostomTabBill.js | 2 +- src/components/Common/CommonElementEvent.js | 2 +- src/components/Common/CommonGroupBill.js | 2 +- src/components/Common/CommonGroupBillEvent.js | 2 +- src/components/Common/CommonInstructSet.js | 2 +- src/components/Common/CommonJurisdictionNewEvent.js | 2 +- src/components/Common/CommonList.js | 2 +- src/components/Common/CommonListA.js | 2 +- src/components/Common/CommonListEdit.js | 2 +- src/components/Common/CommonListEditEvent.js | 2 +- src/components/Common/CommonListEvent.js | 2 +- src/components/Common/CommonListLeft/index.js | 2 +- src/components/Common/CommonListSelect/index.js | 2 +- src/components/Common/CommonListSelectAssignment.js | 2 +- src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx | 2 +- src/components/Common/CommonListSelectFlex/index.js | 2 +- src/components/Common/CommonListSelectMulti/index.js | 2 +- src/components/Common/CommonListSelectParam/index.js | 2 +- src/components/Common/CommonListSelectProductMaterial.js | 2 +- src/components/Common/CommonListSelectTree/index.js | 2 +- src/components/Common/CommonListTab/index.js | 2 +- src/components/Common/CommonListTabEvent.js | 2 +- src/components/Common/CommonListTree/index.js | 2 +- src/components/Common/CommonListTreeEvent.js | 2 +- src/components/Common/CommonListTreeSelect/index.js | 2 +- src/components/Common/CommonNewBill.js | 2 +- src/components/Common/CommonNewBillEvent.js | 2 +- src/components/Common/CommonNewListBill.js | 2 +- src/components/Common/CommonNewTabBill.js | 2 +- src/components/Common/CommonNewTabBillEvent.js | 2 +- src/components/Common/CommonProductionPlanEvent.js | 2 +- src/components/Common/CommonProductionPlanOutsideEvent.js | 2 +- src/components/Common/CommonProductionPlanTreeEvent.js | 2 +- src/components/Common/CommonProductionmMainPlanEvent.js | 2 +- src/components/Common/CommonSubBill.js | 2 +- src/components/Common/CommonSubBillEvent.js | 2 +- src/components/Common/CommonSystemSettingEvent.js | 2 +- src/components/Common/CommonViewDrag/index.js | 2 +- src/components/Common/CommonViewDragable/index.js | 2 +- src/components/Common/FileImposition/index.js | 2 +- src/components/Common/Gatte/CommonGatte.js | 2 +- src/components/Common/MakeUpPDF/index.js | 412 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/Common/MakeUpPDF/index.less | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/Common/MaterialRequirementsPlanning.js | 2 +- src/components/Common/PersonCenter/PersonCenter.js | 2 +- src/components/Common/SearchComponent/index.js | 2 +- src/components/Common/ToolBar/ToolBarNew.js | 2 +- src/components/Common/commonBusiness.js | 83 +++++++++++++++++++++++++++++++++++++++++------------------------------------------ src/components/CommonClassifyEvent/CommonClassify.js | 2 +- src/components/CommonElementEvent/BatchNPriceUpdate.js | 2 +- src/components/CommonElementEvent/BatchPriceUpdate.js | 2 +- src/components/CommonElementEvent/BatchWorkListPriceUpdate.js | 2 +- src/components/CommonElementEvent/CheckModelInfo.js | 2 +- src/components/CommonElementEvent/CheckPhaseInfo.js | 2 +- src/components/CommonElementEvent/CustomerInfo.js | 2 +- src/components/CommonElementEvent/ElemachineInfo.js | 2 +- src/components/CommonElementEvent/EleteamInfo.js | 2 +- src/components/CommonElementEvent/FilfileManageInfo.js | 2 +- src/components/CommonElementEvent/KnifeMouldInfo.js | 2 +- src/components/CommonElementEvent/MaterialsInfo.js | 2 +- src/components/CommonElementEvent/PaymentTermsInfo.js | 2 +- src/components/CommonElementEvent/PrintInfo.js | 2 +- src/components/CommonElementEvent/ProcessInfo.js | 2 +- src/components/CommonElementEvent/ProductClassifyInfo.js | 2 +- src/components/CommonElementEvent/SftLoginInfo.js | 2 +- src/components/CommonElementEvent/SisCommonStyle.js | 2 +- src/components/CommonElementEvent/SisformulaInfo.js | 2 +- src/components/CommonElementEvent/StatementInfo.js | 2 +- src/components/CommonElementEvent/SupplyInfo.js | 2 +- src/components/CommonElementEvent/TestStandInfo.js | 2 +- src/components/CommonImportDataEvent/importDataInfo.js | 2 +- src/components/CommonSystemSettingEvent/CommonSystemSetting.js | 2 +- src/components/CommonSystemSettingEvent/TabFinancePeriod.js | 2 +- src/components/JurisdictionAllotEvent/SystemPermissionInfo.js | 2 +- src/components/Manufacture/CommonPackEvent.js | 2 +- src/components/Manufacture/ProcessCard/ProcessCard.js | 2 +- src/components/Manufacture/ProcessCardPack/ProcessCardPack.js | 2 +- src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js | 2 +- src/components/Manufacture/ProcessCardPackTableTreeNew/index.js | 2 +- src/components/Manufacture/WorkOrder/WorkOrder.js | 2 +- src/components/Manufacture/WorkOrderPack/WorkOrderPack.js | 2 +- src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js | 2 +- src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js | 2 +- src/components/Manufacture/WorkOrderPackTableTreeNew/index.js | 2 +- src/components/ProductionPlan/ProductionPlan.js | 2 +- src/components/ProductionReport/ProductionReport.js | 2 +- src/components/QuickQuote/index.jsx | 2 +- src/components/QuoQuotation/Quotation/Quotation.js | 2 +- src/components/QuoQuotation/QuotationPack/QuotationPack.js | 2 +- src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js | 2 +- src/components/productionMainPlan/productionMainPlan.js | 2 +- src/components/productionMainPlan/productionUnifiedPlanning.js | 2 +- src/components/productionPlanInfo/productionPlanChangeMacheInfo.js | 2 +- src/components/productionPlanInfo/productionPlanInfo.js | 2 +- src/components/productionPlanInfo/productionPlanInfo2.js | 2 +- src/components/productionPlanInfo/productionPlanOutside.js | 2 +- src/components/productionSchedule/productionPlanChangeMacheInfo.js | 2 +- src/components/productionSchedule/productionPlanInfo2.js | 2 +- src/components/productionSchedule/productionSchedule.js | 2 +- src/components/productionScheduleTree/productionPlanChangeMacheInfo.js | 2 +- src/components/productionScheduleTree/productionPlanInfo2.js | 2 +- src/components/productionScheduleTree/productionScheduleTree.js | 2 +- src/components/productionScheduleTree/productionScheduleTreeBack.js | 2 +- 114 files changed, 647 insertions(+), 153 deletions(-) create mode 100644 src/components/Common/MakeUpPDF/index.js create mode 100644 src/components/Common/MakeUpPDF/index.less 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 ( +
+