xlyErp / xlyUmi

Commit 96b0de663b97b267c5946f0a5d943d2d408e62d8

Authored by Min
2 parents 767f936e 5730aa7e

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

Inline Side-by-side
Showing 1 changed file with 7 additions and 12 deletions
src/components/QuickQuote/index.jsx
  View file @96b0de6
... ... @@ -322,8 +322,7 @@ const QuickQuoteEvent = props => {
322 322 sParam: sParam,
323 323 [`sParam${iOrder}`]: sParamDefault,
324 324 ...(sFieldName ? { [sFieldName]: sParamDefault } : {}),
325   - sParamKey: `sParam${iOrder}`,
326   - sParamKeyNew: sFieldName || `sParam${iOrder}`,
  325 + sParamKey: sFieldName || `sParam${iOrder}`,
327 326 };
328 327 })
329 328 .filter(item => item !== "");
... ... @@ -928,7 +927,6 @@ const QuickQuoteEvent = props => {
928 927 if (sBackendParams.length) {
929 928 const sQuoParams = sBackendParams.map(item => ({
930 929 sParamKey: item.sParamKey,
931   - sParamKeyNew: item.sParamKeyNew,
932 930 sParamName: item.sParam,
933 931 sParamValue: item.value !== undefined ? item.value : "",
934 932 bSelfCbx: !(item.value === "" || item.value === undefined),
... ... @@ -1683,13 +1681,13 @@ const BoxComponent = props => {
1683 1681 .filter(item => item.sPartsName === boxModel || !item.sPartsName)
1684 1682 .map(config => ({
1685 1683 ...config,
1686   - costomStyle: sBackProcessData.find(item => item[config.sName0 || config.sName])?.sParamConfig ? styles.sParamConfig : "",
  1684 + costomStyle: sBackProcessData.find(item => item[config.sName])?.sParamConfig ? styles.sParamConfig : "",
1687 1685 })),
1688 1686 tableConfig: { ...slaveConfig, gdsconfigformslave: downAbleConfigsNew },
1689 1687 iColValueView: 24,
1690 1688 viewRow: slaveRowData,
1691 1689 getViewRow: config => {
1692   - return sBackProcessData.find(item => item[config.sName0 || config.sName]) || {};
  1690 + return sBackProcessData.find(item => item[config.sName]) || {};
1693 1691 },
1694 1692 tableName: `slaveDown${boxModel}`,
1695 1693 getSqlDropDownData: (...args) => {
... ... @@ -1821,7 +1819,7 @@ const BoxComponent = props => {
1821 1819 props.setState(pre => ({
1822 1820 ...pre,
1823 1821 backendParamsConfig: commonUtils.convertStrToObj(
1824   - sBackProcessData.find(item => item[showConfig.sName0 || showConfig.sName])?.sParamConfig,
  1822 + sBackProcessData.find(item => item[showConfig.sName])?.sParamConfig,
1825 1823 []
1826 1824 ),
1827 1825 backendConfig: { sParentFieldsName: showConfig.sName, sBoxModel: boxModel },
... ... @@ -2975,7 +2973,6 @@ const BackendParamsExtraComponent = props => {
2975 2973  
2976 2974 const viewConfigs = backendParamsConfig.map(item => ({
2977 2975 ...item,
2978   - sName0: `sParam${item.iOrder}`,
2979 2976 sName: item.sFieldName || `sParam${item.iOrder}`,
2980 2977 showName: item.sParam,
2981 2978 sDropDownType: item.sParamDropDown ? "sql" : "",
... ... @@ -2996,7 +2993,7 @@ const BackendParamsExtraComponent = props => {
2996 2993 tableName: `sBackendParams${boxModel}`,
2997 2994 getSqlDropDownData: (...args) => {
2998 2995 const showConfig = args[2];
2999   - const { sParamDropDown = "", sName0, sName } = showConfig;
  2996 + const { sParamDropDown = "", sName } = showConfig;
3000 2997 const dropDownData = sParamDropDown.split(",");
3001 2998 if (dropDownData?.length) {
3002 2999 return {
... ... @@ -3005,8 +3002,7 @@ const BackendParamsExtraComponent = props => {
3005 3002 value: item,
3006 3003 sParam: showConfig.sParam,
3007 3004 [sName]: item,
3008   - sParamKey: sName0,
3009   - sParamKeyNew: sName,
  3005 + sParamKey: sName,
3010 3006 })),
3011 3007 totalPageCount: 1,
3012 3008 currentPageNo: 1,
... ... @@ -3026,8 +3022,7 @@ const BackendParamsExtraComponent = props => {
3026 3022 sId: commonUtils.createSid(),
3027 3023 value: changeValue[sFieldName],
3028 3024 sParam: showConfig.sParam,
3029   - sParamKey: showConfig.sName0,
3030   - sParamKeyNew: sFieldName,
  3025 + sParamKey: sFieldName,
3031 3026 };
3032 3027 dropDownDataSelected[sFieldName] = dropDownDataSelected.value;
3033 3028 const { sParam } = dropDownDataSelected;
... ...