From 5fd2185e5ef1d0f4a10919129b0ce1eba9ed20b3 Mon Sep 17 00:00:00 2001 From: pengm <674192343@qq.com> Date: Tue, 23 Sep 2025 13:44:44 +0800 Subject: [PATCH] 1.销售订单 部件,材料，工序增加商机机会表 --- src/components/Common/CommonBillEvent.js | 30 ++++++++++++++++++++---------- src/components/Common/commonFunc.js | 4 ++-- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js index bee8802..f034db0 100644 --- a/src/components/Common/CommonBillEvent.js +++ b/src/components/Common/CommonBillEvent.js @@ -312,18 +312,23 @@ export default (ChildComponent) => { const config = {}; let addState1 = {}; if (sModelsType.includes('sales/salesOrder')) { - const controlConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrol'.toUpperCase())[0]; + const controlConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrol'.toUpperCase() + || item.sTbName.toUpperCase() === 'salsalesorderchancecontrol'.toUpperCase() )[0]; const controlColumn = commonFunc.getHeaderConfig(controlConfig); - const materialsConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordermaterials'.toUpperCase())[0]; + const materialsConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordermaterials'.toUpperCase() || + item.sTbName.toUpperCase() === 'salsalesorderchancematerials'.toUpperCase() )[0]; const materialsColumn = commonFunc.getHeaderConfig(materialsConfig); - const processConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderprocess'.toUpperCase())[0]; + const processConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderprocess'.toUpperCase() || + item.sTbName.toUpperCase() === 'salsalesorderchanceprocess'.toUpperCase())[0]; const processColumn = commonFunc.getHeaderConfig(processConfig); - const colorConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderparam'.toUpperCase())[0]; + const colorConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderparam'.toUpperCase() || + item.sTbName.toUpperCase() === 'salsalesorderchanceparam'.toUpperCase())[0]; let colorColumn; if (commonUtils.isNotEmptyObject(colorConfig)) { colorColumn = commonFunc.getHeaderConfig(colorConfig); } - const packConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrolcombine'.toUpperCase())[0]; + const packConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrolcombine'.toUpperCase() || + item.sTbName.toUpperCase() === 'salsalesorderchancecontrolcombine')[0]; let packColumn; if (commonUtils.isNotEmptyObject(packConfig)) { packColumn = commonFunc.getHeaderConfig(packConfig); @@ -400,18 +405,23 @@ export default (ChildComponent) => { } else { this.handleGetData(masterConfig, slaveConfig, checkConfig); if (sModelsType.includes('sales/salesOrder')) { - const controlConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrol'.toUpperCase())[0]; + const controlConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrol'.toUpperCase() + || item.sTbName.toUpperCase() === 'salsalesorderchancecontrol'.toUpperCase() )[0]; const controlColumn = commonFunc.getHeaderConfig(controlConfig); - const materialsConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordermaterials'.toUpperCase())[0]; + const materialsConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordermaterials'.toUpperCase() || + item.sTbName.toUpperCase() === 'salsalesorderchancematerials'.toUpperCase() )[0]; const materialsColumn = commonFunc.getHeaderConfig(materialsConfig); - const processConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderprocess'.toUpperCase())[0]; + const processConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderprocess'.toUpperCase() || + item.sTbName.toUpperCase() === 'salsalesorderchanceprocess'.toUpperCase())[0]; const processColumn = commonFunc.getHeaderConfig(processConfig); - const colorConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderparam'.toUpperCase())[0]; + const colorConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesorderparam'.toUpperCase() || + item.sTbName.toUpperCase() === 'salsalesorderchanceparam'.toUpperCase())[0]; let colorColumn; if (commonUtils.isNotEmptyObject(colorConfig)) { colorColumn = commonFunc.getHeaderConfig(colorConfig); } - const packConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrolcombine'.toUpperCase())[0]; + const packConfig = formData.filter(item => item.sTbName.toUpperCase() === 'salsalesordercontrolcombine'.toUpperCase() || + item.sTbName.toUpperCase() === 'salsalesorderchancecontrolcombine')[0]; let packColumn; if (commonUtils.isNotEmptyObject(packConfig)) { packColumn = commonFunc.getHeaderConfig(packConfig); diff --git a/src/components/Common/commonFunc.js b/src/components/Common/commonFunc.js index 28c4f4c..35a0132 100644 --- a/src/components/Common/commonFunc.js +++ b/src/components/Common/commonFunc.js @@ -232,7 +232,7 @@ export function getDefaultData(config, allTableData = {}, extraData = {}) { } else if (sDefault.split(',').length > 1 && sDefault.split(':').length > 1) { sDefault.split(',').forEach(item => { const oldFieldName = item.split(':')[1]; - const [tableName, oldTableFieldName] = oldFieldName.split('.'); + const [tableName, oldTableFieldName] = oldFieldName.split('.'); const newFieldName = item.split(':')[0]; returnData[newFieldName] = allTableData[tableName][oldTableFieldName]; }); @@ -922,4 +922,4 @@ export function getEvalResult(params) { return result; } -export function getControlConfig() {} \ No newline at end of file +export function getControlConfig() {} -- libgit2 0.22.2