diff --git a/src/mes/teamInfo/index.js b/src/mes/teamInfo/index.js
index 5399109..8c7538d 100644
--- a/src/mes/teamInfo/index.js
+++ b/src/mes/teamInfo/index.js
@@ -492,6 +492,14 @@ const TeamInfo = baseProps => {
sName: "slave0"
};
+ if(props.app?.userinfo?.sIPQCNameTmp){
+ if(props.slaveData && props.slaveData.length !== 0){
+ props.slaveData[0].sIpqcId2 = props.app?.userinfo?.sIPQCIdTmp;
+ props.slaveData[0].sIpqcName2 = props.app?.userinfo?.sIPQCNameTmp;
+ }
+
+ }
+
// 临时ipqc
const viewProps = {
...props,
@@ -502,8 +510,16 @@ const TeamInfo = baseProps => {
tableName: "slave",
viewRow: props.slaveData && props.slaveData.length !== 0 ? props.slaveData[0] : {},
onDataChange: (tableName, sName, returnValue , sId , dropDownData , isWait ) => {
- props.onSaveState({
- [`slaveData`]: [ {...props.slaveData[0] , ...returnValue} ]
+ const userinfo = props.app?.userinfo;
+ userinfo.sIPQCIdTmp = returnValue?.sIpqcId2;
+ userinfo.sIPQCNameTmp = returnValue?.sIpqcName2;
+ props.dispatch({
+ type: "app/saveUserinfo",
+ payload: userinfo
+ });
+
+ props.onSaveState({
+ [`slaveData`]: [ {...props.slaveData[0] , ...returnValue} ]
});
setTimeout(()=>{
// 调用指令集保存
@@ -511,7 +527,7 @@ const TeamInfo = baseProps => {
nextProps: { ...props , slaveData : [ {...props.slaveData[0] , ...returnValue} ] },
btnConfig: {
showName: "临时IPQC保存",
- sInstruct: props.slaveConfig?.gdsconfigformslave.filter(e=>e.showName == '保存' && e.sControlName == 'BtnEventSave')[0].sInstruct,
+ sInstruct: props.slaveConfig?.gdsconfigformslave.filter(e=>e.showName == '保存' && e.sControlName == 'BtnEventSave')[0]?.sInstruct,
error:(er)=>{
// this.setState({ dataValue: '' });
},
@@ -524,8 +540,8 @@ const TeamInfo = baseProps => {
};
// 清空临时IPQC
const clearTempIpqc = () => {
- props.onSaveState({
- [`slaveData`]: [ {...props.slaveData[0] , sIpqcId2:'' , sIpqcName2: '' } ]
+ props.onSaveState({
+ [`slaveData`]: [ {...props.slaveData[0] , sIpqcId2:'' , sIpqcName2: '' } ]
});
props.onExecInstructSet({
nextProps: { ...props , slaveData : [ {...props.slaveData[0] , sIpqcId2:'',sIpqcName2:''} ] },
@@ -603,7 +619,7 @@ const TeamInfo = baseProps => {