tplus-components-touch 3.22.2 → 3.22.6

package/dist/components/settlement/settlementStore.js

@@ -287,7 +287,7 @@ var SettlementStore = (_class = function () {
                             }
                         });
                         if (promoVoucher.coupon_code) {
-                            _this2.paymode.calcDjqValue(_this2.paymode.currentMode.djqs[0]);
+                            _this2.paymode.calcDjqCheckValue(_this2.paymode.currentMode.djqs[0], _this2.dto, 'single');
                         }
                     } else {
                         if (promoVoucher.coupon_code) {
@@ -321,7 +321,7 @@ var SettlementStore = (_class = function () {
                                 }
 
                                 _context.next = 4;
-                                return _this2.getCouponList(sn);
+                                return _this2.getCouponList(sn, 'sinlge');
 
                             case 4:
                                 return _context.abrupt('return', _context.sent);
@@ -965,7 +965,12 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'delPay',
         value: function delPay(index) {
+            var _this10 = this;
+
             (0, _remove3.default)(this.paymode.thePaymodes, function (mode) {
+                if (mode.paymethodId === index) {
+                    _this10.paymode.amount = _this10.paymode.amount + mode.value;
+                }
                 return mode.paymethodId === index;
             });
             this.paymode.currentFocus = -1;
@@ -975,6 +980,8 @@ var SettlementStore = (_class = function () {
         key: 'commit',
         value: function () {
             var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
+                var _ref12, isNewRetailBCPos;
+
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
                         switch (_context2.prev = _context2.next) {
@@ -989,43 +996,59 @@ var SettlementStore = (_class = function () {
                                 return _context2.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _context2.prev = 3;
+                                _ref12 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref12.isNewRetailBCPos;
+                                _context2.prev = 4;
 
                                 if (!(this.type == 1)) {
-                                    _context2.next = 9;
+                                    _context2.next = 10;
                                     break;
                                 }
 
-                                _context2.next = 7;
+                                _context2.next = 8;
                                 return this.saveMember();
 
-                            case 7:
-                                _context2.next = 11;
+                            case 8:
+                                _context2.next = 18;
                                 break;
 
-                            case 9:
-                                _context2.next = 11;
+                            case 10:
+                                if (!isNewRetailBCPos) {
+                                    _context2.next = 13;
+                                    break;
+                                }
+
+                                _context2.next = 13;
+                                return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
+
+                            case 13:
+                                _context2.next = 15;
                                 return this.save();
 
-                            case 11:
+                            case 15:
+                                if (!isNewRetailBCPos) {
+                                    _context2.next = 18;
+                                    break;
+                                }
+
+                                _context2.next = 18;
+                                return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
+
+                            case 18:
                                 return _context2.abrupt('return', _promise2.default.resolve(true));
 
-                            case 14:
-                                _context2.prev = 14;
-                                _context2.t0 = _context2['catch'](3);
+                            case 21:
+                                _context2.prev = 21;
+                                _context2.t0 = _context2['catch'](4);
 
                                 console.error('settlementStore.commit失败，错误信息：' + _context2.t0);
                                 return _context2.abrupt('return', _promise2.default.resolve(_context2.t0));
 
-                            case 18:
-                                console.error('settlementStore.commit失败，错误信息：' + err);
-
-                            case 19:
+                            case 25:
                             case 'end':
                                 return _context2.stop();
                         }
                     }
-                }, _callee2, this, [[3, 14]]);
+                }, _callee2, this, [[4, 21]]);
             }));
 
             function commit(_x2) {
@@ -1038,31 +1061,31 @@ var SettlementStore = (_class = function () {
         key: 'handlePrint',
         value: function handlePrint(resp) {
             // 储值打印
-            return (0, _tplusComponentsTouch.printDispatch)(_tplusComponentsTouch.DoNameList.DO_STORAGE_PRINT, resp.ID, {});
+            return (0, _tplusComponentsTouch.printDispatch)(_tplusComponentsTouch.DoNameList.DO_STORAGE_PRINT, resp, {});
         }
     }, {
         key: 'saveMember',
         value: function saveMember() {
-            var _this10 = this;
+            var _this11 = this;
 
             var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn12.PayStyle;
 
             (0, _mobx.runInAction)(function () {
-                _this10.dto.StorageMutiSettleDetails = [];
-                var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
+                _this11.dto.StorageMutiSettleDetails = [];
+                var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
                     return parseFloat(mode.value) != 0;
-                }) : _this10.paymode.thePaymodes;
+                }) : _this11.paymode.thePaymodes;
                 (0, _each3.default)(thePaymodes, function (mode) {
-                    var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
+                    var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
 
                     var value = parseFloat(mode.value);
                     var giveChange = null;
-                    if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
-                        value = Math.Add(value, _this10.paymode.receivable);
-                        giveChange = Math.abs(_this10.paymode.receivable);
+                    if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
+                        value = Math.Add(value, _this11.paymode.receivable);
+                        giveChange = Math.abs(_this11.paymode.receivable);
                     }
-                    _this10.dto.StorageMutiSettleDetails.push({
+                    _this11.dto.StorageMutiSettleDetails.push({
                         Code: mode.paymethodId,
                         StorageAmount: value,
                         GiveChange: giveChange,
@@ -1071,7 +1094,7 @@ var SettlementStore = (_class = function () {
                         PaymentCode: mode.authCode,
                         DynamicPropertyKeys: [],
                         DynamicPropertyValues: [],
-                        DataSource: { Id: _this10.dataSource }
+                        DataSource: { Id: _this11.dataSource }
                     });
                 });
             });
@@ -1081,16 +1104,16 @@ var SettlementStore = (_class = function () {
                 IPMSG = JSON.parse(window.localStorage.IPMSG);
             }
             return (0, _tplusApi.tApi)({ dto: this.dto }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
-                _this10.handlePrint(resp);
+                _this11.handlePrint(resp);
             });
         }
     }, {
         key: 'save',
         value: function () {
-            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
-                var _this11 = this;
+            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+                var _this12 = this;
 
-                var _enumController$getEn13, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn13, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
@@ -1099,24 +1122,24 @@ var SettlementStore = (_class = function () {
                                 _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn13.PayStyle;
 
                                 (0, _mobx.runInAction)(function () {
-                                    _this11.dto.RetailPaymentDetails = [];
-                                    _this11.dto.RetailStorageDetails = [];
-                                    _this11.dto.RetailCouponDetails = [];
+                                    _this12.dto.RetailPaymentDetails = [];
+                                    _this12.dto.RetailStorageDetails = [];
+                                    _this12.dto.RetailCouponDetails = [];
                                     var czkSum = 0;
-                                    var Idmember = _this11.dto.Idmember;
+                                    var Idmember = _this12.dto.Idmember;
                                     var count = 0;
-                                    var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
+                                    var thePaymodes = _this12.newStyle ? (0, _filter3.default)(_this12.paymode.thePaymodes, function (mode) {
                                         return parseFloat(mode.value) != 0;
-                                    }) : _this11.paymode.thePaymodes;
+                                    }) : _this12.paymode.thePaymodes;
                                     (0, _each3.default)(thePaymodes, function (mode, index) {
-                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
+                                        var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': mode.paymentType });
                                         if (mode.paymentType == PayStyle.hyczk) {
                                             if (!Idmember) {
                                                 Idmember = mode.member.id;
                                             }
                                             czkSum = Math.Add(czkSum, mode.value);
-                                            var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this11.member.MeStorageCardId;
-                                            _this11.dto.RetailStorageDetails.push({
+                                            var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this12.member.MeStorageCardId;
+                                            _this12.dto.RetailStorageDetails.push({
                                                 Code: mode.paymethodId,
                                                 MeStorageCardId: MeStorageCardId,
                                                 StoragePaymentAmount: mode.value,
@@ -1125,17 +1148,17 @@ var SettlementStore = (_class = function () {
                                                 Idmember: mode.member.id,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this11.dataSource },
+                                                DataSource: { Id: _this12.dataSource },
                                                 Password: mode.authCode
                                             });
                                         } else {
                                             var value = parseFloat(mode.value);
                                             var giveChange = null;
-                                            if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
-                                                value = Math.Add(value, _this11.paymode.receivable);
-                                                giveChange = Math.abs(_this11.paymode.receivable);
+                                            if (mode.paymentType == PayStyle.xianjin && _this12.paymode.receivable < 0 && value > Math.abs(_this12.paymode.receivable)) {
+                                                value = Math.Add(value, _this12.paymode.receivable);
+                                                giveChange = Math.abs(_this12.paymode.receivable);
                                             }
-                                            _this11.dto.RetailPaymentDetails.push({
+                                            _this12.dto.RetailPaymentDetails.push({
                                                 Code: mode.paymethodId,
                                                 OrigAmount: mode.exchangeRate != 1 ? mode.value2 : value,
                                                 Amount: value,
@@ -1149,12 +1172,12 @@ var SettlementStore = (_class = function () {
                                                 OverchargesAmount: mode.overchargesAmount,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this11.dataSource }
+                                                DataSource: { Id: _this12.dataSource }
                                             });
                                             if (mode.paymentType == PayStyle.djq) {
                                                 (0, _each3.default)(mode.djqs, function (djq) {
                                                     if (djq.checked) {
-                                                        _this11.dto.RetailCouponDetails.push({
+                                                        _this12.dto.RetailCouponDetails.push({
                                                             CouponCode: djq.code,
                                                             ReductionAmount: djq.amount,
                                                             EnableAmount: djq.doorsill,
@@ -1164,7 +1187,7 @@ var SettlementStore = (_class = function () {
                                                             PromotionId: djq.promoId,
                                                             PromotionRuleId: djq.promoRuleId,
                                                             PromoCouponAllocatedId: djq.id,
-                                                            DataSource: { Id: _this11.dataSource }
+                                                            DataSource: { Id: _this12.dataSource }
                                                         });
                                                     }
                                                 });
@@ -1172,42 +1195,42 @@ var SettlementStore = (_class = function () {
                                         }
                                     });
 
-                                    var _ref13 = _mutantsUtil.platform || {},
-                                        isNewRetailBCPos = _ref13.isNewRetailBCPos;
+                                    var _ref14 = _mutantsUtil.platform || {},
+                                        isNewRetailBCPos = _ref14.isNewRetailBCPos;
 
-                                    if (_this11.dto.RetailStorageDetails.length > 0) {
-                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
+                                    if (_this12.dto.RetailStorageDetails.length > 0) {
+                                        var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
                                         if (isNewRetailBCPos) {
                                             // this.dto.RetailStorageDetails && this.dto.RetailStorageDetails.forEach((value, index) => {
                                             //     value.MeStorageCardId = (mode.MeStorageCardId ? mode.MeStorageCardId : this.member.MeStorageCardId);
                                             // })
-                                            _this11.dto.RetailPaymentDetails.push({
-                                                Code: _this11.paymode.counter,
+                                            _this12.dto.RetailPaymentDetails.push({
+                                                Code: _this12.paymode.counter,
                                                 OrigAmount: czkSum,
                                                 Amount: czkSum,
                                                 IdsettleStyle: themode.idSettleStyle,
                                                 IdbankAccount: themode.idBankAccount,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this11.dataSource },
-                                                RetailStorageDetails: _this11.dto.RetailStorageDetails
+                                                DataSource: { Id: _this12.dataSource },
+                                                RetailStorageDetails: _this12.dto.RetailStorageDetails
                                             });
                                         } else {
-                                            _this11.dto.RetailPaymentDetails.push({
-                                                Code: _this11.paymode.counter,
+                                            _this12.dto.RetailPaymentDetails.push({
+                                                Code: _this12.paymode.counter,
                                                 OrigAmount: czkSum,
                                                 Amount: czkSum,
                                                 IdsettleStyle: themode.idSettleStyle,
                                                 IdbankAccount: themode.idBankAccount,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this11.dataSource }
+                                                DataSource: { Id: _this12.dataSource }
                                             });
                                         }
-                                        _this11.dto.Idmember = Idmember;
+                                        _this12.dto.Idmember = Idmember;
                                     }
                                 });
-                                _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
+                                _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
 
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
@@ -1253,8 +1276,8 @@ var SettlementStore = (_class = function () {
                                 }
 
                                 return _context3.abrupt('return', (0, _tplusApi.ccApi)({ dto: (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } }), cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
-                                    _this11.setDtoID(resp.ID);
-                                    _this11.billID = resp.ID;
+                                    _this12.setDtoID(resp.ID);
+                                    _this12.billID = resp.ID;
                                 }));
 
                             case 18:
@@ -1263,8 +1286,8 @@ var SettlementStore = (_class = function () {
 
                             case 20:
                                 return _context3.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
-                                    _this11.setDtoID(resp.ID);
-                                    _this11.billID = resp.ID;
+                                    _this12.setDtoID(resp.ID);
+                                    _this12.billID = resp.ID;
                                 }));
 
                             case 21:
@@ -1276,7 +1299,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function save() {
-                return _ref12.apply(this, arguments);
+                return _ref13.apply(this, arguments);
             }
 
             return save;
@@ -1289,7 +1312,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
                         switch (_context4.prev = _context4.next) {
@@ -1317,7 +1340,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function querySettleResult() {
-                return _ref15.apply(this, arguments);
+                return _ref16.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1343,14 +1366,14 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
-                var _ref17, isNewRetailBCPos, cook1, cook2, message, result, count, _result;
+            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
+                var _ref18, isNewRetailBCPos, cook1, cook2, message, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
                         switch (_context5.prev = _context5.next) {
                             case 0:
-                                _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
+                                _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
                                 _context5.prev = 1;
 
                                 if (!isNewRetailBCPos) {
@@ -1434,7 +1457,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function validePwd(_x3) {
-                return _ref16.apply(this, arguments);
+                return _ref17.apply(this, arguments);
             }
 
             return validePwd;
@@ -1444,7 +1467,7 @@ var SettlementStore = (_class = function () {
 }(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, 'queryPwd', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this12 = this;
+        var _this13 = this;
 
         return function (newPass, newPassConfirm) {
             if (!newPass || !newPassConfirm) {
@@ -1456,7 +1479,7 @@ var SettlementStore = (_class = function () {
             var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
             return (0, _tplusApi.ccApi)({
                 Idstore: idstore,
-                meMemberId: _this12.member.ID,
+                meMemberId: _this13.member.ID,
                 oldPassword: null,
                 newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
                 dataSource: "POS"
@@ -1470,19 +1493,19 @@ var SettlementStore = (_class = function () {
 }), _applyDecoratedDescriptor(_class.prototype, 'initByOriginReturn', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'initByOriginReturn'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'quickSettle', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'quickSettle'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusAndAddPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusAndAddPay'), _class.prototype), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, 'updateMemberInfo', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this13 = this;
+        var _this14 = this;
 
         return function () {
-            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
                 return _regenerator2.default.wrap(function _callee6$(_context6) {
                     while (1) {
                         switch (_context6.prev = _context6.next) {
                             case 0:
-                                _getLoginInfo = _this13.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
+                                _getLoginInfo = _this14.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
                                 _context6.next = 3;
-                                return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
+                                return (0, _tplusApi.tApi)({ Idmember: _this14.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
 
                             case 3:
                                 resp = _context6.sent;
@@ -1496,11 +1519,11 @@ var SettlementStore = (_class = function () {
                                 return _context6.stop();
                         }
                     }
-                }, _callee6, _this13);
+                }, _callee6, _this14);
             }));
 
             return function (_x4) {
-                return _ref18.apply(this, arguments);
+                return _ref19.apply(this, arguments);
             };
         }();
     }
@@ -1577,8 +1600,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
         }
     }, {
         key: 'calcDjqCheckValue',
-        value: function calcDjqCheckValue(q1, dto) {
-            var _this14 = this;
+        value: function calcDjqCheckValue(q1, dto, params) {
+            var _this15 = this;
 
             var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
             var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -1588,9 +1611,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 _message2.default.warn('本单最多可用' + useLimitPerOrder + '张');
                 return;
             }
+            if (params === 'single') {
+                this.checkList = [];
+            }
 
-            var _ref19 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref19.isNewRetailBCPos;
+            var _ref20 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref20.isNewRetailBCPos;
 
             var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn14.PayStyle,
@@ -1622,7 +1648,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             if (!q1.checked) {
                 this.checkList.forEach(function (ele, i) {
                     if (ele.id === q1.id) {
-                        _this14.checkList.splice(i, 1);
+                        _this15.checkList.splice(i, 1);
                     }
                 });
             } else {
@@ -1634,9 +1660,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.checkList.forEach(function (ele, i) {
                 if (ele.discountPct > 0) {
                     if (ele.amount === 0) {
-                        console.log(ele.amount, _this14.currentMode.receivable, 'amount2222222222');
-                        ele.amount = (1 - ele.discountPct) * _this14.currentMode.receivable;
-                        console.log(ele.amount, _this14.currentMode.receivable, 'amount1111111111');
+                        ele.amount = (1 - ele.discountPct) * _this15.currentMode.receivable;
                     }
                 }
                 sum = Math.Add(sum, ele.amount);
@@ -1644,6 +1668,9 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.currentMode.value = (0, _utils.getFixedNumber)(Math.min(this.receivable, sum, this.currentMode.maxamount));
             this.currentMode.receivable = (0, _utils.getFixedNumber)(this.receivable - this.currentMode.value);
             this.currentMode.overchargesAmount = (0, _utils.getFixedNumber)(sum - this.currentMode.value);
+            if (params === 'single') {
+                return;
+            }
             var promoVoucher = {};
             promoVoucher.boName = "Retail";
             // promoVoucher.promoLinks = _filter(this.currentMode.djqs,djq=>djq.checked);
@@ -1695,22 +1722,22 @@ var PayMode = exports.PayMode = (_class3 = function () {
             return (0, _tplusApi.ccApi)((0, _extends3.default)({}, promoVoucher), 'promotion/PromoCalculate/findUsefulCouponPromoList', false, false, { method: 'post', timeout_skip: true }).then(function (result) {
                 if (result && result.length != 0) {
                     result.forEach(function (element) {
-                        var djq1 = (0, _filter3.default)(_this14.currentMode.djqs, function (djq) {
+                        var djq1 = (0, _filter3.default)(_this15.currentMode.djqs, function (djq) {
                             return djq.id === element.id;
                         });
 
-                        var _ref20 = element || {},
-                            couponCode = _ref20.couponCode,
-                            name = _ref20.name,
-                            tieredAmountResult = _ref20.tieredAmountResult,
-                            fromDate = _ref20.fromDate,
-                            dateMount = _ref20.dateMount,
-                            promoMethodEnum = _ref20.promoMethodEnum,
-                            discountPct = _ref20.discountPct,
-                            nominalAmount = _ref20.nominalAmount,
-                            promoId = _ref20.promoId,
-                            id = _ref20.id,
-                            doorsill = _ref20.doorsill;
+                        var _ref21 = element || {},
+                            couponCode = _ref21.couponCode,
+                            name = _ref21.name,
+                            tieredAmountResult = _ref21.tieredAmountResult,
+                            fromDate = _ref21.fromDate,
+                            dateMount = _ref21.dateMount,
+                            promoMethodEnum = _ref21.promoMethodEnum,
+                            discountPct = _ref21.discountPct,
+                            nominalAmount = _ref21.nominalAmount,
+                            promoId = _ref21.promoId,
+                            id = _ref21.id,
+                            doorsill = _ref21.doorsill;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -1738,9 +1765,9 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             //     couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
                             //     id
                             // })
-                            _this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
+                            _this15.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
                         } else {
-                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum);
+                            _this15.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -1752,8 +1779,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref21 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref21.isNewRetailBCPos;
+            var _ref22 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref22.isNewRetailBCPos;
 
             var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
                 Differentiate = _enumController$getEn15.Differentiate;
@@ -1816,9 +1843,20 @@ var PayMode = exports.PayMode = (_class3 = function () {
         value: function setCurrentModeValue(v, max) {
             this.currentMode.value = parseFloat(v) || 0;
             this.currentMode.errinfo = '';
+            var sum = this.amount;
+
+            var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn16.PayStyle;
+
+            this.paymodes.thePaymodes && this.paymodes.thePaymodes.forEach(function (mode) {
+                if (mode.paymentType === PayStyle.hyczk) {
+                    sum -= mode.value;
+                }
+            });
+
             if (this.amount > 0 && (v === '' || v === '0.00')) {
                 this.currentMode.errinfo = "实收金额必须录入";
-            } else if (Math.abs(parseFloat(v)) > Math.abs(this.amount)) {
+            } else if (Math.abs(parseFloat(v)) > Math.abs(sum)) {
                 this.currentMode.errinfo = "实收不应大于应收";
             } else if (parseFloat(v) > 0 && parseFloat(v) > (max || 0)) {
                 this.currentMode.errinfo = "余额不足";
@@ -1832,16 +1870,16 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
-                var _this15 = this;
+            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
+                var _this16 = this;
 
-                var _enumController$getEn16, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _enumController$getEn17, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
                 return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
                         switch (_context7.prev = _context7.next) {
                             case 0:
-                                _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn16.settleStyleType, PayStyle = _enumController$getEn16.PayStyle;
+                                _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn17.settleStyleType, PayStyle = _enumController$getEn17.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
                                 _context7.next = 5;
@@ -1865,6 +1903,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 isQuick: (0, _findIndex3.default)(modes.QuickSettleStyles, { 'Code': mode.Code }) >= 0,
                                                 orderBy: 1,
                                                 paymentType: mode.Code,
+                                                offlineDisable: mode.offlineDisable,
                                                 idSettleStyle: mode.IdSettleStyle,
                                                 idBankAccount: mode.IdBankAccount,
                                                 exchangeRate: mode.Currency ? mode.Currency.ExchangeRate : 1,
@@ -1872,7 +1911,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
                                             });
                                         });
-                                        _this15.paymodes = paymodes;
+                                        _this16.paymodes = paymodes;
                                         //modes.QuickSettleStyles
                                     });
                                 }
@@ -1886,7 +1925,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x5, _x6) {
-                return _ref22.apply(this, arguments);
+                return _ref23.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -1931,19 +1970,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
 }), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this16 = this;
+        var _this17 = this;
 
         return function () {
-            _this16.checkList = [];
+            _this17.checkList = [];
         };
     }
 }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this17 = this;
+        var _this18 = this;
 
         return function (id, couponNum, code) {
-            _this17.currentMode.djqs.forEach(function (ele) {
+            _this18.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
                     ele.couponCategoryEnum = couponNum;
                     var IsEnable = ele.couponCategoryEnum === 'RIGUP' || ele.couponCategoryEnum === 'UN_MATCH' || ele.couponCategoryEnum === "PREPARING" || ele.couponCategoryEnum === 'PROMO_LIMITED' || ele.couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
@@ -1955,7 +1994,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
 }), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this18 = this;
+        var _this19 = this;
 
         return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
             var djq = {
@@ -1977,13 +2016,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 couponCategoryEnum: couponCategoryEnum,
                 id: id
             };
-            _this18.currentMode.djqs.push(djq);
+            _this19.currentMode.djqs.push(djq);
         };
     }
 }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
 var Member = exports.Member = (_class5 = function () {
     function Member(m) {
-        var _this19 = this;
+        var _this20 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
@@ -2006,17 +2045,17 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref23 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref23.isNewRetailBCPos;
+            var _ref24 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref24.isNewRetailBCPos;
 
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
             m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
             (0, _mobx.runInAction)(function () {
-                _this19.cardNo = m.CardCode;
+                _this20.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this19.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this20.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this19.balance = _this19.rawbalance;
+                    _this20.balance = _this20.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;