diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index e55b4cd..0bbd31a 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -1406,7 +1406,7 @@ export default class CommonComponent extends Component { obj.title = obj.value; } obj.placeholder = this.props.showConfig.placeholder; - + if (this.props.name === "tableS0" && this.props.showConfig.sName === "sStatus") { if (this.state.dataValue === "已提交") { obj.className = "sStatusSubmit"; @@ -2425,11 +2425,16 @@ export default class CommonComponent extends Component { searchPageNum: 0, searchTotalPageCount: 1, searchDropDownData: [], searchValue: '', spinState: false, }); } + const bUserName = location.pathname?.includes('loginMes') && this.props.showConfig.sName?.includes('sUserName'); // /* 调用父组件的回带函数 */ if (this.state.dataValue === returnValue[this.props.showConfig.sName]) { if (!this.completeFlag) { const addState = {}; - addState[this.props.showConfig.sName] = undefined; + if(bUserName) { + addState[this.props.showConfig.sName] = this.state.dataValue + ' '; + } else{ + addState[this.props.showConfig.sName] = undefined; + } setTimeout(() => { this.props.onChange(this.props.name, this.props.showConfig.sName, { ...returnValue, ...addState }, this.props.sId, dropDownDataNew); }, 0); @@ -2716,7 +2721,7 @@ export default class CommonComponent extends Component { // 登记取样特殊处理 if(slaveConfig.sId=='12710101117346647176280'){ - + if(innerInputProps.id.includes('bReturn')){ window.$xlyStorage = this.props.dataValue; } @@ -2725,7 +2730,7 @@ export default class CommonComponent extends Component { this.myRef.current.querySelector('input').addEventListener('keydown',(event)=>{ if (event.code === 'NumpadEnter' || event.code === 'Enter') { // 或者使用 event.keyCode === 13 - + event.preventDefault(); // 阻止默认行为 // console.log(this.value) // const inputValue = this.value; @@ -2767,7 +2772,7 @@ export default class CommonComponent extends Component { }) - + // debugger // innerInputProps.onPressEnter = (event2)=>{ // setTimeout(()=>{ @@ -3065,7 +3070,7 @@ export default class CommonComponent extends Component { const fieldDecoratorProps = this.getFieldDecoratorProps(); /* 通用组件(主表存在getFieldDecorator表单验证,而从表则不需要) */ - + // 班组报工,产量上报信息,label文字颜色特殊处理 if(slaveConfig.sId=='17087428780006438414984564455000'){ // 计件