Commit 324b4b3876cbc2e76a18c3dadbd10c5686b0cb32

Authored by Min
1 parent c5278118

1.完善取消作废的英文翻译

src/components/Common/SlaveMemo.js
@@ -10,6 +10,7 @@ import * as commonUtils from '../../utils/utils'; @@ -10,6 +10,7 @@ import * as commonUtils from '../../utils/utils';
10 import ShowType from './CommonComponent';/* 通用方法 */ 10 import ShowType from './CommonComponent';/* 通用方法 */
11 import AntdDraggableModal from '../Common/AntdDraggableModal'; 11 import AntdDraggableModal from '../Common/AntdDraggableModal';
12 import moment from 'moment'; 12 import moment from 'moment';
  13 +import * as commonFunc from "@/components/Common/commonFunc";
13 14
14 const { TextArea } = Input; 15 const { TextArea } = Input;
15 const FormItem = Form.Item; 16 const FormItem = Form.Item;
@@ -153,7 +154,7 @@ export default class SlaveMemo extends Component { @@ -153,7 +154,7 @@ export default class SlaveMemo extends Component {
153 let bVisibleMemo; 154 let bVisibleMemo;
154 let sMemoField; 155 let sMemoField;
155 let btnName = ''; 156 let btnName = '';
156 - const title = '详细'; 157 + const title = commonFunc.showLocalMessage(this.props, 'sDetailTitle', '详细');
157 let bEnabledTextArea = false; /* 多行文本默认可输入 非编辑状态多行文本禁止输入 */ 158 let bEnabledTextArea = false; /* 多行文本默认可输入 非编辑状态多行文本禁止输入 */
158 let bNoMemo = false; 159 let bNoMemo = false;
159 if (commonUtils.isNotEmptyObject(sCurrMemoProps)) { 160 if (commonUtils.isNotEmptyObject(sCurrMemoProps)) {
src/components/Common/ToolBar/ToolBarNew.js
@@ -1521,6 +1521,11 @@ class ToolBarComponent extends Component { @@ -1521,6 +1521,11 @@ class ToolBarComponent extends Component {
1521 message.error(sErrorInfo); 1521 message.error(sErrorInfo);
1522 return; 1522 return;
1523 } 1523 }
  1524 + const bCancel = commonFunc.showLocalMessage(this.props, 'bCancel', '确定要取消');
  1525 +
  1526 + const bInvalid = commonFunc.showLocalMessage(this.props, 'bInvalid', '确定要作废');
  1527 +
  1528 + const bInvalidCancel = commonFunc.showLocalMessage(this.props, 'bInvalidCancel', '确定要作废');
1524 1529
1525 /* 新增 */ 1530 /* 新增 */
1526 if (key === "BtnAdd") { 1531 if (key === "BtnAdd") {
@@ -2028,13 +2033,13 @@ class ToolBarComponent extends Component { @@ -2028,13 +2033,13 @@ class ToolBarComponent extends Component {
2028 /* 作废、取消作废 */ 2033 /* 作废、取消作废 */
2029 if (key === "BtnBsOperation.BtnInvalid") { 2034 if (key === "BtnBsOperation.BtnInvalid") {
2030 obj = { 2035 obj = {
2031 - title: "确定要作废", 2036 + title: bInvalid,
2032 handleType: "toVoid", 2037 handleType: "toVoid",
2033 }; 2038 };
2034 this.props.onChangeInvalid(obj); 2039 this.props.onChangeInvalid(obj);
2035 } else if (key === "BtnBsOperation.BtnCancelInvalid") { 2040 } else if (key === "BtnBsOperation.BtnCancelInvalid") {
2036 obj = { 2041 obj = {
2037 - title: "确定取消作废", 2042 + title: bInvalidCancel,
2038 handleType: "cancel", 2043 handleType: "cancel",
2039 }; 2044 };
2040 this.props.onChangeInvalid(obj); 2045 this.props.onChangeInvalid(obj);
@@ -2044,13 +2049,13 @@ class ToolBarComponent extends Component { @@ -2044,13 +2049,13 @@ class ToolBarComponent extends Component {
2044 } 2049 }
2045 } else if (key === "BtnInvalid") { 2050 } else if (key === "BtnInvalid") {
2046 obj = { 2051 obj = {
2047 - title: "确定要作废", 2052 + title: bInvalid,
2048 handleType: "toVoid", 2053 handleType: "toVoid",
2049 }; 2054 };
2050 this.props.onChangeInvalid(obj); 2055 this.props.onChangeInvalid(obj);
2051 } else if (key === "BtnCancelInvalid") { 2056 } else if (key === "BtnCancelInvalid") {
2052 obj = { 2057 obj = {
2053 - title: "确定取消作废", 2058 + title: bInvalidCancel,
2054 handleType: "cancel", 2059 handleType: "cancel",
2055 }; 2060 };
2056 this.props.onChangeInvalid(obj); 2061 this.props.onChangeInvalid(obj);
@@ -2129,7 +2134,7 @@ class ToolBarComponent extends Component { @@ -2129,7 +2134,7 @@ class ToolBarComponent extends Component {
2129 } else if (key === "BtnCancel") { 2134 } else if (key === "BtnCancel") {
2130 /* 取消 */ 2135 /* 取消 */
2131 obj = { 2136 obj = {
2132 - title: "确定要取消", 2137 + title: bCancel,
2133 }; 2138 };
2134 this.props.onCancel(obj); 2139 this.props.onCancel(obj);
2135 } else if (key.indexOf("BtnPrint") > -1 && commonUtils.isNotEmptyStr(e.item.props["data-sactiveid"])) { 2140 } else if (key.indexOf("BtnPrint") > -1 && commonUtils.isNotEmptyStr(e.item.props["data-sactiveid"])) {
src/components/Common/commonFunc.js
@@ -566,8 +566,8 @@ export function getFilterConditon(sAssignField, allTableData) { @@ -566,8 +566,8 @@ export function getFilterConditon(sAssignField, allTableData) {
566 } 566 }
567 export function showLocalMessage(props, sName, sChineseName) { 567 export function showLocalMessage(props, sName, sChineseName) {
568 let sTitle = ''; 568 let sTitle = '';
569 - if(commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) && commonUtils.isNotEmptyArr(props.app.gdsformconst)) {  
570 - const gdsformconst = props.app.gdsformconst; 569 + if(commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) && commonUtils.isNotEmptyArr(props.app.commonConst)) {
  570 + const gdsformconst = props.app.commonConst;
571 sTitle = this.showMessage(gdsformconst, sName) 571 sTitle = this.showMessage(gdsformconst, sName)
572 } else { 572 } else {
573 sTitle = sChineseName; 573 sTitle = sChineseName;