Commit 2ad494ce93e2dc721be3a1bddc6bde69a97e7e9a

Authored by 陈鑫涛
2 parents 0088b65e ad0f9215

Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

src/components/Common/CommonJurisdictionNewEvent.js
@@ -348,7 +348,6 @@ export default (ChildComponent) => { @@ -348,7 +348,6 @@ export default (ChildComponent) => {
348 } 348 }
349 // 模拟config的 gdsconfigformslave 配置 349 // 模拟config的 gdsconfigformslave 配置
350 imitateTableConfig = (title, dataIndex, width) => { 350 imitateTableConfig = (title, dataIndex, width) => {
351 - console.log('222app',this.props.app);  
352 const {userinfo} = this.props.app; 351 const {userinfo} = this.props.app;
353 return { 352 return {
354 bCanInput: false, 353 bCanInput: false,
@@ -372,8 +371,8 @@ export default (ChildComponent) => { @@ -372,8 +371,8 @@ export default (ChildComponent) => {
372 sId: commonUtils.createSid(), 371 sId: commonUtils.createSid(),
373 sParentId: '11811781131121915102156308120', 372 sParentId: '11811781131121915102156308120',
374 sSubsidiaryId: '1111111111', 373 sSubsidiaryId: '1111111111',
375 - showName: dataIndex,  
376 - sName: userinfo.sLanguage === 'sEnglish' ? dataIndex : title, 374 + showName: userinfo.sLanguage === 'sEnglish' ? dataIndex : title,
  375 + sName: dataIndex,
377 }; 376 };
378 } 377 }
379 // 根据模拟列,模拟列配置 378 // 根据模拟列,模拟列配置