Commit e8339f25286938ff76ad217ef73f71250f0ec00b
1 parent
a30c3563
1.处理工艺指导书报错
2.更多功能去掉重置日报
Showing
2 changed files
with
12 additions
and
11 deletions
src/components/Common/CommonViewDragable/index.js
| @@ -9,6 +9,7 @@ import React, { | @@ -9,6 +9,7 @@ import React, { | ||
| 9 | import "@ant-design/compatible/assets/index.css"; | 9 | import "@ant-design/compatible/assets/index.css"; |
| 10 | import { Tabs, Tooltip } from "antd"; | 10 | import { Tabs, Tooltip } from "antd"; |
| 11 | import ShowType from "@/components/Common/CommonComponent"; | 11 | import ShowType from "@/components/Common/CommonComponent"; |
| 12 | +import * as commonFunc from "@/components/Common/commonFunc"; | ||
| 12 | import * as commonBusiness from "@/components/Common/commonBusiness"; | 13 | import * as commonBusiness from "@/components/Common/commonBusiness"; |
| 13 | import StaticEditTable from "@/components/Common/CommonTable"; | 14 | import StaticEditTable from "@/components/Common/CommonTable"; |
| 14 | import * as commonUtils from "@/utils/utils"; | 15 | import * as commonUtils from "@/utils/utils"; |
| @@ -221,8 +222,8 @@ const RGLComponent = childProps => { | @@ -221,8 +222,8 @@ const RGLComponent = childProps => { | ||
| 221 | ); | 222 | ); |
| 222 | }; | 223 | }; |
| 223 | 224 | ||
| 224 | -const EmptyComponent = () => { | ||
| 225 | - const noData = commonFunc.showLocalMessage(this.props, 'noData', '暂无数据'); | 225 | +const EmptyComponent = (props) => { |
| 226 | + const noData = commonFunc.showLocalMessage(props, 'noData', '暂无数据'); | ||
| 226 | return <div className="emptyComponent">{noData}</div>; | 227 | return <div className="emptyComponent">{noData}</div>; |
| 227 | }; | 228 | }; |
| 228 | 229 |
src/mes/indexMes/index.js
| @@ -1169,15 +1169,15 @@ const SystemFunComponent = () => { | @@ -1169,15 +1169,15 @@ const SystemFunComponent = () => { | ||
| 1169 | overlayClassName={styles.systemFun} | 1169 | overlayClassName={styles.systemFun} |
| 1170 | content={ | 1170 | content={ |
| 1171 | <div className="systemFunContent"> | 1171 | <div className="systemFunContent"> |
| 1172 | - <div | ||
| 1173 | - className="restDailyReport" | ||
| 1174 | - onClick={() => { | ||
| 1175 | - handleSystemFunClick("restDailyReport"); | ||
| 1176 | - }} | ||
| 1177 | - > | ||
| 1178 | - <UndoOutlined /> | ||
| 1179 | - <span>{resetDailyReport}</span> | ||
| 1180 | - </div> | 1172 | + {/*<div*/} |
| 1173 | + {/* className="restDailyReport"*/} | ||
| 1174 | + {/* onClick={() => {*/} | ||
| 1175 | + {/* handleSystemFunClick("restDailyReport");*/} | ||
| 1176 | + {/* }}*/} | ||
| 1177 | + {/*>*/} | ||
| 1178 | + {/* <UndoOutlined />*/} | ||
| 1179 | + {/* <span>{resetDailyReport}</span>*/} | ||
| 1180 | + {/*</div>*/} | ||
| 1181 | <div | 1181 | <div |
| 1182 | className="restDailyReport" | 1182 | className="restDailyReport" |
| 1183 | onClick={() => { | 1183 | onClick={() => { |