Commit 9866d8b98b72c1b12159fcb13163962383bb6a7d

Authored by Min
1 parent a405ceef

1.处理工艺卡复制到没反应bug

src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
@@ -998,7 +998,7 @@ const ProcessCardPackTableTreeNewEvent = props => { @@ -998,7 +998,7 @@ const ProcessCardPackTableTreeNewEvent = props => {
998 returnProps.onButtonClick = handleButtonClick; 998 returnProps.onButtonClick = handleButtonClick;
999 999
1000 // 复制到 1000 // 复制到
1001 - const handleCopyTo = async (name, sActiveId) => { 1001 + const handleCopyTo = async (name, sActiveId, iFlag) => {
1002 /* 待用数据声明 */ 1002 /* 待用数据声明 */
1003 const { masterConfig, masterData, slaveData, controlData, materials0Data, processData, colorData, sModelsId, packData, formRoute } = props; 1003 const { masterConfig, masterData, slaveData, controlData, materials0Data, processData, colorData, sModelsId, packData, formRoute } = props;
1004 1004
@@ -1045,7 +1045,7 @@ const ProcessCardPackTableTreeNewEvent = props => { @@ -1045,7 +1045,7 @@ const ProcessCardPackTableTreeNewEvent = props => {
1045 const dataUrl = `${ 1045 const dataUrl = `${
1046 commonConfig.server_host 1046 commonConfig.server_host
1047 }bill/billCopyToCheck/?sModelsId=${sModelsId}&sActiveId=${sActiveId}&tbSuffix=${tbSuffix}&sName=${formRoute}`; 1047 }bill/billCopyToCheck/?sModelsId=${sModelsId}&sActiveId=${sActiveId}&tbSuffix=${tbSuffix}&sName=${formRoute}`;
1048 - const values = { sSlaveId: sId }; 1048 + const values = { sSlaveId: sId , iFlag: iFlag};
1049 const dataReturn = (await commonServices.postValueService(token, values, dataUrl)).data; 1049 const dataReturn = (await commonServices.postValueService(token, values, dataUrl)).data;
1050 if (dataReturn.code === 1) { 1050 if (dataReturn.code === 1) {
1051 if (dataReturn?.dataset?.rows?.length > 0) { 1051 if (dataReturn?.dataset?.rows?.length > 0) {
@@ -1059,6 +1059,18 @@ const ProcessCardPackTableTreeNewEvent = props => { @@ -1059,6 +1059,18 @@ const ProcessCardPackTableTreeNewEvent = props => {
1059 } else { 1059 } else {
1060 handleDispatch(copyTo, sActiveId); 1060 handleDispatch(copyTo, sActiveId);
1061 } 1061 }
  1062 + } else if (dataReturn.code === -7) {
  1063 + Modal.confirm({
  1064 + title: '是否继续', /* 防呆校验 */
  1065 + content: dataReturn.msg,
  1066 + onOk() {
  1067 + iFlag = 1;
  1068 + handleCopyTo(name,sActiveId, iFlag);
  1069 + },
  1070 + onCancel() {
  1071 + },
  1072 + });
  1073 + return true;
1062 } 1074 }
1063 }; 1075 };
1064 returnProps.onCopyTo = handleCopyTo; 1076 returnProps.onCopyTo = handleCopyTo;