tplus-components-touch 3.26.30 → 3.26.34

package/dist/components/settlement/settlement.js

@@ -458,7 +458,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }
         item.InventoryName = item.Inventory.Name;
         item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
-        item.TotalDiscount = (0, _utils.getFixedNumber)(item.Discount * item.Quantity);
+        //item.TotalDiscount = getFixedNumber(item.Discount * item.Quantity);
+        item.TotalDiscount = item.DetailDiscountAmount;
         item.nAmount = (0, _utils.getFixedNumber)(item.TaxAmount);
         item.UnitName = item.Unit.Name;
         item.nQuantity = (0, _utils.getRoundValue)(item.Quantity, quantityPrecision);
@@ -603,7 +604,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             }
           }
         }, 500);
-        _this2.connectRfCard();
       }
     };
 
@@ -615,6 +615,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                _this2.connectRfCard();
                 _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn2.PayStyle;
 
                 _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
@@ -622,17 +623,17 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _context.t0 = isInputMember && _this2.store.paymode.currentMode.memberId;
 
                 if (!_context.t0) {
-                  _context.next = 8;
+                  _context.next = 9;
                   break;
                 }
 
-                _context.next = 7;
+                _context.next = 8;
                 return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
 
-              case 7:
+              case 8:
                 _context.t0 = _context.sent;
 
-              case 8:
+              case 9:
                 memberdata1 = _context.t0;
 
                 if (memberdata1 && memberdata1.length === 1) {
@@ -653,7 +654,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }, 300);
                 }
 
-              case 10:
+              case 11:
               case 'end':
                 return _context.stop();
             }
@@ -837,7 +838,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               cardTypeEnum = _this2.store.paymode.currentMode.cardTypeEnum;
 
               if (!result) {
-                _context4.next = 21;
+                _context4.next = 20;
                 break;
               }
 
@@ -855,34 +856,33 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
                 }
               }, 350);
-              _this2.connectRfCard();
 
               if (!isInputMember) {
-                _context4.next = 19;
+                _context4.next = 18;
                 break;
               }
 
-              _context4.next = 15;
+              _context4.next = 14;
               return _this2.store.updateMemberInfo(_this2.store);
 
-            case 15:
+            case 14:
               resp = _context4.sent;
 
               updataMemberInfo(resp);
-              _context4.next = 20;
+              _context4.next = 19;
               break;
 
-            case 19:
+            case 18:
               if (cardTypeEnum === 'BALANCE_CARD') {
                 _this2.store.updateCardInfo();
               }
 
-            case 20:
+            case 19:
               _this2.setState({
                 isInputMember: false
               });
 
-            case 21:
+            case 20:
             case 'end':
               return _context4.stop();
           }
@@ -1452,8 +1452,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         return;
       }
       _this2.czkdebounced = (0, _debounce3.default)((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-        var memberdata1, _this2$store$paymode$2, cardTypeEnum, walletEnabled;
-
+        var memberdata1;
         return _regenerator2.default.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
@@ -1465,8 +1464,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 memberdata1 = _context5.sent;
 
                 if (memberdata1 && memberdata1.length === 1) {
-                  _this2$store$paymode$2 = _this2.store.paymode.currentMode, cardTypeEnum = _this2$store$paymode$2.cardTypeEnum, walletEnabled = _this2$store$paymode$2.walletEnabled;
-
                   if (_this2.store.paymode.currentMode.storageCardNo) {
                     _this2.setState({
                       czkValue: _this2.store.paymode.currentMode.storageCardNo
@@ -2629,7 +2626,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.btnDebounced = function (type, bquick) {
       _this2.setState({
-        bquick: bquick
+        bquick: bquick,
+        isInputMember: true
       });
 
       var _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(),
@@ -3356,8 +3354,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             _this6.connectRfCard(); //读取失败后，重新连接一下。
             return;
           } else if (ret.status === 1) {
-            //this.searchMember(ret.value);
-            _this6.czkInput.input["value"] = ret.value;
+            // this.searchMember(ret.value);
+            // this.czkInput.input["value"]=ret.value;
             _this6.loadCzk(ret.value);
           }
         });