tplus-components-touch 3.22.17 → 3.23.3

package/dist/components/settlement/settlementStore.js

@@ -109,6 +109,10 @@ var _moment = require('moment');
 
 var _moment2 = _interopRequireDefault(_moment);
 
+var _reduce2 = require('lodash/reduce');
+
+var _reduce3 = _interopRequireDefault(_reduce2);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _initDefineProp(target, property, descriptor, context) {
@@ -657,6 +661,9 @@ var SettlementStore = (_class = function () {
                             _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
                             _this7.updateEvent();
                             var message = '';
+                            var sum = (0, _reduce3.default)(_this7.paymode.thePaymodes, function (total, cur) {
+                                return total + cur.value;
+                            }, 0);
                             if (global.CheckMemberStorageProcessorBlock) {
                                 message = CheckMemberStorageProcessorBlock.execute(m);
                             }
@@ -664,7 +671,7 @@ var SettlementStore = (_class = function () {
                                 _this7.paymode.currentMode.errinfo = message;
                             } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
                                 _this7.paymode.currentMode.errinfo = "余额不足";
-                            } else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
+                            } else if (_this7.paymode.amount > 0 && parseFloat(_this7.paymode.amount) !== sum && _this7.paymode.currentMode.value == 0) {
                                 _this7.paymode.currentMode.errinfo = "实收金额必须录入";
                             } else {
                                 // 查询成功后将焦点移入下一个输入框
@@ -829,7 +836,7 @@ var SettlementStore = (_class = function () {
                 maxamount: this.paymode.amount
             });
             if (type == PayStyle.hyczk) {
-                if (!mode.member.id) {
+                if (!mode.member.id || !mode.member.StorageCardNo) {
                     (0, _mobx.runInAction)(function () {
                         mode.errinfo = '未录入储值卡';
                     });
@@ -1171,7 +1178,7 @@ var SettlementStore = (_class = function () {
                                                 DataSource: { Id: _this11.dataSource }
                                             });
                                             if (mode.paymentType == PayStyle.djq) {
-                                                (0, _each3.default)(_this11.paymode.checkList && _this11.paymode.checkList.length ? _this11.paymode.checkList : _this11.paymode.currentMode.djqs, function (djq) {
+                                                (0, _each3.default)(_this11.paymode.checkList && _this11.paymode.checkList.length ? _this11.paymode.checkList : mode.djqs, function (djq) {
                                                     _this11.dto.RetailCouponDetails.push({
                                                         CouponCode: djq.promoCouponCode,
                                                         ReductionAmount: djq.amount,
@@ -1842,13 +1849,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
             var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn17.PayStyle;
 
-            this.paymodes.thePaymodes && this.paymodes.thePaymodes.forEach(function (mode) {
+            this.thePaymodes && this.thePaymodes.forEach(function (mode) {
                 if (mode.paymentType === PayStyle.hyczk) {
                     sum -= mode.value;
                 }
             });
 
-            if (this.amount > 0 && (v === '' || v === '0.00')) {
+            if (this.amount > 0 && (v === '' || v === '0.00') && sum !== 0) {
                 this.currentMode.errinfo = "实收金额必须录入";
             } else if (Math.abs(parseFloat(v)) > Math.abs(sum)) {
                 this.currentMode.errinfo = "实收不应大于应收";