Commit c7ef589047e5aa3372c51dd02843158a2b28be14
1 parent
4b9f8619
1.翻译MES弹窗取消,清空,确认
2.主表 printpdf支持打印pdf
Showing
3 changed files
with
3 additions
and
4 deletions
src/components/Common/CommonComponent/index.js
| @@ -2867,7 +2867,7 @@ export default class CommonComponent extends Component { | @@ -2867,7 +2867,7 @@ export default class CommonComponent extends Component { | ||
| 2867 | display: this.state.sActiveDisplay ? 'block' : 'none', | 2867 | display: this.state.sActiveDisplay ? 'block' : 'none', |
| 2868 | // top: this.props.name === 'slaveInfo' ? '1px' : '', | 2868 | // top: this.props.name === 'slaveInfo' ? '1px' : '', |
| 2869 | // left: this.props.name === 'slaveInfo' ? '2px' : this.props.name === 'master' ? '1px' : '', | 2869 | // left: this.props.name === 'slaveInfo' ? '2px' : this.props.name === 'master' ? '1px' : '', |
| 2870 | - position: 'absolute', | 2870 | + // position: 'absolute', |
| 2871 | height: '100%', | 2871 | height: '100%', |
| 2872 | overflow: 'hidden', | 2872 | overflow: 'hidden', |
| 2873 | }} | 2873 | }} |
src/mes/common/commonModelComponent/index.js
| @@ -1936,7 +1936,7 @@ const CommonRepairComponent = props => { | @@ -1936,7 +1936,7 @@ const CommonRepairComponent = props => { | ||
| 1936 | filterConfig, | 1936 | filterConfig, |
| 1937 | record = {}, | 1937 | record = {}, |
| 1938 | callback, | 1938 | callback, |
| 1939 | - confirmBtnName = "确认", | 1939 | + confirmBtnName = "Sure", |
| 1940 | enabled = true, | 1940 | enabled = true, |
| 1941 | width = 600, | 1941 | width = 600, |
| 1942 | height = "auto", | 1942 | height = "auto", |
| @@ -2049,7 +2049,7 @@ const CommonRepairComponent = props => { | @@ -2049,7 +2049,7 @@ const CommonRepairComponent = props => { | ||
| 2049 | <Space> | 2049 | <Space> |
| 2050 | {/* // OQC标签弹窗添加清空按钮 */} | 2050 | {/* // OQC标签弹窗添加清空按钮 */} |
| 2051 | { | 2051 | { |
| 2052 | - params.tableName=='slaveWyrj2'? <Button size="large" onClick={onEmptyClick}>清空</Button> : null | 2052 | + params.tableName=='slaveWyrj2'? <Button size="large" onClick={onEmptyClick}>Clear</Button> : null |
| 2053 | } | 2053 | } |
| 2054 | <Button size="large" onClick={onCancel}> | 2054 | <Button size="large" onClick={onCancel}> |
| 2055 | {BtnCancel} | 2055 | {BtnCancel} |
src/mes/common/commonOperationBarComponent/index.js
| @@ -1021,7 +1021,6 @@ const CommonOperationBarComponent = basProps => { | @@ -1021,7 +1021,6 @@ const CommonOperationBarComponent = basProps => { | ||
| 1021 | <div className="leftBar"> | 1021 | <div className="leftBar"> |
| 1022 | <Space> | 1022 | <Space> |
| 1023 | {btnLeftConfig.map(item => { | 1023 | {btnLeftConfig.map(item => { |
| 1024 | - console.log('ssss', item); | ||
| 1025 | let sTooltip = item.showName +'-'+ item.sChinese || item.showName ; | 1024 | let sTooltip = item.showName +'-'+ item.sChinese || item.showName ; |
| 1026 | if(item.showName === 'Proofreading/revision Complete'){ | 1025 | if(item.showName === 'Proofreading/revision Complete'){ |
| 1027 | sTooltip = item.showName + '-装校版结束'; | 1026 | sTooltip = item.showName + '-装校版结束'; |