Commit 4412679852bf6cc736c0fdc2a57eb8c5962041ea

Authored by 陈鑫涛
2 parents 4bbfa941 d8a4a150

Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

src/components/QuickQuote/index.jsx
@@ -1298,6 +1298,7 @@ const TreeComponent = props => { @@ -1298,6 +1298,7 @@ const TreeComponent = props => {
1298 addState.calcPriceFinished = false; 1298 addState.calcPriceFinished = false;
1299 addState.backendParamsConfig = []; 1299 addState.backendParamsConfig = [];
1300 addState.backendConfig = {}; 1300 addState.backendConfig = {};
  1301 + addState.downAbleExtraConfigs = [];
1301 if (manyData.some(item => Object.keys(item).length > 4)) { 1302 if (manyData.some(item => Object.keys(item).length > 4)) {
1302 addState.manyData = []; 1303 addState.manyData = [];
1303 } 1304 }
@@ -3063,6 +3064,7 @@ const BackendParamsExtraComponent = props => { @@ -3063,6 +3064,7 @@ const BackendParamsExtraComponent = props => {
3063 })), 3064 })),
3064 tableConfig: { ...slaveConfig, gdsconfigformslave: viewConfigs }, 3065 tableConfig: { ...slaveConfig, gdsconfigformslave: viewConfigs },
3065 iColValueView: 24, 3066 iColValueView: 24,
  3067 + viewRow: { sId: slaveRowData.sId },
3066 getViewRow: config => { 3068 getViewRow: config => {
3067 return sBackProcessData.find(item => item[sParentFieldsName])?.sBackendParams?.find(item => item.sParam === config.showName) || {}; 3069 return sBackProcessData.find(item => item[sParentFieldsName])?.sBackendParams?.find(item => item.sParam === config.showName) || {};
3068 }, 3070 },
@@ -3100,6 +3102,7 @@ const BackendParamsExtraComponent = props => { @@ -3100,6 +3102,7 @@ const BackendParamsExtraComponent = props => {
3100 sParam: showConfig.sParam, 3102 sParam: showConfig.sParam,
3101 sParamKey: sFieldName, 3103 sParamKey: sFieldName,
3102 }; 3104 };
  3105 + if (!dropDownDataSelected) return;
3103 dropDownDataSelected[sFieldName] = dropDownDataSelected.value; 3106 dropDownDataSelected[sFieldName] = dropDownDataSelected.value;
3104 const { sParam } = dropDownDataSelected; 3107 const { sParam } = dropDownDataSelected;
3105 const { sBackendParams = [] } = slaveData[iIndex].sBackProcessData[iIndex1]; 3108 const { sBackendParams = [] } = slaveData[iIndex].sBackProcessData[iIndex1];