Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

陈鑫涛
2 parents 826c283a c97a2e98
Showing 118 changed files with 450 additions and 160 deletions
.umirc.ts
package.json
src/components/AuditInformation/AuditInformation.js
src/components/Common/CommonBill/index.js
src/components/Common/CommonBillDeliver.js
src/components/Common/CommonCalculator.js
src/components/Common/CommonCheckBill/index.js
src/components/Common/CommonColumnList.js
src/components/Common/CommonComponent/index.js
src/components/Common/CommonComponent/index_new.js
src/components/Common/CommonCostomTabBill.js
src/components/Common/CommonGroupBill.js
src/components/Common/CommonList.js
src/components/Common/CommonListA.js
src/components/Common/CommonListEdit.js
src/components/Common/CommonListLeft.js
src/components/Common/CommonListLeft/index.js
src/components/Common/CommonListSelect/index.js
src/components/Common/CommonListSelectAssignment.js
src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx
@@ -22,10 +22,10 @@ export default defineConfig({
       path: "/loginMobile",
       component: "@/routes/mobile/login/LoginMobile",
     },
- 
+
     {
-      path: '/indexMobile',
-      component:'@/routes/mobile/IndexMobile',
+      path: "/indexMobile",
+      component: "@/routes/mobile/IndexMobile",
       routes: [{ path: "*" }],
     },
   ],
@@ -36,4 +36,5 @@ export default defineConfig({
     include: getIcons(),
   },
   plugins: ["@umijs/plugins/dist/dva"],
+  mfsu: false,
 });
@@ -18,6 +18,7 @@
     "@js-preview/pdf": "^2.0.10",
     "antd": "^5.24.3",
     "antd-mobile": "5.37.1",
+    "antd-mobile-icons": "^0.3.0",
     "antd-mobile-v2": "2.3.4",
     "antd-v4": "npm:antd@4.24.16",
     "braft-editor": "^2.3.9",
@@ -5,7 +5,7 @@
 // , Switch, Icon
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Tabs, Avatar, message, Select, Input, Button } from 'antd-v4';
 import * as commonFunc from './../Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
 import StaticEditTable from '../Common/CommonTable';/* 可编辑表格 */
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { UploadOutlined } from '@ant-design/icons';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {
   Row,
   Col,
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { UploadOutlined } from '@ant-design/icons';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col, Checkbox, Layout, Spin, Tabs, Avatar, Button, message, Table, Input, Upload } from 'antd-v4';
 import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
 import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
 /* eslint-disable function-paren-newline */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col, Button } from 'antd-v4';
 import * as commonUtils from '../../utils/utils';
 import commonConfig from '../../utils/config';
@@ -2,7 +2,7 @@
 import React, { Component } from 'react';
 import { UploadOutlined } from '@ant-design/icons';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {
   Row,
   Col,
@@ -7,7 +7,7 @@
  */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin } from 'antd-v4';
 import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功能 */
 import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
 import moment from 'moment';
 import React, { Component, createRef } from 'react';
 import reactComponentDebounce from '@/components/Common/ReactDebounce';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {
   InputNumber,
   Checkbox,
@@ -2,7 +2,7 @@ import moment from &#39;moment&#39;;
 import React, { useState, useEffect } from 'react';
 import { useMount, useUnmount } from 'ahooks';
 // import reactComponentDebounce from 'react-component-debounce';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {
   InputNumber,
   Checkbox,
@@ -2,7 +2,7 @@
  
 import React, { Component, useEffect, useState, useRef } from "react";
 import { Form } from "@ant-design/compatible";
-import "@ant-design/compatible/assets/index.css";
+// import "@ant-design/compatible/assets/index.css";
 import {
   Row,
   Col,
@@ -2,7 +2,7 @@
  
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {Row, Col, Checkbox, Layout, Spin, Tabs, Dropdown, Avatar, Button, message, Menu, Table, Upload} from 'antd-v4';
 import {DownOutlined, UploadOutlined,} from '@ant-design/icons';
 import CommonNewSales from '@/components/Common/CommonGroupBillEvent';/* 继承销售模块业务功能 */
 import React, { Component, useMemo, useState } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Slider, Button } from 'antd-v4';
 import { MessageOutlined, MinusOutlined } from '@ant-design/icons';
 import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */
 /* 此组件作用是 列表绕开注册 */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Slider } from 'antd-v4';
 import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */
 import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
 /* 此组件作用是 可编辑列表 */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Slider } from 'antd-v4';
 import CommonListEvent from '@/components/Common/CommonListEditEvent';/* 继承销售模块业务功能 */
 import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
 /* eslint-disable */
 import React, { Component } from 'react';
 import { Form, Icon } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Slider, Button, Input, message, Tooltip  } from 'antd-v4';
 import { MessageOutlined, MinusOutlined, NodeExpandOutlined } from '@ant-design/icons';
 import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */
 /* eslint-disable */
 import React, { Component } from 'react';
 import { Form, Icon } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Slider, Button } from 'antd-v4';
 import { MessageOutlined, MinusOutlined } from '@ant-design/icons';
 import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */
 /* eslint-disable */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {  UploadOutlined } from '@ant-design/icons';
 import { Layout, Spin, Button, message, Upload, Modal } from 'antd-v4';
 import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */
