From 59f470d82a6a6bff3bad915ed1816a5ea83e490f Mon Sep 17 00:00:00 2001 From: pengm <674192343@qq.com> Date: Fri, 20 Jun 2025 11:52:28 +0800 Subject: [PATCH] 1.处理上查，下查 2.完善翻译 --- src/components/Common/CommonBillEvent.js | 5 +++-- src/components/Common/CommonComponent/index.js | 4 +++- src/components/Common/CommonCostomTabBill.js | 8 +++++--- src/components/Common/CommonListSelectFlex/index.js | 4 ++-- src/components/Common/CommonListSelectMulti/index.js | 623 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ src/components/Common/CommonNewBillEvent.js | 4 ++-- src/components/Common/CommonSubBillEvent.js | 4 ++-- src/components/Common/ToolBar/ToolBarNew.js | 6 ++++-- src/components/CommonElementEvent/SftLoginInfo.js | 3 ++- src/components/Manufacture/WorkOrderPackTableTreeNew/index.js | 21 ++++++++++++++------- src/utils/config.js | 4 ++-- 11 files changed, 386 insertions(+), 300 deletions(-) diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js index 3fc2fd8..e4d6bdb 100644 --- a/src/components/Common/CommonBillEvent.js +++ b/src/components/Common/CommonBillEvent.js @@ -2829,7 +2829,8 @@ export default (ChildComponent) => { /* 上一条、下一条、首条、末条 */ handleSearchData = async (handleType) => { const { - sModelsId, app, currentIndexFlag, currentPageNo, masterData, masterConfig, slaveConfig, checkConfig + sModelsId, app, currentIndexFlag, currentPageNo, masterData, masterConfig, slaveConfig, checkConfig, + sSrcModelsId, } = this.props; let { sBillIdsArray = []} = this.props; let { currentId } = this.props; @@ -2888,7 +2889,7 @@ export default (ChildComponent) => { if(!bExist) { const value = { sClientType: '1', sFilterOrderBy, bFilter, sListFormmasterId, currentPosition, handleType, iCountSum: pages.total, - sUpId: masterData?.sId, + sUpId: masterData?.sId, sParentModelId :sSrcModelsId, }; const url = `${commonConfig.server_host}business/getBusinessDataByIndex?sModelsId=${sModelsId}`; /* 接收返回值 */ diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index 356ca1b..c270fe7 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -2758,15 +2758,17 @@ export default class CommonComponent extends Component { */ floatNumberCheck = (num) => { const dNetPrice = this.props.app?.decimals?.dNetPrice; + const Maximum = commonFunc.showLocalMessage(this.props, 'Maximum', '最多输入${digit}位小数'); const { showConfig } = this.props; const { sName, showName } = showConfig; const digit = sName.includes('Price') && dNetPrice ? dNetPrice : 6; + const Maximun = Maximum.replace('${digit}', digit); if (typeof num === 'string') { num = num.replace('*', ''); } const checkRule = new RegExp(`^(-?\\d+)(\\.?)(\\d{1,${digit}})?$`); if (!checkRule.test(num) && num && num !== '-' && num !== '.') { - message.warning(`【${showName}】【${sName}】最多输入${digit}位小数！`); + message.warning(`【${showName}】【${sName}】${Maximun}`); return undefined; } else { return num; diff --git a/src/components/Common/CommonCostomTabBill.js b/src/components/Common/CommonCostomTabBill.js index 57db879..4ff6c97 100644 --- a/src/components/Common/CommonCostomTabBill.js +++ b/src/components/Common/CommonCostomTabBill.js @@ -2371,6 +2371,8 @@ class CommonNewBill extends Component { slave6Child1Config, slave6Child1InfoConfig, } = this.props; + const confirmSetting = commonFunc.showLocalMessage(this.props, 'confirmSetting', '请配置按钮的存储过程'); + const confirmSettingParam = commonFunc.showLocalMessage(this.props, 'confirmSettingParam', '请先操作参数运算'); const iIndex = commonUtils.isNotEmptyObject(tableSelectedRowKeys) && commonUtils.isNotEmptyArr(tableData) @@ -2388,7 +2390,7 @@ class CommonNewBill extends Component { showConfig.sControlName.includes("BtnCustom.dSplitworkQty") ) { if (masterData.bFirstCalc !== 1) { - message.error("请先操作参数运算！"); + message.error(confirmSettingParam); return; } this.props.onSaveState({ pageLoading: true }); @@ -2435,7 +2437,7 @@ class CommonNewBill extends Component { }); } } else { - message.error("请正确配置存储过程名称！"); + message.error(confirmSetting); } } else if ( commonUtils.isNotEmptyObject(showConfig) && @@ -2523,7 +2525,7 @@ class CommonNewBill extends Component { }); } } else { - message.error("请正确配置存储过程名称！"); + message.error(confirmSetting); } } }; diff --git a/src/components/Common/CommonListSelectFlex/index.js b/src/components/Common/CommonListSelectFlex/index.js index 1d544ab..3c37748 100644 --- a/src/components/Common/CommonListSelectFlex/index.js +++ b/src/components/Common/CommonListSelectFlex/index.js @@ -501,8 +501,8 @@ const CommonListComponent = Form.create({ const sProcessParams = commonFunc.showMessage(app.commonConst, 'sProcessParams');/* 选择工艺参数标题 */ const displayLeft = (sModelsType !== 'search/sisColor' && sModelsType !== 'search/commonPopup'); - const BtnSure = commonFunc.showLocalMessage(this.props, 'BtnSure', '确定'); - const BtnCancel = commonFunc.showLocalMessage(this.props, 'BtnCancel', '取消'); + const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确定'); + const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消'); return (
diff --git a/src/components/Common/CommonListSelectMulti/index.js b/src/components/Common/CommonListSelectMulti/index.js index 367cdf2..25d7ad4 100644 --- a/src/components/Common/CommonListSelectMulti/index.js +++ b/src/components/Common/CommonListSelectMulti/index.js @@ -1,23 +1,23 @@ -import React, { Component } from 'react'; -import { DownOutlined } from '@ant-design/icons'; -import { Form } from '@ant-design/compatible'; +import React, { Component } from "react"; +import { DownOutlined } from "@ant-design/icons"; +import { Form } from "@ant-design/compatible"; // import '@ant-design/compatible/assets/index.css'; -import { Layout, Spin, Button, Row, Col, message } from 'antd-v4'; -import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */ +import { Layout, Spin, Button, Row, Col, message } from "antd-v4"; +import CommonListEvent from "@/components/Common/CommonListEvent"; /* 继承销售模块业务功能 */ // import * as commonUtils from '../../utils/utils'; /* 通用方法 */ -import * as commonFunc from '@/components/Common//commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ +import * as commonFunc from "@/components/Common//commonFunc"; /* 通用单据方法 */ /* 通用单据方法 */ // eslint-disable-next-line import/no-named-as-default -import StaticEditTable from '@/components/Common//CommonTable';/* 可编辑表格 */ -import StaticEditTree from '@/components/Common/Tree/StaticTree'; -import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */ -import * as commonBusiness from '@/components/Common//commonBusiness';/* 单据业务功能 */ -import SearchComponent from '@/components/Common/SearchComponent'; -import AntdDraggableModal from '@/components/Common/AntdDraggableModal'; -import * as commonUtils from '@/utils/utils'; -import ShowType from '@/components/Common/CommonComponent'; -import commonConfig from '@/utils/config'; +import StaticEditTable from "@/components/Common//CommonTable"; /* 可编辑表格 */ +import StaticEditTree from "@/components/Common/Tree/StaticTree"; +import CommonBase from "@/components/Common/CommonBase"; /* 获取配置及数据 */ +import * as commonBusiness from "@/components/Common//commonBusiness"; /* 单据业务功能 */ +import SearchComponent from "@/components/Common/SearchComponent"; +import AntdDraggableModal from "@/components/Common/AntdDraggableModal"; +import * as commonUtils from "@/utils/utils"; +import ShowType from "@/components/Common/CommonComponent"; +import commonConfig from "@/utils/config"; // eslint-disable-next-line no-unused-vars -import stylesIndex from '@/components/Common/CommonListSelectMulti/index.less'; +import stylesIndex from "@/components/Common/CommonListSelectMulti/index.less"; // import DelIcon from '../../assets/delete.svg'; // import DisableDelIcon from '../../assets/disabledelete.svg'; @@ -34,20 +34,18 @@ class CommonList extends Component { }; } componentWillReceiveProps(nextProps) { - const { - slaveData, selectedRowKeys, sModelsType, slaveFilterData, slaveSelectedData, masterConfig, - gdsjurisdiction, - } = nextProps; - if (slaveFilterData === undefined && sModelsType === 'search/sisColor') { + const { slaveData, selectedRowKeys, sModelsType, slaveFilterData, slaveSelectedData, masterConfig, gdsjurisdiction } = nextProps; + if (slaveFilterData === undefined && sModelsType === "search/sisColor") { if (commonUtils.isNotEmptyArr(slaveData) && commonUtils.isNotEmptyArr(selectedRowKeys)) { const slaveFilterData = slaveData.filter(item => selectedRowKeys.includes(item.sSlaveId)); if (commonUtils.isNotEmptyArr(slaveFilterData)) { this.props.onSaveState({ - slaveFilterData, slaveSelectedRowKeys: selectedRowKeys, + slaveFilterData, + slaveSelectedRowKeys: selectedRowKeys, }); } } - } else if (commonUtils.isEmptyArr(slaveFilterData) && sModelsType === 'search/commonPopup') { + } else if (commonUtils.isEmptyArr(slaveFilterData) && sModelsType === "search/commonPopup") { if (commonUtils.isNotEmptyArr(slaveData) && commonUtils.isNotEmptyArr(slaveSelectedData)) { this.props.onSaveState({ slaveFilterData: slaveSelectedData, @@ -57,13 +55,17 @@ class CommonList extends Component { if (masterConfig) { // 过滤存储需要展示的按钮 let btnList = masterConfig.gdsconfigformslave.filter(item => item.bVisible && !item.sName && item.showName && item.sControlName); - btnList = btnList.filter(item => gdsjurisdiction.findIndex(child => item.sControlName === child.sAction) < 0 && (item.sControlName.includes('BtnAdd') || item.sControlName.includes('BtnCopyTo'))); + btnList = btnList.filter( + item => + gdsjurisdiction.findIndex(child => item.sControlName === child.sAction) < 0 && + (item.sControlName.includes("BtnAdd") || item.sControlName.includes("BtnCopyTo")) + ); // 过滤权限 this.setState({ btnList }); } if (this.state.openFlag) { this.setState({ openFlag: false }, () => { - this.props.onButtonClick('BtnRefresh'); + this.props.onButtonClick("BtnRefresh"); }); } } @@ -71,21 +73,21 @@ class CommonList extends Component { onOpenNewTab = () => { this.setState({ openFlag: true }); this.props.onOpenNewTab(); - } + }; /** 确认下单 */ handleSelect = () => { - const { - slaveFilterData, app, processData, controlSelectedRowKeys, - } = this.props; + const { slaveFilterData, app, processData, controlSelectedRowKeys } = this.props; let startIndex = 0; /* 最开始下标 */ const iOrderArr = []; /* 当前控制表选中行下的工序 接着编号 */ - const filterData = commonUtils.isNotEmptyArr(processData) && commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? - processData.filter(item => controlSelectedRowKeys.includes(item.sControlId)) : []; + const filterData = + commonUtils.isNotEmptyArr(processData) && commonUtils.isNotEmptyArr(controlSelectedRowKeys) + ? processData.filter(item => controlSelectedRowKeys.includes(item.sControlId)) + : []; if (commonUtils.isNotEmptyArr(filterData)) { /* 找到最大序号值 接着拍 */ - filterData.forEach((item) => { + filterData.forEach(item => { const iOrder = commonUtils.isNotEmptyNumber(item.iOrder) ? item.iOrder : 0; /* 获取tableData中iOrder最大值 */ iOrderArr.push(iOrder); }); @@ -108,10 +110,11 @@ class CommonList extends Component { }; handleDoubleClickSelect = () => { const { slaveConfig } = this.props; - if (commonUtils.isNotEmptyObject(slaveConfig) && !slaveConfig.bMutiSelect) { // 单选时双击选中数据 + if (commonUtils.isNotEmptyObject(slaveConfig) && !slaveConfig.bMutiSelect) { + // 单选时双击选中数据 this.handleSelect(); } - } + }; /** 关闭 */ handleCancelModal = () => { const { app } = this.props; @@ -125,17 +128,17 @@ class CommonList extends Component { handleTreeSelect = (name, checkedKeys, e) => { this.props.onSelect(name, checkedKeys, e); /* 调用CommonListEvent通用处理 */ }; - handleTableSelectRowChange = (name, selectedRowKeys, changeValue, chooseProcessParams) => { /* 表格行选择 */ + handleTableSelectRowChange = (name, selectedRowKeys, changeValue, chooseProcessParams) => { + /* 表格行选择 */ this.props.onTableSelectRowChange(name, selectedRowKeys); - if (name === 'slave') { /* 选择工序 从表表 */ - const { - [`${name}Data`]: tableData, slaveConfig, fatherModelsType, sModelsType, - } = this.props; + if (name === "slave") { + /* 选择工序 从表表 */ + const { [`${name}Data`]: tableData, slaveConfig, fatherModelsType, sModelsType } = this.props; const { selectedRowKeysLength } = this.props; const { slaveFilterData } = this.props; const oldSlaveFilterData = slaveFilterData === undefined ? [] : JSON.parse(JSON.stringify(slaveFilterData)); const newSlaveFilterData = []; - selectedRowKeys.forEach((key) => { + selectedRowKeys.forEach(key => { const filterDataIndex = oldSlaveFilterData.findIndex(item => item.sSlaveId === key); if (filterDataIndex < 0) { const tableDataIndex = tableData.findIndex(item => item.sSlaveId === key); @@ -144,8 +147,9 @@ class CommonList extends Component { newSlaveFilterData.push({ ...oldSlaveFilterData[filterDataIndex] }); } }); - let sDeliverRemark = ''; - if (sModelsType === 'search/commonPopup') { /* 选择成品库存 改变时候 增加数量信息提示 */ + let sDeliverRemark = ""; + if (sModelsType === "search/commonPopup") { + /* 选择成品库存 改变时候 增加数量信息提示 */ let dChooseProductQty = 0; let dSrcQty = 0; let dMinsQty = 0; /* 欠数 */ @@ -160,19 +164,22 @@ class CommonList extends Component { } this.props.onSaveState({ - slaveFilterData: newSlaveFilterData, sDeliverRemark, + slaveFilterData: newSlaveFilterData, + sDeliverRemark, }); if (chooseProcessParams) { let modalVisible = false; let slaveSelectOneData = {}; let slaveSelectOneDataIndex = -1; if (commonUtils.isNotEmptyArr(tableData)) { - if (selectedRowKeys instanceof Array) { // 多选情况下 - if (commonUtils.isEmpty(selectedRowKeysLength) || (selectedRowKeys.length - selectedRowKeysLength) > 0) { + if (selectedRowKeys instanceof Array) { + // 多选情况下 + if (commonUtils.isEmpty(selectedRowKeysLength) || selectedRowKeys.length - selectedRowKeysLength > 0) { modalVisible = true; } slaveSelectOneDataIndex = tableData.findIndex(item => item.sId === selectedRowKeys[selectedRowKeys.length - 1]); // 多选选择最后一个 - } else { // 单选情况下 + } else { + // 单选情况下 slaveSelectOneDataIndex = tableData.findIndex(item => item.sId === selectedRowKeys); } if (slaveSelectOneDataIndex > -1) { @@ -181,14 +188,14 @@ class CommonList extends Component { } // let masterData = {}; const sProcessParamsSelects = []; - let paramType = ''; + let paramType = ""; if (commonUtils.isNotEmptyObject(slaveSelectOneData) && commonUtils.isNotEmptyObject(fatherModelsType)) { - if (fatherModelsType.includes('manufacture/')) { + if (fatherModelsType.includes("manufacture/")) { paramType = slaveSelectOneData.sWorkOrderParam; if (commonUtils.isNotEmptyObject(slaveSelectOneData.sWorkOrderParam)) { slaveSelectOneData = { ...slaveSelectOneData, ...commonUtils.convertStrToObj(slaveSelectOneData.sWorkOrderParam) }; } - } else if (fatherModelsType.includes('quotation/')) { + } else if (fatherModelsType.includes("quotation/")) { paramType = slaveSelectOneData.sProcessParam; if (commonUtils.isNotEmptyObject(slaveSelectOneData.sProcessParam)) { slaveSelectOneData = { ...slaveSelectOneData, ...commonUtils.convertStrToObj(slaveSelectOneData.sProcessParam) }; @@ -200,36 +207,42 @@ class CommonList extends Component { bisMutiSelect: false, bMutiSelect: false, }; - const gdsconfigformslave = [{ - sId: commonUtils.createSid(), - sName: 'sId', - showName: '主键', - bVisible: false, - iFitWidth: 45, - }, { - sId: commonUtils.createSid(), - sName: 'bSelfCbx', - showName: '选择', - bVisible: true, - iFitWidth: 37, - }, { - sId: commonUtils.createSid(), - sName: 'sParamKey', - showName: '参数主键', - bVisible: false, - iFitWidth: 200, - }, { - sId: commonUtils.createSid(), - sName: 'sParamName', - showName: '参数名', - bVisible: true, - iFitWidth: 230, - }, { - sId: commonUtils.createSid(), - sName: 'sParamValue', - showName: '参数值', - bVisible: true, - }]; + const gdsconfigformslave = [ + { + sId: commonUtils.createSid(), + sName: "sId", + showName: "主键", + bVisible: false, + iFitWidth: 45, + }, + { + sId: commonUtils.createSid(), + sName: "bSelfCbx", + showName: "选择", + bVisible: true, + iFitWidth: 37, + }, + { + sId: commonUtils.createSid(), + sName: "sParamKey", + showName: "参数主键", + bVisible: false, + iFitWidth: 200, + }, + { + sId: commonUtils.createSid(), + sName: "sParamName", + showName: "参数名", + bVisible: true, + iFitWidth: 230, + }, + { + sId: commonUtils.createSid(), + sName: "sParamValue", + showName: "参数值", + bVisible: true, + }, + ]; sParamConfig.gdsconfigformslave = gdsconfigformslave; const sParamColumn = commonFunc.getHeaderConfig(sParamConfig); /* 要把数据以表格的形式显示出来 */ @@ -237,13 +250,13 @@ class CommonList extends Component { const sParamData = []; if (commonUtils.isNotEmptyArr(sParamJsonObj)) { for (const key of Object.keys(sParamJsonObj)) { - if (key.includes('sParam') && !key.includes('DropDown') && !key.includes('Default')) { + if (key.includes("sParam") && !key.includes("DropDown") && !key.includes("Default")) { const obj = {}; obj.sId = commonUtils.createSid(); obj.sParamKey = key; obj.sParamName = sParamJsonObj[key]; /* 找到数字 找到下拉数据源 */ - const num = key.replace(/[^\d]/g, '').trim(); + const num = key.replace(/[^\d]/g, "").trim(); if (Number(num)) { const number = Number(num); const sParamDropDownKey = `sParamDropDown${number}`; @@ -262,10 +275,10 @@ class CommonList extends Component { const iIndex = slaveConfig.gdsconfigformslave.findIndex(item => item.sName === `sParamValue${i.toString()}`); if (iIndex > -1 && !commonUtils.isEmpty(slaveSelectOneData[`sParam${i.toString()}`])) { slaveConfig.gdsconfigformslave[iIndex].showName = slaveSelectOneData[`sParam${i.toString()}`]; - slaveConfig.gdsconfigformslave[iIndex].bVisible = !slaveSelectOneData[`sParam${i.toString()}`].includes('参数值'); + slaveConfig.gdsconfigformslave[iIndex].bVisible = !slaveSelectOneData[`sParam${i.toString()}`].includes("参数值"); /* 判断是否是sql下拉 */ if (!commonUtils.isEmpty(slaveSelectOneData[`sParamDropDown${i.toString()}`])) { - slaveConfig.gdsconfigformslave[iIndex].sDropDownType = 'sql'; + slaveConfig.gdsconfigformslave[iIndex].sDropDownType = "sql"; } // masterData = { ...masterNewData, ...commonUtils.convertStrToObj(slaveFilterData[0].sProcessParam) }; sProcessParamsSelects.push(slaveConfig.gdsconfigformslave[iIndex]); @@ -295,7 +308,7 @@ class CommonList extends Component { sParamData, }); } - } else if (name === 'sParam' && commonUtils.isNotEmptyArr(selectedRowKeys)) { + } else if (name === "sParam" && commonUtils.isNotEmptyArr(selectedRowKeys)) { /* 点击工艺参数列表 根据点击行动态加载配置 */ const { sParamData, sParamConfig } = this.props; /* 找到最后一个选中 */ @@ -304,13 +317,13 @@ class CommonList extends Component { /* 选中数据时 塞入选中行的配置 */ if (iIndex > -1) { const sParamObj = sParamData[iIndex]; - const index = sParamConfig.gdsconfigformslave.findIndex(item => item.sName === 'sParamValue'); + const index = sParamConfig.gdsconfigformslave.findIndex(item => item.sName === "sParamValue"); if (index > -1) { if (commonUtils.isNotEmptyObject(sParamObj.sDropDownData)) { - sParamConfig.gdsconfigformslave[index].sDropDownType = 'const'; + sParamConfig.gdsconfigformslave[index].sDropDownType = "const"; sParamConfig.gdsconfigformslave[index].showDropDown = JSON.stringify(sParamObj.sDropDownData); } else { - sParamConfig.gdsconfigformslave[index].sDropDownType = ''; + sParamConfig.gdsconfigformslave[index].sDropDownType = ""; sParamConfig.gdsconfigformslave[index].showDropDown = undefined; } } @@ -325,20 +338,20 @@ class CommonList extends Component { }); } } - } + }; /* 连续点击 复制选择 */ - handleContinueTableSelectRowChange= (name, selectedRowKeys, changeValue, chooseProcessParams) => { /* 表格行选择 */ + handleContinueTableSelectRowChange = (name, selectedRowKeys, changeValue, chooseProcessParams) => { + /* 表格行选择 */ this.props.onTableSelectRowChange(name, selectedRowKeys); - if (name === 'slave') { /* 选择工序 从表表 */ - const { - [`${name}Data`]: tableData, slaveConfig, fatherModelsType, sModelsType, - } = this.props; + if (name === "slave") { + /* 选择工序 从表表 */ + const { [`${name}Data`]: tableData, slaveConfig, fatherModelsType, sModelsType } = this.props; const { selectedRowKeysLength } = this.props; const { slaveFilterData } = this.props; const oldSlaveFilterData = slaveFilterData === undefined ? [] : JSON.parse(JSON.stringify(slaveFilterData)); let newSlaveFilterData = []; - selectedRowKeys.forEach((key) => { + selectedRowKeys.forEach(key => { const filterDataIndex = oldSlaveFilterData.findIndex(item => item.sSlaveId === key); if (filterDataIndex < 0) { newSlaveFilterData = JSON.parse(JSON.stringify(oldSlaveFilterData)); @@ -347,7 +360,7 @@ class CommonList extends Component { const newRow = JSON.parse(JSON.stringify(tableData[tableDataIndex])); newRow.sId = commonUtils.createSid(); newRow.sSlaveId = newRow.sId; - newRow.handleType = 'add'; + newRow.handleType = "add"; newRow.key = newRow.sId; newSlaveFilterData.push(newRow); } @@ -357,13 +370,14 @@ class CommonList extends Component { const newRow = JSON.parse(JSON.stringify(oldSlaveFilterData[filterDataIndex])); newRow.sId = commonUtils.createSid(); newRow.sSlaveId = newRow.sId; - newRow.handleType = 'add'; + newRow.handleType = "add"; newRow.key = newRow.sId; newSlaveFilterData.push(newRow); } }); - let sDeliverRemark = ''; - if (sModelsType === 'search/commonPopup') { /* 选择成品库存 改变时候 增加数量信息提示 */ + let sDeliverRemark = ""; + if (sModelsType === "search/commonPopup") { + /* 选择成品库存 改变时候 增加数量信息提示 */ let dChooseProductQty = 0; let dSrcQty = 0; let dMinsQty = 0; /* 欠数 */ @@ -377,19 +391,22 @@ class CommonList extends Component { sDeliverRemark = `源单数量：${dSrcQty} 已选数量：${dChooseProductQty} 欠数：${dMinsQty}`; } this.props.onSaveState({ - slaveFilterData: newSlaveFilterData, sDeliverRemark, + slaveFilterData: newSlaveFilterData, + sDeliverRemark, }); if (chooseProcessParams) { let modalVisible = false; let slaveSelectOneData = {}; let slaveSelectOneDataIndex = -1; if (commonUtils.isNotEmptyArr(tableData)) { - if (selectedRowKeys instanceof Array) { // 多选情况下 - if (commonUtils.isEmpty(selectedRowKeysLength) || (selectedRowKeys.length - selectedRowKeysLength) > 0) { + if (selectedRowKeys instanceof Array) { + // 多选情况下 + if (commonUtils.isEmpty(selectedRowKeysLength) || selectedRowKeys.length - selectedRowKeysLength > 0) { modalVisible = true; } slaveSelectOneDataIndex = tableData.findIndex(item => item.sId === selectedRowKeys[selectedRowKeys.length - 1]); // 多选选择最后一个 - } else { // 单选情况下 + } else { + // 单选情况下 slaveSelectOneDataIndex = tableData.findIndex(item => item.sId === selectedRowKeys); } if (slaveSelectOneDataIndex > -1) { @@ -398,14 +415,14 @@ class CommonList extends Component { } // let masterData = {}; const sProcessParamsSelects = []; - let paramType = ''; + let paramType = ""; if (commonUtils.isNotEmptyObject(slaveSelectOneData) && commonUtils.isNotEmptyObject(fatherModelsType)) { - if (fatherModelsType.includes('manufacture/')) { + if (fatherModelsType.includes("manufacture/")) { paramType = slaveSelectOneData.sWorkOrderParam; if (commonUtils.isNotEmptyObject(slaveSelectOneData.sWorkOrderParam)) { slaveSelectOneData = { ...slaveSelectOneData, ...commonUtils.convertStrToObj(slaveSelectOneData.sWorkOrderParam) }; } - } else if (fatherModelsType.includes('quotation/')) { + } else if (fatherModelsType.includes("quotation/")) { paramType = slaveSelectOneData.sProcessParam; if (commonUtils.isNotEmptyObject(slaveSelectOneData.sProcessParam)) { slaveSelectOneData = { ...slaveSelectOneData, ...commonUtils.convertStrToObj(slaveSelectOneData.sProcessParam) }; @@ -417,36 +434,42 @@ class CommonList extends Component { bisMutiSelect: false, bMutiSelect: false, }; - const gdsconfigformslave = [{ - sId: commonUtils.createSid(), - sName: 'sId', - showName: '主键', - bVisible: false, - iFitWidth: 45, - }, { - sId: commonUtils.createSid(), - sName: 'bSelfCbx', - showName: '选择', - bVisible: true, - iFitWidth: 37, - }, { - sId: commonUtils.createSid(), - sName: 'sParamKey', - showName: '参数主键', - bVisible: false, - iFitWidth: 200, - }, { - sId: commonUtils.createSid(), - sName: 'sParamName', - showName: '参数名', - bVisible: true, - iFitWidth: 230, - }, { - sId: commonUtils.createSid(), - sName: 'sParamValue', - showName: '参数值', - bVisible: true, - }]; + const gdsconfigformslave = [ + { + sId: commonUtils.createSid(), + sName: "sId", + showName: "主键", + bVisible: false, + iFitWidth: 45, + }, + { + sId: commonUtils.createSid(), + sName: "bSelfCbx", + showName: "选择", + bVisible: true, + iFitWidth: 37, + }, + { + sId: commonUtils.createSid(), + sName: "sParamKey", + showName: "参数主键", + bVisible: false, + iFitWidth: 200, + }, + { + sId: commonUtils.createSid(), + sName: "sParamName", + showName: "参数名", + bVisible: true, + iFitWidth: 230, + }, + { + sId: commonUtils.createSid(), + sName: "sParamValue", + showName: "参数值", + bVisible: true, + }, + ]; sParamConfig.gdsconfigformslave = gdsconfigformslave; const sParamColumn = commonFunc.getHeaderConfig(sParamConfig); /* 要把数据以表格的形式显示出来 */ @@ -454,13 +477,13 @@ class CommonList extends Component { const sParamData = []; if (commonUtils.isNotEmptyArr(sParamJsonObj)) { for (const key of Object.keys(sParamJsonObj)) { - if (key.includes('sParam') && !key.includes('DropDown') && !key.includes('Default')) { + if (key.includes("sParam") && !key.includes("DropDown") && !key.includes("Default")) { const obj = {}; obj.sId = commonUtils.createSid(); obj.sParamKey = key; obj.sParamName = sParamJsonObj[key]; /* 找到数字 找到下拉数据源 */ - const num = key.replace(/[^\d]/g, '').trim(); + const num = key.replace(/[^\d]/g, "").trim(); if (Number(num)) { const number = Number(num); const sParamDropDownKey = `sParamDropDown${number}`; @@ -479,10 +502,10 @@ class CommonList extends Component { const iIndex = slaveConfig.gdsconfigformslave.findIndex(item => item.sName === `sParamValue${i.toString()}`); if (iIndex > -1 && !commonUtils.isEmpty(slaveSelectOneData[`sParam${i.toString()}`])) { slaveConfig.gdsconfigformslave[iIndex].showName = slaveSelectOneData[`sParam${i.toString()}`]; - slaveConfig.gdsconfigformslave[iIndex].bVisible = !slaveSelectOneData[`sParam${i.toString()}`].includes('参数值'); + slaveConfig.gdsconfigformslave[iIndex].bVisible = !slaveSelectOneData[`sParam${i.toString()}`].includes("参数值"); /* 判断是否是sql下拉 */ if (!commonUtils.isEmpty(slaveSelectOneData[`sParamDropDown${i.toString()}`])) { - slaveConfig.gdsconfigformslave[iIndex].sDropDownType = 'sql'; + slaveConfig.gdsconfigformslave[iIndex].sDropDownType = "sql"; } // masterData = { ...masterNewData, ...commonUtils.convertStrToObj(slaveFilterData[0].sProcessParam) }; sProcessParamsSelects.push(slaveConfig.gdsconfigformslave[iIndex]); @@ -512,7 +535,7 @@ class CommonList extends Component { sParamData, }); } - } else if (name === 'sParam' && commonUtils.isNotEmptyArr(selectedRowKeys)) { + } else if (name === "sParam" && commonUtils.isNotEmptyArr(selectedRowKeys)) { /* 点击工艺参数列表 根据点击行动态加载配置 */ const { sParamData, sParamConfig } = this.props; /* 找到最后一个选中 */ @@ -521,13 +544,13 @@ class CommonList extends Component { /* 选中数据时 塞入选中行的配置 */ if (iIndex > -1) { const sParamObj = sParamData[iIndex]; - const index = sParamConfig.gdsconfigformslave.findIndex(item => item.sName === 'sParamValue'); + const index = sParamConfig.gdsconfigformslave.findIndex(item => item.sName === "sParamValue"); if (index > -1) { if (commonUtils.isNotEmptyObject(sParamObj.sDropDownData)) { - sParamConfig.gdsconfigformslave[index].sDropDownType = 'const'; + sParamConfig.gdsconfigformslave[index].sDropDownType = "const"; sParamConfig.gdsconfigformslave[index].showDropDown = JSON.stringify(sParamObj.sDropDownData); } else { - sParamConfig.gdsconfigformslave[index].sDropDownType = ''; + sParamConfig.gdsconfigformslave[index].sDropDownType = ""; sParamConfig.gdsconfigformslave[index].showDropDown = undefined; } } @@ -542,22 +565,25 @@ class CommonList extends Component { }); } } - } + }; handleCancelProcessParamsModalVisible = () => { this.props.onSaveState({ sProcessParamsModalVisible: false, }); - } + }; handleProcessParamsOk1 = () => { - const { - slaveData, slaveSelectOneDataIndex, slaveFilterData, sProcessParamsSelects, - } = this.props; - let sProcessParamStr = ''; - if (commonUtils.isNotEmptyArr(slaveData) && !commonUtils.isEmpty(slaveSelectOneDataIndex) && commonUtils.isNotEmptyArr(slaveFilterData) && commonUtils.isNotEmptyArr(sProcessParamsSelects)) { + const { slaveData, slaveSelectOneDataIndex, slaveFilterData, sProcessParamsSelects } = this.props; + let sProcessParamStr = ""; + if ( + commonUtils.isNotEmptyArr(slaveData) && + !commonUtils.isEmpty(slaveSelectOneDataIndex) && + commonUtils.isNotEmptyArr(slaveFilterData) && + commonUtils.isNotEmptyArr(sProcessParamsSelects) + ) { // eslint-disable-next-line array-callback-return - sProcessParamsSelects.map((item) => { - let sParamValue = ''; + sProcessParamsSelects.map(item => { + let sParamValue = ""; if (commonUtils.isNotEmptyObject(slaveData[slaveSelectOneDataIndex][item.sName])) { sParamValue = slaveData[slaveSelectOneDataIndex][item.sName]; } @@ -570,17 +596,20 @@ class CommonList extends Component { slaveFilterData, sProcessParamsModalVisible: false, }); - } + }; handleProcessParamsOk = () => { - const { - slaveData, slaveSelectOneDataIndex, slaveFilterData, sProcessParamsSelects, sParamData, - } = this.props; + const { slaveData, slaveSelectOneDataIndex, slaveFilterData, sProcessParamsSelects, sParamData } = this.props; /* 保存时候把sParamData赛道sParam1中 */ - let sProcessParamStr = ''; - if (commonUtils.isNotEmptyArr(slaveData) && !commonUtils.isEmpty(slaveSelectOneDataIndex) && commonUtils.isNotEmptyArr(slaveFilterData) && commonUtils.isNotEmptyArr(sProcessParamsSelects)) { + let sProcessParamStr = ""; + if ( + commonUtils.isNotEmptyArr(slaveData) && + !commonUtils.isEmpty(slaveSelectOneDataIndex) && + commonUtils.isNotEmptyArr(slaveFilterData) && + commonUtils.isNotEmptyArr(sProcessParamsSelects) + ) { // eslint-disable-next-line array-callback-return - sProcessParamsSelects.map((item) => { - let sParamValue = ''; + sProcessParamsSelects.map(item => { + let sParamValue = ""; if (commonUtils.isNotEmptyObject(slaveData[slaveSelectOneDataIndex][item.sName])) { sParamValue = slaveData[slaveSelectOneDataIndex][item.sName]; } @@ -601,18 +630,32 @@ class CommonList extends Component { slaveFilterData, sProcessParamsModalVisible: false, }); - } + }; // ----------------------------数据修改回带end ---------------------------- // - copyTo = (sActiveId) => { + copyTo = sActiveId => { const { - dispatch, masterConfig, masterData, contactData, addressData, slavePagination, - sisproductclassifyProcessClassifyData, machineData, assortData, outsideData, processstyleData, processApsRuleData, - eleemployeeData, elemachineData, eleknifemouldproductData, eleknifemouldfileData, eleteststandarditemData, + dispatch, + masterConfig, + masterData, + contactData, + addressData, + slavePagination, + sisproductclassifyProcessClassifyData, + machineData, + assortData, + outsideData, + processstyleData, + processApsRuleData, + eleemployeeData, + elemachineData, + eleknifemouldproductData, + eleknifemouldfileData, + eleteststandarditemData, slaveSelectedData, } = this.props; const copyTo = {}; const copyToConfig = masterConfig.gdsconfigformslave.filter(item => item.sControlName.includes(name)); - copyTo.name = 'BtnCopyTo'; + copyTo.name = "BtnCopyTo"; copyTo.config = copyToConfig; copyTo.masterData = slaveSelectedData[0] || masterData; copyTo.supplyData = []; @@ -633,21 +676,21 @@ class CommonList extends Component { copyTo.eleknifemouldfileData = eleknifemouldfileData; copyTo.eleteststandarditemData = eleteststandarditemData; dispatch({ - type: 'content/onRouter', + type: "content/onRouter", payload: { - url: `${commonConfig.server_host}gdsmodule/getGdsmoduleById/${sActiveId}?sModelsId=${sActiveId}`, /* 接口地址 */ + url: `${commonConfig.server_host}gdsmodule/getGdsmoduleById/${sActiveId}?sModelsId=${sActiveId}` /* 接口地址 */, copyTo, pages: slavePagination, newRecordFlag: `NewRecord_${sActiveId}`, }, }); - } + }; - handleDrag = (data) => { + handleDrag = data => { this.props.onSaveState({ slaveFilterData: data, }); - } + }; handleTableDel = (name, isWait, tableSelectedRowKeys) => { const { slaveSelectedRowKeys } = this.props; @@ -659,14 +702,14 @@ class CommonList extends Component { }); this.props.onDataRowDel(name, isWait, tableSelectedRowKeys); } - } + }; /* 动态参数标题选择框 全选/取消全选 */ handleCheckParamChange = () => { const { sParamData, sParamColumn } = this.props; /* 全选 取消全选功能 */ if (commonUtils.isNotEmptyArr(sParamData)) { /* 标题bSelfCbx加标识 */ - const iIndex = sParamColumn.findIndex(item => item.dataIndex === 'bSelfCbx'); + const iIndex = sParamColumn.findIndex(item => item.dataIndex === "bSelfCbx"); if (iIndex > -1) { let bSelfCbx = false; if (sParamColumn[iIndex].bCheckAll) { @@ -684,13 +727,13 @@ class CommonList extends Component { sParamColumn, }); } - } + }; render() { const { pageLoading } = this.props; return ( -
+
-
+
{ +})(props => { const { form, onReturnForm, @@ -740,23 +783,28 @@ const CommonListComponent = Form.create({ onReturnForm(form); const pagination = { ...slavePagination, - size: 'large', + size: "large", showQuickJumper: true, hideOnSinglePage: false, showTotal: false, simple: true, }; const tableProps = { - ...commonBusiness.getTableTypes('slave', props), + ...commonBusiness.getTableTypes("slave", props), tableProps: { - rowKey: 'sSlaveId', pagination, onChange: props.onTitleChange, chooseProcessParams: true, sModelsType, AutoTableHeight: 350, // chooseProcessParams为选择工序中点击工序名称表格行出现弹窗 + rowKey: "sSlaveId", + pagination, + onChange: props.onTitleChange, + chooseProcessParams: true, + sModelsType, + AutoTableHeight: 350, // chooseProcessParams为选择工序中点击工序名称表格行出现弹窗 }, bContinueClick: true, }; const sParamProps = { - ...commonBusiness.getTableTypes('sParam', props), + ...commonBusiness.getTableTypes("sParam", props), tableProps: { - rowKey: 'sId', + rowKey: "sId", pagination, onChange: props.onTitleChange, sModelsType, @@ -776,17 +824,20 @@ const CommonListComponent = Form.create({ // disableimg: 删除, // }; const deleteSet = { - autoHeight: '100%', - setOpterationColumn: 'Y', + autoHeight: "100%", + setOpterationColumn: "Y", }; let tableFilterProps = { - ...commonBusiness.getTableTypes('slaveFilter', props), + ...commonBusiness.getTableTypes("slaveFilter", props), tableProps: { - rowSelection: null, rowKey: 'sSlaveId', onChange: props.onTitleChange, AutoTableHeight: 350, + rowSelection: null, + rowKey: "sSlaveId", + onChange: props.onTitleChange, + AutoTableHeight: 350, }, onDrag: props.onDrag, }; - if (props.sModelsType && props.sModelsType.includes('modal/searchProcess')) { + if (props.sModelsType && props.sModelsType.includes("modal/searchProcess")) { tableFilterProps = { ...tableFilterProps, ...deleteSet, @@ -800,11 +851,12 @@ const CommonListComponent = Form.create({ enabled: true, }; } - const tableBelone = commonUtils.isNotEmptyObject(app.currentPane) && commonUtils.isNotEmptyObject(app.currentPane.name) && app.currentPane.bEdit ? 'none' : 'list'; + const tableBelone = + commonUtils.isNotEmptyObject(app.currentPane) && commonUtils.isNotEmptyObject(app.currentPane.name) && app.currentPane.bEdit ? "none" : "list"; - const name = 'filterTree'; + const name = "filterTree"; const treeProps = { - ...commonBusiness.getTreeTypes('tree', props), + ...commonBusiness.getTreeTypes("tree", props), isSearch: false, checkable: false, [`${name}Column`]: props[`${name}Column`], @@ -829,17 +881,17 @@ const CommonListComponent = Form.create({ showLine: true, switcherIcon: , }; - const sProcessParams = commonFunc.showMessage(app.commonConst, 'sProcessParams');/* 选择工艺参数标题 */ - const displayLeft = (sModelsType !== 'search/sisColor' && sModelsType !== 'search/commonPopup'); + const sProcessParams = commonFunc.showMessage(app.commonConst, "sProcessParams"); /* 选择工艺参数标题 */ + const displayLeft = sModelsType !== "search/sisColor" && sModelsType !== "search/commonPopup"; const realizeHeight = commonUtils.isNotEmptyNumber(props.realizeHeight) ? props.realizeHeight : 0; - const BtnSure = commonFunc.showLocalMessage(this.props, 'BtnSure', '确定'); - const BtnCancel = commonFunc.showLocalMessage(this.props, 'BtnCancel', '取消'); - const btnClick = (btn) => { + const BtnSure = commonFunc.showLocalMessage(props, "BtnSure", "确定"); + const BtnCancel = commonFunc.showLocalMessage(props, "BtnCancel", "取消"); + const btnClick = btn => { const { sControlName } = btn; - const picArr = slaveConfig.gdsconfigformslave.filter(item => (item.sName === 'picArr')); + const picArr = slaveConfig.gdsconfigformslave.filter(item => item.sName === "picArr"); if (picArr.length) { - const sActiveId = picArr[0] ? picArr[0].sActiveId : ''; - if (sControlName === 'BtnAdd') { + const sActiveId = picArr[0] ? picArr[0].sActiveId : ""; + if (sControlName === "BtnAdd") { const params = { newRecordFlag: `NewRecord_${sActiveId}`, }; @@ -852,9 +904,9 @@ const CommonListComponent = Form.create({ } props.onAdd(params); props.onOpenNewTab(); - } else if (sControlName === 'BtnCopyTo') { + } else if (sControlName === "BtnCopyTo") { if (!Array.isArray(slaveSelectedData) || slaveSelectedData.length !== 1) { - message.warn('请选择一例单据'); // 请选择数据 + message.warn("请选择一例单据"); // 请选择数据 } else { onCopyTo(sActiveId); props.onOpenNewTab(); @@ -862,80 +914,97 @@ const CommonListComponent = Form.create({ } } }; + const filteItem = commonFunc.showLocalMessage(props, "filteItem", "过滤项"); return (
- +
-
+
0 ? `${500 + realizeHeight}px` : 'auto', paddingLeft: '10px' }} + className={realizeHeight <= 0 ? "xly-normal-list" : "xly-normal-list resize-container"} + style={{ height: realizeHeight > 0 ? `${500 + realizeHeight}px` : "auto", paddingLeft: "10px" }} > - {displayLeft ? - 0 ? `${500 + realizeHeight}px` : 'auto' }}> + {displayLeft ? ( + 0 ? `${500 + realizeHeight}px` : "auto" }}>
-
过滤项
+
{filteItem}
- : '' - } - 0 ? `${500 + realizeHeight}px` : 'auto' }} span={sModelsType === 'search/commonPopup' ? 15 : 5}> + + ) : ( + "" + )} + 0 ? `${500 + realizeHeight}px` : "auto" }} + span={sModelsType === "search/commonPopup" ? 15 : 5} + > - 0 ? `${500 + realizeHeight}px` : 'auto' }} span={displayLeft ? 15 : sModelsType === 'search/commonPopup' ? 9 : 19} > - + 0 ? `${500 + realizeHeight}px` : "auto" }} + span={displayLeft ? 15 : sModelsType === "search/commonPopup" ? 9 : 19} + > +
-
+
- { - props.btnList.map(btn => ( - - )) - } + {props.btnList.map(btn => ( + + ))}
- { - commonUtils.isNotEmptyObject(app.currentPane) && commonUtils.isNotEmptyObject(app.currentPane.name) && app.currentPane.bEdit ? -
{props.sDeliverRemark}
: '' - } -
{props.sDeliverRemark}
+ ) : ( + "" + )} +
- - + +
- { - false ? - -
- { commonUtils.isNotEmptyArr(sProcessParamsSelects) && commonUtils.isNotEmptyArr(selectedRowKeys) ? - sProcessParamsSelects.map((child) => { - const sMemo = child.sName.toLowerCase().endsWith('memo'); + {false ? ( + +
+ {commonUtils.isNotEmptyArr(sProcessParamsSelects) && commonUtils.isNotEmptyArr(selectedRowKeys) + ? sProcessParamsSelects.map(child => { + const sMemo = child.sName.toLowerCase().endsWith("memo"); let enabledNew = !child.bReadonly; if (child.iTag === 1) { enabledNew = false; @@ -944,11 +1013,11 @@ const CommonListComponent = Form.create({ } const slaveSelectOneDataIndex = slaveData.findIndex(item => item.sId === selectedRowKeys[selectedRowKeys.length - 1]); // 多选选择最后一个 /* 如果没值 则取默认值 */ - let sDataValue = ''; + let sDataValue = ""; if (commonUtils.isNotEmptyArr(slaveData) && commonUtils.isNotEmptyObject(slaveData[slaveSelectOneDataIndex])) { sDataValue = slaveData[slaveSelectOneDataIndex][child.sName]; - const sDefaultName = child.sName.replace('Value', 'Default'); - let sDefaultValue = ''; + const sDefaultName = child.sName.replace("Value", "Default"); + let sDefaultValue = ""; if (sDefaultName) { sDefaultValue = slaveData[slaveSelectOneDataIndex][sDefaultName]; } @@ -957,7 +1026,7 @@ const CommonListComponent = Form.create({ } } const showTypeProps = { - name: 'slave', + name: "slave", form: props.form, record: slaveData[slaveSelectOneDataIndex], sId: slaveData[slaveSelectOneDataIndex].sId, @@ -979,30 +1048,32 @@ const CommonListComponent = Form.create({ {`${child.showName}:`}
- ); - }) : '' - } -
- - : '' - } - { - props.sProcessParamsModalVisible ? - -
- -
- : '' - } + ); + }) + : ""} +
+ + ) : ( + "" + )} + {props.sProcessParamsModalVisible ? ( + +
+ +
+ + ) : ( + "" + )}
); diff --git a/src/components/Common/CommonNewBillEvent.js b/src/components/Common/CommonNewBillEvent.js index e36929e..4f1a3d9 100644 --- a/src/components/Common/CommonNewBillEvent.js +++ b/src/components/Common/CommonNewBillEvent.js @@ -1935,7 +1935,7 @@ export default (ChildComponent) => { /* 上一条、下一条、首条、末条 */ handleSearchData = async (handleType) => { const { - sModelsId, app, currentIndexFlag, currentPageNo, masterData, + sModelsId, app, currentIndexFlag, currentPageNo, masterData, sSrcModelsId, masterConfig, slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config, } = this.props; let { sBillIdsArray = []} = this.props; @@ -1993,7 +1993,7 @@ export default (ChildComponent) => { if(!bExist) { const value = { sClientType: '1', sFilterOrderBy, bFilter, sListFormmasterId, currentPosition, handleType, iCountSum: pages.total, - sUpId: masterData?.sId, + sUpId: masterData?.sId, sParentModelId :sSrcModelsId, }; const url = `${commonConfig.server_host}business/getBusinessDataByIndex?sModelsId=${sModelsId}`; /* 接收返回值 */ diff --git a/src/components/Common/CommonSubBillEvent.js b/src/components/Common/CommonSubBillEvent.js index 4c99c2e..0471077 100644 --- a/src/components/Common/CommonSubBillEvent.js +++ b/src/components/Common/CommonSubBillEvent.js @@ -2815,7 +2815,7 @@ export default (ChildComponent) => { handleSearchData = async (handleType) => { const { sModelsId, app, currentIndexFlag, currentPageNo, slaveChildConfig, memoDataList, masterData, - masterConfig, slaveConfig, checkConfig, + masterConfig, slaveConfig, checkConfig, sSrcModelsId, } = this.props; let { sBillIdsArray = []} = this.props; let { currentId } = this.props; @@ -2868,7 +2868,7 @@ export default (ChildComponent) => { if(!bExist) { const value = { sClientType: '1', sFilterOrderBy, bFilter, sListFormmasterId, currentPosition, handleType, iCountSum: pages.total, - sUpId: masterData?.sId, + sUpId: masterData?.sId, sParentModelId :sSrcModelsId, }; const url = `${commonConfig.server_host}business/getBusinessDataByIndex?sModelsId=${sModelsId}`; /* 接收返回值 */ diff --git a/src/components/Common/ToolBar/ToolBarNew.js b/src/components/Common/ToolBar/ToolBarNew.js index c97234a..840ad68 100644 --- a/src/components/Common/ToolBar/ToolBarNew.js +++ b/src/components/Common/ToolBar/ToolBarNew.js @@ -1281,9 +1281,10 @@ class ToolBarComponent extends Component { loading: true, }); const { sModelsId, masterData, slaveData, slaveDelData: slaveDelDataOld, app } = this.props; + const confirmSetting = commonFunc.showLocalMessage(this.props, 'confirmSetting', '请配置按钮的存储过程'); const btnConfig = this.props.masterConfig.gdsconfigformslave.filter(item => item.sControlName === "BtnCommonImport")[0]; // sButtonEnabled sButtonParam if (!commonUtils.isNotEmptyObject(btnConfig) || !commonUtils.isNotEmptyStr(btnConfig.sButtonParam)) { - message.error("请配置按钮的存储过程"); + message.error(confirmSetting); this.props.onSaveState({ loading: false, }); @@ -1527,6 +1528,7 @@ class ToolBarComponent extends Component { const bInvalidCancel = commonFunc.showLocalMessage(this.props, 'bInvalidCancel', '确定要作废'); + const confirmSetting = commonFunc.showLocalMessage(this.props, 'confirmSetting', '请配置按钮的存储过程'); /* 新增 */ if (key === "BtnAdd") { /* 增加 */ @@ -2354,7 +2356,7 @@ class ToolBarComponent extends Component { loading: false, }); } else { - message.error("请配置按钮的存储过程"); + message.error(confirmSetting); this.props.onSaveState({ loading: false, }); diff --git a/src/components/CommonElementEvent/SftLoginInfo.js b/src/components/CommonElementEvent/SftLoginInfo.js index 96d6aef..f4c5eb1 100644 --- a/src/components/CommonElementEvent/SftLoginInfo.js +++ b/src/components/CommonElementEvent/SftLoginInfo.js @@ -59,7 +59,8 @@ const SftLoginComponent = Form.create({ const tabDrivergroup = commonFunc.showMessage(app.commonConst, 'tabDrivergroup');/* 司机查看权限 */ const tabDepartgroup = commonFunc.showMessage(app.commonConst, 'tabDepartgroup');/* 部门查看权限 */ const tabApproveGroup = commonFunc.showMessage(app.commonConst, 'sftlogininfoCheck');/* 审核组权限 */ - const tabBrandgroup = '分管公司权限'; + const tabCompanyAuthority = commonFunc.showLocalMessage(this.props, 'tabCompanyAuthority', '分管公司权限'); + const tabBrandgroup = tabCompanyAuthority; return (
diff --git a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js index cbab0dc..1380c4c 100644 --- a/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js +++ b/src/components/Manufacture/WorkOrderPackTableTreeNew/index.js @@ -3213,14 +3213,21 @@ const controlProps = props => { const tableRow = controlData.find(item => item.sId === tableSelectedRowKeys[0]); let controlChildData = []; if(commonUtils.isNotEmptyObject(tableRow)) { - // 递归查找所有子节点 + // 使用Set来记录已处理节点，防止循环引用 + const processedNodes = new Set(); + const findChildren = (parentId, allNodes) => { - const children = allNodes.filter(node => node.sControlParentId === parentId); - let result = [...children]; - children.forEach(child => { - result = result.concat(findChildren(child.sNodeId, allNodes)); - }); - return result; + // 防止重复处理同一个父节点 + if (processedNodes.has(parentId)) return []; + processedNodes.add(parentId); + + const children = allNodes.filter(node => + node.sControlParentId === parentId && !processedNodes.has(node.sNodeId) + ); + + return children.concat( + ...children.map(child => findChildren(child.sNodeId, allNodes)) + ); }; controlChildData = findChildren(tableRow.sNodeId, controlData); diff --git a/src/utils/config.js b/src/utils/config.js index 2b64629..1dad3e6 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -8,8 +8,8 @@ const API = process.env.API; const bHttps = false; export const webSite = { - faceAddress: isDev ? '//8.130.144.93:8088/xlyFace' : '//' + location.host + '/xlyFace', - ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//8.130.144.93:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/', + faceAddress: isDev ? '//192.168.2.19:8080/xlyFace' : '//' + location.host + '/xlyFace', + ipAddress: isDev ? '//192.168.2.19:8080/xlyEntry/' : '//' + location.host + '/xlyEntry/', interfaceAddress: localStorage.apiAddress ? localStorage.apiAddress : isDev ? '//8.130.144.93:8088/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址 fileAddress: isDev ? '//8.130.144.93:8088/xlyReport/' : '//' + location.host + '/xlyReport/', // 接口地址 fileAddressEbc: isDev ? '//8.130.144.93:8088/xlyReport/' : '//' + location.host + '/xlyReport/', -- libgit2 0.22.2