tplus-components-touch 3.22.8 → 3.22.12

package/dist/components/settlement/settlementStore.js

@@ -269,11 +269,7 @@ var SettlementStore = (_class = function () {
                                 promoRuleId = tieredAmountResult.promoRuleId,
                                 couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
 
-                            if ((0, _find3.default)(_this2.paymode.currentMode.djqs, function (djq) {
-                                return djq.code == couponCode;
-                            })) {
-                                _message2.default.info(Differentiate.COUPON + '\u5DF2\u6DFB\u52A0');
-                            } else if (result.IsRepelWithPoints && (0, _find3.default)(_this2.paymode.thePaymodes, function (themode) {
+                            if (result.IsRepelWithPoints && (0, _find3.default)(_this2.paymode.thePaymodes, function (themode) {
                                 return themode.paymentType == PayStyle.jfdx;
                             })) {
                                 _message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
@@ -671,7 +667,7 @@ var SettlementStore = (_class = function () {
                             } else {
                                 // 查询成功后将焦点移入下一个输入框
                                 var nextInput = document.querySelector('.czk .received .input');
-                                nextInput && nextInput.focus();
+                                nextInput && nextInput.select();
                             }
                         });
                     }
@@ -1173,21 +1169,19 @@ var SettlementStore = (_class = function () {
                                                 DataSource: { Id: _this11.dataSource }
                                             });
                                             if (mode.paymentType == PayStyle.djq) {
-                                                (0, _each3.default)(mode.djqs, function (djq) {
-                                                    if (djq.checked) {
-                                                        _this11.dto.RetailCouponDetails.push({
-                                                            CouponCode: djq.code,
-                                                            ReductionAmount: djq.amount,
-                                                            EnableAmount: djq.doorsill,
-                                                            CouponTitle: djq.name,
-                                                            IdMember: djq.UMemberID ? mode.member.id : null,
-                                                            LastTS: djq.LastTS,
-                                                            PromotionId: djq.promoId,
-                                                            PromotionRuleId: djq.promoRuleId,
-                                                            PromoCouponAllocatedId: djq.id,
-                                                            DataSource: { Id: _this11.dataSource }
-                                                        });
-                                                    }
+                                                (0, _each3.default)(_this11.paymode.checkList, function (djq) {
+                                                    _this11.dto.RetailCouponDetails.push({
+                                                        CouponCode: djq.promoCouponCode,
+                                                        ReductionAmount: djq.amount,
+                                                        EnableAmount: djq.doorsill,
+                                                        CouponTitle: djq.name,
+                                                        IdMember: djq.UMemberID ? mode.member.id : null,
+                                                        LastTS: djq.LastTS,
+                                                        PromotionId: djq.promoId,
+                                                        PromotionRuleId: djq.promoRuleId,
+                                                        PromoCouponAllocatedId: djq.id,
+                                                        DataSource: { Id: _this11.dataSource }
+                                                    });
                                                 });
                                             }
                                         }
@@ -1646,6 +1640,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
             if (!q1.checked) {
                 this.checkList.forEach(function (ele, i) {
                     if (ele.id === q1.id) {
+                        // this.checkList.forEach((ele1) => {
+                        //     if(ele.discountPct > 0) {
+                        //         this.currentMode.receivable = this.currentMode.receivable + ele.amount / (1 - discountPct);
+                        //     } else {
+                        //         this.currentMode.receivable = this.currentMode.receivable + ele.amount;
+                        //     }
+                        // })
+                        // if(ele.discountPct > 0) {
+                        //     this.currentMode.receivable = 100;
+                        // } else {
+                        //     this.currentMode.receivable = this.currentMode.receivable + ele.amount;
+                        // }
                         _this14.checkList.splice(i, 1);
                     }
                 });
@@ -1655,11 +1661,14 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 }
                 this.checkList.push(q1);
             }
+
+            var copy1 = (0, _cloneDeep2.default)(this.receivable);
             this.checkList.forEach(function (ele, i) {
                 if (ele.discountPct > 0) {
-                    if (ele.amount === 0) {
-                        ele.amount = (1 - ele.discountPct) * _this14.currentMode.receivable;
-                    }
+                    ele.amount = (1 - ele.discountPct) * copy1;
+                    copy1 -= ele.amount;
+                } else {
+                    copy1 -= ele.amount;
                 }
                 sum = Math.Add(sum, ele.amount);
             });
@@ -1719,9 +1728,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
             promoVoucher.promoLinks = this.checkList;
             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) {
-                            return djq.id === element.id;
+                    result.forEach(function (element, index) {
+                        var djq1 = false;
+                        _this14.currentMode.djqs.forEach(function (djq) {
+                            console.log(element.id, djq.id, element.id === djq.id, 'djq1111111111');
+                            if (element.id === djq.id) {
+                                djq1 = true;
+                            }
                         });
 
                         var _ref21 = element || {},
@@ -1743,7 +1756,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             promoRuleId = tieredAmountResult.promoRuleId,
                             couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
 
-                        if (!djq1.length) {
+                        if (!djq1) {
                             // this.currentMode.djqs.push({
                             //     promoCouponCode: element.CouponCode,
                             //     name: element.CouponTitle,
@@ -1764,13 +1777,15 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             //     id
                             // })
                             _this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
+                            djq1 = false;
                         } else {
-                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum);
+                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, nominalAmount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
                     });
                 }
+                // 优惠券【6052098985043】与【6120822326451】不可叠加使用
             });
             //this.receivable = getFixedNumber(this.receivable - sum);
         }
@@ -1979,9 +1994,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
     initializer: function initializer() {
         var _this17 = this;
 
-        return function (id, couponNum, code) {
+        return function (id, couponNum, nominalAmount) {
             _this17.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
+                    if (nominalAmount) {
+                        ele.amount = nominalAmount;
+                    }
                     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;
                     ele.IsEnable = IsEnable;