@@ -3,7 +3,7 @@
  
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Button, Row, Col } from 'antd-v4';
 import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功能 */
 // import * as commonUtils from '../../utils/utils'; /* 通用方法 */
 /* eslint-disable */
 import React, { PureComponent } from "react";
 import { Form } from "@ant-design/compatible";
-import "@ant-design/compatible/assets/index.css";
+// import "@ant-design/compatible/assets/index.css";
 import { Layout, Spin, Button, Row, Col } from "antd-v4";
 import * as commonFunc from "@/components/Common/commonFunc"; /* 通用单据方法 */ /* 通用单据方法 */
 import StaticEditTable from "@/components/Common//CommonTable"; /* 可编辑表格 */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Button, Row, Col, message } from 'antd-v4';
 import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
 import StaticEditTable from '@/components/Common//CommonTable';/* 可编辑表格 */
 import React, { Component } from 'react';
 import { DownOutlined } from '@ant-design/icons';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Button, Row, Col, message } from 'antd-v4';
 import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */
 // import * as commonUtils from '../../utils/utils'; /* 通用方法 */
 /* eslint-disable */
 import React, { Component } from 'react';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Form } from '@ant-design/compatible';
 import { Spin, Tabs, message, Modal, Tooltip } from 'antd-v4';
 import * as commonUtils from '@/utils/utils';/* 通用方法 */
@@ -7,7 +7,7 @@
  */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Button, Row, Col } from 'antd-v4';
 import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功能 */
 import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
 import React, { Component } from 'react';
 import { DownOutlined } from '@ant-design/icons';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Button, Row, Col, message } from 'antd-v4';
 import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */
 // import * as commonUtils from '../../utils/utils'; /* 通用方法 */
 /* eslint-disable */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Slider, Tabs, Row, Col, Card } from 'antd-v4';
 import baseChar from '@/components/Common/baseChar'; /* 获取图表配置及数据 */
 import CommonListTabEvent from '@/components/Common/CommonListTabEvent';/* 继承销售模块业务功能 */
@@ -8,7 +8,7 @@
 /* eslint-disable */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin } from 'antd-v4';
 import CommonListTreeEvent from '../CommonListTreeEvent';/* 继承销售模块业务功能 */
 import * as commonFunc from '../commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
@@ -4,7 +4,7 @@
  */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Button, message } from 'antd-v4';
 import CommonListTreeEvent from '@/components/Common/CommonListTreeEvent';/* 继承销售模块业务功能 */
 import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
@@ -2,7 +2,7 @@
  
 import React, { Component, useState, useRef, useEffect } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {Row, Col, Checkbox, Layout, Spin, Tabs, Dropdown, Avatar, Button, Menu, Table, Upload} from 'antd-v4';
 import { message } from '@/utils/common/message';
 import {DownOutlined, UploadOutlined,} from '@ant-design/icons';
@@ -2,7 +2,7 @@
  
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {Row, Col, Checkbox, Layout, Spin, Tabs, Dropdown, Avatar, Button, message, Menu, Table, Upload} from 'antd-v4';
 import {DownOutlined, UploadOutlined,} from '@ant-design/icons';
 import CommonNewSales from '@/components/Common/CommonNewTabBillEvent';/* 继承销售模块业务功能 */
@@ -2,7 +2,7 @@
  
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {Row, Col, Checkbox, Layout, Spin, Tabs, Dropdown, Avatar, Button, message, Menu, Table, Upload} from 'antd-v4';
 import {DownOutlined, UploadOutlined,} from '@ant-design/icons';
 import CommonNewSales from '@/components/Common/CommonNewTabBillEvent';/* 继承销售模块业务功能 */
@@ -4,7 +4,7 @@
 import React, { Component } from 'react';
 import { UploadOutlined } from '@ant-design/icons';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col, Checkbox, Layout, Spin, Tabs, Avatar, Button, Table, Input, Upload } from 'antd-v4';
 import { message } from '@/utils/common/message';
 import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
