Commit 3636cbc940bac444a5ed22aa6e4976157dd1336a

Authored by Min
1 parent e8339f25

1.处理备注弹窗报错bug

src/components/Common/SlaveMemo.js
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 import React, { Component } from "react"; 5 import React, { Component } from "react";
6 import { Form } from "@ant-design/compatible"; 6 import { Form } from "@ant-design/compatible";
7 import "@ant-design/compatible/assets/index.css"; 7 import "@ant-design/compatible/assets/index.css";
  8 +import * as commonFunc from "@/components/Common/commonFunc";
8 import { Input, Space, Button } from "antd"; 9 import { Input, Space, Button } from "antd";
9 import * as commonUtils from "../../utils/utils"; 10 import * as commonUtils from "../../utils/utils";
10 import ShowType from "./CommonComponent"; /* 通用方法 */ 11 import ShowType from "./CommonComponent"; /* 通用方法 */
@@ -218,7 +219,8 @@ class SlaveMemoRc extends Component { @@ -218,7 +219,8 @@ class SlaveMemoRc extends Component {
218 let bVisibleMemo; 219 let bVisibleMemo;
219 let sMemoField; 220 let sMemoField;
220 let btnName = ""; 221 let btnName = "";
221 - const sDetailTitle = commonFunc.showLocalMessage(props, 'sDetailTitle', '详细'); 222 + const sDetailTitle = commonFunc.showLocalMessage(this.props, 'sDetailTitle', '详细');
  223 + const BtnClose = commonFunc.showLocalMessage(this.props, 'BtnClose', '详细');
222 const title = sDetailTitle; 224 const title = sDetailTitle;
223 let bEnabledTextArea = false; /* 多行文本默认可输入 非编辑状态多行文本禁止输入 */ 225 let bEnabledTextArea = false; /* 多行文本默认可输入 非编辑状态多行文本禁止输入 */
224 if (commonUtils.isNotEmptyObject(sCurrMemoProps)) { 226 if (commonUtils.isNotEmptyObject(sCurrMemoProps)) {
@@ -262,7 +264,7 @@ class SlaveMemoRc extends Component { @@ -262,7 +264,7 @@ class SlaveMemoRc extends Component {
262 取消 264 取消
263 </Button> */} 265 </Button> */}
264 <Button size="large" type="primary" onClick={this.handleOk}> 266 <Button size="large" type="primary" onClick={this.handleOk}>
265 - 关闭 267 + {BtnClose}
266 </Button> 268 </Button>
267 </Space> 269 </Space>
268 } 270 }