Commit 79352ea2bf4c21687ea3421913c26347c11c7fbc

Authored by Min
1 parent 59ea8ea6

1.班组信息记忆临时ipqc

Showing 1 changed file with 22 additions and 6 deletions
src/mes/teamInfo/index.js
@@ -492,6 +492,14 @@ const TeamInfo = baseProps => { @@ -492,6 +492,14 @@ const TeamInfo = baseProps => {
492 sName: "slave0" 492 sName: "slave0"
493 }; 493 };
494 494
  495 + if(props.app?.userinfo?.sIPQCNameTmp){
  496 + if(props.slaveData && props.slaveData.length !== 0){
  497 + props.slaveData[0].sIpqcId2 = props.app?.userinfo?.sIPQCIdTmp;
  498 + props.slaveData[0].sIpqcName2 = props.app?.userinfo?.sIPQCNameTmp;
  499 + }
  500 +
  501 + }
  502 +
495 // 临时ipqc 503 // 临时ipqc
496 const viewProps = { 504 const viewProps = {
497 ...props, 505 ...props,
@@ -502,8 +510,16 @@ const TeamInfo = baseProps => { @@ -502,8 +510,16 @@ const TeamInfo = baseProps => {
502 tableName: "slave", 510 tableName: "slave",
503 viewRow: props.slaveData && props.slaveData.length !== 0 ? props.slaveData[0] : {}, 511 viewRow: props.slaveData && props.slaveData.length !== 0 ? props.slaveData[0] : {},
504 onDataChange: (tableName, sName, returnValue , sId , dropDownData , isWait ) => { 512 onDataChange: (tableName, sName, returnValue , sId , dropDownData , isWait ) => {
505 - props.onSaveState({  
506 - [`slaveData`]: [ {...props.slaveData[0] , ...returnValue} ] 513 + const userinfo = props.app?.userinfo;
  514 + userinfo.sIPQCIdTmp = returnValue?.sIpqcId2;
  515 + userinfo.sIPQCNameTmp = returnValue?.sIpqcName2;
  516 + props.dispatch({
  517 + type: "app/saveUserinfo",
  518 + payload: userinfo
  519 + });
  520 +
  521 + props.onSaveState({
  522 + [`slaveData`]: [ {...props.slaveData[0] , ...returnValue} ]
507 }); 523 });
508 setTimeout(()=>{ 524 setTimeout(()=>{
509 // 调用指令集保存 525 // 调用指令集保存
@@ -511,7 +527,7 @@ const TeamInfo = baseProps => { @@ -511,7 +527,7 @@ const TeamInfo = baseProps => {
511 nextProps: { ...props , slaveData : [ {...props.slaveData[0] , ...returnValue} ] }, 527 nextProps: { ...props , slaveData : [ {...props.slaveData[0] , ...returnValue} ] },
512 btnConfig: { 528 btnConfig: {
513 showName: "临时IPQC保存", 529 showName: "临时IPQC保存",
514 - sInstruct: props.slaveConfig?.gdsconfigformslave.filter(e=>e.showName == '保存' && e.sControlName == 'BtnEventSave')[0].sInstruct, 530 + sInstruct: props.slaveConfig?.gdsconfigformslave.filter(e=>e.showName == '保存' && e.sControlName == 'BtnEventSave')[0]?.sInstruct,
515 error:(er)=>{ 531 error:(er)=>{
516 // this.setState({ dataValue: '' }); 532 // this.setState({ dataValue: '' });
517 }, 533 },
@@ -524,8 +540,8 @@ const TeamInfo = baseProps => { @@ -524,8 +540,8 @@ const TeamInfo = baseProps => {
524 }; 540 };
525 // 清空临时IPQC 541 // 清空临时IPQC
526 const clearTempIpqc = () => { 542 const clearTempIpqc = () => {
527 - props.onSaveState({  
528 - [`slaveData`]: [ {...props.slaveData[0] , sIpqcId2:'' , sIpqcName2: '' } ] 543 + props.onSaveState({
  544 + [`slaveData`]: [ {...props.slaveData[0] , sIpqcId2:'' , sIpqcName2: '' } ]
529 }); 545 });
530 props.onExecInstructSet({ 546 props.onExecInstructSet({
531 nextProps: { ...props , slaveData : [ {...props.slaveData[0] , sIpqcId2:'',sIpqcName2:''} ] }, 547 nextProps: { ...props , slaveData : [ {...props.slaveData[0] , sIpqcId2:'',sIpqcName2:''} ] },
@@ -603,7 +619,7 @@ const TeamInfo = baseProps => { @@ -603,7 +619,7 @@ const TeamInfo = baseProps => {
603 <CommonViewTable {...viewProps} className="temporaryIpqc"></CommonViewTable> 619 <CommonViewTable {...viewProps} className="temporaryIpqc"></CommonViewTable>
604 <Button style={{ 'position': 'absolute' , 'top': '20%' ,'right': '2%'}} type="primary" onClick={() => { clearTempIpqc() }} > 清空 </Button> 620 <Button style={{ 'position': 'absolute' , 'top': '20%' ,'right': '2%'}} type="primary" onClick={() => { clearTempIpqc() }} > 清空 </Button>
605 </div> 621 </div>
606 - 622 +
607 </div> 623 </div>
608 </div> 624 </div>
609 <div className="postList"> 625 <div className="postList">