tplus-components-touch 3.22.2 → 3.22.6

package/dist/components/settlement/settlement.js

@@ -277,7 +277,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           });
         }
         if (b.lastChild) {
-          if (bWidth < cWidth) {
+          // 原来bWidth < cWidth，过渡过程中右边按钮会隐藏，+20之后解决
+          if (bWidth < cWidth + 20) {
             b.lastChild.className = 'btns voucherMode';
           } else {
             b.lastChild.className = 'btns';
@@ -935,6 +936,31 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       });
     };
 
+    _this2.checkOfflineEnable = function (paymode, key) {
+      var _ref8 = paymode || {},
+          paymodes = _ref8.paymodes;
+
+      var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
+
+      if (isOffline) {
+        if (paymodes) {
+          var currentPayMode = paymodes.find(function (item) {
+            return item.paymentType === key;
+          });
+          if (currentPayMode && !currentPayMode.offlineDisable) {
+            return true;
+          } else {
+            _message2.default.warn('\u79BB\u7EBF\u6A21\u5F0F\u4E0B\u4E0D\u652F\u6301\u6B64\u7ED3\u7B97\u65B9\u5F0F');
+            return false;
+          }
+        }
+        _message2.default.warn('\u79BB\u7EBF\u6A21\u5F0F\u4E0B\u7ED3\u7B97\u65B9\u5F0F\u6570\u636E\u9519\u8BEF');
+        return false;
+      } else {
+        return true;
+      }
+    };
+
     _this2.onTabsClick2 = function (paymode, brefund, themode, key) {
       var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn7.PayStyle,
@@ -1052,6 +1078,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           boriginReturn = _this2$store3.boriginReturn;
       var noAlreadyWarn = _this2.state.noAlreadyWarn;
 
+
+      if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(key)) return false;
+
       if (_this2.checkModeDisabled(key, brefund, boriginReturn)) {
         return;
       }
@@ -1140,6 +1169,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleChange = function (index, e) {
+      if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(_this2.store.paymode.currentFocus)) return;
       var currentInput = e.target;
       var amountMaxLength = parseInt(_this2.props.initData["AmountMaxLength"] || 10);
       if (!isNaN(e.target.value) || e.target.value == '-') {
@@ -1222,8 +1252,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         return;
       }
 
-      var _ref8 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref8.isNewRetailBCPos;
+      var _ref9 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref9.isNewRetailBCPos;
 
       if (isNewRetailBCPos) {
         _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
@@ -1244,8 +1274,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       //   return ;
       // }
       _this2.store.checkCoupon(v).then(function () {
-        _this2.inputdjq.input.value = '';
         _this2.inputdjq.input.focus();
+      }).finally(function () {
+        setTimeout(function () {
+          _this2.inputdjq.input.value = '';
+          var ele = document.getElementById('djqInput');
+          ele.value = '';
+        }, 100);
       });
     };
 
@@ -1267,6 +1302,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.onHotKeyClick1 = function (mode, index, boriginReturn) {
+      if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
       if (_this2.hotkeydebouncedPayMode == mode) {
         return;
       }
@@ -1306,6 +1342,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.onHotKeyClick2 = function (index, mode, paymode, e) {
+      if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
       if (_this2.hotkeydebouncedPayMode == mode) {
         return;
       }
@@ -1360,7 +1397,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           thePaymodes.forEach(function (paymodes, index) {
             if (paymodes.paymethodId == _this2.state.currentIndex) payIndex = index;
           });
-
           _this2.setFocusAndSelectionMode(thePaymodes, payIndex);
         }
       }, 500, {
@@ -1406,7 +1442,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var findIndex = currenIndex;
       var endCurrentMode = thePaymodes.find(function (mode, index) {
         findIndex++;
-        return (symbol ? index > currenIndex : index < currenIndex) && mode.paymentType != PayStyle.hyczk && mode.paymentType != PayStyle.djq && mode.paymentType != PayStyle.jfdx;
+        return (symbol ? index > currenIndex : index < currenIndex) && mode.paymentType != PayStyle.hyczk && mode.paymentType != PayStyle.djq && mode.paymentType != PayStyle.jfdx && _mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType, true);
       });
       if (endCurrentMode) return { mode: endCurrentMode, index: findIndex };
       return null;
@@ -1647,7 +1683,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 } else if (MemberPoints && Number(amount) == Number(0)) {
                   message = "兑换成功";
                 }
-                window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, stores, function () {
+                window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, function () {
                   _this.handleGuestShow(5);
                 });
                 _this2.setState({ isXianjin: false });
@@ -1666,13 +1702,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.hasElectron === false) return;
       var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
 
