diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index 769512d..48a6a34 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -167,7 +167,6 @@ const QuickQuoteEvent = props => { addState.onDataChange = (name, sFieldName, changeValue, sId, dropDownData, isWait) => { const { masterData = {}, slaveData = [], selectedNode = {} } = state; - const extraState = { calcPriceFinished: false, manyData: [], diff --git a/src/mobile/components/SelectInput.jsx b/src/mobile/components/SelectInput.jsx index c34faa1..ae452c1 100644 --- a/src/mobile/components/SelectInput.jsx +++ b/src/mobile/components/SelectInput.jsx @@ -22,6 +22,9 @@ const SelectInput = props => { if (!itemDetail) return; const viewRowNew = itemDetail.sName ? viewRow?.[itemDetail.sName] : ""; + if (itemDetail.sDropDownType === "const") { + return + } if (tableName.includes("slaveDown")) { if (!viewRow.sBackProcessData) return; const data = viewRow.sBackProcessData[downIndex][itemDetail.sName]; @@ -57,7 +60,7 @@ const SelectInput = props => { const handleConfirm = () => { const index = columns.findIndex(item => item.value === values[0]); const data = coplyColumns[index]; - data[itemDetail.sName] = data.sName; + data[itemDetail.sName] = data[itemDetail.sName] ? data[itemDetail.sName] : data.label || data.sName || data.sProcessName || data.sColorName; setValue(columns[index]?.label || ""); props.onDataChange(tableName, itemDetail.sName, data, null, coplyColumns); setVisible(false); diff --git a/src/mobile/quotation/detailNew.jsx b/src/mobile/quotation/detailNew.jsx index 13c4434..829d33f 100644 --- a/src/mobile/quotation/detailNew.jsx +++ b/src/mobile/quotation/detailNew.jsx @@ -893,22 +893,7 @@ const QuickQuoteEvent = props => { masterConfig: masterConfig && masterConfig.length ? masterConfig[0] : {}, }; }; -const getSqlDropDownData = async (sId, props) => { - const { selectedNode } = props; - const url = `${commonConfig.server_host}business/getSelectLimit/${sId}`; - const body = { - sSqlCondition: { - sProductClassifyId: selectedNode.sId, - }, - sKeyUpFilterName: "", - pageNum: 1, - pageSize: 20, - }; - const retrunData = await commonServices.postValueService(props.app.token, body, url); - const sColumnNameConfigStr = retrunData.data?.dataset?.rows?.[0]?.sColumnNameConfig; - // 取上机尺寸 - return commonUtils.convertStrToObj(sColumnNameConfigStr, []); -}; + const QuotationAllprogressDetail = baseProps => { const { location, quotationData } = baseProps; // 处理 formData @@ -922,9 +907,6 @@ const QuotationAllprogressDetail = baseProps => { const { showName, sUnit } = quotationData; const timeRef = useRef(0); useEffect(() => { - // props.setState(pre => - // ({ ...pre, masterData: { ...quotationData, sProductName: showName, sProductUnit: sUnit } }) - // ); props.setState(pre => { const { slaveData = [], slaveConfig } = pre; const addState = {}; @@ -958,6 +940,7 @@ const QuotationAllprogressDetail = baseProps => { return { ...pre, ...addState, + masterData: { ...quotationData, sProductName: showName, sProductUnit: sUnit }, // downAbleConfigs: downAbleConfigs // .filter(item => item.sType === "2") // .map((item, index) => ({ @@ -1150,9 +1133,14 @@ const QuotationTabs = props => { }; // 内容 -const BoxComponent = props => { +const BoxComponent = async props => { const { state, boxModel } = props; - const { activeKey, slaveConfig, masterData, selectedNode, boxConfig, downAbleConfigs = [], slaveData } = state || {}; + console.log("🚀 ~ BoxComponent:", props); + + const { activeKey, slaveConfig, masterData, selectedNode, boxConfig, slaveData } = state || {}; + const showDownConfig = slaveConfig.gdsconfigformslave.find(item => item.sControlName === "BtnDownConfig"); + const downAbleConfigs = await getSqlDropDownData({ ...showDownConfig }); + console.log("🚀 ~ downAbleConfigs:", downAbleConfigs); const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {}; const { sModelsId } = props; @@ -1358,6 +1346,7 @@ const BoxComponent = props => { useEffect(() => { setDownAbleConfigsNew(downAbleConfigs); }, [selectedNode.showName, boxModel]); + console.log("🚀 ~ useEffect ~ downAbleConfigs:", downAbleConfigs); // 初始化状态,存储每个 Switch 的状态 const [switchStates, setSwitchStates] = useState(null); @@ -1395,6 +1384,7 @@ const BoxComponent = props => { viewRow: slaveRowData, tableName: `slaveDown${boxModel}`, }; + console.log(downViewProps, "downViewProps"); const calcMethodData = commonUtils.convertStrToObj(slaveRowData?.sColumnNameConfigExclusion, []); const radioValue = calcMethodData[0]?.sCode; @@ -1705,7 +1695,7 @@ const BoxComponent = props => { fill="outline" size="small" onClick={val => { - const currentBoxModel = 'slaveUp' + props.boxModel + const currentBoxModel = "slaveUp" + props.boxModel; props.onDataChange(currentBoxModel, "sName", { sName: item.sName }, item.sId, boxsList); setBoxPopup(false); }}