快速报价app

陈鑫涛
1 parent 8b302a40
Showing 3 changed files with 16 additions and 24 deletions
src/components/QuickQuote/index.jsx
src/mobile/components/SelectInput.jsx
src/mobile/quotation/detailNew.jsx
@@ -167,7 +167,6 @@ const QuickQuoteEvent = props =&gt; {
   addState.onDataChange = (name, sFieldName, changeValue, sId, dropDownData, isWait) => {
     const { masterData = {}, slaveData = [], selectedNode = {} } = state;
-
     const extraState = {
       calcPriceFinished: false,
       manyData: [],
@@ -22,6 +22,9 @@ const SelectInput = props =&gt; {
     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 =&gt; {
   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);
@@ -893,22 +893,7 @@ const QuickQuoteEvent = props =&gt; {
     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 =&gt; {
   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 =&gt; {
       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 =&gt; {
 };
 // 内容
-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 =&gt; {
   useEffect(() => {
     setDownAbleConfigsNew(downAbleConfigs);
   }, [selectedNode.showName, boxModel]);
+  console.log("🚀 ~ useEffect ~ downAbleConfigs:", downAbleConfigs);
   // 初始化状态，存储每个 Switch 的状态
   const [switchStates, setSwitchStates] = useState(null);
@@ -1395,6 +1384,7 @@ const BoxComponent = props =&gt; {
     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 =&gt; {
                     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);
                     }}