From 65c63161753d2eeefe28990545d7050aba04dcb5 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Thu, 19 Jun 2025 14:09:43 +0800
Subject: [PATCH] 1.处理工序信息 页签根据配置显示多语言

---
 src/components/Common/CommonBillEvent.js         |  4 ++--
 src/components/Common/CommonSubBillEvent.js      |  2 +-
 src/components/CommonElementEvent/ProcessInfo.js | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js
index e9b9ce6..9551ef3 100644
--- a/src/components/Common/CommonBillEvent.js
+++ b/src/components/Common/CommonBillEvent.js
@@ -2384,7 +2384,7 @@ export default (ChildComponent) => {
             let iIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'BtnCheck' || item.sControlName === 'BtnExamine'  || item.sControlName === 'BtnSubmit');
             /* 配置了表格允许为空 则不进行校验 */
             if (slaveConfig && slaveConfig.bNotCanEmpty ) {
-              message.error(`${slaveConfig.sChinese || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
+              message.error(`${slaveConfig.showName || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
               this.props.onSaveState({
                 loading: false,
               });
@@ -2395,7 +2395,7 @@ export default (ChildComponent) => {
               bCheck = true;
             }
             if(bCheck) {
-              message.error(`${slaveConfig.sChinese || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
+              message.error(`${slaveConfig.showName || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
               this.props.onSaveState({
                 loading: false,
               });
diff --git a/src/components/Common/CommonSubBillEvent.js b/src/components/Common/CommonSubBillEvent.js
index 48eb356..4c99c2e 100644
--- a/src/components/Common/CommonSubBillEvent.js
+++ b/src/components/Common/CommonSubBillEvent.js
@@ -2192,7 +2192,7 @@ export default (ChildComponent) => {
           if (sModelsType !== 'commonBill/onlyMaster' && !sModelsType.includes('sales/salesInvoice') && !sModelsType.includes('purchase/purchaseInvoice') && !sModelsType.includes('purchase/outsideInvoice') && sModelsType !== 'cashier/financialTransfer' && sModelsType !== 'cashier/financialAdjustment'
             && !sModelsType.includes('cashier/receipt') && !sModelsType.includes('cashier/payment') && !sModelsType.includes('purchase/purchaseEnquiry')) {
             if (slaveConfig && slaveConfig.bNotCanEmpty && commonUtils.isEmptyArr(slaveData)) {
-               message.error(`${slaveConfig.sChinese || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
+               message.error(`${slaveConfig.showName || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
               // if (bGroupDataByDefineNo) {
               //   commonUtils.isEmptyArr(slaveData) && message.error('按批次汇总失败，请检查批次号等数据！');
               // } else {
diff --git a/src/components/CommonElementEvent/ProcessInfo.js b/src/components/CommonElementEvent/ProcessInfo.js
index 6fa00a8..222a66e 100644
--- a/src/components/CommonElementEvent/ProcessInfo.js
+++ b/src/components/CommonElementEvent/ProcessInfo.js
@@ -91,7 +91,7 @@ const ProcessComponent = Form.create({
     const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabAssort'); /* 配套工序 */
     if (iIndexProcess > -1) {
       bAssort = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
-      tabAssort = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
+      tabAssort = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
     }
   }
   let bOutside = commonUtils.isNotEmptyObject(outsideConfig); /* 發外公式 */
@@ -99,7 +99,7 @@ const ProcessComponent = Form.create({
     const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabOutSide'); /* 發外公式 */
     if (iIndexProcess > -1) {
       bOutside = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
-      tabOutside = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
+      tabOutside = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
     }
   }
   let bProcessstyle = commonUtils.isNotEmptyObject(processstyleConfig); /* 工序规格 */
@@ -108,7 +108,7 @@ const ProcessComponent = Form.create({
     const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabProcessStyle'); /* 工序规格 */
     if (iIndexProcess > -1) {
       bProcessstyle = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
-      tabProcessstyle = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
+      tabProcessstyle = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
     }
   }
   const bProcesssApsRule = false; /* APS规则定义 */
@@ -126,7 +126,7 @@ const ProcessComponent = Form.create({
     const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabProcessParam'); /* 工单参数 */
     if (iIndexProcess > -1) {
       bOrderParam = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
-      tabOrderParam = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
+      tabOrderParam = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
     }
   }
   let bOfferParam = true; /* 报价参数 */
@@ -135,7 +135,7 @@ const ProcessComponent = Form.create({
     const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabQuoParam'); /* 报价参数 */
     if (iIndexProcess > -1) {
       bOfferParam = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
-      tabOfferParam = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
+      tabOfferParam = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
     }
   }
 
@@ -145,7 +145,7 @@ const ProcessComponent = Form.create({
     const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabReportParam');
     if (iIndexProcess > -1) {
       bReportParam = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
-      tabReportParam = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
+      tabReportParam = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
     }
   }
 
@@ -155,7 +155,7 @@ const ProcessComponent = Form.create({
     const iIndex = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabNormParam');
     if (iIndex > -1) {
       bNormParam = props.masterConfig.gdsconfigformslave[iIndex].bVisible;
-      tabNormParam = props.masterConfig.gdsconfigformslave[iIndex].sChinese;
+      tabNormParam = props.masterConfig.gdsconfigformslave[iIndex].showName;
     }
   }
 
@@ -165,7 +165,7 @@ const ProcessComponent = Form.create({
     const iIndex = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabTestParam');
     if (iIndex > -1) {
       bTestParam = props.masterConfig.gdsconfigformslave[iIndex].bVisible;
-      tabTestParam = props.masterConfig.gdsconfigformslave[iIndex].sChinese;
+      tabTestParam = props.masterConfig.gdsconfigformslave[iIndex].showName;
     }
   }
   let defalutKey = '3';
--
libgit2 0.22.2