tplus-components-touch 3.22.15 → 3.22.19

package/dist/components/settlement/settlementStore.js

@@ -217,18 +217,20 @@ var SettlementStore = (_class = function () {
                     detailDTO.isManualFreeGift = item.IsPresent;
                     detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
                     detailDTO.IsManualChangePrice = item.IsManualChangePrice;
-                    if (detailDTO.IsManualChangePrice) //如果是手工改价
-                        {
-                            detailDTO.listPrice = item.TaxPrice;
-                            detailDTO.netAmountWithTax = item.TaxAmount;
-                        } else {
-                        var bookingQuantity = 0;
-                        if (item.BookingQuantity) {
-                            bookingQuantity = item.BookingQuantity;
-                        }
-                        detailDTO.listPrice = item.MemberPrice;
-                        detailDTO.netAmountWithTax = Math.Multiply(item.MemberPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
+                    // if(detailDTO.IsManualChangePrice)//如果是手工改价
+                    // {
+                    //     detailDTO.listPrice = item.TaxPrice;
+                    //     detailDTO.netAmountWithTax = item.TaxAmount;
+                    // }
+                    // else
+                    // {
+                    var bookingQuantity = 0;
+                    if (item.BookingQuantity) {
+                        bookingQuantity = item.BookingQuantity;
                     }
+                    detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
+                    detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
+                    //} 
                     detailDTO.taxRate = item.TaxRate;
                     detailDTO.quantity = item.Quantity;
 
@@ -494,6 +496,7 @@ var SettlementStore = (_class = function () {
                 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) {
@@ -828,7 +831,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 = '未录入储值卡';
                     });
@@ -1170,7 +1173,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,
@@ -1270,6 +1273,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;
                                 }));