快速报价app

陈鑫涛
1 parent 676f1770
Showing 6 changed files with 148789 additions and 16104 deletions
src/mobile/components/SelectInput.jsx
src/mobile/quotation/detailNew.jsx
src/mobile/quotation/index.json
src/mobile/quotation/index.jsx
src/mobile/quotation/quotationDetail.css
src/mobile/quotation/quotationDetail.less
@@ -15,22 +15,20 @@ const SelectInput = props =&gt; {
   const [searchValue, setSearchValue] = useState("");
   const [visible, setVisible] = useState(false);
   const { sId } = props.itemDetail || {};
-  const { viewRow, itemDetail, sModelsId, sValue, name, id, No, quotationData, showDropDown } = props || {};
+  const { tableName, viewRow, itemDetail, sModelsId, sValue, name, id, No, quotationData, showDropDown } = props || {};
+  const { masterData } = props.state;
   const [bCanInput, setBCanInput] = useState(props.bCanInput);
   const { bReadonly } = itemDetail || {};
-  console.log("🚀 ~ formDatassss:", bReadonly);
-
   // useEffect(() => {
   //   setValue(props.sValue || ""); // 动态更新 value
   // }, [props.sValue]);
   useEffect(() => {
-  if (!itemDetail) return;
-  console.log(itemDetail.sName, 'viewRowNew');
+    if (!itemDetail) return;
+    console.log(itemDetail, tableName, "viewRowNew");
  
-  const viewRowNew = itemDetail.sName ? viewRow?.[itemDetail.sName] : "";
-  console.log("🚀 ~ useEffect ~ viewRowNew:", viewRowNew);
-  setValue(viewRowNew || ""); // 动态更新 value
-}, [itemDetail, itemDetail?.sName, viewRow]);
+    const viewRowNew = itemDetail.sName ? viewRow?.[itemDetail.sName] : "";
+    setValue(viewRowNew || ""); // 动态更新 value
+  }, [itemDetail, itemDetail?.sName, viewRow]);
   const [columns, setColumns] = useState([]);
   const [coplyColumns, setCopyColumns] = useState(columns);
   const getSqlDropDownData = async searchValue => {
@@ -46,7 +44,7 @@ const SelectInput = props =&gt; {
     commonServices.postValueService(props.app.token, body, url).then(res => {
       if (res.data.code === 1) {
         const list = res.data.dataset.rows?.map(item => ({
-          label: item.sCustomerName || item.sName || item.sProcessName || item.sColorName,
+          label: item.sCustomerName || item.sName || item.sProcessName || item.sColorName || item.sMaterialsName,
           value: item.sId || item.sSlaveId,
         }));
         setColumns(list);
@@ -84,6 +82,8 @@ const SelectInput = props =&gt; {
     debouncedChangeOption(val);
   };
   useEffect(() => {
+    console.log("🚀 ~ useEffect ~ itemDetailssss:", itemDetail)
+
     if (!visible) return;
     let { sDropDownType } = itemDetail;
     if (sDropDownType === "sql") {
@@ -105,8 +105,6 @@ const SelectInput = props =&gt; {
   useCallback;
  
   const clickBtn = () => {
-    console.log(itemDetail, "clickBtn");
-
     setVisible(true);
   };
   return (
@@ -117,7 +115,13 @@ const SelectInput = props =&gt; {
           value={value}
           onChange={val => {
             setValue(val);
-            props.setState(pre => ({ ...pre,[itemDetail.sName]:val}));
+            // 如果是master
+            if (tableName === "master") {
+              masterData[itemDetail.sName] = val;
+              props.setState(pre => ({ ...pre, masterData }));
+            } else {
+              props.setState(pre => ({ ...pre, [itemDetail.sName]: val }));
+            }
           }}
           readOnly={bReadonly}
         />
@@ -896,16 +896,23 @@ const QuickQuoteEvent = props =&gt; {
     masterConfig: masterConfig && masterConfig.length ? masterConfig[0] : {},
   };
 };
+const getProps = props => {
+  const { state } = props;
  
+  return {
+    ...props,
+  };
+};
 const QuotationAllprogressDetail = baseProps => {
   // const props = QuickQuoteEvent(baseProps);
   const [state, setState] = useState(JsonData.state);
-  const props = {
+  const propss = {
     ...baseProps,
     ...JsonData,
     setState,
     state,
   };
+  const props = getProps(propss);
   return (
     <div className={styles.quotationDetailBox}>
       <QuotationDetail {...props} />
@@ -914,10 +921,9 @@ const QuotationAllprogressDetail = baseProps =&gt; {
 };
  
 const QuotationDetail = props => {
-  const { location, app, sModelsId, state, masterData, selectedNode = {} } = props;
-  console.log("🚀 ~ QuotationDetail:", props);
+  const { location, app, sModelsId, state, selectedNode = {} } = props;
   const { token } = app;
-  const { formData = [], masterConfig } = state || {};
+  const { formData = [], masterConfig, slaveRowData, masterData } = state || {};
   const { quotationData } = JSON.parse(location.state) || {};
   if (!masterConfig) return;
   //masterData 主表数据
@@ -931,7 +937,6 @@ const QuotationDetail = props =&gt; {
     viewRow: { ...masterData, sProductClassifyId: selectedNode.sId },
     tableName: "master",
   };
-  console.log("🚀 ~ viewProps:", viewProps);
  
   return (
     <div>
@@ -947,64 +952,48 @@ const QuotationDetail = props =&gt; {
   );
 };
 const MasterComponent = props => {
-  console.log("🚀 ~ MasterComponent:", props);
   const { viewConfigs, masterData } = props;
  
   const customer = viewConfigs?.find(x => x.sName === "sCustomerName") || {};
   const customerProps = {
     ...props,
     itemDetail: customer,
-    sValue: masterData.sCustomerName,
-    id: masterData.sCustomerId,
-    No: masterData.sCustomerNo,
   };
   const product = viewConfigs?.find(x => x.sName === "sProductName") || {};
   const productProps = {
     ...props,
     itemDetail: product,
-    bCanInput: true,
-    sValue: masterData.sProductName,
   };
   const dLength = viewConfigs?.find(x => x.sName === "dLength") || {};
  
   const dLengthProps = {
     ...props,
     itemDetail: dLength,
-    bCanInput: true,
-    sValue: masterData.dLength,
   };
   const dWidth = viewConfigs?.find(x => x.sName === "dWidth") || {};
   const dWidthProps = {
     ...props,
     itemDetail: dWidth,
-    bCanInput: true,
-    sValue: masterData.dWidth,
   };
   const dHeight = viewConfigs?.find(x => x.sName === "dHeight") || {};
   const dHeightProps = {
     ...props,
     itemDetail: dHeight,
-    bCanInput: true,
-    sValue: masterData.dHeight,
   };
   const dProductQty = viewConfigs?.find(x => x.sName === "dProductQty") || {};
   const dProductQtyProps = {
     ...props,
     itemDetail: dProductQty,
-    bCanInput: true,
-    sValue: masterData.dProductQty,
   };
   const sProductUnit = viewConfigs?.find(x => x.sName === "sProductUnit") || {};
   const sProductUnitProps = {
     ...props,
     itemDetail: sProductUnit,
-    sValue: masterData.sProductUnit,
   };
   const sDeliverName = viewConfigs?.find(x => x.sName === "sDeliverName") || {};
   const sDeliverNameProps = {
     ...props,
     itemDetail: sDeliverName,
-    sValue: masterData.sDeliverName,
   };
   const baseProps = {
     ...props,
@@ -1097,15 +1086,16 @@ const QuotationTabs = props =&gt; {
 const BoxComponent = props => {
   const { state, boxModel } = props;
   const { activeKey, slaveConfig, masterData, selectedNode, boxConfig, downAbleConfigs = [], slaveData } = state || {};
-  console.log("🚀 ~ BoxComponent:", slaveData);
   const { sModelsId } = props;
   const [selectList, setSelectList] = useState([]);
   const [boxTypeList, setBoxTypeList] = useState([]);
   const [searchValue, setSearchValue] = useState("");
-  const [slaveRowData, setSlaveRowData] = useState(null);
   const [boxPopup, setBoxPopup] = useState(false);
   const [boxsList, setBoxsList] = useState([]);
   const [selected, setSelected] = useState(null);
+  const slaveRowDatas = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {};
+  const [slaveRowData, setSlaveRowData] = useState(slaveRowDatas);
+
   // 获取盒型信息
   useEffect(() => {
     const sId = "17428091410008594700322758474000";
@@ -1288,21 +1278,26 @@ const BoxComponent = props =&gt; {
   const upViewProps20 = getUpViewPropsByITag(20);
  
   // 后道参数
+  const { sBackProcessData } = slaveRowData || [];
+  const downViewConfigs = downAbleConfigs
+    .filter(item => item.sPartsName === boxModel || !item.sPartsName)
+    .map((item, i) => {
+      return {
+        ...item,
+        isSelect: sBackProcessData.length && sBackProcessData[i].sId ? true : false,
+      };
+    });
+
   const downViewProps = {
     ...props,
-    viewConfigs: downAbleConfigs
-      .filter(item => item.sPartsName === boxModel || !item.sPartsName)
-      .map(item => {
-        return {
-          ...item,
-          isSelect: false,
-        };
-      }),
+    viewConfigs: downViewConfigs,
     tableConfig: { ...slaveConfig, gdsconfigformslave: downAbleConfigs },
     iColValueView: 24,
     viewRow: slaveRowData,
     tableName: `slaveDown${boxModel}`,
   };
+  console.log(downViewProps,'downViewProps');
+  
   const calcMethodData = commonUtils.convertStrToObj(slaveRowData?.sColumnNameConfigExclusion, []);
   const radioValue = calcMethodData[0]?.sCode;
   const [materialLength, setMaterialLength] = useState(0);
@@ -1444,7 +1439,7 @@ const BoxComponent = props =&gt; {
     // };
     // setSlaveRowData(rowData);
     // setSelected(selectListDetail?.sBoxType);
-  },[slaveData]);
+  }, [slaveData]);
   return (
     <div>
       <Selector
@@ -1511,14 +1506,15 @@ const BoxComponent = props =&gt; {
         </div>
       </div>
       <div>
-        <MaterialsComponent {...props} />
+        <MaterialsComponent {...props} slaveRowData={slaveRowData} boxModel={boxModel} />
       </div>
       <div>
         <div>后道参数</div>
         {downViewProps.viewConfigs.map((x, i) => (
-          <div>
-            {x.showName}
+          <div className={styles.backBox}>
+            <div className={styles.backEnd}>{x.showName}</div>
             <Switch
+              checked={x.isSelect}
               onChange={async val => {
                 console.log(val, x, "val");
               }}
@@ -1571,6 +1567,7 @@ const BoxComponent = props =&gt; {
                         ...Object.assign({}, ...slaveNewData),
                       };
                       setSlaveRowData(rowData);
+                      // props.setState(pre => ({ ...pre, slaveRowData:rowData }));
                       setBoxPopup(false);
                     }}
                   >
@@ -1615,7 +1612,6 @@ const MaterialsComponent = props =&gt; {
         return item;
       }
     });
-
   const extraState = {
     calcPriceFinished: false,
     manyData: [],
@@ -1662,7 +1658,7 @@ const MaterialsComponent = props =&gt; {
         材料信息
         <div className={styles.materialsLine}>
           <div className={styles.selectInput} style={{ width: "50%" }}>
-            <SelectInput {...viewProps} />
+            <SelectInput {...viewProps} itemDetail={materialsConfigNew[0]} />
           </div>
           <div className={styles.materialBtns}>
             <div className={styles.materialBtns}>
@@ -1711,8 +1707,16 @@ const MaterialsComponent = props =&gt; {
                     }
                   : { width: "1.93rem", height: "1.93rem", display: "flex", justifyContent: "center", alignItems: "center", textAlign: "center" }
               }
+              onClick={() => {
+                const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId);
+                const rowIndex = materialsInfo.findIndex((item, i) => i === index);
+                const materialsInfoNew = [...materialsInfo];
+                materialsInfoNew.splice(rowIndex, 1);
+                slaveData[iIndex].materialsInfo = materialsInfoNew;
+                props.setState(pre => ({ ...pre, slaveData, ...extraState }));
+              }}
             >
-              <AddOutline />
+              <MinusOutline />
             </Button>
           </div>
         </div>