-      var _ref11 = dt || {},
-          guestshow_enable = _ref11.guestshow_enable,
-          guestshow_clear = _ref11.guestshow_clear,
-          guestshow_welcome = _ref11.guestshow_welcome,
-          guestshow_collect = _ref11.guestshow_collect,
-          guestshow_refund = _ref11.guestshow_refund,
-          guestshow_change = _ref11.guestshow_change;
+      var _ref12 = dt || {},
+          guestshow_enable = _ref12.guestshow_enable,
+          guestshow_clear = _ref12.guestshow_clear,
+          guestshow_welcome = _ref12.guestshow_welcome,
+          guestshow_collect = _ref12.guestshow_collect,
+          guestshow_refund = _ref12.guestshow_refund,
+          guestshow_change = _ref12.guestshow_change;
 
       var hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
       if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -1707,9 +1743,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(args) {
+      var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(args) {
         var handleUserInputs = function () {
-          var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(promises) {
+          var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
             return _regenerator2.default.wrap(function _callee7$(_context7) {
@@ -1800,7 +1836,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           }));
 
           return function handleUserInputs(_x4) {
-            return _ref14.apply(this, arguments);
+            return _ref15.apply(this, arguments);
           };
         }();
 
@@ -1903,7 +1939,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(values) {
+                  var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(values) {
                     var result;
                     return _regenerator2.default.wrap(function _callee6$(_context6) {
                       while (1) {
@@ -1977,7 +2013,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }));
 
                   return function commit(_x3) {
-                    return _ref13.apply(this, arguments);
+                    return _ref14.apply(this, arguments);
                   };
                 }();
 
@@ -1992,13 +2028,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x2) {
-        return _ref12.apply(this, arguments);
+        return _ref13.apply(this, arguments);
       };
     }();
 
     _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11() {
       var handleUserInputs = function () {
-        var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
+        var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
           return _regenerator2.default.wrap(function _callee10$(_context10) {
@@ -2095,11 +2131,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }));
 
         return function handleUserInputs(_x6) {
-          return _ref18.apply(this, arguments);
+          return _ref19.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _ref16, isNewRetailBCPos, _enumController$getEn20, PayStyle, isNeedPasswordForStoragePay, commit;
+      var that, curmode, promises, _ref17, isNewRetailBCPos, _enumController$getEn20, PayStyle, isNeedPasswordForStoragePay, commit;
 
       return _regenerator2.default.wrap(function _callee11$(_context11) {
         while (1) {
@@ -2108,7 +2144,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
-              _ref16 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref16.isNewRetailBCPos;
+              _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
 
               if (isNewRetailBCPos) {
                 if (curmode.value > 0) {
@@ -2129,7 +2165,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               }
 
               commit = function () {
-                var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
+                var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
                   var result;
                   return _regenerator2.default.wrap(function _callee9$(_context9) {
                     while (1) {
@@ -2179,7 +2215,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }));
 
                 return function commit(_x5) {
-                  return _ref17.apply(this, arguments);
+                  return _ref18.apply(this, arguments);
                 };
               }();
 
@@ -2230,7 +2266,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(paymode) {
+      var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(paymode) {
         var that, confirmPwd;
         return _regenerator2.default.wrap(function _callee12$(_context12) {
           while (1) {
@@ -2246,8 +2282,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       // if (v !== '') {
                       modal.destroy();
 
-                      var _ref20 = that.state || {},
-                          confirmPwd = _ref20.confirmPwd;
+                      var _ref21 = that.state || {},
+                          confirmPwd = _ref21.confirmPwd;
 
                       setTimeout(function () {
                         paymode.authCode = v;
@@ -2337,8 +2373,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               type: 'primary', size: 'large', onClick: function onClick() {
                                 var v = (0, _trim3.default)(that['inputAmount']['input']['value']);
 
-                                var _ref21 = that.state || {},
-                                    confirmPwd = _ref21.confirmPwd;
+                                var _ref22 = that.state || {},
+                                    confirmPwd = _ref22.confirmPwd;
                                 // if (v !== '') {
 
 
@@ -2367,7 +2403,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   setTimeout(function () {
                     that['inputS' + paymode.paymethodId] && that['inputS' + paymode.paymethodId].input.focus();
                     that.inputAmount && that.inputAmount.input.focus();
-                  }, 200);
+                  }, 300);
                 }));
 
               case 3:
@@ -2379,7 +2415,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x7) {
-        return _ref19.apply(this, arguments);
+        return _ref20.apply(this, arguments);
       };
     }();
 
@@ -2397,6 +2433,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           boriginReturn = _this2$store7.boriginReturn,
           newStyle = _this2$store7.newStyle;
 
+
+      if (bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type)) return false;
+
       var status = false;
       paymode.thePaymodes.forEach(function (v) {
         if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
@@ -2429,8 +2468,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref22 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref22.isNewRetailBCPos;
+      var _ref23 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref23.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -3005,20 +3044,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref23 = _mutantsMicrofx.localStore.get('user') || {},
-        _ref23$loginInfo = _ref23.loginInfo;
+    var _ref24 = _mutantsMicrofx.localStore.get('user') || {},
+        _ref24$loginInfo = _ref24.loginInfo;
 
-    _ref23$loginInfo = _ref23$loginInfo === undefined ? {} : _ref23$loginInfo;
-    var ICCardServer = _ref23$loginInfo.ICCardServer,
-        ICCardPassword = _ref23$loginInfo.ICCardPassword;
+    _ref24$loginInfo = _ref24$loginInfo === undefined ? {} : _ref24$loginInfo;
+    var ICCardServer = _ref24$loginInfo.ICCardServer,
+        ICCardPassword = _ref24$loginInfo.ICCardPassword;
 
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref24 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref24.isHorizontalPad,
-        isHorizontalSunMi = _ref24.isHorizontalSunMi;
+    var _ref25 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref25.isHorizontalPad,
+        isHorizontalSunMi = _ref25.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3252,8 +3291,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           discountRetailTotalAount = _state2.discountRetailTotalAount,
           discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount;
 
-      var _ref25 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref25.isNewRetailBCPos;
+      var _ref26 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref26.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3316,11 +3355,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref26 = quantityDetail || {},
-          _ref26$buyQuantity = _ref26.buyQuantity,
-          buyQuantity = _ref26$buyQuantity === undefined ? 0 : _ref26$buyQuantity,
-          _ref26$returnQuantity = _ref26.returnQuantity,
-          returnQuantity = _ref26$returnQuantity === undefined ? 0 : _ref26$returnQuantity;
+      var _ref27 = quantityDetail || {},
+          _ref27$buyQuantity = _ref27.buyQuantity,
+          buyQuantity = _ref27$buyQuantity === undefined ? 0 : _ref27$buyQuantity,
+          _ref27$returnQuantity = _ref27.returnQuantity,
+          returnQuantity = _ref27$returnQuantity === undefined ? 0 : _ref27$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4680,7 +4719,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             ),
             _react2.default.createElement(
               'div',
-              { className: 'received' },
+              { className: 'received receivedNumber' },
               _react2.default.createElement(
                 'span',
                 null,
@@ -4689,16 +4728,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 null,
-                _react2.default.createElement(_input2.default, {
+                _react2.default.createElement(_numKeyboard2.default, {
                   id: 'paymentAmount',
+                  className: _index.hotKey.hotKeyNotFilter('input') + ' receivedInput',
                   type: 'text',
-                  className: _index.hotKey.hotKeyNotFilter('input'),
-                  onChange: function onChange(event) {
-                    _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.member.balance));
+                  style: { width: 230 },
+                  onChange: function onChange(value) {
+                    _this8.setCurrentModeValue(value, Math.min(currentMode.maxamount, currentMode.member.balance));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)),
-                  ref: function ref(_ref27) {
-                    return _this8["inputCzkAmount"] = _ref27;
+                  maxLength: 12,
+                  precisionLength: 2,
+                  ref: function ref(input) {
+                    return _this8.inputCzkAmount = input;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -4847,6 +4889,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             visible: this.state.djqVisible,
             maskClosable: false,
             onOk: this.handleDjqOk,
+            destroyOnClose: true,
             onCancel: this.handleDjqCancel,
             centered: !this.isHorizontalPad ? true : false,
             title: Differentiate.COUPON + '支付',
@@ -4886,7 +4929,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   _react2.default.createElement(_input2.default, {
                     type: 'text',
                     placeholder: '\u626B\u63CF/\u8F93\u5165' + Differentiate.COUPON + '\u53F7\u5E76\u56DE\u8F66',
-                    className: 'input'
+                    className: 'input',
+                    id: 'djqInput'
                     // onChange={this.onDjqChange}
                     // value={currentMode && currentMode.member.cardNo}
                     , ref: function ref(input) {
@@ -4905,7 +4949,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       }, _this8.djqKeyboardOnOk, _this8.djqKeyboardOnClose)();
                     },
                     onBlur: function onBlur(e) {
-                      _keyboard2.default.close();
+                      _keyboard2.default.close();_this8.inputdjq.input.value = '';
                     }
                   })
                 ),