xlyErp / xlyUmi

Commit 65c63161753d2eeefe28990545d7050aba04dcb5

Authored by Min
1 parent ac2b57cb

1.处理工序信息 页签根据配置显示多语言

Inline Side-by-side
Showing 3 changed files with 11 additions and 11 deletions
src/components/Common/CommonBillEvent.js
  View file @65c6316
... ... @@ -2384,7 +2384,7 @@ export default (ChildComponent) => {
2384 2384 let iIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'BtnCheck' || item.sControlName === 'BtnExamine' || item.sControlName === 'BtnSubmit');
2385 2385 /* 配置了表格允许为空 则不进行校验 */
2386 2386 if (slaveConfig && slaveConfig.bNotCanEmpty ) {
2387   - message.error(`${slaveConfig.sChinese || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
  2387 + message.error(`${slaveConfig.showName || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
2388 2388 this.props.onSaveState({
2389 2389 loading: false,
2390 2390 });
... ... @@ -2395,7 +2395,7 @@ export default (ChildComponent) => {
2395 2395 bCheck = true;
2396 2396 }
2397 2397 if(bCheck) {
2398   - message.error(`${slaveConfig.sChinese || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
  2398 + message.error(`${slaveConfig.showName || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
2399 2399 this.props.onSaveState({
2400 2400 loading: false,
2401 2401 });
... ...
src/components/Common/CommonSubBillEvent.js
  View file @65c6316
... ... @@ -2192,7 +2192,7 @@ export default (ChildComponent) => {
2192 2192 if (sModelsType !== 'commonBill/onlyMaster' && !sModelsType.includes('sales/salesInvoice') && !sModelsType.includes('purchase/purchaseInvoice') && !sModelsType.includes('purchase/outsideInvoice') && sModelsType !== 'cashier/financialTransfer' && sModelsType !== 'cashier/financialAdjustment'
2193 2193 && !sModelsType.includes('cashier/receipt') && !sModelsType.includes('cashier/payment') && !sModelsType.includes('purchase/purchaseEnquiry')) {
2194 2194 if (slaveConfig && slaveConfig.bNotCanEmpty && commonUtils.isEmptyArr(slaveData)) {
2195   - message.error(`${slaveConfig.sChinese || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
  2195 + message.error(`${slaveConfig.showName || ''}${commonFunc.showMessage(app.commonConst, 'slaveNotNull')}`); // 从表不能为空！
2196 2196 // if (bGroupDataByDefineNo) {
2197 2197 // commonUtils.isEmptyArr(slaveData) && message.error('按批次汇总失败，请检查批次号等数据！');
2198 2198 // } else {
... ...
src/components/CommonElementEvent/ProcessInfo.js
  View file @65c6316
... ... @@ -91,7 +91,7 @@ const ProcessComponent = Form.create({
91 91 const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabAssort'); /* 配套工序 */
92 92 if (iIndexProcess > -1) {
93 93 bAssort = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
94   - tabAssort = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
  94 + tabAssort = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
95 95 }
96 96 }
97 97 let bOutside = commonUtils.isNotEmptyObject(outsideConfig); /* 發外公式 */
... ... @@ -99,7 +99,7 @@ const ProcessComponent = Form.create({
99 99 const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabOutSide'); /* 發外公式 */
100 100 if (iIndexProcess > -1) {
101 101 bOutside = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
102   - tabOutside = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
  102 + tabOutside = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
103 103 }
104 104 }
105 105 let bProcessstyle = commonUtils.isNotEmptyObject(processstyleConfig); /* 工序规格 */
... ... @@ -108,7 +108,7 @@ const ProcessComponent = Form.create({
108 108 const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabProcessStyle'); /* 工序规格 */
109 109 if (iIndexProcess > -1) {
110 110 bProcessstyle = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
111   - tabProcessstyle = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
  111 + tabProcessstyle = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
112 112 }
113 113 }
114 114 const bProcesssApsRule = false; /* APS规则定义 */
... ... @@ -126,7 +126,7 @@ const ProcessComponent = Form.create({
126 126 const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabProcessParam'); /* 工单参数 */
127 127 if (iIndexProcess > -1) {
128 128 bOrderParam = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
129   - tabOrderParam = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
  129 + tabOrderParam = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
130 130 }
131 131 }
132 132 let bOfferParam = true; /* 报价参数 */
... ... @@ -135,7 +135,7 @@ const ProcessComponent = Form.create({
135 135 const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabQuoParam'); /* 报价参数 */
136 136 if (iIndexProcess > -1) {
137 137 bOfferParam = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
138   - tabOfferParam = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
  138 + tabOfferParam = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
139 139 }
140 140 }
141 141  
... ... @@ -145,7 +145,7 @@ const ProcessComponent = Form.create({
145 145 const iIndexProcess = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabReportParam');
146 146 if (iIndexProcess > -1) {
147 147 bReportParam = props.masterConfig.gdsconfigformslave[iIndexProcess].bVisible;
148   - tabReportParam = props.masterConfig.gdsconfigformslave[iIndexProcess].sChinese;
  148 + tabReportParam = props.masterConfig.gdsconfigformslave[iIndexProcess].showName;
149 149 }
150 150 }
151 151  
... ... @@ -155,7 +155,7 @@ const ProcessComponent = Form.create({
155 155 const iIndex = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabNormParam');
156 156 if (iIndex > -1) {
157 157 bNormParam = props.masterConfig.gdsconfigformslave[iIndex].bVisible;
158   - tabNormParam = props.masterConfig.gdsconfigformslave[iIndex].sChinese;
  158 + tabNormParam = props.masterConfig.gdsconfigformslave[iIndex].showName;
159 159 }
160 160 }
161 161  
... ... @@ -165,7 +165,7 @@ const ProcessComponent = Form.create({
165 165 const iIndex = props.masterConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'tabTestParam');
166 166 if (iIndex > -1) {
167 167 bTestParam = props.masterConfig.gdsconfigformslave[iIndex].bVisible;
168   - tabTestParam = props.masterConfig.gdsconfigformslave[iIndex].sChinese;
  168 + tabTestParam = props.masterConfig.gdsconfigformslave[iIndex].showName;
169 169 }
170 170 }
171 171 let defalutKey = '3';
... ...