tplus-components-touch 3.33.5 → 3.33.9

package/dist/components/settlement/settlement.js

@@ -2032,9 +2032,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           while (1) {
                             switch (_context10.prev = _context10.next) {
                               case 0:
-                                if (!result1) {
+                                if (result1) {
                                   if (voucherDateTime < currentZeroTime) {
-                                    _this5.store.setVoucherDate();
+                                    setVoucherDate();
                                   }
                                 }
                                 _context10.next = 3;
@@ -2090,7 +2090,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           };
         }();
 
-        var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit, _this2$props3, isUpdateDate, type, VoucherDate;
+        var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit, _this2$props3, isUpdateDate, type, VoucherDate, setVoucherDate;
 
         return _regenerator2.default.wrap(function _callee12$(_context12) {
           while (1) {
@@ -2100,16 +2100,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';
@@ -2269,11 +2259,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                 _this2$props3 = _this2.props, isUpdateDate = _this2$props3.isUpdateDate, type = _this2$props3.type;
                 VoucherDate = _this2.store.dto.VoucherDate;
+                setVoucherDate = _this2.store.setVoucherDate;
 
 
                 handleUserInputs(promises);
 
-              case 32:
+              case 33:
               case 'end':
                 return _context12.stop();
             }
@@ -3455,7 +3446,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;
@@ -3468,9 +3465,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,
@@ -3542,11 +3539,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,