@@ -29,7 +29,7 @@ import {
   PlaySquareOutlined
 } from '@ant-design/icons';
 import { Icon as LegacyIcon } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import lodash from 'lodash';
 import { Table, Input, Checkbox, Button, Upload, message, Popover, Spin, Space, Form, Tooltip, Row, Progress,Modal, Col, Pagination } from 'antd-v4';
 import { DndProvider, DropTarget, DragSource } from 'react-dnd';
@@ -1266,6 +1266,11 @@ class CommonTableRc extends React.Component {
       })
     }
  
+    this.props.onCostomColums?.([
+      ...tableColumn,
+      ...subTableColumn
+    ]);
+
     // 判断工序状态
     if (commonUtils.isNotEmptyArr(sPartNameStatus) && commonUtils.isNotEmptyArr(dataSource)) {
       this.useVListNew = true;
 /* eslint-disable */
 /* eslint-disable object-curly-newline,prefer-destructuring */
 import React, { Component } from 'react';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {Row, Col, Form, Tooltip, Divider} from 'antd-v4';
 import { DoubleRightOutlined } from '@ant-design/icons';
 import commonConfig from '@/utils/config';
@@ -378,9 +378,9 @@ export default class CommonView extends Component {
                   enabledNew = true;
                 }
                 // 设备信息页面修改MES系统PLC编号，控制是否输入
-                if (sModelsType === 'element/machineInfo' && child.sName === 'iPlcNo') {
-                  enabledNew = isEnabledPlcNo;
-                }
+                // if (sModelsType === 'element/machineInfo' && child.sName === 'iPlcNo') {
+                //   enabledNew = isEnabledPlcNo;
+                // }
  
                 /* 红冲中的单据 不可修改 */
                 if (commonUtils.isNotEmptyObject(masterData) && ((commonUtils.isNotEmptyObject(masterData.sMinusSrcId)) || commonUtils.isNotEmptyObject(masterData.sMinusUsed))) {
 /* eslint-disable */
 import React, { Component } from "react";
-import "@ant-design/compatible/assets/index.css";
+// import "@ant-design/compatible/assets/index.css";
 import { Col, Tabs, Tooltip } from "antd-v4";
 import ShowType from "@/components/Common/CommonComponent";
 import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
@@ -6,7 +6,7 @@ import React, {
   useRef,
   useState
 } from "react";
-import "@ant-design/compatible/assets/index.css";
+// 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";
 /* eslint-disable object-curly-newline,prefer-destructuring */
 import React, { Component } from 'react';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col, Form } from 'antd-v4';
 import ShowType from '@/components/Common/CommonComponent';
 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
@@ -5,7 +5,7 @@
 import React, { Component } from 'react';
 import { UploadOutlined } from '@ant-design/icons';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col, Button, Upload } from 'antd-v4';
 import config from '@/utils/config';
 import * as commonUtils from '@/utils/utils';/* 通用方法 */
 /* eslint-disable */
 /* eslint-disable object-curly-newline,prefer-destructuring */
 import React, { Component } from 'react';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col, Divider, Tooltip } from 'antd-v4';
 import ShowType from '@/components/Common/CommonComponent';
 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
@@ -389,7 +389,7 @@ export default class CommonViewTable extends Component {
                     onViewClick: this.handleViewClick,
                     onFieldDoubleClick: this.props.handleFieldDoubleClick,
                     getDateFormat: this.props.getDateFormat,
-                    onFieldPopupModal: this.handleFieldPopupModal,
+                    onFieldPopupModal: this.props.onFieldPopupModal || this.handleFieldPopupModal,
                     onCostomChange: this.props.onCostomChange, // 控件后自定义按钮事件
                     sBtnSendDialogConfigList: this.props.sBtnSendDialogConfigList, // 校验并获取物料主数据按钮配置
                     onToolBarBtnClick: this.props.onToolBarBtnClick, // 工具栏按钮事件
@@ -4,7 +4,7 @@
 /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col, Radio } from 'antd-v4';
 import * as commonUtils from '../../utils/utils';
 import ShowType from './CommonComponent';/* 通用方法 */
 /* eslint-disable */
 import React, { Component } from 'react';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
 import BraftEditor from 'braft-editor'
 import 'braft-editor/dist/index.css'
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin } from 'antd-v4';
 import CommonListEvent from '../CommonListEvent';/* 继承销售模块业务功能 */
 import * as commonFunc from '../commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
@@ -7,7 +7,7 @@
  */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin } from 'antd-v4';
 import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功能 */
 import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
