diff --git a/src/assets/hasCancel_english.png b/src/assets/hasCancel_english.png new file mode 100644 index 0000000..d2cb85b --- /dev/null +++ b/src/assets/hasCancel_english.png diff --git a/src/assets/hasChecked.png b/src/assets/hasChecked.png new file mode 100644 index 0000000..65a5324 --- /dev/null +++ b/src/assets/hasChecked.png diff --git a/src/assets/hasChecked_big5.png b/src/assets/hasChecked_big5.png new file mode 100644 index 0000000..94a005a --- /dev/null +++ b/src/assets/hasChecked_big5.png diff --git a/src/assets/hasChecked_english.png b/src/assets/hasChecked_english.png new file mode 100644 index 0000000..cce3cca --- /dev/null +++ b/src/assets/hasChecked_english.png diff --git a/src/assets/hasChecking_big5.png b/src/assets/hasChecking_big5.png new file mode 100644 index 0000000..8f84ff6 --- /dev/null +++ b/src/assets/hasChecking_big5.png diff --git a/src/assets/hasChecking_english.png b/src/assets/hasChecking_english.png new file mode 100644 index 0000000..7cc03d4 --- /dev/null +++ b/src/assets/hasChecking_english.png diff --git a/src/assets/haveCancel_big5.png b/src/assets/haveCancel_big5.png new file mode 100644 index 0000000..ea00c99 --- /dev/null +++ b/src/assets/haveCancel_big5.png diff --git a/src/assets/haveCancel_english.png b/src/assets/haveCancel_english.png new file mode 100644 index 0000000..3602850 --- /dev/null +++ b/src/assets/haveCancel_english.png diff --git a/src/components/AuditInformation/AuditInformation.js b/src/components/AuditInformation/AuditInformation.js index 536c1e1..32be17e 100644 --- a/src/components/AuditInformation/AuditInformation.js +++ b/src/components/AuditInformation/AuditInformation.js @@ -112,8 +112,8 @@ class AuditInformation extends Component { } }; render() { - const { pageLoading, masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { }; render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { } }; render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { this.props.onSaveState({ slavePagination }); }; render() { - const { masterData, sModelsType } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app ); return ( { } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { this.props.onSaveState({ [`${name}${optionName}Keys`]: value }); } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { }; render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); - const imgPersonSrc = commonBusiness.handleCheckIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { this.props.onSaveState({ [modelVisible]: false }); }; render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app ); return ( { } } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app ); return ( { }; render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { // 审核状态 const AvatarComponent = props => { - const { masterData } = props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); if (!imgSrc) return ""; return (
diff --git a/src/components/Manufacture/WorkOrder/WorkOrder.js b/src/components/Manufacture/WorkOrder/WorkOrder.js index c34ae30..239f283 100644 --- a/src/components/Manufacture/WorkOrder/WorkOrder.js +++ b/src/components/Manufacture/WorkOrder/WorkOrder.js @@ -3707,8 +3707,8 @@ class WorkOrder extends Component { } render() { - const { pageLoading, masterData, fastOrderModalVisible } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app ); return ( { // 审核状态 const AvatarComponent = props => { - const { masterData } = props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); if (!imgSrc) return ""; return (
diff --git a/src/components/ProductionReport/ProductionReport.js b/src/components/ProductionReport/ProductionReport.js index fbe2d68..6970231 100644 --- a/src/components/ProductionReport/ProductionReport.js +++ b/src/components/ProductionReport/ProductionReport.js @@ -1118,7 +1118,7 @@ class ProductionReport extends Component { render() { const { - pageLoading, masterData, visible, checkConditions, checkPersonData, app, + pageLoading, masterData, visible, checkConditions, checkPersonData, app, sModelsType, } = this.props; const checkCondition = commonFunc.showMessage(app.commonConst, 'checkCondition');/* 审核条件 */ const checkSmemo = commonFunc.showMessage(app.commonConst, 'checkSmemo');/* 备注 */ @@ -1131,7 +1131,7 @@ class ProductionReport extends Component { dataIndex: 'sMemo', key: 'sMemo', }]; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); const btnSure = commonFunc.showMessage(app.commonConst, 'btnSure');/* 确认 */ const check = commonFunc.showMessage(app.commonConst, 'check');/* 审核 */ const BtnClose = commonFunc.showMessage(app.commonConst, 'BtnClose');/* 关闭 */ diff --git a/src/components/QuoQuotation/Quotation/Quotation.js b/src/components/QuoQuotation/Quotation/Quotation.js index 2f65f00..1ecbb4b 100644 --- a/src/components/QuoQuotation/Quotation/Quotation.js +++ b/src/components/QuoQuotation/Quotation/Quotation.js @@ -3705,8 +3705,8 @@ class Quotation extends Component { } render() { - const { pageLoading, masterData, fastOrderModalVisible } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return (