xlyErp / xlyUmi

Commit 161722ed88a8ab68cef5a7985950deee18656bc8

Authored by qmj
2 parents 5db52e08 2a4eb5f0

Merge remote-tracking branch 'origin/云南五彩' into 云南五彩

Inline Side-by-side
Showing 4 changed files with 3 additions and 7 deletions
src/components/Common/CommonNewBillEvent.js
  View file @161722e
... ... @@ -948,7 +948,7 @@ export default ChildComponent => {
948 948 this.props.getServiceError(dataReturn);
949 949 }
950 950 } else if (
951   - commonUtils.isNotEmptyArr(copyTo.config) &&
  951 + false && commonUtils.isNotEmptyArr(copyTo.config) &&
952 952 copyTo.config.filter(item => item.sControlName && item.sControlName.includes("TmpInfoBySql")).length > 1
953 953 ) {
954 954 const sTmpInfoConfig = copyTo.config.filter(item => item.sControlName && item.sControlName.includes("TmpInfoBySql"))[0];
... ...
src/components/Manufacture/CommonPackEvent.js
  View file @161722e
... ... @@ -92,7 +92,7 @@ const CommonPackEvent = props => {
92 92 };
93 93 returnProps.onGetParamsValue = handleGetParamsValue;
94 94 // 对processData数组进行排序
95   - const sortData = (tableData, processData) => {
  95 + const sortData = (tableData, processData = []) => {
96 96 processData.sort((g1, g2) => {
97 97 const iIndex1 = tableData.findIndex(item => item.sId === g1.sControlId) === -1 ? 999 : tableData.findIndex(item => item.sId === g1.sControlId);
98 98 if (g1.iOrder === undefined) {
... ...
src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
  View file @161722e
... ... @@ -1717,10 +1717,6 @@ const WorkOrderPackTableTreeNewEvent = props => {
1717 1717 let { masterData, slaveSelectedRowKeys } = props;
1718 1718 const bInsertMaterials = selectConfig?.sControlName?.toLowerCase().includes("inserttestmaterials");
1719 1719 const bTmpInfoBySql = selectConfig?.sControlName?.toLowerCase().includes("tmpinfobysql");
1720   - if (name === "productProcessInfo" && !bInsertMaterials) {
1721   - message.info("productProcessInfo已废弃，请改成TmpInfoBySql！");
1722   - return;
1723   - }
1724 1720 /* 插入测试材料 */
1725 1721 if(bInsertMaterials) {
1726 1722 let iSlaveIndex = -1;
... ...
src/utils/config.js
  View file @161722e
... ... @@ -9,7 +9,7 @@ const API = process.env.API;
9 9 const bHttps = localStorage.ipAddress ? false : location.protocol === 'https:';
10 10 export const webSite = {
11 11 faceAddress: isDev ? '//km5cjx.gnway.cc:36867/xlyFace' : '//' + location.host + '/xlyFace',
12   - ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:37845/xlyEntry/' : '//' + location.host + '/xlyEntry/',
  12 + ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/',
13 13  
14 14 // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//118.178.19.35:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/',
15 15 // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:36867/xlyEntry/' : '//' + location.host + '/xlyEntry/',
... ...