diff --git a/src/components/Common/CommonNewBillEvent.js b/src/components/Common/CommonNewBillEvent.js index 2357fe6..7b2db58 100644 --- a/src/components/Common/CommonNewBillEvent.js +++ b/src/components/Common/CommonNewBillEvent.js @@ -948,7 +948,7 @@ export default ChildComponent => { this.props.getServiceError(dataReturn); } } else if ( - commonUtils.isNotEmptyArr(copyTo.config) && + false && commonUtils.isNotEmptyArr(copyTo.config) && copyTo.config.filter(item => item.sControlName && item.sControlName.includes("TmpInfoBySql")).length > 1 ) { const sTmpInfoConfig = copyTo.config.filter(item => item.sControlName && item.sControlName.includes("TmpInfoBySql"))[0]; diff --git a/src/components/Manufacture/CommonPackEvent.js b/src/components/Manufacture/CommonPackEvent.js index cb66440..899b997 100644 --- a/src/components/Manufacture/CommonPackEvent.js +++ b/src/components/Manufacture/CommonPackEvent.js @@ -92,7 +92,7 @@ const CommonPackEvent = props => { }; returnProps.onGetParamsValue = handleGetParamsValue; // 对processData数组进行排序 - const sortData = (tableData, processData) => { + const sortData = (tableData, processData = []) => { processData.sort((g1, g2) => { const iIndex1 = tableData.findIndex(item => item.sId === g1.sControlId) === -1 ? 999 : tableData.findIndex(item => item.sId === g1.sControlId); if (g1.iOrder === undefined) { diff --git a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js index 9c18692..da8039d 100644 --- a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js +++ b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js @@ -1717,10 +1717,6 @@ const WorkOrderPackTableTreeNewEvent = props => { let { masterData, slaveSelectedRowKeys } = props; const bInsertMaterials = selectConfig?.sControlName?.toLowerCase().includes("inserttestmaterials"); const bTmpInfoBySql = selectConfig?.sControlName?.toLowerCase().includes("tmpinfobysql"); - if (name === "productProcessInfo" && !bInsertMaterials) { - message.info("productProcessInfo已废弃,请改成TmpInfoBySql!"); - return; - } /* 插入测试材料 */ if(bInsertMaterials) { let iSlaveIndex = -1; diff --git a/src/utils/config.js b/src/utils/config.js index 91cf5f2..27d8eaa 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -9,7 +9,7 @@ const API = process.env.API; const bHttps = localStorage.ipAddress ? false : location.protocol === 'https:'; export const webSite = { faceAddress: isDev ? '//km5cjx.gnway.cc:36867/xlyFace' : '//' + location.host + '/xlyFace', - ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:37845/xlyEntry/' : '//' + location.host + '/xlyEntry/', + ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/', // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//118.178.19.35:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/', // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/',