diff --git a/.umirc.ts b/.umirc.ts index 3ca6fca..c7e7628 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -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, }); diff --git a/package.json b/package.json index 044792b..87598bb 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/components/AuditInformation/AuditInformation.js b/src/components/AuditInformation/AuditInformation.js index 8b0998d..536c1e1 100644 --- a/src/components/AuditInformation/AuditInformation.js +++ b/src/components/AuditInformation/AuditInformation.js @@ -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';/* 可编辑表格 */ diff --git a/src/components/Common/CommonBill/index.js b/src/components/Common/CommonBill/index.js index 08ad387..2c9fe27 100644 --- a/src/components/Common/CommonBill/index.js +++ b/src/components/Common/CommonBill/index.js @@ -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, diff --git a/src/components/Common/CommonBillDeliver.js b/src/components/Common/CommonBillDeliver.js index 3272bfa..0b64d0d 100644 --- a/src/components/Common/CommonBillDeliver.js +++ b/src/components/Common/CommonBillDeliver.js @@ -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'; diff --git a/src/components/Common/CommonCalculator.js b/src/components/Common/CommonCalculator.js index 18afd21..999fe2c 100644 --- a/src/components/Common/CommonCalculator.js +++ b/src/components/Common/CommonCalculator.js @@ -1,7 +1,7 @@ /* 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'; diff --git a/src/components/Common/CommonCheckBill/index.js b/src/components/Common/CommonCheckBill/index.js index 2cbe4dc..4e7ace0 100644 --- a/src/components/Common/CommonCheckBill/index.js +++ b/src/components/Common/CommonCheckBill/index.js @@ -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, diff --git a/src/components/Common/CommonColumnList.js b/src/components/Common/CommonColumnList.js index 31dc1fb..8400444 100644 --- a/src/components/Common/CommonColumnList.js +++ b/src/components/Common/CommonColumnList.js @@ -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';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index 51eb725..8e9c8ae 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -1,7 +1,7 @@ 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, diff --git a/src/components/Common/CommonComponent/index_new.js b/src/components/Common/CommonComponent/index_new.js index cefc70e..3e4ccef 100644 --- a/src/components/Common/CommonComponent/index_new.js +++ b/src/components/Common/CommonComponent/index_new.js @@ -2,7 +2,7 @@ import moment from 'moment'; 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, diff --git a/src/components/Common/CommonCostomTabBill.js b/src/components/Common/CommonCostomTabBill.js index 7edf4a7..57db879 100644 --- a/src/components/Common/CommonCostomTabBill.js +++ b/src/components/Common/CommonCostomTabBill.js @@ -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, diff --git a/src/components/Common/CommonGroupBill.js b/src/components/Common/CommonGroupBill.js index d4de0c4..93bd19d 100644 --- a/src/components/Common/CommonGroupBill.js +++ b/src/components/Common/CommonGroupBill.js @@ -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';/* 继承销售模块业务功能 */ diff --git a/src/components/Common/CommonList.js b/src/components/Common/CommonList.js index 536f6bd..3e76b2f 100644 --- a/src/components/Common/CommonList.js +++ b/src/components/Common/CommonList.js @@ -1,6 +1,6 @@ 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';/* 继承销售模块业务功能 */ diff --git a/src/components/Common/CommonListA.js b/src/components/Common/CommonListA.js index 090f3bd..df6588c 100644 --- a/src/components/Common/CommonListA.js +++ b/src/components/Common/CommonListA.js @@ -1,7 +1,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, Slider } from 'antd-v4'; import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonListEdit.js b/src/components/Common/CommonListEdit.js index dc7be6f..bc6023b 100644 --- a/src/components/Common/CommonListEdit.js +++ b/src/components/Common/CommonListEdit.js @@ -1,7 +1,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, Slider } from 'antd-v4'; import CommonListEvent from '@/components/Common/CommonListEditEvent';/* 继承销售模块业务功能 */ import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonListLeft.js b/src/components/Common/CommonListLeft.js index 1ed9a48..0e82a44 100644 --- a/src/components/Common/CommonListLeft.js +++ b/src/components/Common/CommonListLeft.js @@ -1,7 +1,7 @@ /* 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';/* 继承销售模块业务功能 */ diff --git a/src/components/Common/CommonListLeft/index.js b/src/components/Common/CommonListLeft/index.js index a6623cd..f57fe94 100644 --- a/src/components/Common/CommonListLeft/index.js +++ b/src/components/Common/CommonListLeft/index.js @@ -1,7 +1,7 @@ /* 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';/* 继承销售模块业务功能 */ diff --git a/src/components/Common/CommonListSelect/index.js b/src/components/Common/CommonListSelect/index.js index d636bea..57dad09 100644 --- a/src/components/Common/CommonListSelect/index.js +++ b/src/components/Common/CommonListSelect/index.js @@ -1,7 +1,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 { UploadOutlined } from '@ant-design/icons'; import { Layout, Spin, Button, message, Upload, Modal } from 'antd-v4'; import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */ diff --git a/src/components/Common/CommonListSelectAssignment.js b/src/components/Common/CommonListSelectAssignment.js index 4020eae..394c20b 100644 --- a/src/components/Common/CommonListSelectAssignment.js +++ b/src/components/Common/CommonListSelectAssignment.js @@ -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'; /* 通用方法 */ diff --git a/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx b/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx index d82a502..508dfd9 100644 --- a/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx +++ b/src/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex/index.jsx @@ -1,7 +1,7 @@ /* 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"; /* 可编辑表格 */ diff --git a/src/components/Common/CommonListSelectFlex/index.js b/src/components/Common/CommonListSelectFlex/index.js index 83d1790..ada1c5b 100644 --- a/src/components/Common/CommonListSelectFlex/index.js +++ b/src/components/Common/CommonListSelectFlex/index.js @@ -1,6 +1,6 @@ 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';/* 可编辑表格 */ diff --git a/src/components/Common/CommonListSelectMulti/index.js b/src/components/Common/CommonListSelectMulti/index.js index bcceeaf..3f1496e 100644 --- a/src/components/Common/CommonListSelectMulti/index.js +++ b/src/components/Common/CommonListSelectMulti/index.js @@ -1,7 +1,7 @@ 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'; /* 通用方法 */ diff --git a/src/components/Common/CommonListSelectParam/index.js b/src/components/Common/CommonListSelectParam/index.js index e5d86d6..69ed1c6 100644 --- a/src/components/Common/CommonListSelectParam/index.js +++ b/src/components/Common/CommonListSelectParam/index.js @@ -1,6 +1,6 @@ /* 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';/* 通用方法 */ diff --git a/src/components/Common/CommonListSelectProductMaterial.js b/src/components/Common/CommonListSelectProductMaterial.js index 90812ba..7d1f7b2 100644 --- a/src/components/Common/CommonListSelectProductMaterial.js +++ b/src/components/Common/CommonListSelectProductMaterial.js @@ -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';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonListSelectTree/index.js b/src/components/Common/CommonListSelectTree/index.js index af9d361..4032e6e 100644 --- a/src/components/Common/CommonListSelectTree/index.js +++ b/src/components/Common/CommonListSelectTree/index.js @@ -1,7 +1,7 @@ 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'; /* 通用方法 */ diff --git a/src/components/Common/CommonListTab/index.js b/src/components/Common/CommonListTab/index.js index 7aa5e90..a98ccfe 100644 --- a/src/components/Common/CommonListTab/index.js +++ b/src/components/Common/CommonListTab/index.js @@ -1,7 +1,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, Slider, Tabs, Row, Col, Card } from 'antd-v4'; import baseChar from '@/components/Common/baseChar'; /* 获取图表配置及数据 */ import CommonListTabEvent from '@/components/Common/CommonListTabEvent';/* 继承销售模块业务功能 */ diff --git a/src/components/Common/CommonListTree/index.js b/src/components/Common/CommonListTree/index.js index 910f5be..fe7ced8 100644 --- a/src/components/Common/CommonListTree/index.js +++ b/src/components/Common/CommonListTree/index.js @@ -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';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonListTreeSelect/index.js b/src/components/Common/CommonListTreeSelect/index.js index a1bc791..9e9be41 100644 --- a/src/components/Common/CommonListTreeSelect/index.js +++ b/src/components/Common/CommonListTreeSelect/index.js @@ -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';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonNewBill.js b/src/components/Common/CommonNewBill.js index 7fa0b35..9e8c31c 100644 --- a/src/components/Common/CommonNewBill.js +++ b/src/components/Common/CommonNewBill.js @@ -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'; diff --git a/src/components/Common/CommonNewListBill.js b/src/components/Common/CommonNewListBill.js index 8564741..8ad929b 100644 --- a/src/components/Common/CommonNewListBill.js +++ b/src/components/Common/CommonNewListBill.js @@ -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';/* 继承销售模块业务功能 */ diff --git a/src/components/Common/CommonNewTabBill.js b/src/components/Common/CommonNewTabBill.js index 1361999..4915f2a 100644 --- a/src/components/Common/CommonNewTabBill.js +++ b/src/components/Common/CommonNewTabBill.js @@ -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';/* 继承销售模块业务功能 */ diff --git a/src/components/Common/CommonSubBill.js b/src/components/Common/CommonSubBill.js index 7f67805..5e200e2 100644 --- a/src/components/Common/CommonSubBill.js +++ b/src/components/Common/CommonSubBill.js @@ -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';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index e478c85..694c5a0 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -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; diff --git a/src/components/Common/CommonView/index.js b/src/components/Common/CommonView/index.js index eb20af0..7a35b3f 100644 --- a/src/components/Common/CommonView/index.js +++ b/src/components/Common/CommonView/index.js @@ -1,7 +1,7 @@ /* 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))) { diff --git a/src/components/Common/CommonViewDrag/index.js b/src/components/Common/CommonViewDrag/index.js index 663ad23..b275103 100644 --- a/src/components/Common/CommonViewDrag/index.js +++ b/src/components/Common/CommonViewDrag/index.js @@ -1,6 +1,6 @@ /* 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"; diff --git a/src/components/Common/CommonViewDragable/index.js b/src/components/Common/CommonViewDragable/index.js index 78dd322..bb1ffe4 100644 --- a/src/components/Common/CommonViewDragable/index.js +++ b/src/components/Common/CommonViewDragable/index.js @@ -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"; diff --git a/src/components/Common/CommonViewFlex/index.js b/src/components/Common/CommonViewFlex/index.js index 473ed28..d4d12d6 100644 --- a/src/components/Common/CommonViewFlex/index.js +++ b/src/components/Common/CommonViewFlex/index.js @@ -1,6 +1,6 @@ /* 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'; diff --git a/src/components/Common/CommonViewNew.js b/src/components/Common/CommonViewNew.js index 3afd13b..4116feb 100644 --- a/src/components/Common/CommonViewNew.js +++ b/src/components/Common/CommonViewNew.js @@ -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';/* 通用方法 */ diff --git a/src/components/Common/CommonViewTable/index.js b/src/components/Common/CommonViewTable/index.js index 27b4b22..642d910 100644 --- a/src/components/Common/CommonViewTable/index.js +++ b/src/components/Common/CommonViewTable/index.js @@ -1,7 +1,7 @@ /* 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, // 工具栏按钮事件 diff --git a/src/components/Common/ContextMenuModal.js b/src/components/Common/ContextMenuModal.js index 21be754..a31a230 100644 --- a/src/components/Common/ContextMenuModal.js +++ b/src/components/Common/ContextMenuModal.js @@ -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';/* 通用方法 */ diff --git a/src/components/Common/EditorModal/index.js b/src/components/Common/EditorModal/index.js index 6800951..f712d49 100644 --- a/src/components/Common/EditorModal/index.js +++ b/src/components/Common/EditorModal/index.js @@ -1,6 +1,6 @@ /* 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' diff --git a/src/components/Common/Gatte/CommonGatte.js b/src/components/Common/Gatte/CommonGatte.js index f2ff629..1ab9236 100644 --- a/src/components/Common/Gatte/CommonGatte.js +++ b/src/components/Common/Gatte/CommonGatte.js @@ -1,6 +1,6 @@ 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';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/MaterialRequirementsPlanning.js b/src/components/Common/MaterialRequirementsPlanning.js index d6cf297..9530ab4 100644 --- a/src/components/Common/MaterialRequirementsPlanning.js +++ b/src/components/Common/MaterialRequirementsPlanning.js @@ -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';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/Common/PersonCenter/PersonCenter.js b/src/components/Common/PersonCenter/PersonCenter.js index f7090bd..1de4698 100644 --- a/src/components/Common/PersonCenter/PersonCenter.js +++ b/src/components/Common/PersonCenter/PersonCenter.js @@ -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'; diff --git a/src/components/Common/SearchComponent/index.js b/src/components/Common/SearchComponent/index.js index 9bb82b9..79dd911 100644 --- a/src/components/Common/SearchComponent/index.js +++ b/src/components/Common/SearchComponent/index.js @@ -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'; diff --git a/src/components/Common/SearchComponent_backup.js b/src/components/Common/SearchComponent_backup.js index c6135da..0926cde 100644 --- a/src/components/Common/SearchComponent_backup.js +++ b/src/components/Common/SearchComponent_backup.js @@ -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'; diff --git a/src/components/Common/ShowTablEdit.js b/src/components/Common/ShowTablEdit.js index 1acae2d..f584c10 100644 --- a/src/components/Common/ShowTablEdit.js +++ b/src/components/Common/ShowTablEdit.js @@ -1,7 +1,7 @@ /* 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'; diff --git a/src/components/Common/ShowType/ShowTypeNew.js b/src/components/Common/ShowType/ShowTypeNew.js index 26a8824..c017f45 100644 --- a/src/components/Common/ShowType/ShowTypeNew.js +++ b/src/components/Common/ShowType/ShowTypeNew.js @@ -5,7 +5,7 @@ import moment from 'moment'; 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'; diff --git a/src/components/Common/SlaveMemo copy 2.js b/src/components/Common/SlaveMemo copy 2.js index bbeb8f0..8c7dce6 100644 --- a/src/components/Common/SlaveMemo copy 2.js +++ b/src/components/Common/SlaveMemo copy 2.js @@ -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';/* 通用方法 */ diff --git a/src/components/Common/SlaveMemo copy.js b/src/components/Common/SlaveMemo copy.js index bbeb8f0..8c7dce6 100644 --- a/src/components/Common/SlaveMemo copy.js +++ b/src/components/Common/SlaveMemo copy.js @@ -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';/* 通用方法 */ diff --git a/src/components/Common/SlaveMemo.js b/src/components/Common/SlaveMemo.js index bbeb8f0..8c7dce6 100644 --- a/src/components/Common/SlaveMemo.js +++ b/src/components/Common/SlaveMemo.js @@ -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';/* 通用方法 */ diff --git a/src/components/Common/SlaveMemo1 copy 2.js b/src/components/Common/SlaveMemo1 copy 2.js index 8448be6..281835f 100644 --- a/src/components/Common/SlaveMemo1 copy 2.js +++ b/src/components/Common/SlaveMemo1 copy 2.js @@ -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';/* 通用方法 */ diff --git a/src/components/Common/SlaveMemo1 copy.js b/src/components/Common/SlaveMemo1 copy.js index 8448be6..281835f 100644 --- a/src/components/Common/SlaveMemo1 copy.js +++ b/src/components/Common/SlaveMemo1 copy.js @@ -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';/* 通用方法 */ diff --git a/src/components/Common/SlaveMemo1.js b/src/components/Common/SlaveMemo1.js index 8448be6..281835f 100644 --- a/src/components/Common/SlaveMemo1.js +++ b/src/components/Common/SlaveMemo1.js @@ -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';/* 通用方法 */ diff --git a/src/components/Common/ToolBar/ToolBarNew.js b/src/components/Common/ToolBar/ToolBarNew.js index 6d25e4c..5d18db0 100644 --- a/src/components/Common/ToolBar/ToolBarNew.js +++ b/src/components/Common/ToolBar/ToolBarNew.js @@ -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: ( +
+ {this.handleGetMsg(file.response.msg)} +
+ ), + 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 { {showNameNew} + ): commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName.indexOf("BtnImportFile") > -1 ? ( +
+ + + {showNameNew} + + +
) : commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName.indexOf("BtnDlPbOrder") > -1 ? (
this.handleBtnDownload()}> diff --git a/src/components/Common/ToolBar/index.less b/src/components/Common/ToolBar/index.less index 75bde6e..017d04d 100644 --- a/src/components/Common/ToolBar/index.less +++ b/src/components/Common/ToolBar/index.less @@ -45,6 +45,12 @@ fill: @disable_color!important; stroke: @disable_color!important; } + .uploadlink{ + color: #ffffff; + } + .uploadlink:hover{ + color:#1890FF!important; + } } .xlyProcess { diff --git a/src/components/Common/Tree/StaticTree.js b/src/components/Common/Tree/StaticTree.js index 3c64426..72df452 100644 --- a/src/components/Common/Tree/StaticTree.js +++ b/src/components/Common/Tree/StaticTree.js @@ -6,7 +6,7 @@ import file from '@/assets/file.svg'; 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'; diff --git a/src/components/CommonClassifyEvent/CommonClassify.js b/src/components/CommonClassifyEvent/CommonClassify.js index 359e814..a11e702 100644 --- a/src/components/CommonClassifyEvent/CommonClassify.js +++ b/src/components/CommonClassifyEvent/CommonClassify.js @@ -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'; diff --git a/src/components/CommonElementEvent/CheckModelInfo.js b/src/components/CommonElementEvent/CheckModelInfo.js index 7fc52a9..f62957b 100644 --- a/src/components/CommonElementEvent/CheckModelInfo.js +++ b/src/components/CommonElementEvent/CheckModelInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/CheckPhaseInfo.js b/src/components/CommonElementEvent/CheckPhaseInfo.js index 658f1f5..856eaa7 100644 --- a/src/components/CommonElementEvent/CheckPhaseInfo.js +++ b/src/components/CommonElementEvent/CheckPhaseInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/CustomerInfo.js b/src/components/CommonElementEvent/CustomerInfo.js index 106d013..4c23d6b 100644 --- a/src/components/CommonElementEvent/CustomerInfo.js +++ b/src/components/CommonElementEvent/CustomerInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/ElemachineInfo.js b/src/components/CommonElementEvent/ElemachineInfo.js index 6dd4412..851bae1 100644 --- a/src/components/CommonElementEvent/ElemachineInfo.js +++ b/src/components/CommonElementEvent/ElemachineInfo.js @@ -1,7 +1,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, Tabs, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/EleteamInfo.js b/src/components/CommonElementEvent/EleteamInfo.js index d4c2ede..d7386cb 100644 --- a/src/components/CommonElementEvent/EleteamInfo.js +++ b/src/components/CommonElementEvent/EleteamInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/EmployeeInfo.js b/src/components/CommonElementEvent/EmployeeInfo.js index 5c979a4..f3347b8 100644 --- a/src/components/CommonElementEvent/EmployeeInfo.js +++ b/src/components/CommonElementEvent/EmployeeInfo.js @@ -1,7 +1,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, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/FilfileManageInfo.js b/src/components/CommonElementEvent/FilfileManageInfo.js index e9bcd35..32ad854 100644 --- a/src/components/CommonElementEvent/FilfileManageInfo.js +++ b/src/components/CommonElementEvent/FilfileManageInfo.js @@ -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'; diff --git a/src/components/CommonElementEvent/KnifeMouldInfo.js b/src/components/CommonElementEvent/KnifeMouldInfo.js index 4b050fe..698ce83 100644 --- a/src/components/CommonElementEvent/KnifeMouldInfo.js +++ b/src/components/CommonElementEvent/KnifeMouldInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar, message } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/MaterialsInfo.js b/src/components/CommonElementEvent/MaterialsInfo.js index 9bfe32b..b894c71 100644 --- a/src/components/CommonElementEvent/MaterialsInfo.js +++ b/src/components/CommonElementEvent/MaterialsInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/MonthEndingClosing.js b/src/components/CommonElementEvent/MonthEndingClosing.js index 10fddbc..cd02c91 100644 --- a/src/components/CommonElementEvent/MonthEndingClosing.js +++ b/src/components/CommonElementEvent/MonthEndingClosing.js @@ -1,7 +1,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 '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/PaymentTermsInfo.js b/src/components/CommonElementEvent/PaymentTermsInfo.js index b0293f2..0cc5608 100644 --- a/src/components/CommonElementEvent/PaymentTermsInfo.js +++ b/src/components/CommonElementEvent/PaymentTermsInfo.js @@ -1,7 +1,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 '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/PrintInfo.js b/src/components/CommonElementEvent/PrintInfo.js index acc7186..977155c 100644 --- a/src/components/CommonElementEvent/PrintInfo.js +++ b/src/components/CommonElementEvent/PrintInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar, message } from 'antd-v4'; import styles from '@/index.less'; import Toolbar from '@/components/Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/ProcessInfo.js b/src/components/CommonElementEvent/ProcessInfo.js index dc37ff8..6fa00a8 100644 --- a/src/components/CommonElementEvent/ProcessInfo.js +++ b/src/components/CommonElementEvent/ProcessInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/ProductClassifyInfo.js b/src/components/CommonElementEvent/ProductClassifyInfo.js index 21bbd59..1a746c3 100644 --- a/src/components/CommonElementEvent/ProductClassifyInfo.js +++ b/src/components/CommonElementEvent/ProductClassifyInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/SftLoginInfo.js b/src/components/CommonElementEvent/SftLoginInfo.js index fb9ef9b..96d6aef 100644 --- a/src/components/CommonElementEvent/SftLoginInfo.js +++ b/src/components/CommonElementEvent/SftLoginInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar } from 'antd-v4'; import * as commonUtils from '@/utils/utils';/* 通用方法 */ import styles from '../../index.less'; diff --git a/src/components/CommonElementEvent/SisCommonStyle.js b/src/components/CommonElementEvent/SisCommonStyle.js index dd9c9cc..37baef8 100644 --- a/src/components/CommonElementEvent/SisCommonStyle.js +++ b/src/components/CommonElementEvent/SisCommonStyle.js @@ -1,7 +1,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, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/SisformulaInfo.js b/src/components/CommonElementEvent/SisformulaInfo.js index b7fcf2f..19e6b19 100644 --- a/src/components/CommonElementEvent/SisformulaInfo.js +++ b/src/components/CommonElementEvent/SisformulaInfo.js @@ -1,7 +1,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, Tabs, Row, Col } from 'antd-v4'; import styles from '@/index.less'; import * as commonUtils from '@/utils/utils'; diff --git a/src/components/CommonElementEvent/SupplyInfo.js b/src/components/CommonElementEvent/SupplyInfo.js index ab83db1..02bc594 100644 --- a/src/components/CommonElementEvent/SupplyInfo.js +++ b/src/components/CommonElementEvent/SupplyInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/SysMsgInfo.js b/src/components/CommonElementEvent/SysMsgInfo.js index aaf8e99..7f1afee 100644 --- a/src/components/CommonElementEvent/SysMsgInfo.js +++ b/src/components/CommonElementEvent/SysMsgInfo.js @@ -1,7 +1,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';// Tabs, Form, import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonElementEvent/TestStandInfo.js b/src/components/CommonElementEvent/TestStandInfo.js index d650c84..0f20198 100644 --- a/src/components/CommonElementEvent/TestStandInfo.js +++ b/src/components/CommonElementEvent/TestStandInfo.js @@ -1,7 +1,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, Tabs, Spin, Avatar } from 'antd-v4'; import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/CommonImportDataEvent/importDataInfo.js b/src/components/CommonImportDataEvent/importDataInfo.js index cd5d8b1..414148f 100644 --- a/src/components/CommonImportDataEvent/importDataInfo.js +++ b/src/components/CommonImportDataEvent/importDataInfo.js @@ -1,7 +1,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, Tabs, Spin } from 'antd-v4'; import styles from '@/index.less'; import * as commonFunc from '@/components/Common/commonFunc'; diff --git a/src/components/CommonSystemSettingEvent/CommonSystemSetting.js b/src/components/CommonSystemSettingEvent/CommonSystemSetting.js index 9e6c10b..81899e1 100644 --- a/src/components/CommonSystemSettingEvent/CommonSystemSetting.js +++ b/src/components/CommonSystemSettingEvent/CommonSystemSetting.js @@ -1,7 +1,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, Tabs } from 'antd-v4'; import styles from '@/index.less'; import * as commonUtils from '@/utils/utils';/* 通用方法 */ diff --git a/src/components/CommonSystemSettingEvent/TabFinanceOffer.js b/src/components/CommonSystemSettingEvent/TabFinanceOffer.js index aa133a3..9e23d18 100644 --- a/src/components/CommonSystemSettingEvent/TabFinanceOffer.js +++ b/src/components/CommonSystemSettingEvent/TabFinanceOffer.js @@ -1,6 +1,6 @@ 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'; diff --git a/src/components/CommonSystemSettingEvent/TabFinancePeriod.js b/src/components/CommonSystemSettingEvent/TabFinancePeriod.js index 3c77239..cbdfa37 100644 --- a/src/components/CommonSystemSettingEvent/TabFinancePeriod.js +++ b/src/components/CommonSystemSettingEvent/TabFinancePeriod.js @@ -1,7 +1,7 @@ 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';/* 单据业务功能 */ diff --git a/src/components/CommonSystemSettingEvent/TabSalesBuyer.js b/src/components/CommonSystemSettingEvent/TabSalesBuyer.js index 76ce3a3..8cf2150 100644 --- a/src/components/CommonSystemSettingEvent/TabSalesBuyer.js +++ b/src/components/CommonSystemSettingEvent/TabSalesBuyer.js @@ -1,6 +1,6 @@ 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'; diff --git a/src/components/CommonSystemSettingEvent/TabSysParam.js b/src/components/CommonSystemSettingEvent/TabSysParam.js index eb36395..54b9d66 100644 --- a/src/components/CommonSystemSettingEvent/TabSysParam.js +++ b/src/components/CommonSystemSettingEvent/TabSysParam.js @@ -1,6 +1,6 @@ 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'; diff --git a/src/components/FaceDetect/index.js b/src/components/FaceDetect/index.js index bb753ac..f8f0243 100644 --- a/src/components/FaceDetect/index.js +++ b/src/components/FaceDetect/index.js @@ -1,7 +1,7 @@ /* 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'; diff --git a/src/components/JurisdictionAllotEvent/SystemPermissionInfo.js b/src/components/JurisdictionAllotEvent/SystemPermissionInfo.js index d64aea3..f70c7ab 100644 --- a/src/components/JurisdictionAllotEvent/SystemPermissionInfo.js +++ b/src/components/JurisdictionAllotEvent/SystemPermissionInfo.js @@ -1,7 +1,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, Tabs, Spin, Row, Col, Input } from 'antd-v4'; import styles from '../../index.less'; import selfstyles from './SystemPermissionInfo.less'; diff --git a/src/components/Manufacture/ProcessCard/ProcessCard.js b/src/components/Manufacture/ProcessCard/ProcessCard.js index 9e85507..90ce638 100644 --- a/src/components/Manufacture/ProcessCard/ProcessCard.js +++ b/src/components/Manufacture/ProcessCard/ProcessCard.js @@ -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'; diff --git a/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js b/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js index 90d435d..637c3b9 100644 --- a/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js +++ b/src/components/Manufacture/ProcessCardPack/ProcessCardPack.js @@ -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'; diff --git a/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js b/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js index 0ce36c9..8f67a1a 100644 --- a/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js +++ b/src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js @@ -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, diff --git a/src/components/Manufacture/WorkOrder/SplitPaste.js b/src/components/Manufacture/WorkOrder/SplitPaste.js index 7fa70d3..35691a8 100644 --- a/src/components/Manufacture/WorkOrder/SplitPaste.js +++ b/src/components/Manufacture/WorkOrder/SplitPaste.js @@ -1,7 +1,7 @@ /* 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'; diff --git a/src/components/Manufacture/WorkOrder/WorkOrder.js b/src/components/Manufacture/WorkOrder/WorkOrder.js index a192e57..c34ae30 100644 --- a/src/components/Manufacture/WorkOrder/WorkOrder.js +++ b/src/components/Manufacture/WorkOrder/WorkOrder.js @@ -1,7 +1,7 @@ /* 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, diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js b/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js index b382324..4d6ef05 100644 --- a/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js +++ b/src/components/Manufacture/WorkOrderPack/WorkOrderPack.js @@ -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, diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js index 8409037..d3636c9 100644 --- a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js +++ b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js @@ -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, diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js b/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js index 5c77e7e..4c7d88d 100644 --- a/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js +++ b/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js @@ -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, diff --git a/src/components/PrintLabel/PrintLabel.js b/src/components/PrintLabel/PrintLabel.js index 2eff304..3c9d36d 100644 --- a/src/components/PrintLabel/PrintLabel.js +++ b/src/components/PrintLabel/PrintLabel.js @@ -1,7 +1,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';// Tabs, Form, import styles from '../../index.less'; import Toolbar from '../Common/ToolBar/ToolBarNew'; diff --git a/src/components/ProductionPlan/ProductionPlan.js b/src/components/ProductionPlan/ProductionPlan.js index 0a27d82..5d1e61a 100644 --- a/src/components/ProductionPlan/ProductionPlan.js +++ b/src/components/ProductionPlan/ProductionPlan.js @@ -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, diff --git a/src/components/ProductionReport/ProductionReport.js b/src/components/ProductionReport/ProductionReport.js index 15f6835..fbe2d68 100644 --- a/src/components/ProductionReport/ProductionReport.js +++ b/src/components/ProductionReport/ProductionReport.js @@ -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, diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index 04f768d..4f5ea4e 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -1,6 +1,6 @@ /* 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 "@/components/Common/commonBusiness"; 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 => { } 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 => { 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 => {
+ ); }; @@ -1276,7 +1286,7 @@ const BoxComponent = props => { 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 => { sName: "bComMaterials", iColValue: 4, }; + } else { + return item; } }); @@ -2028,4 +2040,175 @@ const ManyComponent = props => { ); }; +// 选择盒型弹窗 +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 => ( + (item.sBoxType || "其它") === boxType).length} + offset={[20, 8]} + color="#faad14" + > + {boxType} + + } + key={boxType === "全部" ? 0 : commonUtils.createSid()} + treeData={boxType} + switcherIcon={} + > + )), + [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 ? : "暂无图片"); + }); + + columns + .filter(item => item.dataIndex === "operation") + .forEach(column => { + column.fixed = "right"; + column.render = (value, record, index) => ( + + ); + }); + }, + }; + + return ( + + 关闭 + + } + > +
+
{ + setTreeClassName(styles.overFlow); + }} + onMouseLeave={() => { + setTreeClassName(""); + }} + > + {boxTypeList.length && ( + { + const { treeData } = select.node; + setBoxTypeSelected(treeData); + }} + > + {renderTreeNodes} + + )} +
+
+ +
+
+ + ); +}; + export default QuickQuote; diff --git a/src/components/QuickQuote/index.less b/src/components/QuickQuote/index.less index ad54071..10a5636 100644 --- a/src/components/QuickQuote/index.less +++ b/src/components/QuickQuote/index.less @@ -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 diff --git a/src/components/QuoQuotation/Quotation/Quotation.js b/src/components/QuoQuotation/Quotation/Quotation.js index 99c96cb..2f65f00 100644 --- a/src/components/QuoQuotation/Quotation/Quotation.js +++ b/src/components/QuoQuotation/Quotation/Quotation.js @@ -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'; diff --git a/src/components/QuoQuotation/Quotation/SplitPasteQuotation.js b/src/components/QuoQuotation/Quotation/SplitPasteQuotation.js index c21ebdd..315b2c1 100644 --- a/src/components/QuoQuotation/Quotation/SplitPasteQuotation.js +++ b/src/components/QuoQuotation/Quotation/SplitPasteQuotation.js @@ -1,6 +1,6 @@ /* 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 } from 'antd-v4'; import ShowType from '@/components/Common/CommonComponent'; import splitstyles from '@/components/Manufacture/SplitPaste.less'; diff --git a/src/components/QuoQuotation/QuotationPack/QuotationPack.js b/src/components/QuoQuotation/QuotationPack/QuotationPack.js index 282fea7..44cdffe 100644 --- a/src/components/QuoQuotation/QuotationPack/QuotationPack.js +++ b/src/components/QuoQuotation/QuotationPack/QuotationPack.js @@ -7,7 +7,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, Spin, Avatar, Select, message, Button, Slider, Tabs, Table, Checkbox, Row, Col, } from 'antd-v4'; import AddIcon from '../../../assets/add.svg'; import DisableAddIcon from '../../../assets/disableadd.svg'; diff --git a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js index f76a0bf..9be16d0 100644 --- a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js +++ b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js @@ -7,7 +7,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, Spin, Avatar, Select, message, Button, Slider, Tabs, Collapse, Radio, Row, Col, Table, Checkbox, } from 'antd-v4'; import { RightOutlined } from '@ant-design/icons'; import AddIcon from '../../../assets/add.svg'; diff --git a/src/components/login/Login.js b/src/components/login/Login.js index 9da928b..3121e3c 100644 --- a/src/components/login/Login.js +++ b/src/components/login/Login.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import { LockOutlined, UserOutlined } 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 { Input, Button, Select, message, Radio } from 'antd-v4'; import commonConfig from '@/utils/config'; // import * as commonUtils from '../../utils/utils'; diff --git a/src/components/productionMainPlan/productionMainPlan.js b/src/components/productionMainPlan/productionMainPlan.js index 5eefc40..71a3282 100644 --- a/src/components/productionMainPlan/productionMainPlan.js +++ b/src/components/productionMainPlan/productionMainPlan.js @@ -1,7 +1,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, Avatar, Tabs, Card, Row, Col, message } from 'antd-v4'; // Switch, Modal, Card, Row, Col import styles from '@/index.less'; import * as commonFunc from '@/components/Common/commonFunc'; diff --git a/src/components/productionMainPlan/productionUnifiedPlanning.js b/src/components/productionMainPlan/productionUnifiedPlanning.js index 42ba6cd..2324c8a 100644 --- a/src/components/productionMainPlan/productionUnifiedPlanning.js +++ b/src/components/productionMainPlan/productionUnifiedPlanning.js @@ -1,6 +1,6 @@ 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, message } from 'antd-v4'; // Button import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js b/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js index 0dac436..62fcb28 100644 --- a/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js +++ b/src/components/productionPlanInfo/productionPlanChangeMacheInfo.js @@ -1,7 +1,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, Button, Row, Col } from 'antd-v4'; import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/productionPlanInfo/productionPlanInfo.js b/src/components/productionPlanInfo/productionPlanInfo.js index 25b6b48..c494757 100644 --- a/src/components/productionPlanInfo/productionPlanInfo.js +++ b/src/components/productionPlanInfo/productionPlanInfo.js @@ -1,7 +1,7 @@ /* eslint-disable array-callback-return,no-undef,object-curly-newline,prefer-destructuring,no-unused-vars */ 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, Card, Row, Col } from 'antd-v4'; // Switch Select, Tabs, import styles from '../../index.less'; import selfstyles from '../productionMainPlan/index.less'; diff --git a/src/components/productionPlanInfo/productionPlanInfo2.js b/src/components/productionPlanInfo/productionPlanInfo2.js index 1317f4f..eb43c25 100644 --- a/src/components/productionPlanInfo/productionPlanInfo2.js +++ b/src/components/productionPlanInfo/productionPlanInfo2.js @@ -1,7 +1,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, Select } from 'antd-v4'; // Switch import styles from '../../index.less'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/productionPlanInfo/productionPlanOutside.js b/src/components/productionPlanInfo/productionPlanOutside.js index 49b465e..2cff6f3 100644 --- a/src/components/productionPlanInfo/productionPlanOutside.js +++ b/src/components/productionPlanInfo/productionPlanOutside.js @@ -1,7 +1,7 @@ /* eslint-disable array-callback-return,no-undef,object-curly-newline,prefer-destructuring,no-unused-vars */ 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, Card, Row, Col, message } from 'antd-v4'; // Switch Select, Tabs, import styles from '../../index.less'; import selfstyles from '../productionMainPlan/index.less'; diff --git a/src/components/productionSchedule/productionPlanChangeMacheInfo.js b/src/components/productionSchedule/productionPlanChangeMacheInfo.js index 0dac436..62fcb28 100644 --- a/src/components/productionSchedule/productionPlanChangeMacheInfo.js +++ b/src/components/productionSchedule/productionPlanChangeMacheInfo.js @@ -1,7 +1,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, Button, Row, Col } from 'antd-v4'; import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/productionSchedule/productionPlanInfo2.js b/src/components/productionSchedule/productionPlanInfo2.js index 1317f4f..eb43c25 100644 --- a/src/components/productionSchedule/productionPlanInfo2.js +++ b/src/components/productionSchedule/productionPlanInfo2.js @@ -1,7 +1,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, Select } from 'antd-v4'; // Switch import styles from '../../index.less'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/productionSchedule/productionSchedule.js b/src/components/productionSchedule/productionSchedule.js index 17db1b6..9a74348 100644 --- a/src/components/productionSchedule/productionSchedule.js +++ b/src/components/productionSchedule/productionSchedule.js @@ -1,7 +1,7 @@ /* eslint-disable array-callback-return,no-undef,object-curly-newline,prefer-destructuring,no-unused-vars */ 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 { LoadingOutlined } from '@ant-design/icons'; import { Modal, Layout, Spin, Card, Row, Col, message } from 'antd-v4'; // Switch Select, Tabs, import styles from '@/index.less'; diff --git a/src/components/productionScheduleTree/productionPlanChangeMacheInfo.js b/src/components/productionScheduleTree/productionPlanChangeMacheInfo.js index 0dac436..62fcb28 100644 --- a/src/components/productionScheduleTree/productionPlanChangeMacheInfo.js +++ b/src/components/productionScheduleTree/productionPlanChangeMacheInfo.js @@ -1,7 +1,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, Button, Row, Col } from 'antd-v4'; import CommonListEvent from './CommonListEvent';/* 继承销售模块业务功能 */ import * as commonFunc from './commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ diff --git a/src/components/productionScheduleTree/productionPlanInfo2.js b/src/components/productionScheduleTree/productionPlanInfo2.js index 1317f4f..eb43c25 100644 --- a/src/components/productionScheduleTree/productionPlanInfo2.js +++ b/src/components/productionScheduleTree/productionPlanInfo2.js @@ -1,7 +1,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, Select } from 'antd-v4'; // Switch import styles from '../../index.less'; import * as commonFunc from '../Common/commonFunc'; diff --git a/src/components/productionScheduleTree/productionScheduleTree.js b/src/components/productionScheduleTree/productionScheduleTree.js index dae6309..c3caa9c 100644 --- a/src/components/productionScheduleTree/productionScheduleTree.js +++ b/src/components/productionScheduleTree/productionScheduleTree.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import { DownOutlined, LoadingOutlined, MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons'; import { Form, Icon } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; +// import '@ant-design/compatible/assets/index.css'; import { Modal, Layout, Spin, Card, Row, Col, message, Tree, Switch, Pagination } from 'antd-v4'; // Switch Select, Tabs, import styles from '@/index.less'; import selfstyles from '@/components/productionMainPlan/index.less'; diff --git a/src/components/productionScheduleTree/productionScheduleTreeBack.js b/src/components/productionScheduleTree/productionScheduleTreeBack.js index edd49c0..18d707f 100644 --- a/src/components/productionScheduleTree/productionScheduleTreeBack.js +++ b/src/components/productionScheduleTree/productionScheduleTreeBack.js @@ -2,7 +2,7 @@ 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 { Modal, Layout, Spin, Card, Row, Col, message, Tree, Switch, Pagination } from 'antd-v4'; // Switch Select, Tabs, import styles from '@/index.less'; import selfstyles from '@/components/productionMainPlan/index.less'; diff --git a/src/global.less b/src/global.less index 8640804..4b9add3 100644 --- a/src/global.less +++ b/src/global.less @@ -1,3 +1,4 @@ +@import "@ant-design/compatible/assets/index.css"; @import "antd-v4/dist/antd.compact.css"; @import "./index.less"; @import "./default.less";