Commit bca4669a084502bc8fe3b7075fddb59c03c429fb
1 parent
3f49020a
1.单据保存去掉表格内容不能为空![dTotalMoney或dRoundingMoney必须大于0]
Showing
1 changed file
with
7 additions
and
7 deletions
src/components/Common/CommonBillEvent.js
| @@ -2529,13 +2529,13 @@ export default (ChildComponent) => { | @@ -2529,13 +2529,13 @@ export default (ChildComponent) => { | ||
| 2529 | } | 2529 | } |
| 2530 | } | 2530 | } |
| 2531 | } | 2531 | } |
| 2532 | - if (commonUtils.isNotEmptyArr(slaveData) && slaveData.length > 0 && flagCheckSave) { | ||
| 2533 | - message.warning('表格内容不能为空![dTotalMoney或dRoundingMoney必须大于0]'); | ||
| 2534 | - this.props.onSaveState({ | ||
| 2535 | - loading: false, | ||
| 2536 | - }); | ||
| 2537 | - return; | ||
| 2538 | - } | 2532 | + // if (commonUtils.isNotEmptyArr(slaveData) && slaveData.length > 0 && flagCheckSave) { |
| 2533 | + // message.warning('表格内容不能为空![dTotalMoney或dRoundingMoney必须大于0]'); | ||
| 2534 | + // this.props.onSaveState({ | ||
| 2535 | + // loading: false, | ||
| 2536 | + // }); | ||
| 2537 | + // return; | ||
| 2538 | + // } | ||
| 2539 | const dPmoney = this.props.getFloatNum('dProductMoney'); | 2539 | const dPmoney = this.props.getFloatNum('dProductMoney'); |
| 2540 | dslaveTotalMoney = commonUtils.convertFixNum(dslaveTotalMoney, dPmoney);/* 取系统设定小数位 */ | 2540 | dslaveTotalMoney = commonUtils.convertFixNum(dslaveTotalMoney, dPmoney);/* 取系统设定小数位 */ |
| 2541 | if (commonUtils.isNotEmptyArr(slaveData) && commonUtils.isNotEmptyNumber(masterData.dTotalMoney) && commonUtils.isNotEmptyNumber(masterData.dAdvanceMoney) && commonUtils.convertFixNum(masterData.dTotalMoney - masterData.dAdvanceMoney, dPmoney) !== dslaveTotalMoney) { | 2541 | if (commonUtils.isNotEmptyArr(slaveData) && commonUtils.isNotEmptyNumber(masterData.dTotalMoney) && commonUtils.isNotEmptyNumber(masterData.dAdvanceMoney) && commonUtils.convertFixNum(masterData.dTotalMoney - masterData.dAdvanceMoney, dPmoney) !== dslaveTotalMoney) { |