Commit a9e112879ddbeee407dc28099af36a0d791e4801

Authored by 陈鑫涛
2 parents 440b53cd c0e8fae4

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

src/components/QuickQuote/index.jsx
@@ -2697,19 +2697,20 @@ const BoxModelSelectedModal = props => { @@ -2697,19 +2697,20 @@ const BoxModelSelectedModal = props => {
2697 const column = commonFunc.getHeaderConfig(config); 2697 const column = commonFunc.getHeaderConfig(config);
2698 setBoxColumn(column); 2698 setBoxColumn(column);
2699 2699
2700 - const getSqlDropDownData = async ({ sId }, cb) => { 2700 + const getSqlDropDownData = async ({ sId, sSqlCondition = {} }, cb) => {
2701 const url = `${commonConfig.server_host}business/getSelectLimit/${sId}`; 2701 const url = `${commonConfig.server_host}business/getSelectLimit/${sId}`;
2702 const body = { 2702 const body = {
2703 sKeyUpFilterName: "", 2703 sKeyUpFilterName: "",
2704 pageNum: 1, 2704 pageNum: 1,
2705 pageSize: 1000, 2705 pageSize: 1000,
  2706 + sSqlCondition,
2706 }; 2707 };
2707 const retrunData = await commonServices.postValueService(props.app.token, body, url); 2708 const retrunData = await commonServices.postValueService(props.app.token, body, url);
2708 const dropDownData = retrunData.data?.dataset?.rows; 2709 const dropDownData = retrunData.data?.dataset?.rows;
2709 cb(dropDownData); 2710 cb(dropDownData);
2710 }; 2711 };
2711 2712
2712 - getSqlDropDownData({ sId: "17428091410008594700322758474000" }, dropDownData => { 2713 + getSqlDropDownData({ sId: "17428091410008594700322758474000", sSqlCondition: { sProductClassifyId: selectedNode.sId } }, dropDownData => {
2713 const boxTypeList = Array.from(new Set(dropDownData.map(item => item.sBoxType || "其它"))); 2714 const boxTypeList = Array.from(new Set(dropDownData.map(item => item.sBoxType || "其它")));
2714 setBoxTypeList(boxTypeList); 2715 setBoxTypeList(boxTypeList);
2715 setBoxData( 2716 setBoxData(