diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js index 61cfb3d..a7c2a51 100644 --- a/src/components/Common/CommonBillEvent.js +++ b/src/components/Common/CommonBillEvent.js @@ -3477,7 +3477,7 @@ export default (ChildComponent) => { const tableRow = tableData.find(item => item.sId === treeSelectedKeys[0]); if(commonUtils.isNotEmptyObject(tableRow)) { const controlChildData = tableData.filter(item => commonUtils.isNotEmptyObject(item.sControlParentId) && item.sControlParentId === tableRow.sNodeId); - console.log('ziji', controlChildData); + controlChildData.forEach((itemNew) => { tableSelectedRowKeys.push(itemNew.sId); }); diff --git a/src/components/Common/CommonListSelectFlex/index.js b/src/components/Common/CommonListSelectFlex/index.js index 3c37748..33dd0ed 100644 --- a/src/components/Common/CommonListSelectFlex/index.js +++ b/src/components/Common/CommonListSelectFlex/index.js @@ -246,7 +246,7 @@ class CommonList extends Component { } handleTableSelectRowChange = (name, selectedRowKeys, changeValue, chooseProcessParams) => { /* 表格行选择 */ - const bContinueClick = true; + const bContinueClick = false; if (bContinueClick) { /* 连续点击 */ this.handleTableSelectRowChangeContinue(name, selectedRowKeys, changeValue, chooseProcessParams); } else { @@ -462,7 +462,7 @@ const CommonListComponent = Form.create({ tableProps: { rowKey: 'sSlaveId', pagination, onChange: props.onTitleChange, chooseProcessParams: true, sModelsType, AutoTableHeight: 350, // chooseProcessParams为选择工序中点击工序名称表格行出现弹窗 }, - bContinueClick: true, + // bContinueClick: true, }; const tableFilterProps = { diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 04082aa..1695223 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -7528,7 +7528,7 @@ const CommonTable = (props) => { setUpdateRowNumTime(pre => pre + 1); } const uniqueTableId = `table_${props.formId}_${props.config?.sId}`; - + addState.xlyTableMax = props.app?.currentPane?.route === "/indexPage/commonList" && localStorage.getItem(`${commonConfig.prefix}TableMax`); return ( diff --git a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js index 990adf3..87e6e94 100644 --- a/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js +++ b/src/components/Manufacture/ProcessCardPackTableTreeNew/index.js @@ -225,7 +225,7 @@ const ProcessCardPackTableTreeNewEvent = props => { }, {}); const func = props[`${tableName}Props`]?.[funcName]; - console.log("=====func", func); + if (func) { return func(params); } diff --git a/src/utils/config.js b/src/utils/config.js index 2ef3f2c..252e3ec 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -9,7 +9,9 @@ const API = process.env.API; const bHttps = false; export const webSite = { faceAddress: isDev ? '//118.178.19.35:8088/xlyFace' : '//' + location.host + '/xlyFace', - 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/', + // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//118.178.19.35:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/', + // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//8.130.144.93:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/', interfaceAddress: localStorage.apiAddress ? localStorage.apiAddress : isDev ? '//118.178.19.35:8088/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址 fileAddress: isDev ? '//118.178.19.35:8088/xlyReport/' : '//' + location.host + '/xlyReport/', // 接口地址 fileAddressEbc: isDev ? '//118.178.19.35:8088/xlyReport/' : '//' + location.host + '/xlyReport/',