tplus-components-touch 3.42.5 → 3.42.6

package/dist/components/settlement/settlement.js

@@ -279,6 +279,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.hotkeydebouncedPayMode = "";
     _this2.currentInput = null;
 
+    _this2.getIsReturn = function () {
+      var dataModal = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data;
+      return dataModal.IdbusiType === 35 || dataModal.IdbusiType === 40; //40预售退货类型。
+    };
+
+    _this2.getBoriginReturn = function () {
+      var boriginReturn = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && JSON.getCellValue(_this2.context.viewModel.data, "IsOriginalReturn");
+      return boriginReturn || false;
+    };
+
+    _this2.getNotBoriginReturn = function () {
+      var isReturn = _this2.getIsReturn();
+      var boriginReturn = _this2.getBoriginReturn();
+      return isReturn && !boriginReturn;
+    };
+
     _this2.resizeSettlementToolBtns = function () {
       var newStyle = _this2.store.newStyle;
       var isMemberStorePage = _this2.props.isMemberStorePage;
@@ -413,14 +429,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.handleGuestShow(amount < 0 ? 2 : 3, amount);
       setTimeout(function () {
         _this2.handleDefault();
-        //  // 单据模式 临时性获取第一个结算方式焦点
-        // // document.querySelector('.modeItem:nth-child(1) .content input').focus()
         var _this2$store = _this2.store,
             paymode = _this2$store.paymode,
             brefund = _this2$store.brefund,
             newStyle = _this2$store.newStyle;
 
-        var boriginReturn = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && JSON.getCellValue(_this2.context.viewModel.data, "IsOriginalReturn");
+        var boriginReturn = _this2.getBoriginReturn();
         var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
           return !(_this2.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
         }) : paymode.thePaymodes;
@@ -632,36 +646,37 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.showCzkModal = function () {
       var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(id, append) {
-        var _enumController$getEn2, PayStyle, _ref2, isInputMember, memberdata1;
+        var _ref2, isInputMember, _enumController$getEn2, PayStyle, ctMode, memberId, returnType, memberdata1;
 
         return _regenerator2.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _this2.connectRfCard();
+                _ref2 = _this2.state || {}, isInputMember = _ref2.isInputMember;
                 _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn2.PayStyle;
+                ctMode = _this2.store && _this2.store.paymode && _this2.store.paymode.currentMode;
+                memberId = ctMode && ctMode.memberId;
+                returnType = _this2.getNotBoriginReturn();
 
+                _this2.connectRfCard();
                 _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
-                _ref2 = _this2.state || {}, isInputMember = _ref2.isInputMember;
-                _context.t0 = isInputMember && _this2.store.paymode.currentMode.memberId;
+                _context.t0 = isInputMember && memberId;
 
                 if (!_context.t0) {
-                  _context.next = 9;
+                  _context.next = 12;
                   break;
                 }
 
-                _context.next = 8;
-                return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
+                _context.next = 11;
+                return _this2.store.updateCurrentMode(memberId, returnType);
 
-              case 8:
+              case 11:
                 _context.t0 = _context.sent;
 
-              case 9:
+              case 12:
                 memberdata1 = _context.t0;
 
-                _this2.setState({
-                  czkVisible: true
-                });
+                _this2.setState({ czkVisible: true });
                 if (memberdata1 && memberdata1.length === 1) {
                   _this2.handleCzkMoreData(true);
                   _this2.store.handleCzkData(memberdata1[0]);
@@ -677,7 +692,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }, 300);
                 }
 
-              case 12:
+              case 15:
               case 'end':
                 return _context.stop();
             }
@@ -721,7 +736,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleCzkData = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-      var _enumController$getEn3, PayStyle;
+      var _enumController$getEn3, PayStyle, returnType;
 
       return _regenerator2.default.wrap(function _callee2$(_context2) {
         while (1) {
@@ -733,43 +748,44 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle;
 
               if (_this2.store.paymode.currentMode.storageCardNo) {
-                _context2.next = 5;
+                _context2.next = 6;
                 break;
               }
 
-              _context2.next = 5;
-              return _this2.store.loadCzk(_this2.czkInput.input.value);
+              returnType = _this2.getNotBoriginReturn();
+              _context2.next = 6;
+              return _this2.store.loadCzk(_this2.czkInput.input.value, returnType);
 
-            case 5:
+            case 6:
               if (_this2.store.paymode.currentMode.storageCardNo) {
-                _context2.next = 8;
+                _context2.next = 9;
                 break;
               }
 
               _message2.default.error("请录入储值卡！");
               return _context2.abrupt('return');
 
-            case 8:
+            case 9:
               if (!(0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
                 return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.storageCardNo == _this2.store.paymode.currentMode.storageCardNo;
               })) {
-                _context2.next = 11;
+                _context2.next = 12;
                 break;
               }
 
               _message2.default.error("该储值卡已使用。");
               return _context2.abrupt('return');
 
-            case 11:
+            case 12:
               if (!(_this2.store.bquick && _this2.store.paymode.amount != _this2.store.paymode.currentMode.value)) {
-                _context2.next = 14;
+                _context2.next = 15;
                 break;
               }
 
               _message2.default.error("实收金额应等于应收金额。");
               return _context2.abrupt('return');
 
-            case 14:
+            case 15:
 
               _this2.setState({
                 czkVisible: false,
@@ -780,7 +796,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _this2.store.paymode.calcMemberBalance();
               _this2.handleCzk();
 
-            case 18:
+            case 19:
             case 'end':
               return _context2.stop();
           }
@@ -1354,10 +1370,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.setCurrentModeValue = function (val, max) {
+      var returnType = _this2.getNotBoriginReturn();
+
       var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn13.PayStyle;
 
-      var reg = /^[\d.]+$/g;
+      var reg = returnType ? /^[\d.-]+$/g : /^[\d.]+$/g;
       if (_this2.store.paymode.currentMode.paymentType === PayStyle.hyczk || _this2.store.paymode.currentMode.paymentType === PayStyle.jfdx) {
         if (!val) {
           _this2.setState({
@@ -1484,15 +1502,16 @@ 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;
+        var returnType, memberdata1;
         return _regenerator2.default.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                _context5.next = 2;
-                return _this2.store.loadCzk(v);
+                returnType = _this2.getNotBoriginReturn();
+                _context5.next = 3;
+                return _this2.store.loadCzk(v, returnType);
 
-              case 2:
+              case 3:
                 memberdata1 = _context5.sent;
 
                 if (memberdata1 && memberdata1.length === 1) {
@@ -1509,7 +1528,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   });
                 }
 
-              case 4:
+              case 5:
               case 'end':
                 return _context5.stop();
             }
@@ -1615,8 +1634,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _this2.hotkeydebounced = null;
       }
       _this2.hotkeydebounced = (0, _debounce3.default)(function () {
-        // let { type, amount, totalVariety, totalQuantity, isReturn, quantityDetail,memberDisabled } = this.props
-        var boriginReturn = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && JSON.getCellValue(_this2.context.viewModel.data, "IsOriginalReturn");
+        var boriginReturn = _this2.getBoriginReturn();
         var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
           return !(_this2.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
         }) : paymode.thePaymodes;
@@ -1625,7 +1643,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         if (!notsettle && !_this2.checkSettleDisabled(paymode, thePaymodes)) {
           _this2.handleSettle();
         } else if ((thePaymodes || []).length > 0) {
-
           // 根据currentIndex  = paymethodeId 获取当前支付方式位置
           var payIndex = -1;
           thePaymodes.forEach(function (paymodes, index) {
@@ -2808,7 +2825,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.debounced) {
         _this2.debounced.cancel();
         _this2.debounced = null;
-        // console.log("debounce canceled");
       }
       if (!isKeyBorad) {
         _this2.debounced = (0, _debounce3.default)(function () {
@@ -3432,6 +3448,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     }
 
+    //是否退货
+
+
+    //原单退货状态
+
+
+    //非原单退货状态
+
+
     //对结算按钮超出的处理
 
   }, {
@@ -3536,6 +3561,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     // 处理客显显示功能
 
+
     //that[`inputS${paymode.paymethodId}`]
 
   }, {
@@ -3729,10 +3755,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           newPassConfirm = _state2.newPassConfirm,
           newPass = _state2.newPass,
           isNotAutoFocus = _state2.isNotAutoFocus;
-
-      var _ref32 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref32.isNewRetailBCPos;
-
       var _store2 = this.store,
           paymode = _store2.paymode,
           brefund = _store2.brefund,
@@ -3748,7 +3770,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           noIsMinAmount = _props.noIsMinAmount;
       // 原单退货
 
-      var boriginReturn = this.context && this.context.viewModel && this.context.viewModel.data && JSON.getCellValue(this.context.viewModel.data, "IsOriginalReturn");
+      var boriginReturn = this.getBoriginReturn();
       var totalTaxAmount = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.TotalTaxAmount;
 
       //收订金
@@ -3817,11 +3839,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref33 = quantityDetail || {},
-          _ref33$buyQuantity = _ref33.buyQuantity,
-          buyQuantity = _ref33$buyQuantity === undefined ? 0 : _ref33$buyQuantity,
-          _ref33$returnQuantity = _ref33.returnQuantity,
-          returnQuantity = _ref33$returnQuantity === undefined ? 0 : _ref33$returnQuantity;
+      var _ref32 = quantityDetail || {},
+          _ref32$buyQuantity = _ref32.buyQuantity,
+          buyQuantity = _ref32$buyQuantity === undefined ? 0 : _ref32$buyQuantity,
+          _ref32$returnQuantity = _ref32.returnQuantity,
+          returnQuantity = _ref32$returnQuantity === undefined ? 0 : _ref32$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4706,7 +4728,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     return _this8.czkInput = input;
                   },
                   onKeyDown: function () {
-                    var _ref34 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(e) {
+                    var _ref33 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(e) {
                       var time, _paymode;
 
                       return _regenerator2.default.wrap(function _callee17$(_context17) {
@@ -4762,7 +4784,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     }));
 
                     return function (_x13) {
-                      return _ref34.apply(this, arguments);
+                      return _ref33.apply(this, arguments);
                     };
                   }(),
                   onFocus: function onFocus(e) {
@@ -4819,8 +4841,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.balance));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)),
-                  ref: function ref(_ref35) {
-                    return _this8["inputCzkAmount"] = _ref35;
+                  ref: function ref(_ref34) {
+                    return _this8["inputCzkAmount"] = _ref34;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5490,8 +5512,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
                   },
                   defaultValue: currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
-                  ref: function ref(_ref36) {
-                    return _this8["inputJfdxAmount"] = _ref36;
+                  ref: function ref(_ref35) {
+                    return _this8["inputJfdxAmount"] = _ref35;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";