Commit b0629eb896403a122a32b2aa9eca3dca81831221

Authored by zhangzzzz
1 parent 913bc0f4

快速报价修改字段;

快速报价颜色功能优化;
src/components/QuickQuote/index.jsx
@@ -231,7 +231,7 @@ const QuickQuoteEvent = props => { @@ -231,7 +231,7 @@ const QuickQuoteEvent = props => {
231 : { 231 : {
232 sId: commonUtils.createSid(), 232 sId: commonUtils.createSid(),
233 value: sParamDefault, 233 value: sParamDefault,
234 - sParentParam: sParam, 234 + sParam: sParam,
235 [`sParams${index}`]: sParamDefault, 235 [`sParams${index}`]: sParamDefault,
236 }; 236 };
237 }) 237 })
@@ -522,7 +522,7 @@ const QuickQuoteEvent = props => { @@ -522,7 +522,7 @@ const QuickQuoteEvent = props => {
522 return pre; 522 return pre;
523 }, {}), 523 }, {}),
524 dPartsQty: masterData.dProductQty, 524 dPartsQty: masterData.dProductQty,
525 - iPositiveColor: Number(item.sColor), 525 + // iPositiveColor: Number(item.sColor),
526 sPartsName: item.sBoxModel, 526 sPartsName: item.sBoxModel,
527 materialsInfo: item.materialsInfo?.filter(x => commonUtils.isNotEmptyObject(x)), 527 materialsInfo: item.materialsInfo?.filter(x => commonUtils.isNotEmptyObject(x)),
528 processInfo: 528 processInfo:
@@ -2413,7 +2413,7 @@ const BackendParamsExtraComponent = props => { @@ -2413,7 +2413,7 @@ const BackendParamsExtraComponent = props => {
2413 tableConfig: { ...slaveConfig, gdsconfigformslave: viewConfigs }, 2413 tableConfig: { ...slaveConfig, gdsconfigformslave: viewConfigs },
2414 iColValueView: 24, 2414 iColValueView: 24,
2415 getViewRow: config => { 2415 getViewRow: config => {
2416 - return sBackProcessData.find(item => item[sParentFieldsName])?.sBackendParams?.find(item => item.sParentParam === config.showName) || {}; 2416 + return sBackProcessData.find(item => item[sParentFieldsName])?.sBackendParams?.find(item => item.sParam === config.showName) || {};
2417 }, 2417 },
2418 tableName: `sBackendParams${boxModel}`, 2418 tableName: `sBackendParams${boxModel}`,
2419 getSqlDropDownData: (...args) => { 2419 getSqlDropDownData: (...args) => {
@@ -2425,7 +2425,7 @@ const BackendParamsExtraComponent = props => { @@ -2425,7 +2425,7 @@ const BackendParamsExtraComponent = props => {
2425 dropDownData: dropDownData.map(item => ({ 2425 dropDownData: dropDownData.map(item => ({
2426 sId: commonUtils.createSid(), 2426 sId: commonUtils.createSid(),
2427 value: item, 2427 value: item,
2428 - sParentParam: showConfig.sParam, 2428 + sParam: showConfig.sParam,
2429 [sName]: item, 2429 [sName]: item,
2430 })), 2430 })),
2431 totalPageCount: 1, 2431 totalPageCount: 1,
@@ -2440,9 +2440,9 @@ const BackendParamsExtraComponent = props => { @@ -2440,9 +2440,9 @@ const BackendParamsExtraComponent = props => {
2440 const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId); 2440 const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId);
2441 const iIndex1 = slaveData[iIndex].sBackProcessData.findIndex(item => item[sParentFieldsName]); 2441 const iIndex1 = slaveData[iIndex].sBackProcessData.findIndex(item => item[sParentFieldsName]);
2442 const dropDownDataSelected = dropDownData.find(item => item.sId === changeValue[sFieldName]); 2442 const dropDownDataSelected = dropDownData.find(item => item.sId === changeValue[sFieldName]);
2443 - const { sParentParam } = dropDownDataSelected; 2443 + const { sParam } = dropDownDataSelected;
2444 const { sBackendParams = [] } = slaveData[iIndex].sBackProcessData[iIndex1]; 2444 const { sBackendParams = [] } = slaveData[iIndex].sBackProcessData[iIndex1];
2445 - const iIndex2 = sBackendParams.findIndex(item => item.sParentParam === sParentParam); 2445 + const iIndex2 = sBackendParams.findIndex(item => item.sParam === sParam);
2446 if (iIndex2 !== -1) { 2446 if (iIndex2 !== -1) {
2447 sBackendParams[iIndex2] = dropDownDataSelected; 2447 sBackendParams[iIndex2] = dropDownDataSelected;
2448 } else { 2448 } else {