app核价

陈鑫涛
1 parent 8d597817
Showing 3 changed files with 20 additions and 9 deletions
src/components/Common/CommonCostomTabBill.js
src/mobile/quotation/detailNew.jsx
src/mobile/quotation/master.jsx
@@ -2468,7 +2468,6 @@ class CommonNewBill extends Component {
         const proName = proObj.sproName;
         let sRowData = slaveRow;
         //取第一条BOM的id
-        console.log('addState1addState1', name, tableData);
         sRowData = { ...sRowData, sBomId: tableData[0].sBomId };
         const value = {
           sProName: proName,
@@ -17,7 +17,6 @@ import { cloneDeep } from &quot;lodash&quot;;
 import moment from "moment";
 const QuickQuoteEvent = props => {
   const { location, selectedNode, sModelsId } = props;
-  const [isDraftSaved, setIsDraftSaved] = useState(false);
   // const selectedNode = JSON.parse(location.state).quotationData;
   const addState = {};
  
@@ -357,7 +356,6 @@ const QuickQuoteEvent = props =&gt; {
       });
       return;
     }
-    const type = isDraftSaved ? "add" : "update";
     props.onSaveState(
       {
         ...addState.onGetAllDelData(),
@@ -878,6 +876,7 @@ const QuickQuoteEvent = props =&gt; {
           manyqtysData: state.manyData,
         },
       }));
+     
       const result = await props.handleCalculation(
         false,
         { ...masterProps, ...newState, manyqtysConfig: state.manyConfig, manyqtysData: state.manyData },
@@ -2279,7 +2278,7 @@ const ManyComponent = props =&gt; {
     };
     props.onSaveState(
       {
-        masterData: { ...props.masterData, handleType: props.masterData.handleType || "update" },
+        masterData: { ...props.masterData, handleType: props.isDraftSaved ? "add" : "update" },
         ...addState,
       },
       () => {
@@ -15,6 +15,7 @@ const masterEvent = props =&gt; {
   const { token } = app;
   const [state, setState] = useState(null);
   const [isInitialized, setIsInitialized] = useState(false);
+  const [isDraftSaved, setIsDraftSaved] = useState(false);
  
   const getSqlDropDownData = async (formId, name, showConfig, record, sKeyUpFilterName, pageNum) => {
     const url = `${commonConfig.server_host}business/getSelectLimit/${showConfig.sId}?sModelsId=${sModelsId}`;
@@ -186,6 +187,8 @@ const masterEvent = props =&gt; {
     onSaveState: handleSaveState,
     onSaveData: handleSaveData,
     onSubmit: handleSave,
+    isDraftSaved,
+    setIsDraftSaved,
     // onButtonClick: handleButtonClick,
     ...state,
   };
@@ -360,7 +363,6 @@ const handleCalculation = async (bSave, nextProps, isWait, props) =&gt; {
     manyDataCache = [],
     dQuickQuoteProductQty,
   } = nextProps;
-    console.log("🚀 ~ handleCalculation ~ dQuickQuoteProductQty:", dQuickQuoteProductQty)
   let { slaveData, controlData, materialsData, processData, masterData, manyqtysData, packData } = nextProps;
   const sMakePerson = masterData.sMakePerson;
   const data = [];
@@ -408,15 +410,25 @@ const handleCalculation = async (bSave, nextProps, isWait, props) =&gt; {
       masterData.sFormId = nextProps.masterData.sFormId;
       masterData.sBillNo = nextProps.masterData.sBillNo;
     }
-    masterData.handleType = nextProps.handleType && nextProps.handleType === "update" ? "update" : "add";
+    // masterData.handleType = nextProps.handleType && nextProps.handleType === "update" ? "update" : "add";
     if (masterData.handleType === "update" && !commonUtils.isEmpty(sMakePerson)) {
       masterData.sMakePerson = sMakePerson;
+      if (masterData.sBillNo === "") {
+        const slaveUrl = `${commonConfig.server_host}business/getBusinessDataByFormcustomId/${"172129113112117410664746760"}?sModelsId=${
+          props.sModelsId
+        }`;
+        const value = { sId: masterData.sId };
+        const slaveReturnData = (await commonServices.postValueService(props.app.token, value, slaveUrl)).data;
+        const data = slaveReturnData.dataset.rows[0].dataSet[0];
+        masterData = { ...data };
+      }
     }
     slaveData = valueReturn[`${slaveConfig.sTbName.toLowerCase()}_tmp`].map(item => {
       item.handleType = dQuickQuoteProductQty ? "update" : item.handleType;
-        item.sId = commonUtils.createSid();
+      item.sId = commonUtils.createSid();
       return item;
     });
+
     controlData = valueReturn[`${controlConfig.sTbName.toLowerCase()}_tmp`].map(item => {
       item.handleType = dQuickQuoteProductQty ? "update" : item.handleType;
       item.sId = commonUtils.createSid();
@@ -539,7 +551,7 @@ const handleCalculation = async (bSave, nextProps, isWait, props) =&gt; {
         ...addState,
       });
     } else {
-      masterData.handleType = "update";
+      // masterData.handleType = "update";
       if (isWait) {
         return {
           slaveData,
@@ -798,7 +810,8 @@ const handleSaveData = async (params, props) =&gt; {
     Toast.show({
       content: "保存成功",
     });
-    masterData.handleType = "update";
+    // masterData.handleType = "update";
+    props.setIsDraftSaved(true);
     props.onSaveState({
       enabled: false,
       currentId: masterData.sId,