From 2460b90e99c43f4de3d7eedc5b4196dc96800b21 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Thu, 19 Jun 2025 13:33:59 +0800
Subject: [PATCH] 1.修改确认取消多语言翻译

---
 src/components/Common/CommonBillEvent.js                           | 10 ++++++----
 src/components/Common/CommonListSelect/index.js                    |  7 +++++--
 src/components/Common/CommonListSelectFlex/index.js                |  7 +++++--
 src/components/Common/CommonNewBillEvent.js                        |  5 ++---
 src/components/Common/CommonSubBillEvent.js                        |  5 +++--
 src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js |  3 ++-
 src/mobile/common/CommobileToolBar.js                              |  1 -
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js
index 35fcdd6..e9b9ce6 100644
--- a/src/components/Common/CommonBillEvent.js
+++ b/src/components/Common/CommonBillEvent.js
@@ -2116,6 +2116,7 @@ export default (ChildComponent) => {
       const {
         sModelsId, masterData, app, masterConfig, slaveConfig, checkConfig, token, sModelsType, controlConfig, materialsConfig, processConfig, colorConfig, packConfig, slaveData, orderDetailConfig,
       } = this.props;
+      const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示');
       const sSlaveIdArray = [];
       if (commonUtils.isNotEmptyArr(slaveData)) {
         slaveData.forEach((item) => {
@@ -2240,13 +2241,12 @@ export default (ChildComponent) => {
           }
         } else if(returnData.code === -8){
           Modal.info({
-            title: '温馨提示:',
+            title: FriendlyReminder,
             content: (
               <div>
                 {this.handleGetMsg(returnData.msg)}
               </div>
             ),
-            okText: '确认',
             onOk() {},
           });
           this.props.onSaveState({
@@ -6071,6 +6071,9 @@ export default (ChildComponent) => {
 
     /** 按钮操作事件 */
     handleButtonClick = async (name) => {
+
+      const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示');
+
       if (name === 'BtnOut') {
         this.handleOut();
       } else if (name === 'BtnDesignFunction') {
@@ -6329,13 +6332,12 @@ export default (ChildComponent) => {
             this.props.onSaveState({ ...allReturnMap, pageLoading:false, });
           }else if (dataReturn.code === -8 || dataReturn.code === 2) {
             Modal.info({
-              title: '温馨提示:',
+              title: FriendlyReminder,
               content: (
                 <div>
                   {this.handleGetMsg(dataReturn.msg)}
                 </div>
               ),
-              okText: '确认',
               onOk() {},
             });
             this.props.onSaveState({ ...allReturnMap, pageLoading:false, });
diff --git a/src/components/Common/CommonListSelect/index.js b/src/components/Common/CommonListSelect/index.js
index 57dad09..79ec03f 100644
--- a/src/components/Common/CommonListSelect/index.js
+++ b/src/components/Common/CommonListSelect/index.js
@@ -854,6 +854,9 @@ const CommonListComponent = Form.create({
     },
   };
   const upInvoiceName = commonUtils.isNotEmptyArr(btnUploadApi) ? btnUploadApi[0].showName :  '发票上传（金税）';
+  
+  const BtnSure = commonFunc.showLocalMessage(this.props, 'BtnSure', '确定');
+  const BtnCancel = commonFunc.showLocalMessage(this.props, 'BtnCancel', '取消');
 
   return (
     <Form >
@@ -953,8 +956,8 @@ const CommonListComponent = Form.create({
                       </Button>
                     )) :
                       <div>
-                      <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>取消</Button>
-                      <Button type="primary" onClick={props.onSelect}>确认</Button>
+                      <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>{BtnCancel}</Button>
+                      <Button type="primary" onClick={props.onSelect}>{BtnSure}</Button>
                     </div>
                   }
 
diff --git a/src/components/Common/CommonListSelectFlex/index.js b/src/components/Common/CommonListSelectFlex/index.js
index ada1c5b..1d544ab 100644
--- a/src/components/Common/CommonListSelectFlex/index.js
+++ b/src/components/Common/CommonListSelectFlex/index.js
@@ -500,6 +500,9 @@ const CommonListComponent = Form.create({
   const tableBelone = commonUtils.isNotEmptyObject(app.currentPane) && commonUtils.isNotEmptyObject(app.currentPane.name) && app.currentPane.bEdit ? 'none' : 'list';
   const sProcessParams = commonFunc.showMessage(app.commonConst, 'sProcessParams');/* 选择工艺参数标题 */
   const displayLeft = (sModelsType !== 'search/sisColor' && sModelsType !== 'search/commonPopup');
+
+  const BtnSure = commonFunc.showLocalMessage(this.props, 'BtnSure', '确定');
+  const BtnCancel = commonFunc.showLocalMessage(this.props, 'BtnCancel', '取消');
   return (
     <div className="modalChooseProcessContent">
       <Form >
@@ -533,8 +536,8 @@ const CommonListComponent = Form.create({
             </div>
           </Layout>
           <div style={{ textAlign: 'right', marginRight: '9px', marginBottom: '9px' }}>
-            <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>取消</Button>
-            <Button type="primary" onClick={props.onSelect}>确认</Button>
+            <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>{BtnCancel}</Button>
+            <Button type="primary" onClick={props.onSelect}>{BtnSure}</Button>
           </div>
         </Layout>
         {
diff --git a/src/components/Common/CommonNewBillEvent.js b/src/components/Common/CommonNewBillEvent.js
index ff56ea5..e36929e 100644
--- a/src/components/Common/CommonNewBillEvent.js
+++ b/src/components/Common/CommonNewBillEvent.js
@@ -4167,6 +4167,7 @@ export default (ChildComponent) => {
     };
     /** 按钮操作事件 */
     handleButtonClick = async (name, bBtncalcComfim) => {
+      const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示');
       if (name === 'BtnOut') {
         this.handleOut();
       } else if (name === 'BtnDesignFunction') {
@@ -4426,14 +4427,12 @@ export default (ChildComponent) => {
           } else if (dataReturn.code === -7) {
             const _this = this;
             Modal.confirm({
-              title: "温馨提示:",
+              title: FriendlyReminder,
               content: (
                 <div>
                   {this.handleGetMsg(dataReturn.msg)}
                 </div>
               ),
-              okText: "确认",
-              cancelText: "取消",
               onOk() {
                 _this.handleButtonClick(name, true);
               },
diff --git a/src/components/Common/CommonSubBillEvent.js b/src/components/Common/CommonSubBillEvent.js
index f3c6287..48eb356 100644
--- a/src/components/Common/CommonSubBillEvent.js
+++ b/src/components/Common/CommonSubBillEvent.js
@@ -1912,6 +1912,8 @@ export default (ChildComponent) => {
         sModelsId, masterData, app, masterConfig, slaveConfig, checkConfig, token, sModelsType, controlConfig, materialsConfig, processConfig, colorConfig, packConfig, slaveData,
         orderDetailConfig, slaveChildConfig, formRoute, slave0Config,
       } = this.props;
+      const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示');
+
       const sSlaveIdArray = [];
       if (commonUtils.isNotEmptyArr(slaveData)) {
         slaveData.forEach((item) => {
@@ -2041,13 +2043,12 @@ export default (ChildComponent) => {
           }
         }else if(returnData.code === -8){
           Modal.info({
-            title: '温馨提示:',
+            title: FriendlyReminder,
             content: (
               <div>
                 {this.handleGetMsg(returnData.msg)}
               </div>
             ),
-            okText: '确认',
             onOk() {},
           });
           this.props.onSaveState({
diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
index cae75e6..ec8c947 100644
--- a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
+++ b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
@@ -8768,6 +8768,7 @@ const WorkOrderComponent = Form.create({
     }
   }
   const autoHeight = `calc( 100vh - 92px )`;
+  const chooseCombinePartsName = commonFunc.showLocalMessage(props, 'chooseCombinePartsName', '选择合版部件名称');
 
   return (
     <Form>
@@ -9104,7 +9105,7 @@ const WorkOrderComponent = Form.create({
           combinePartsChooseVisible ?
             <AntdDraggableModal
               width={1150}
-              title="选择合版部件名称"
+              title={chooseCombinePartsName}
               visible={combinePartsChooseVisible === undefined ? false : combinePartsChooseVisible}
               onCancel={props.onCancelModal.bind(this, 'combinePartsChooseVisible')}
               // onOk={props.onSelectCombinePartsChoose}
diff --git a/src/mobile/common/CommobileToolBar.js b/src/mobile/common/CommobileToolBar.js
index bc12388..323e3b0 100644
--- a/src/mobile/common/CommobileToolBar.js
+++ b/src/mobile/common/CommobileToolBar.js
@@ -421,7 +421,6 @@ class CommobileToolBar extends Component {
             {this.handleGetMsg(returnData.msg)}
           </div>
         ),
-        okText: '确认',
         onOk() {},
       });
       bResult = false;
--
libgit2 0.22.2