@@ -15,7 +15,7 @@ import {
 } from '@ant-design/icons';
  
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
  
 import { Button, Input, Modal, Menu, Badge, message, Dropdown, Space, notification, Popover, Tabs } from 'antd-v4';
 import styles from '@/routes/indexPage.less';
@@ -2,7 +2,7 @@
 import React, { Component } from 'react';
 import { MinusCircleOutlined, PlusOutlined, SettingOutlined } from '@ant-design/icons';
 import { Form, Icon as LegacyIcon } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col, Button, message, Space } from 'antd-v4';
 import moment from 'moment';
 import commonConfig from '@/utils/config';
@@ -5,7 +5,7 @@
 import React, { Component } from 'react';
 import { MinusCircleOutlined, PlusOutlined, SettingOutlined } from '@ant-design/icons';
 import { Form, Icon as LegacyIcon } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col, Button, message } from 'antd-v4';
 import moment from 'moment';
 import commonConfig from '../../utils/config';
 /* eslint-disable no-trailing-spaces */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Input } from 'antd-v4';
 import styles from '../../index.less';
  
@@ -5,7 +5,7 @@ import moment from &#39;moment&#39;;
 import React, { Component } from 'react';
 import reactComponentDebounce from 'react-component-debounce';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { InputNumber, Checkbox, DatePicker, Input, Cascader, Select, AutoComplete } from 'antd-v4';
 import * as commonServices from '@/services/services';
 import * as dropdownstatic from '@/utils/dropdownstatic';
@@ -4,7 +4,7 @@
 /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Input, message } from 'antd-v4';
 import * as commonUtils from '../../utils/utils';
 import ShowType from './CommonComponent';/* 通用方法 */
@@ -4,7 +4,7 @@
 /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Input, message } from 'antd-v4';
 import * as commonUtils from '../../utils/utils';
 import ShowType from './CommonComponent';/* 通用方法 */
@@ -4,7 +4,7 @@
 /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Input, message } from 'antd-v4';
 import * as commonUtils from '../../utils/utils';
 import ShowType from './CommonComponent';/* 通用方法 */
@@ -4,7 +4,7 @@
 /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Input } from 'antd-v4';
 import * as commonUtils from '../../utils/utils';
 import ShowType from './CommonComponent';/* 通用方法 */
@@ -4,7 +4,7 @@
 /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Input } from 'antd-v4';
 import * as commonUtils from '../../utils/utils';
 import ShowType from './CommonComponent';/* 通用方法 */
@@ -4,7 +4,7 @@
 /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Input } from 'antd-v4';
 import * as commonUtils from '../../utils/utils';
 import ShowType from './CommonComponent';/* 通用方法 */
@@ -2541,7 +2541,7 @@ class ToolBarComponent extends Component {
           boxVisible: true,
           makeUpPDFRecord,
           title: config.showName,
-         
+
           onCancel: () => {
             this.setState({ BtnBoxData: null, makeUpPDFRecord: undefined });
             this.props.onSaveState({
@@ -2580,7 +2580,7 @@ class ToolBarComponent extends Component {
       });
     } else if (this.props.onButtonClick !== undefined) {
       this.props.onButtonClick(key);
-    } 
+    }
   };
  
   // 删除当前pane
@@ -3891,6 +3891,34 @@ class ToolBarComponent extends Component {
     }
   };
  
