Commit 6dc23d74a0e1be6b5f30a77cf7a1b6af22758580

Authored by Min
1 parent 939084cc

1.已审批,已作废,审批中 根据系统设置的语言 加载对应的图片

Showing 35 changed files with 69 additions and 58 deletions
src/assets/hasCancel_english.png 0 → 100644

40 KB

src/assets/hasChecked.png 0 → 100644

107 KB

src/assets/hasChecked_big5.png 0 → 100644

106 KB

src/assets/hasChecked_english.png 0 → 100644

101 KB

src/assets/hasChecking_big5.png 0 → 100644

181 KB

src/assets/hasChecking_english.png 0 → 100644

170 KB

src/assets/haveCancel_big5.png 0 → 100644

40 KB

src/assets/haveCancel_english.png 0 → 100644

40 KB

src/components/AuditInformation/AuditInformation.js
@@ -112,8 +112,8 @@ class AuditInformation extends Component { @@ -112,8 +112,8 @@ class AuditInformation extends Component {
112 } 112 }
113 }; 113 };
114 render() { 114 render() {
115 - const { pageLoading, masterData } = this.props;  
116 - const imgSrc = commonBusiness.handleAddIcon(masterData); 115 + const { masterData, sModelsType, app } = this.props;
  116 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
117 return ( 117 return (
118 <Spin spinning={pageLoading}> 118 <Spin spinning={pageLoading}>
119 <WorkOrderComponent 119 <WorkOrderComponent
src/components/Common/CommonBillDeliverEvent.js
@@ -5135,8 +5135,8 @@ export default (ChildComponent) =&gt; { @@ -5135,8 +5135,8 @@ export default (ChildComponent) =&gt; {
5135 }; 5135 };
5136 5136
5137 render() { 5137 render() {
5138 - const { masterData } = this.props;  
5139 - const imgSrc = commonBusiness.handleAddIcon(masterData); 5138 + const { masterData, sModelsType, app } = this.props;
  5139 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
5140 return ( 5140 return (
5141 <ChildComponent 5141 <ChildComponent
5142 {...this.props} 5142 {...this.props}
src/components/Common/CommonBillEvent.js
@@ -9979,8 +9979,8 @@ export default (ChildComponent) =&gt; { @@ -9979,8 +9979,8 @@ export default (ChildComponent) =&gt; {
9979 } 9979 }
9980 }; 9980 };
9981 render() { 9981 render() {
9982 - const { masterData } = this.props;  
9983 - const imgSrc = commonBusiness.handleAddIcon(masterData); 9982 + const { masterData, sModelsType, app } = this.props;
  9983 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
9984 return ( 9984 return (
9985 <ChildComponent 9985 <ChildComponent
9986 {...this.props} 9986 {...this.props}
src/components/Common/CommonCheckBillEvent.js
@@ -5541,8 +5541,8 @@ export default (ChildComponent) =&gt; { @@ -5541,8 +5541,8 @@ export default (ChildComponent) =&gt; {
5541 } 5541 }
5542 5542
5543 render() { 5543 render() {
5544 - const { masterData } = this.props;  
5545 - const imgSrc = commonBusiness.handleAddIcon(masterData); 5544 + const { masterData, sModelsType, app } = this.props;
  5545 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
5546 return ( 5546 return (
5547 <ChildComponent 5547 <ChildComponent
5548 {...this.props} 5548 {...this.props}
src/components/Common/CommonElementEvent.js
@@ -4709,8 +4709,8 @@ export default (ChildComponent) =&gt; { @@ -4709,8 +4709,8 @@ export default (ChildComponent) =&gt; {
4709 this.props.onSaveState({ slavePagination }); 4709 this.props.onSaveState({ slavePagination });
4710 }; 4710 };
4711 render() { 4711 render() {
4712 - const { masterData, sModelsType } = this.props;  
4713 - const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType); 4712 + const { masterData, sModelsType, app } = this.props;
  4713 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
4714 return ( 4714 return (
4715 <ChildComponent 4715 <ChildComponent
4716 {...this.props} 4716 {...this.props}
src/components/Common/CommonGroupBillEvent.js
@@ -4421,8 +4421,8 @@ export default (ChildComponent) =&gt; { @@ -4421,8 +4421,8 @@ export default (ChildComponent) =&gt; {
4421 } 4421 }
4422 4422
4423 render() { 4423 render() {
4424 - const { masterData } = this.props;  
4425 - const imgSrc = commonBusiness.handleAddIcon(masterData); 4424 + const { masterData, sModelsType, app } = this.props;
  4425 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
4426 return ( 4426 return (
4427 <ChildComponent 4427 <ChildComponent
4428 {...this.props} 4428 {...this.props}
src/components/Common/CommonJurisdictionEvent.js
@@ -522,8 +522,8 @@ export default (ChildComponent) =&gt; { @@ -522,8 +522,8 @@ export default (ChildComponent) =&gt; {
522 this.props.onSaveState({ [`${name}${optionName}Keys`]: value }); 522 this.props.onSaveState({ [`${name}${optionName}Keys`]: value });
523 } 523 }
524 render() { 524 render() {
525 - const { masterData } = this.props;  
526 - const imgSrc = commonBusiness.handleAddIcon(masterData); 525 + const { masterData, sModelsType, app } = this.props;
  526 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
527 return ( 527 return (
528 <ChildComponent 528 <ChildComponent
529 {...this.props} 529 {...this.props}
src/components/Common/CommonJurisdictionNewEvent.js
@@ -776,8 +776,8 @@ export default (ChildComponent) =&gt; { @@ -776,8 +776,8 @@ export default (ChildComponent) =&gt; {
776 }; 776 };
777 777
778 render() { 778 render() {
779 - const { masterData } = this.props;  
780 - const imgSrc = commonBusiness.handleAddIcon(masterData); 779 + const { masterData, sModelsType, app } = this.props;
  780 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
781 return ( 781 return (
782 <ChildComponent 782 <ChildComponent
783 {...this.props} 783 {...this.props}
src/components/Common/CommonNewBillEvent.js
@@ -5841,8 +5841,8 @@ export default (ChildComponent) =&gt; { @@ -5841,8 +5841,8 @@ export default (ChildComponent) =&gt; {
5841 } 5841 }
5842 5842
5843 render() { 5843 render() {
5844 - const { masterData } = this.props;  
5845 - const imgSrc = commonBusiness.handleAddIcon(masterData); 5844 + const { masterData, sModelsType, app } = this.props;
  5845 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
5846 return ( 5846 return (
5847 <ChildComponent 5847 <ChildComponent
5848 {...this.props} 5848 {...this.props}
src/components/Common/CommonNewTabBillEvent.js
@@ -6981,9 +6981,8 @@ export default (ChildComponent) =&gt; { @@ -6981,9 +6981,8 @@ export default (ChildComponent) =&gt; {
6981 } 6981 }
6982 6982
6983 render() { 6983 render() {
6984 - const { masterData } = this.props;  
6985 - const imgSrc = commonBusiness.handleAddIcon(masterData);  
6986 - const imgPersonSrc = commonBusiness.handleCheckIcon(masterData); 6984 + const { masterData, sModelsType, app } = this.props;
  6985 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
6987 return ( 6986 return (
6988 <ChildComponent 6987 <ChildComponent
6989 {...this.props} 6988 {...this.props}
src/components/Common/CommonProductionPlanEvent.js
@@ -1017,8 +1017,8 @@ export default (ChildComponent) =&gt; { @@ -1017,8 +1017,8 @@ export default (ChildComponent) =&gt; {
1017 this.props.onSaveState({ [modelVisible]: false }); 1017 this.props.onSaveState({ [modelVisible]: false });
1018 }; 1018 };
1019 render() { 1019 render() {
1020 - const { masterData } = this.props;  
1021 - const imgSrc = commonBusiness.handleAddIcon(masterData); 1020 + const { masterData, sModelsType, app } = this.props;
  1021 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
1022 return ( 1022 return (
1023 <ChildComponent 1023 <ChildComponent
1024 {...this.props} 1024 {...this.props}
src/components/Common/CommonProductionPlanOutsideEvent.js
@@ -903,8 +903,8 @@ export default (ChildComponent) =&gt; { @@ -903,8 +903,8 @@ export default (ChildComponent) =&gt; {
903 } 903 }
904 } 904 }
905 render() { 905 render() {
906 - const { masterData } = this.props;  
907 - const imgSrc = commonBusiness.handleAddIcon(masterData); 906 + const { masterData, sModelsType, app } = this.props;
  907 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
908 return ( 908 return (
909 <ChildComponent 909 <ChildComponent
910 {...this.props} 910 {...this.props}
src/components/Common/CommonSubBillEvent.js
@@ -6839,8 +6839,8 @@ export default (ChildComponent) =&gt; { @@ -6839,8 +6839,8 @@ export default (ChildComponent) =&gt; {
6839 }; 6839 };
6840 6840
6841 render() { 6841 render() {
6842 - const { masterData } = this.props;  
6843 - const imgSrc = commonBusiness.handleAddIcon(masterData); 6842 + const { masterData, sModelsType, app } = this.props;
  6843 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
6844 return ( 6844 return (
6845 <ChildComponent 6845 <ChildComponent
6846 {...this.props} 6846 {...this.props}
src/components/Common/commonBusiness.js
@@ -12,8 +12,15 @@ import * as commonFunc from &#39;./commonFunc&#39;; /* 通用单据方法 */ @@ -12,8 +12,15 @@ import * as commonFunc from &#39;./commonFunc&#39;; /* 通用单据方法 */
12 import commonConfig from '../../utils/config'; 12 import commonConfig from '../../utils/config';
13 import * as commonServices from '../../services/services'; 13 import * as commonServices from '../../services/services';
14 import imgCheck from '../../assets/hasChecked.svg'; /* 已审核ICON */ 14 import imgCheck from '../../assets/hasChecked.svg'; /* 已审核ICON */
  15 +import imgCheckBig5 from '../../assets/hasChecked_big5.png'; /* 已审核ICON-繁体 */
  16 +import imgCheckEnglish from '../../assets/hasChecked_english.png'; /* 已审核ICON-英文 */
15 import imgInvalid from '../../assets/haveCancel.png'; /* 已作废ICON */ 17 import imgInvalid from '../../assets/haveCancel.png'; /* 已作废ICON */
  18 +import imgInvalidBig5 from '../../assets/haveCancel_big5.png'; /* 已作废ICON */
  19 +import imgInvalidEnglish from '../../assets/haveCancel_english.png'; /* 已作废ICON */
16 import imgChecking from '../../assets/haveChecking.svg'; /* 审核中 */ 20 import imgChecking from '../../assets/haveChecking.svg'; /* 审核中 */
  21 +import imgCheckingBig5 from '../../assets/hasChecking_big5.png'; /* 审核中-繁体 */
  22 +import imgCheckingEnglish from '../../assets/hasChecking_english.png'; /* 审核中-英文 */
  23 +
17 import imgCheckPerson from '../../assets/personChecked1.png'; /* 审核中 */ 24 import imgCheckPerson from '../../assets/personChecked1.png'; /* 审核中 */
18 import imgSubmit from '../../assets/haveSubmited.svg'; /* 已提交 */ 25 import imgSubmit from '../../assets/haveSubmited.svg'; /* 已提交 */
19 import { cloneDeep } from 'lodash'; 26 import { cloneDeep } from 'lodash';
@@ -138,8 +145,13 @@ export function validateField(values, props) { @@ -138,8 +145,13 @@ export function validateField(values, props) {
138 } 145 }
139 /** 添加审核或者作废图标 */ 146 /** 添加审核或者作废图标 */
140 // eslint-disable-next-line no-unused-vars 147 // eslint-disable-next-line no-unused-vars
141 -export function handleAddIcon(masterData, sModelsType) { 148 +export function handleAddIcon(masterData, sModelsType, app = {}) {
142 let imgSrc = ''; 149 let imgSrc = '';
  150 + // 从app中获取用户语言设置
  151 + const userLanguage = app?.userinfo?.sLanguage || 'sChinese'; // 默认简体中文
  152 + const isTraditionalChinese = userLanguage === 'sBig5';
  153 + const isEnglish = userLanguage === 'sEnglish';
  154 +
143 if (commonUtils.isNotEmptyObject(masterData)) { 155 if (commonUtils.isNotEmptyObject(masterData)) {
144 const { 156 const {
145 bInvalid, 157 bInvalid,
@@ -148,19 +160,19 @@ export function handleAddIcon(masterData, sModelsType) { @@ -148,19 +160,19 @@ export function handleAddIcon(masterData, sModelsType) {
148 bSubmit, 160 bSubmit,
149 } = masterData; 161 } = masterData;
150 if (bInvalid) { 162 if (bInvalid) {
151 - imgSrc = imgInvalid; 163 + imgSrc = isEnglish ? imgInvalidEnglish : (isTraditionalChinese ? imgInvalidBig5 : imgInvalid);
152 } else if (bCheck) { 164 } else if (bCheck) {
153 if (commonUtils.isNotEmptyStr(sModelsType) && sModelsType.includes('element/')) { 165 if (commonUtils.isNotEmptyStr(sModelsType) && sModelsType.includes('element/')) {
154 if (sModelsType.includes('element/customerInfo')) { 166 if (sModelsType.includes('element/customerInfo')) {
155 - imgSrc = imgCheck; 167 + imgSrc = isEnglish ? imgCheckEnglish : (isTraditionalChinese ? imgCheckBig5 : imgCheck);
156 } else { 168 } else {
157 imgSrc = ''; 169 imgSrc = '';
158 } 170 }
159 } else { 171 } else {
160 - imgSrc = imgCheck; 172 + imgSrc = isEnglish ? imgCheckEnglish : (isTraditionalChinese ? imgCheckBig5 : imgCheck);
161 } 173 }
162 } else if (sStatus === '2') { 174 } else if (sStatus === '2') {
163 - imgSrc = imgChecking; 175 + imgSrc = isEnglish ? imgCheckingEnglish : (isTraditionalChinese ? imgCheckingBig5 : imgChecking);
164 } else if (bSubmit) { 176 } else if (bSubmit) {
165 imgSrc = imgSubmit; 177 imgSrc = imgSubmit;
166 } 178 }
src/components/Manufacture/ProcessCard/ProcessCard.js
@@ -2927,8 +2927,8 @@ class ProcessCard extends Component { @@ -2927,8 +2927,8 @@ class ProcessCard extends Component {
2927 } 2927 }
2928 2928
2929 render() { 2929 render() {
2930 - const { pageLoading, masterData, fastOrderModalVisible } = this.props;  
2931 - const imgSrc = commonBusiness.handleAddIcon(masterData); 2930 + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
  2931 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
2932 return ( 2932 return (
2933 <Spin spinning={pageLoading}> 2933 <Spin spinning={pageLoading}>
2934 <ProcessCardComponent 2934 <ProcessCardComponent
src/components/Manufacture/ProcessCardPack/ProcessCardPack.js
@@ -4515,8 +4515,8 @@ class ProcessCardPack extends Component { @@ -4515,8 +4515,8 @@ class ProcessCardPack extends Component {
4515 }); 4515 });
4516 } 4516 }
4517 render() { 4517 render() {
4518 - const { pageLoading, masterData, fastOrderModalVisible } = this.props;  
4519 - const imgSrc = commonBusiness.handleAddIcon(masterData); 4518 + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
  4519 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
4520 return ( 4520 return (
4521 <Spin spinning={pageLoading}> 4521 <Spin spinning={pageLoading}>
4522 <ProcessCardComponent 4522 <ProcessCardComponent
src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js
@@ -6717,8 +6717,8 @@ class ProcessCardPackTableTree extends Component { @@ -6717,8 +6717,8 @@ class ProcessCardPackTableTree extends Component {
6717 }); 6717 });
6718 } 6718 }
6719 render() { 6719 render() {
6720 - const { pageLoading, masterData, fastOrderModalVisible } = this.props;  
6721 - const imgSrc = commonBusiness.handleAddIcon(masterData); 6720 + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
  6721 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
6722 return ( 6722 return (
6723 <Spin spinning={pageLoading}> 6723 <Spin spinning={pageLoading}>
6724 <ProcessCardComponent 6724 <ProcessCardComponent
src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
@@ -3581,8 +3581,8 @@ const ToolBarComponent = props =&gt; { @@ -3581,8 +3581,8 @@ const ToolBarComponent = props =&gt; {
3581 3581
3582 // 审核状态 3582 // 审核状态
3583 const AvatarComponent = props => { 3583 const AvatarComponent = props => {
3584 - const { masterData } = props;  
3585 - const imgSrc = commonBusiness.handleAddIcon(masterData); 3584 + const { masterData, sModelsType, app } = this.props;
  3585 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
3586 if (!imgSrc) return ""; 3586 if (!imgSrc) return "";
3587 return ( 3587 return (
3588 <div className={styles.avatar}> 3588 <div className={styles.avatar}>
src/components/Manufacture/WorkOrder/WorkOrder.js
@@ -3707,8 +3707,8 @@ class WorkOrder extends Component { @@ -3707,8 +3707,8 @@ class WorkOrder extends Component {
3707 } 3707 }
3708 3708
3709 render() { 3709 render() {
3710 - const { pageLoading, masterData, fastOrderModalVisible } = this.props;  
3711 - const imgSrc = commonBusiness.handleAddIcon(masterData); 3710 + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
  3711 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
3712 return ( 3712 return (
3713 <Spin spinning={pageLoading}> 3713 <Spin spinning={pageLoading}>
3714 <WorkOrderComponent 3714 <WorkOrderComponent
src/components/Manufacture/WorkOrderPack/WorkOrderPack.js
@@ -5451,8 +5451,8 @@ class WorkOrderPack extends Component { @@ -5451,8 +5451,8 @@ class WorkOrderPack extends Component {
5451 } 5451 }
5452 5452
5453 render() { 5453 render() {
5454 - const { pageLoading, masterData, fastOrderModalVisible } = this.props;  
5455 - const imgSrc = commonBusiness.handleAddIcon(masterData); 5454 + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
  5455 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
5456 return ( 5456 return (
5457 <Spin spinning={pageLoading}> 5457 <Spin spinning={pageLoading}>
5458 <WorkOrderComponent 5458 <WorkOrderComponent
src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
@@ -7288,8 +7288,8 @@ class WorkOrderPack extends Component { @@ -7288,8 +7288,8 @@ class WorkOrderPack extends Component {
7288 } 7288 }
7289 7289
7290 render() { 7290 render() {
7291 - const { pageLoading, masterData, fastOrderModalVisible } = this.props;  
7292 - const imgSrc = commonBusiness.handleAddIcon(masterData); 7291 + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
  7292 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
7293 const addState = {}; 7293 const addState = {};
7294 const { processConfig = {} } = this.props; 7294 const { processConfig = {} } = this.props;
7295 const { gdsconfigformslave = [] } = processConfig; 7295 const { gdsconfigformslave = [] } = processConfig;
src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js
@@ -6774,8 +6774,8 @@ class WorkOrderPack extends Component { @@ -6774,8 +6774,8 @@ class WorkOrderPack extends Component {
6774 } 6774 }
6775 6775
6776 render() { 6776 render() {
6777 - const { pageLoading, masterData, fastOrderModalVisible } = this.props;  
6778 - const imgSrc = commonBusiness.handleAddIcon(masterData); 6777 + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
  6778 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
6779 const addState = {}; 6779 const addState = {};
6780 const { processConfig = {} } = this.props; 6780 const { processConfig = {} } = this.props;
6781 const { gdsconfigformslave = [] } = processConfig; 6781 const { gdsconfigformslave = [] } = processConfig;
src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
@@ -4048,8 +4048,8 @@ const ToolBarComponent = props =&gt; { @@ -4048,8 +4048,8 @@ const ToolBarComponent = props =&gt; {
4048 4048
4049 // 审核状态 4049 // 审核状态
4050 const AvatarComponent = props => { 4050 const AvatarComponent = props => {
4051 - const { masterData } = props;  
4052 - const imgSrc = commonBusiness.handleAddIcon(masterData); 4051 + const { masterData, sModelsType, app } = this.props;
  4052 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
4053 if (!imgSrc) return ""; 4053 if (!imgSrc) return "";
4054 return ( 4054 return (
4055 <div className={styles.avatar}> 4055 <div className={styles.avatar}>
src/components/ProductionReport/ProductionReport.js
@@ -1118,7 +1118,7 @@ class ProductionReport extends Component { @@ -1118,7 +1118,7 @@ class ProductionReport extends Component {
1118 1118
1119 render() { 1119 render() {
1120 const { 1120 const {
1121 - pageLoading, masterData, visible, checkConditions, checkPersonData, app, 1121 + pageLoading, masterData, visible, checkConditions, checkPersonData, app, sModelsType,
1122 } = this.props; 1122 } = this.props;
1123 const checkCondition = commonFunc.showMessage(app.commonConst, 'checkCondition');/* 审核条件 */ 1123 const checkCondition = commonFunc.showMessage(app.commonConst, 'checkCondition');/* 审核条件 */
1124 const checkSmemo = commonFunc.showMessage(app.commonConst, 'checkSmemo');/* 备注 */ 1124 const checkSmemo = commonFunc.showMessage(app.commonConst, 'checkSmemo');/* 备注 */
@@ -1131,7 +1131,7 @@ class ProductionReport extends Component { @@ -1131,7 +1131,7 @@ class ProductionReport extends Component {
1131 dataIndex: 'sMemo', 1131 dataIndex: 'sMemo',
1132 key: 'sMemo', 1132 key: 'sMemo',
1133 }]; 1133 }];
1134 - const imgSrc = commonBusiness.handleAddIcon(masterData); 1134 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
1135 const btnSure = commonFunc.showMessage(app.commonConst, 'btnSure');/* 确认 */ 1135 const btnSure = commonFunc.showMessage(app.commonConst, 'btnSure');/* 确认 */
1136 const check = commonFunc.showMessage(app.commonConst, 'check');/* 审核 */ 1136 const check = commonFunc.showMessage(app.commonConst, 'check');/* 审核 */
1137 const BtnClose = commonFunc.showMessage(app.commonConst, 'BtnClose');/* 关闭 */ 1137 const BtnClose = commonFunc.showMessage(app.commonConst, 'BtnClose');/* 关闭 */
src/components/QuoQuotation/Quotation/Quotation.js
@@ -3705,8 +3705,8 @@ class Quotation extends Component { @@ -3705,8 +3705,8 @@ class Quotation extends Component {
3705 } 3705 }
3706 3706
3707 render() { 3707 render() {
3708 - const { pageLoading, masterData, fastOrderModalVisible } = this.props;  
3709 - const imgSrc = commonBusiness.handleAddIcon(masterData); 3708 + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
  3709 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
3710 return ( 3710 return (
3711 <Spin spinning={pageLoading}> 3711 <Spin spinning={pageLoading}>
3712 <QuotationComponent 3712 <QuotationComponent
src/components/QuoQuotation/QuotationPack/QuotationPack.js
@@ -5315,8 +5315,8 @@ class QuotationPack extends Component { @@ -5315,8 +5315,8 @@ class QuotationPack extends Component {
5315 } 5315 }
5316 } 5316 }
5317 render() { 5317 render() {
5318 - const { pageLoading, masterData, fastOrderModalVisible } = this.props;  
5319 - const imgSrc = commonBusiness.handleAddIcon(masterData); 5318 + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
  5319 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
5320 return ( 5320 return (
5321 <Spin spinning={pageLoading}> 5321 <Spin spinning={pageLoading}>
5322 <QuotationComponent 5322 <QuotationComponent
src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
@@ -7915,8 +7915,8 @@ class QuotationPackTableTree extends Component { @@ -7915,8 +7915,8 @@ class QuotationPackTableTree extends Component {
7915 } 7915 }
7916 } 7916 }
7917 render() { 7917 render() {
7918 - const { pageLoading, masterData, fastOrderModalVisible } = this.props;  
7919 - const imgSrc = commonBusiness.handleAddIcon(masterData); 7918 + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
  7919 + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
7920 return ( 7920 return (
7921 <Spin spinning={pageLoading}> 7921 <Spin spinning={pageLoading}>
7922 <QuotationComponent 7922 <QuotationComponent