tplus-components-touch 3.54.3 → 3.54.6

package/dist/components/settlement/settlementStore.js

@@ -169,8 +169,6 @@ function _initializerWarningHelper(descriptor, context) {
 var t = _mutantsMicrofx.i18n.getFixedT(null, 'newretail');
 
 var SettlementStore = (_class = (_temp = _class2 = function () {
-    //赊销-客户id
-    //赊销-销售合计
     // 预售都是全款；预订是否全款，在点击确认支付时计算订金和商品金额计算得出
     function SettlementStore() {
         (0, _classCallCheck3.default)(this, SettlementStore);
@@ -182,7 +180,9 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
         if (params) this.cloudPrintArguments = params;
         this.setNewStyle();
         this.SettlementApi = _settlementApi2.default;
-    } // 赊销-欠款单据
+    } //赊销-客户id
+
+    // 赊销-欠款单据
     //type==2
     //type 1：储值；2：赊销; 不传或0是普通开单
 
@@ -209,7 +209,6 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                 data = _ref.data,
                 payModeKey = _ref.payModeKey,
                 creditSalesVoucher = _ref.creditSalesVoucher,
-                saleTotalTaxAmount = _ref.saleTotalTaxAmount,
                 custVendorId = _ref.custVendorId;
 
             this.setNewStyle();
@@ -222,7 +221,6 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                 this.brefund = this.paymode.setAmount(amount, 0);
                 this.dto = context.viewModel.data;
                 this.creditSalesVoucher = creditSalesVoucher;
-                this.saleTotalTaxAmount = saleTotalTaxAmount;
                 this.custVendorId = custVendorId;
             } else {
                 this.context = context;
@@ -285,18 +283,6 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                         this.paymode.bookMaxValue = _mutantsMicrofx.stores.drawerStore.totalWaitPaidAmount;
                     }
                 }
-                if (IdbusiType === 42) {
-                    var _dto = this.dto,
-                        TotalTaxAmount = _dto.TotalTaxAmount,
-                        ArrearsAmount = _dto.ArrearsAmount;
-
-                    var returnAmount = Math.abs(TotalTaxAmount) - ArrearsAmount;
-                    value = amount;
-                    (0, _mobx.runInAction)(function () {
-                        _this2.dto.CreditUsageAmount = (0, _utils.getFixedNumber)(returnAmount > 0 ? -(Math.abs(TotalTaxAmount) - returnAmount) : TotalTaxAmount, 2);
-                    });
-                }
-
                 this.brefund = this.paymode.setAmount(value, this.dto.OnlinePaymentAmount);
             }
             this.paymode.clean();
@@ -1111,8 +1097,8 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                     "latitude": IPMSG.latitude || "",
                                     "Retails": this.creditSalesVoucher,
                                     "IdCustVendor": this.custVendorId,
-                                    "TotalOwedAmount": this.paymode.amount,
-                                    "TotalTaxAmount": this.saleTotalTaxAmount,
+                                    "TotalOwedAmount": this.paymode.amount, //TotalOwedAmount欠款金额
+                                    "TotalTaxAmount": this.paymode.received, //TotalTaxAmount 本次结算付款金额
                                     "RetailPaymentDetails": retailPaymentDetails,
                                     UserCode: UserCode,
                                     UserId: UserId,
@@ -1290,7 +1276,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
             var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
                 var _this12 = this;
 
-                var _enumController$getEn14, PayStyle, TradeType, IPMSG, RetailTypeEnum, _getLoginInfo3, PreSellOrBook, PercentageWhenBook, _ref14, IdbusiType, DistributionMode, prepaidAmount, fullPayment, dtoParams, payList, payment, tradeType, ret, _ref15, type, data, msg, code;
+                var _enumController$getEn14, PayStyle, TradeType, IPMSG, RetailTypeEnum, _getLoginInfo3, PreSellOrBook, PercentageWhenBook, _ref14, IdbusiType, DistributionMode, TotalTaxAmount, _dto, _TotalTaxAmount, ArrearsAmount, returnAmount1, prepaidAmount, fullPayment, dtoParams, payList, payment, tradeType, ret, _ref15, type, data, msg, code;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
@@ -1391,8 +1377,21 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                 }
                                 RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
                                 _getLoginInfo3 = this.getLoginInfo(), PreSellOrBook = _getLoginInfo3.PreSellOrBook, PercentageWhenBook = _getLoginInfo3.PercentageWhenBook;
-                                _ref14 = this.dto || {}, IdbusiType = _ref14.IdbusiType, DistributionMode = _ref14.DistributionMode;
+                                _ref14 = this.dto || {}, IdbusiType = _ref14.IdbusiType, DistributionMode = _ref14.DistributionMode, TotalTaxAmount = _ref14.TotalTaxAmount;
 
