From d5f1f8718dc28569f3eec999e2263933686ff0f5 Mon Sep 17 00:00:00 2001
From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Mon, 16 Jun 2025 18:20:07 +0800
Subject: [PATCH] 确认下单

---
 src/mobile/quotation/detailNew.jsx | 6 +++---
 src/mobile/quotation/master.jsx    | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/mobile/quotation/detailNew.jsx b/src/mobile/quotation/detailNew.jsx
index da3d4d1..34efce3 100644
--- a/src/mobile/quotation/detailNew.jsx
+++ b/src/mobile/quotation/detailNew.jsx
@@ -17,7 +17,7 @@ import { cloneDeep } from "lodash";
 import moment from "moment";
 const QuickQuoteEvent = props => {
   const { location, selectedNode, sModelsId } = props;
-  const [isDraftSaved, setIsDraftSaved] = useState(props.isDraftSaved || false);
+  const [isDraftSaved, setIsDraftSaved] = useState(false);
   // const selectedNode = JSON.parse(location.state).quotationData;
   const addState = {};
 
@@ -354,7 +354,7 @@ const QuickQuoteEvent = props => {
     props.onSaveState(
       {
         ...addState.onGetAllDelData(),
-        masterData: { ...nextProps.masterData, handleType: type, sQuoConfig: JSON.stringify(addState.onGetFilterState(nextState)) },
+        masterData: { ...nextProps.masterData, handleType: masterData.handleType, sQuoConfig: JSON.stringify(addState.onGetFilterState(nextState)) },
         slaveData: nextProps.slaveData.map(item => {
           return {
             ...item,
@@ -2047,7 +2047,7 @@ const ManyComponent = props => {
   };
   return (
     <div>
-      <div>
+      <div style={{marginBottom:'1rem',textAlign:'right'}}>
         <Button
           color="primary"
           fill="solid"
diff --git a/src/mobile/quotation/master.jsx b/src/mobile/quotation/master.jsx
index 97b4847..fbd8af7 100644
--- a/src/mobile/quotation/master.jsx
+++ b/src/mobile/quotation/master.jsx
@@ -150,7 +150,7 @@ const masterEvent = props => {
         handleType: "add",
         iPositiveColor: 4,
         maxBillNo: "sBillNo",
-        sFormId: commonUtils.createSid(),
+        sFormId: sModelsId,
         sId: commonUtils.createSid(),
       };
       setState(prevState => ({
@@ -499,7 +499,9 @@ const handleCalculation = async (bSave, nextProps, isWait, props) => {
     /* 计算成功后自动调用保存 */
     if (bSave) {
       const data = [];
-      masterData.handleType = "update";
+      // masterData.handleType = "update";
+      // masterData.sFormId = commonUtils.createSid()
+      masterData.sId = commonUtils.createSid()
       data.push(commonBusiness.mergeData("master", masterConfig.sTbName, [masterData]));
       data.push(commonBusiness.mergeData("slave", slaveConfig.sTbName, slaveData, slaveDelData));
       data.push(commonBusiness.mergeData("control", controlConfig.sTbName, controlData, controlDelData));
--
libgit2 0.22.2