+
+  /* 通用上传各种文件 */
+  handleUploadFilesChange = info => {
+    const { file,} = info;
+    if (file.response && file.response.code === 1) {
+     /* 刷新列表 */
+      message.open({
+        type:  'success',
+        content: '文件上传成功',
+        duration: 1
+      });
+      this.handleRefresh();
+    }else if (file.response && file.response.code === -8) {
+      Modal.info({
+        title: '温馨提示:',
+        content: (
+          <div>
+            {this.handleGetMsg(file.response.msg)}
+          </div>
+        ),
+        okText: '确认',
+        onOk() {},
+      });
+    } else if (file.response && file.response.code === -1) {
+      message.error(file.response.msg);
+    }
+  };
+
   customRequest = option => {
     const { onSuccess, onError, file, action, data = {} } = option;
     // 添加额外的参数
@@ -4255,6 +4283,18 @@ class ToolBarComponent extends Component {
       disabled: !this.props.enabled,
       // beforeUpload: this.handleBeforeUpload,
     };
+    const sBrandsId = userinfo?.sBrandsId;
+    const sSubsidiaryId = userinfo?.sSubsidiaryId;
+    /* 上传文件 */
+    const uploadFilesProps = {
+      action: `${commonConfig.file_host}file/uploadMachinePlc?sModelsId=${sModelsId}&&sBrandsId=${sBrandsId}&sSubsidiaryId=${sSubsidiaryId}&token=${app.token}`,
+      onChange: this.handleUploadFilesChange,
+      accept: '*/*',
+      showUploadList: false,
+      disabled: false,
+      multiple:true,
+      // beforeUpload: this.handleBeforeUpload,
+    };
  
     /* 发票上传  */
     let invoiceBody = {};
@@ -4524,6 +4564,14 @@ class ToolBarComponent extends Component {
                             <span style={{ color: this.props.enabled ? "#fff" : "#a2a2a2" }}>{showNameNew}</span>
                           </Upload>
                         </div>
+                      ): commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName.indexOf("BtnImportFile") > -1 ? (
+                        <div>
+                          <Upload {...uploadFilesProps}>
+                            <a className={styles.uploadlink} style={{ color: "#ffffff"}}>
+                              <UploadOutlined fill="#fff"/> {showNameNew}
+                            </a>
+                          </Upload>
+                        </div>
                       ) : commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName.indexOf("BtnDlPbOrder") > -1 ? (
                         <div className={styles.toolBarUpload}>
                           <a {...this.getDisabledProps("BtnDlPbOrder")} onClick={() => this.handleBtnDownload()}>
@@ -45,6 +45,12 @@
     fill: @disable_color!important;
     stroke: @disable_color!important;
   }
+  .uploadlink{
+    color: #ffffff;
+  }
+  .uploadlink:hover{
+    color:#1890FF!important;
+  }
 }
  
 .xlyProcess {
@@ -6,7 +6,7 @@ import file from &#39;@/assets/file.svg&#39;;
 import file_single from '@/assets/file_single.svg';
 import process from '@/assets/treeprocess.svg';
 import material from '@/assets/treematerial.svg';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Tree, Button, Input, Checkbox } from 'antd-v4';
 import StaticEditTable from '../CommonTable';/* 可编辑表格 */
 import * as commonUtils from '../../../utils/utils';
@@ -2,7 +2,7 @@
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-// import '@ant-design/compatible/assets/index.css';
+// // import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin } from 'antd-v4';
 import styles from '@/index.less';
 import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Tabs, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
@@ -4,7 +4,7 @@
 /* eslint-disable no-undef,import/first,prefer-destructuring,jsx-a11y/alt-text */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Button, Layout, message, Spin } from 'antd-v4';
 import StaticEditTable from '../Common/CommonTable';
 import * as commonBusiness from '../Common/commonBusiness';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar, message } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin } from 'antd-v4';
 import styles from '../../index.less';
 // import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar, message } from 'antd-v4';
 import styles from '@/index.less';
 import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar } from 'antd-v4';
 import * as commonUtils from '@/utils/utils';/* 通用方法 */
 import styles from '../../index.less';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Tabs, Row, Col } from 'antd-v4';
 import styles from '@/index.less';
 import * as commonUtils from '@/utils/utils';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin } from 'antd-v4';// Tabs, Form,
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Avatar } from 'antd-v4';
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin } from 'antd-v4';
 import styles from '@/index.less';
 import * as commonFunc from '@/components/Common/commonFunc';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Tabs } from 'antd-v4';
 import styles from '@/index.less';
 import * as commonUtils from '@/utils/utils';/* 通用方法 */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col } from 'antd-v4';
 import ShowType from '@/components/Common/CommonComponent';
 import styles from '@/index.less';
 import moment from 'moment';
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col, message, DatePicker, Button } from 'antd-v4';
 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
 import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col } from 'antd-v4';
 import ShowType from '@/components/Common/CommonComponent';
 import styles from '@/index.less';
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col } from 'antd-v4';
 import ShowType from '@/components/Common/CommonComponent';
 import styles from '@/index.less';
 /* eslint-disable */
 import React, { Component } from 'react';
 import { VideoCameraOutlined } from '@ant-design/icons';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Progress, message } from 'antd-v4';
 import * as commonServices from "../../services/services";
 import config from '@/utils/config';
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Tabs, Spin, Row, Col, Input } from 'antd-v4';
 import styles from '../../index.less';
 import selfstyles from './SystemPermissionInfo.less';
@@ -5,7 +5,7 @@
  
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Modal, Layout, Spin, Avatar, Select, message, Button } from 'antd-v4';
 import ProcessUp from '../../../assets/processUp.svg';
 import ProcessDown from '../../../assets/processDown.svg';
