Commit d5f1f8718dc28569f3eec999e2263933686ff0f5
1 parent
79cbf38c
确认下单
Showing
2 changed files
with
7 additions
and
5 deletions
src/mobile/quotation/detailNew.jsx
| @@ -17,7 +17,7 @@ import { cloneDeep } from "lodash"; | @@ -17,7 +17,7 @@ import { cloneDeep } from "lodash"; | ||
| 17 | import moment from "moment"; | 17 | import moment from "moment"; |
| 18 | const QuickQuoteEvent = props => { | 18 | const QuickQuoteEvent = props => { |
| 19 | const { location, selectedNode, sModelsId } = props; | 19 | const { location, selectedNode, sModelsId } = props; |
| 20 | - const [isDraftSaved, setIsDraftSaved] = useState(props.isDraftSaved || false); | 20 | + const [isDraftSaved, setIsDraftSaved] = useState(false); |
| 21 | // const selectedNode = JSON.parse(location.state).quotationData; | 21 | // const selectedNode = JSON.parse(location.state).quotationData; |
| 22 | const addState = {}; | 22 | const addState = {}; |
| 23 | 23 | ||
| @@ -354,7 +354,7 @@ const QuickQuoteEvent = props => { | @@ -354,7 +354,7 @@ const QuickQuoteEvent = props => { | ||
| 354 | props.onSaveState( | 354 | props.onSaveState( |
| 355 | { | 355 | { |
| 356 | ...addState.onGetAllDelData(), | 356 | ...addState.onGetAllDelData(), |
| 357 | - masterData: { ...nextProps.masterData, handleType: type, sQuoConfig: JSON.stringify(addState.onGetFilterState(nextState)) }, | 357 | + masterData: { ...nextProps.masterData, handleType: masterData.handleType, sQuoConfig: JSON.stringify(addState.onGetFilterState(nextState)) }, |
| 358 | slaveData: nextProps.slaveData.map(item => { | 358 | slaveData: nextProps.slaveData.map(item => { |
| 359 | return { | 359 | return { |
| 360 | ...item, | 360 | ...item, |
| @@ -2047,7 +2047,7 @@ const ManyComponent = props => { | @@ -2047,7 +2047,7 @@ const ManyComponent = props => { | ||
| 2047 | }; | 2047 | }; |
| 2048 | return ( | 2048 | return ( |
| 2049 | <div> | 2049 | <div> |
| 2050 | - <div> | 2050 | + <div style={{marginBottom:'1rem',textAlign:'right'}}> |
| 2051 | <Button | 2051 | <Button |
| 2052 | color="primary" | 2052 | color="primary" |
| 2053 | fill="solid" | 2053 | fill="solid" |
src/mobile/quotation/master.jsx
| @@ -150,7 +150,7 @@ const masterEvent = props => { | @@ -150,7 +150,7 @@ const masterEvent = props => { | ||
| 150 | handleType: "add", | 150 | handleType: "add", |
| 151 | iPositiveColor: 4, | 151 | iPositiveColor: 4, |
| 152 | maxBillNo: "sBillNo", | 152 | maxBillNo: "sBillNo", |
| 153 | - sFormId: commonUtils.createSid(), | 153 | + sFormId: sModelsId, |
| 154 | sId: commonUtils.createSid(), | 154 | sId: commonUtils.createSid(), |
| 155 | }; | 155 | }; |
| 156 | setState(prevState => ({ | 156 | setState(prevState => ({ |
| @@ -499,7 +499,9 @@ const handleCalculation = async (bSave, nextProps, isWait, props) => { | @@ -499,7 +499,9 @@ const handleCalculation = async (bSave, nextProps, isWait, props) => { | ||
| 499 | /* 计算成功后自动调用保存 */ | 499 | /* 计算成功后自动调用保存 */ |
| 500 | if (bSave) { | 500 | if (bSave) { |
| 501 | const data = []; | 501 | const data = []; |
| 502 | - masterData.handleType = "update"; | 502 | + // masterData.handleType = "update"; |
| 503 | + // masterData.sFormId = commonUtils.createSid() | ||
| 504 | + masterData.sId = commonUtils.createSid() | ||
| 503 | data.push(commonBusiness.mergeData("master", masterConfig.sTbName, [masterData])); | 505 | data.push(commonBusiness.mergeData("master", masterConfig.sTbName, [masterData])); |
| 504 | data.push(commonBusiness.mergeData("slave", slaveConfig.sTbName, slaveData, slaveDelData)); | 506 | data.push(commonBusiness.mergeData("slave", slaveConfig.sTbName, slaveData, slaveDelData)); |
| 505 | data.push(commonBusiness.mergeData("control", controlConfig.sTbName, controlData, controlDelData)); | 507 | data.push(commonBusiness.mergeData("control", controlConfig.sTbName, controlData, controlDelData)); |