tplus-components-touch 3.33.6 → 3.33.10

package/dist/components/settlement/settlement.js

@@ -204,6 +204,8 @@ var _index = require('../../index');
 
 var _tplusPoslogin = require('tplus-poslogin');
 
+var _tplusApi = require('tplus-api');
+
 var _index2 = require('./prototypeTable/index');
 
 var _index3 = _interopRequireDefault(_index2);
@@ -2052,37 +2054,30 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         return _ref20.apply(this, arguments);
                       };
                     }());
-                    _context11.next = 43;
+                    _context11.next = 40;
                     break;
 
                   case 37:
-                    if (!(voucherDateTime < currentZeroTime)) {
-                      _context11.next = 41;
-                      break;
+                    if (voucherDateTime < currentZeroTime) {
+                      setVoucherDate();
                     }
-
-                    this.store.setVoucherDate();
-                    _context11.next = 41;
-                    return commit(results);
-
-                  case 41:
-                    _context11.next = 43;
+                    _context11.next = 40;
                     return commit(results);
 
-                  case 43:
-                    _context11.next = 47;
+                  case 40:
+                    _context11.next = 44;
                     break;
 
-                  case 45:
-                    _context11.prev = 45;
+                  case 42:
+                    _context11.prev = 42;
                     _context11.t1 = _context11['catch'](1);
 
-                  case 47:
+                  case 44:
                   case 'end':
                     return _context11.stop();
                 }
               }
-            }, _callee11, this, [[1, 45], [5, 18, 22, 30], [23,, 25, 29]]);
+            }, _callee11, this, [[1, 42], [5, 18, 22, 30], [23,, 25, 29]]);
           }));
 
           return function handleUserInputs(_x6) {
@@ -2100,16 +2095,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: true
                 });
                 console.log("settlement.handleSettle开始执行，参数：", +args);
-                //   let p=new Promise((res,rej)=>{
-                //     res(args);
-                //   });
-                //
-                // const testAsync = async (p) => {
-                //   let result = await p;
-                //   console.log(result);
-                // }
-                //
-                // testAsync(p);
                 _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
                 _this2$store6 = _this2.store, paymode = _this2$store6.paymode, brefund = _this2$store6.brefund, boriginReturn = _this2$store6.boriginReturn, newStyle = _this2$store6.newStyle;
                 isQuickPay = args === 'quickPay';
@@ -3456,7 +3441,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
   }, {
     key: 'onKeyboardChange',
     value: function onKeyboardChange(key) {
+      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn32.PayStyle;
+
       if (this.currentInput) {
+        if (this.store.paymode.currentMode && this.store.paymode.currentMode.paymentType === PayStyle.djq) {
+          return;
+        }
         var value = _keyboard2.default.getNewValue(this.currentInput, this.currentInput.value, key, true);
         if (!isNaN(value) || value == '-') {
           this.currentInput.value = value;
@@ -3469,9 +3460,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function renderToolbtn(mode, index) {
       var _this8 = this;
 
-      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn32.PayIcon,
-          PayStyle = _enumController$getEn32.PayStyle;
+      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn33.PayIcon,
+          PayStyle = _enumController$getEn33.PayStyle;
 
       var isReturn = this.props.isReturn;
       var _store = this.store,
@@ -3543,11 +3534,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function render() {
       var _this9 = this;
 
-      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn33.PayIcon,
-          PayIcon2 = _enumController$getEn33.PayIcon2,
-          PayStyle = _enumController$getEn33.PayStyle,
-          Differentiate = _enumController$getEn33.Differentiate;
+      var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn34.PayIcon,
+          PayIcon2 = _enumController$getEn34.PayIcon2,
+          PayStyle = _enumController$getEn34.PayStyle,
+          Differentiate = _enumController$getEn34.Differentiate;
 
       var _state2 = this.state,
           btnDissabled = _state2.btnDissabled,
@@ -5396,7 +5387,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         _react2.default.createElement(
                           'span',
                           null,
-                          q.amount
+                          q.nominalAmount
                         ),
                         _react2.default.createElement(
                           'span',