+                                if (IdbusiType === 42) {
+                                    (0, _mobx.runInAction)(function () {
+                                        _this12.dto.CreditUsageAmount = (0, _utils.getFixedNumber)(TotalTaxAmount, 2);
+                                    });
+                                }
+                                if (IdbusiType === 42) {
+                                    _dto = this.dto, _TotalTaxAmount = _dto.TotalTaxAmount, ArrearsAmount = _dto.ArrearsAmount;
+                                    returnAmount1 = Math.abs(_TotalTaxAmount) - ArrearsAmount;
+
+                                    (0, _mobx.runInAction)(function () {
+                                        _this12.dto.CreditUsageAmount = returnAmount1 > 1 ? (0, _utils.getFixedNumber)(-(Math.abs(_TotalTaxAmount) - returnAmount1), 2) : Math.abs(_TotalTaxAmount, 2);
+                                    });
+                                }
                                 if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
                                     prepaidAmount = (0, _utils.getFixedNumber)(this.dto.RetailPaymentDetails.reduce(function (c, item) {
                                         return c + (item.Amount || 0);
@@ -1409,68 +1408,75 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                 _context5.t1 = this.dto.IdbusiType == 37;
 
                                 if (!_context5.t1) {
-                                    _context5.next = 14;
+                                    _context5.next = 16;
                                     break;
                                 }
 
-                                _context5.next = 13;
+                                _context5.next = 15;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
-                            case 13:
+                            case 15:
                                 _context5.t1 = _context5.sent;
 
-                            case 14:
+                            case 16:
                                 _context5.t0 = _context5.t1;
 
                                 if (_context5.t0) {
-                                    _context5.next = 17;
+                                    _context5.next = 19;
                                     break;
                                 }
 
                                 _context5.t0 = this.dto.IdbusiType != 37;
 
-                            case 17:
+                            case 19:
                                 if (!_context5.t0) {
-                                    _context5.next = 36;
+                                    _context5.next = 39;
                                     break;
                                 }
 
                                 dtoParams = (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } });
-                                //处理存在二开支付情况
 
+                                if (!(IdbusiType !== 42)) {
+                                    _context5.next = 37;
+                                    break;
+                                }
+
+                                //处理存在二开支付情况
                                 payList = dtoParams.RetailPaymentDetails.filter(function (v) {
                                     return v.ThirdPaymentInfo;
                                 });
 
                                 if (!(payList && payList.length > 0)) {
-                                    _context5.next = 33;
+                                    _context5.next = 36;
                                     break;
                                 }
 
                                 payment = payList[0];
                                 tradeType = payment && payment.Amount > 0 ? TradeType.PAY : TradeType.REFUND;
-                                _context5.next = 25;
+                                _context5.next = 28;
                                 return this.thirdPay(1, payment, tradeType, dtoParams);
 
-                            case 25:
+                            case 28:
                                 ret = _context5.sent;
                                 _ref15 = ret || {}, type = _ref15.type, data = _ref15.data, msg = _ref15.msg, code = _ref15.code;
 
                                 if (!(type === true)) {
-                                    _context5.next = 31;
+                                    _context5.next = 34;
                                     break;
                                 }
 
                                 dtoParams = data;
-                                _context5.next = 33;
+                                _context5.next = 36;
                                 break;
 
-                            case 31:
+                            case 34:
                                 _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
                                 return _context5.abrupt('return', false);
 
-                            case 33:
+                            case 36:
                                 this.dtoParams = dtoParams;
+
+                            case 37:
                                 console.log('结算信息:', dtoParams);
                                 return _context5.abrupt('return', this.SettlementApi.retailPosSettle({
                                     dto: dtoParams,
@@ -1486,7 +1492,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                     _this12.paymode.checkList = [];
                                 }));
 
-                            case 36:
+                            case 39:
                             case 'end':
                                 return _context5.stop();
                         }
@@ -1878,7 +1884,11 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
 
     this.isFull = true;
     this.creditSalesVoucher = [];
-    this.saleTotalTaxAmount = 0;
+    this.isCanSettleOnQuickKey = true;
+
+    this.setCanSettleOnQuickKey = function (value) {
+        _this14.isCanSettleOnQuickKey = value;
+    };
 
     _initDefineProp(this, 'setNewStyle', _descriptor2, this);
 
@@ -2381,9 +2391,6 @@ exports.default = SettlementStore;
 var PayMode = exports.PayMode = (_class3 = function () {
     //预订场景下，现场提货，且选项设置订金比例非100% or 取货最大补款数大于0时 为 true
     function PayMode() {
-        // this.amount=getFixedNumber(amount);
-        // this.calcReserved();
-
         (0, _classCallCheck3.default)(this, PayMode);
         this._counter = 0;
         this.amount = 0;
@@ -2420,6 +2427,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
         _initDefineProp(this, 'setCouponNum', _descriptor15, this);
 
         _initDefineProp(this, 'addDjqs', _descriptor16, this);
+
+        // this.amount=getFixedNumber(amount);
+        // this.calcReserved();
+        this.SettlementApi = _settlementApi2.default;
     }
     // @observable store = null;
     //只是预订场景下，现场提货，且选项设置订金比例非100%时 为 true