tplus-components-touch 3.22.13 → 3.22.17

package/dist/components/settlement/settlement.less

@@ -489,6 +489,14 @@
             font-size: 17px;
             line-height: 16px;
             width: 130px;
+            text-indent: 0;
+            padding-left: 14px;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            overflow: hidden;
+            word-break: break-all;
+            white-space: initial;
           }
           .info{
             // padding-left:23px;

package/dist/components/settlement/settlementStore.js

@@ -493,6 +493,8 @@ var SettlementStore = (_class = function () {
             var _ref5 = _mutantsUtil.platform || {},
                 isNewRetailBCPos = _ref5.isNewRetailBCPos;
 
+            console.log(this.dto, 'dto==========');
+            this.paymode.checkList = [];
             (0, _each3.default)(this.dto.RetailPaymentDetails, function (detail) {
                 var themode = (0, _find3.default)(_this5.paymode.paymodes, { 'idSettleStyle': detail.IdsettleStyle });
                 if (detail.SettleStyle.Code === PayStyle.hyczk && !themode) {
@@ -1169,7 +1171,7 @@ var SettlementStore = (_class = function () {
                                                 DataSource: { Id: _this11.dataSource }
                                             });
                                             if (mode.paymentType == PayStyle.djq) {
-                                                (0, _each3.default)(_this11.paymode.checkList, function (djq) {
+                                                (0, _each3.default)(_this11.paymode.checkList && _this11.paymode.checkList.length ? _this11.paymode.checkList : _this11.paymode.currentMode.djqs, function (djq) {
                                                     _this11.dto.RetailCouponDetails.push({
                                                         CouponCode: djq.promoCouponCode,
                                                         ReductionAmount: djq.amount,
@@ -1269,6 +1271,7 @@ 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.paymode.checkList = [];
                                     _this11.billID = resp.ID;
                                 }));
 
@@ -1651,6 +1654,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 sum = Math.Add(sum, ele.amount);
             });
             this.currentMode.value = (0, _utils.getFixedNumber)(Math.min(this.receivable, sum, this.currentMode.maxamount));
+            console.log(this.receivable, sum, Math.min(this.receivable, sum, this.currentMode.maxamount), 'sum---------');
             this.currentMode.receivable = (0, _utils.getFixedNumber)(this.receivable - Math.min(this.receivable, sum, this.currentMode.maxamount));
             this.currentMode.overchargesAmount = (0, _utils.getFixedNumber)(sum - this.currentMode.value);
             if (params === 'single') {
@@ -1756,7 +1760,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             _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, promoDiscount);
+                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -1971,12 +1975,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
     initializer: function initializer() {
         var _this17 = this;
 
-        return function (id, couponNum, promoDiscount) {
+        return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
             _this17.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
-                    if (promoDiscount) {
-                        ele.amount = promoDiscount;
-                    }
+                    promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
                     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;