@@ -6,7 +6,7 @@
  
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Modal, Layout, Spin, Avatar, Select, message, Button, Tabs } from 'antd-v4';
 import AddIcon from '../../../assets/add.svg';
 import DisableAddIcon from '../../../assets/disableadd.svg';
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import moment from 'moment';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import EjectRight from '@/assets/eject.svg';/* 弹出图标 */
 import {
   RightOutlined,
 /* eslint-disable */
 /* eslint-disable function-paren-newline */
 import React, { Component } from 'react';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Row, Col, List, Card, Checkbox, Select, Form, Tree } from 'antd-v4';
 import ShowType from '@/components/Common/CommonComponent';
 import * as commonUtils from '@/utils/utils';
 /* eslint-disable prefer-destructuring,no-loop-func */
 import React, { Component } from 'react';
 import moment from 'moment';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Form } from '@ant-design/compatible';
 import {
   Modal,
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import moment from 'moment';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {
   Modal,
   Layout,
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import moment from 'moment';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {
   Modal,
   Layout,
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import moment from 'moment';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {
   Modal,
   Layout,
 /* eslint-disable array-callback-return,no-undef */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin } from 'antd-v4';// Tabs, Form,
 import styles from '../../index.less';
 import Toolbar from '../Common/ToolBar/ToolBarNew';
@@ -3,7 +3,7 @@
 import React, { Component } from 'react';
 import { SearchOutlined, SettingOutlined } from '@ant-design/icons';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {
   message,
   Layout,
@@ -6,7 +6,7 @@
  
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import {
   Layout,
   Spin,
 /* eslint-disable */
-import React, { useRef, useEffect, useState, useCallback } from "react";
-import { Button, Divider, Tabs, Tree, Radio, Image, Modal, Input, message } from "antd-v4";
+import { useRef, useEffect, useState, useCallback, useMemo } from "react";
+import { Button, Divider, Tabs, Tree, Radio, Image, Modal, Input, message, Badge } from "antd-v4";
 import { ArrowLeftOutlined, FolderFilled, FolderOpenFilled, FileTextFilled, PlusOutlined, MinusOutlined } from "@ant-design/icons";
 import { cloneDeep } from "lodash";
 import commonConfig from "@/utils/config";
@@ -11,6 +11,7 @@ import * as commonBusiness from &quot;@/components/Common/commonBusiness&quot;;
 import CommonViewTable from "@/components/Common/CommonViewTable";
 import StaticEditTable from "@/components/Common/CommonTable";
 import ShowImgM from "@/components/Common/BoxShowImgMaterial/indexNew";
+import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
 import styles from "./index.less";
 import Typesetting from "@/components/Common/Typesetting/typesetting";
 import DynamicSVG from "@/components/Common/BoxDesignCompontent/svg";
@@ -189,6 +190,7 @@ const QuickQuoteEvent = props =&gt; {
     } else if (name.includes("slave")) {
       const boxModel = name.replace("slaveUp", "").replace("slaveDown", "");
       if (sFieldName === "sName") {
+        if (!changeValue.sName) return;
         const dropDownDataSelected = dropDownData.find(item => item.sName === changeValue.sName);
         const { sColumnNameConfig, sColumnNameConfigExclusion, sColumnNameConfigPic } = dropDownDataSelected;
         const upAbleConfigsExtra = commonUtils.convertStrToObj(sColumnNameConfig, []).map(item => ({
@@ -887,6 +889,13 @@ const QuickQuoteEvent = props =&gt; {
     props.onAdd();
   };
  
+  // 选择盒型弹窗
+  addState.onFieldPopupModal = (showConfig, name) => {
+    if (showConfig.sName === "sName") {
+      props.onSaveState({ boxModelSelectedModalVisible: true, currentBoxModel: name });
+    }
+  };
+
   return {
     ...props,
     onDataChange0: props.onDataChange,
@@ -932,6 +941,7 @@ const QuickQuote = baseProps =&gt; {
           <ContentComponent {...props} />
         </div>
       </div>
+      <BoxModelSelectedModal {...props} />
     </div>
   );
 };
@@ -1276,7 +1286,7 @@ const BoxComponent = props =&gt; {
       viewConfigs: newConfig,
       tableConfig: { ...slaveConfig, gdsconfigformslave: newConfig },
       iColValueView: 24,
-      viewRow: slaveRowData,
+      viewRow: { ...slaveRowData, sProductClassifyId: selectedNode.sId },
       tableName: `slaveUp${boxModel}`,
     };
   };
@@ -1789,6 +1799,8 @@ const MaterialsComponent = props =&gt; {
           sName: "bComMaterials",
           iColValue: 4,
         };
+      } else {
+        return item;
       }
     });
  
@@ -2028,4 +2040,175 @@ const ManyComponent = props =&gt; {
   );
 };
  
+// 选择盒型弹窗
+const BoxModelSelectedModal = props => {
+  const { boxModelSelectedModalVisible } = props;
+  if (!boxModelSelectedModalVisible) return "";
+
+  const onCancel = () => {
+    props.onSaveState({
+      boxModelSelectedModalVisible: false,
+    });
+  };
+
+  const [boxConfig, setBoxConfig] = useState({ gdsconfigformslave: [] });
+  const [boxColumn, setBoxColumn] = useState([]);
+  const [boxTypeList, setBoxTypeList] = useState([]);
+  const [boxData, setBoxData] = useState([]);
+  const [treeClassName, setTreeClassName] = useState("");
+  const [boxTypeSelected, setBoxTypeSelected] = useState("全部");
+
+  useEffect(() => {
+    const boxList = [
+      ["sId", "唯一ID"],
+      ["iOrder", "#", 60],
+      // ["sBoxId", "盒型ID"],
+      ["sName", "名称", 119],
+      ["sPackDetailPath", "刀线图", 300],
+      ["sPackPath", "3D图", 300],
+      ["operation", "操作", 80],
+    ];
+
+    const config = {
+      sId: commonUtils.createSid(),
+      // bisMutiSelect: true,
+      gdsconfigformslave: boxList.map(item => ({
+        sId: commonUtils.createSid(),
+        sName: item[0],
+        showName: item[1],
+        iFitWidth: item[2] || 120,
+        bVisible: item[0] !== "sId",
+      })),
+    };
+    setBoxConfig(config);
+    const column = commonFunc.getHeaderConfig(config);
+    setBoxColumn(column);
+
+    const getSqlDropDownData = async ({ sId }, cb) => {
+      const url = `${commonConfig.server_host}business/getSelectLimit/${sId}`;
+      const body = {
+        sKeyUpFilterName: "",
+        pageNum: 1,
+        pageSize: 1000,
+      };
+      const retrunData = await commonServices.postValueService(props.app.token, body, url);
+      const dropDownData = retrunData.data?.dataset?.rows;
+      cb(dropDownData);
+    };
+
+    getSqlDropDownData({ sId: "17428091410008594700322758474000" }, dropDownData => {
+      const boxTypeList = Array.from(new Set(dropDownData.map(item => item.sBoxType || "其它")));
+      setBoxTypeList(boxTypeList);
+      setBoxData(
+        dropDownData.map((item, index) => ({
+          ...item,
+          iOrder: index + 1,
+        }))
+      );
+    });
+  }, []);
+
+  const renderTreeNodes = useMemo(
+    () =>
+      ["全部", ...boxTypeList].map(boxType => (
+        <Tree.TreeNode
+          title={
+            <Badge
+              count={boxType === "全部" ? boxData.length : boxData.filter(item => (item.sBoxType || "其它") === boxType).length}
+              offset={[20, 8]}
+              color="#faad14"
+            >
+              <span>{boxType}</span>
+            </Badge>
+          }
+          key={boxType === "全部" ? 0 : commonUtils.createSid()}
+          treeData={boxType}
+          switcherIcon={<FolderFilled style={{ color: "#f7cc4f", fontSize: 20 }} />}
+        ></Tree.TreeNode>
+      )),
+    [boxTypeList.length]
+  );
+
+  const tableProps = {
+    ...commonBusiness.getTableTypes("box", {
+      ...props,
+      boxData: boxData.filter(item => (boxTypeSelected === "全部" ? true : (item.sBoxType || "其它") === boxTypeSelected)),
+      boxConfig,
+      boxColumn,
+    }),
+    enabled: false,
+    fixedHeight: "calc(100vh - 365px)",
+    noVlistTable: true,
+    onCostomColums: columns => {
+      columns
+        .filter(item => item.dataIndex?.includes("Path"))
+        .forEach(column => {
+          column.render = (value, record, index) => (value ? <img src={value} alt="" width={270} height={270} /> : "暂无图片");
+        });
+
+      columns
+        .filter(item => item.dataIndex === "operation")
+        .forEach(column => {
+          column.fixed = "right";
+          column.render = (value, record, index) => (
+            <Button
+              style={{ marginLeft: 8 }}
+              onClick={() => {
+                props.onDataChange(props.currentBoxModel, "sName", { sName: record.sName }, record.sId, boxData);
+                props.onSaveState({
+                  boxModelSelectedModalVisible: false,
+                });
+              }}
+            >
+              选择
+            </Button>
+          );
+        });
+    },
+  };
+
+  return (
+    <AntdDraggableModal
+      width="min(calc(100vw - 350px), 1100px)"
+      title="盒型选择"
+      visible={boxModelSelectedModalVisible}
+      onCancel={onCancel}
+      footer={
+        <Button type="primary" onClick={onCancel}>
+          关闭
+        </Button>
+      }
+    >
+      <div className={styles.boxModal}>
+        <div
+          className={`${styles.boxTree} ${treeClassName}`}
+          onMouseEnter={() => {
+            setTreeClassName(styles.overFlow);
+          }}
+          onMouseLeave={() => {
+            setTreeClassName("");
+          }}
+        >
+          {boxTypeList.length && (
+            <Tree
+              className={"hide-file-icon"}
+              defaultExpandAll={true}
+              defaultSelectedKeys={["0"]}
+              onSelect={(e, select) => {
+                const { treeData } = select.node;
+                setBoxTypeSelected(treeData);
+              }}
+            >
+              {renderTreeNodes}
+            </Tree>
+          )}
+        </div>
+        <div className={styles.boxTable} key={boxTypeSelected}>
+          <StaticEditTable {...tableProps} />
+        </div>
+      </div>
+    </AntdDraggableModal>
+  );
+};
+
 export default QuickQuote;
@@ -13,6 +13,10 @@
       .ant-btn-primary {
         border-radius: 5px;
       }
+
+      .ant-col-23 {
+        display: flex !important;
+      }
     }
  
     .back {
@@ -24,43 +28,6 @@
       border-right-width: 0;
     }
  
-    .leftTree {
-      width: 250px;
-      height: 100%;
-      background: #3274b7;
-      padding: 10px 0 0 10px;
-      overflow: hidden;
-
-      :global {
-        .ant-tree {
-          background: transparent;
-
-          .ant-tree-treenode {
-            padding-bottom: 10px;
-          }
-
-          .ant-tree-title {
-            color: #fff;
-            font-size: 16px;
-            font-weight: bold;
-          }
-
-          .ant-tree-node-content-wrapper.ant-tree-node-selected {
-            background-color: #00a183;
-          }
-
-          .ant-tree-node-content-wrapper:hover {
-            background-color: #009688;
-          }
-        }
-
-      }
-    }
-
-    .overFlow {
-      overflow: auto;
-    }
-
     .rightContent {
       flex: 1;
       background: #f8fafe;
@@ -368,4 +335,82 @@
       }
     }
   }
+}
+
+.leftTree,
+.boxTree {
+  width: 250px;
+  height: 100%;
+  background: #3274b7;
+  padding: 10px 0 0 10px;
+  overflow: hidden;
+
+  :global {
+    .ant-tree {
+      background: transparent;
+
+      .ant-tree-treenode {
+        padding-bottom: 10px;
+      }
+
+      .ant-tree-title {
+        color: #fff;
+        font-size: 16px;
+        font-weight: bold;
+      }
+
+      .ant-tree-node-content-wrapper.ant-tree-node-selected {
+        background-color: #00a183;
+      }
+
+      .ant-tree-node-content-wrapper:hover {
+        background-color: #009688;
+      }
+    }
+
+  }
+}
+
+.boxTree {
+  background: transparent;
+
+  :global {
+    .ant-tree {
+
+      .ant-tree-title,
+      .ant-badge {
+        color: #5c6374;
+        font-size: 16px;
+        font-weight: bold;
+      }
+
+      .ant-tree-node-content-wrapper.ant-tree-node-selected {
+        background-color: #bae7ff;
+      }
+
+      .ant-tree-node-content-wrapper:hover {
+        background-color: #bae7ff;
+      }
+    }
+  }
+}
+
+.overFlow {
+  overflow: auto;
+}
+
+.boxModal {
+  width: 100%;
+  height: calc(100vh - 335px);
+  display: flex;
+
+  .boxTree {
+    width: 200px;
+    height: 100%;
+  }
+
+  .boxTable {
+    width: calc(100% - 200px);
+    height: 100%;
+  }
 }
 \ No newline at end of file
@@ -2,7 +2,7 @@
 /* eslint-disable prefer-destructuring,no-loop-func */
 import React, { Component } from 'react';
 import { Form } from '@ant-design/compatible';
-import '@ant-design/compatible/assets/index.css';
+// import '@ant-design/compatible/assets/index.css';
 import { Modal, Layout, Spin, Avatar, Select, message, Button, Slider,Table, Checkbox,Row, Col,  } from 'antd-v4';
 import AddIcon from '../../../assets/add.svg';
 import DisableAddIcon from '../../../assets/disableadd.svg';