tplus-components-touch 3.43.1 → 3.44.3

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,36 @@ 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, 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;
+                memberId = _this2.store && _this2.store.member && _this2.store.member.ID;
+                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 = 11;
                   break;
                 }
 
-                _context.next = 8;
-                return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
+                _context.next = 10;
+                return _this2.store.updateCurrentMode(memberId, returnType);
 
-              case 8:
+              case 10:
                 _context.t0 = _context.sent;
 
-              case 9:
+              case 11:
                 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 +691,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }, 300);
                 }
 
-              case 12:
+              case 14:
               case 'end':
                 return _context.stop();
             }
@@ -721,7 +735,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 +747,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 +795,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();
           }
@@ -1008,11 +1023,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }, 200);
 
       // TODO: 测试优惠券支付
-
-      var _ref10 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref10.isNewRetailBCPos;
-
-      if (isNewRetailBCPos && !_this2.store.paymode.currentMode.boriginReturn) {
+      if (!_this2.store.paymode.currentMode.boriginReturn) {
         _this2.store.getCouponList();
       }
     };
@@ -1094,8 +1105,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkOfflineEnable = function (paymode, key) {
-      var _ref11 = paymode || {},
-          paymodes = _ref11.paymodes;
+      var _ref10 = paymode || {},
+          paymodes = _ref10.paymodes;
 
       var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
 
@@ -1354,10 +1365,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({
@@ -1446,15 +1459,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _message2.default.info('\u539F\u5355\u9000\u8D27\u65F6' + Differentiate.COUPON + '\u4E0D\u53EF\u4EE5\u53D6\u6D88\u3002');
         return;
       }
-
-      var _ref12 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref12.isNewRetailBCPos;
-
-      if (isNewRetailBCPos) {
-        _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
-      } else {
-        _this2.store.paymode.calcDjqValue(q);
-      }
+      _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
       // this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.couponCategoryEnum !== 'RIGHT'}));
       // this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.checked}), this.store.paymode.currentMode.djqs);
     };
@@ -1484,15 +1489,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 +1515,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   });
                 }
 
-              case 4:
+              case 5:
               case 'end':
                 return _context5.stop();
             }
@@ -1615,8 +1621,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 +1630,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) {
@@ -1947,13 +1951,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.hasElectron === false) return;
       var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
 
-      var _ref16 = dt || {},
-          guestshow_enable = _ref16.guestshow_enable,
-          guestshow_clear = _ref16.guestshow_clear,
-          guestshow_welcome = _ref16.guestshow_welcome,
-          guestshow_collect = _ref16.guestshow_collect,
-          guestshow_refund = _ref16.guestshow_refund,
-          guestshow_change = _ref16.guestshow_change;
+      var _ref14 = dt || {},
+          guestshow_enable = _ref14.guestshow_enable,
+          guestshow_clear = _ref14.guestshow_clear,
+          guestshow_welcome = _ref14.guestshow_welcome,
+          guestshow_collect = _ref14.guestshow_collect,
+          guestshow_refund = _ref14.guestshow_refund,
+          guestshow_change = _ref14.guestshow_change;
 
       var hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
       if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -1988,9 +1992,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
+      var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
         var handleUserInputs = function () {
-          var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
+          var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
             return _regenerator2.default.wrap(function _callee10$(_context10) {
@@ -2081,7 +2085,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           }));
 
           return function handleUserInputs(_x6) {
-            return _ref19.apply(this, arguments);
+            return _ref17.apply(this, arguments);
           };
         }();
 
@@ -2174,7 +2178,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
+                  var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
                     var result;
                     return _regenerator2.default.wrap(function _callee9$(_context9) {
                       while (1) {
@@ -2248,7 +2252,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }));
 
                   return function commit(_x5) {
-                    return _ref18.apply(this, arguments);
+                    return _ref16.apply(this, arguments);
                   };
                 }();
 
@@ -2263,13 +2267,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x4) {
-        return _ref17.apply(this, arguments);
+        return _ref15.apply(this, arguments);
       };
     }();
 
     _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
       var handleUserInputs = function () {
-        var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
+        var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
           return _regenerator2.default.wrap(function _callee13$(_context13) {
@@ -2366,11 +2370,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }));
 
         return function handleUserInputs(_x8) {
-          return _ref23.apply(this, arguments);
+          return _ref20.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _ref21, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
+      var that, curmode, promises, _enumController$getEn22, PayStyle, commit;
 
       return _regenerator2.default.wrap(function _callee14$(_context14) {
         while (1) {
@@ -2379,28 +2383,21 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
-              _ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
-              if (isNewRetailBCPos) {
-                if (curmode.value > 0) {
-                  _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
+              if (curmode.value > 0) {
+                _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
 
-                  if (curmode.paymentType === PayStyle.hyczk) {
-                    if (curmode.cardTypeEnum === 'BALANCE_CARD') {
-                      !curmode.freePaymentPasswordStore && promises.push(that.inputPwd(curmode));
-                    } else {
-                      curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
-                    }
+                if (curmode.paymentType === PayStyle.hyczk) {
+                  if (curmode.cardTypeEnum === 'BALANCE_CARD') {
+                    !curmode.freePaymentPasswordStore && promises.push(that.inputPwd(curmode));
+                  } else {
+                    curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
                   }
                 }
-              } else {
-                if (curmode.member.needPwd && curmode.value > 0) {
-                  promises.push(that.inputPwd(curmode));
-                }
               }
 
               commit = function () {
-                var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
+                var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
                   var result;
                   return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
@@ -2450,13 +2447,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }));
 
                 return function commit(_x7) {
-                  return _ref22.apply(this, arguments);
+                  return _ref19.apply(this, arguments);
                 };
               }();
 
               handleUserInputs(promises);
 
-            case 7:
+            case 6:
             case 'end':
               return _context14.stop();
           }
@@ -2501,7 +2498,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
+      var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
         var that, confirmPwd;
         return _regenerator2.default.wrap(function _callee15$(_context15) {
           while (1) {
@@ -2517,8 +2514,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       // if (v !== '') {
                       modal.destroy();
 
-                      var _ref25 = that.state || {},
-                          confirmPwd = _ref25.confirmPwd;
+                      var _ref22 = that.state || {},
+                          confirmPwd = _ref22.confirmPwd;
 
                       setTimeout(function () {
                         paymode.authCode = v;
@@ -2609,8 +2606,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 _ref26 = that.state || {},
-                                    confirmPwd = _ref26.confirmPwd;
+                                var _ref23 = that.state || {},
+                                    confirmPwd = _ref23.confirmPwd;
                                 // if (v !== '') {
 
 
@@ -2651,12 +2648,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x9) {
-        return _ref24.apply(this, arguments);
+        return _ref21.apply(this, arguments);
       };
     }();
 
     _this2.btnDebounced = function () {
-      var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(type, bquick) {
+      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(type, bquick) {
         var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, _enumController$getEn23, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
 
         return _regenerator2.default.wrap(function _callee16$(_context16) {
@@ -2763,14 +2760,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x10, _x11) {
-        return _ref27.apply(this, arguments);
+        return _ref24.apply(this, arguments);
       };
     }();
 
     _this2.onCzkChange = function (v) {
-      // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref28 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref28.isNewRetailBCPos;
+      var _ref25 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref25.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2781,13 +2777,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.setState({
         czkValue: v
       });
-      // if(this.debounced){
-      //   this.debounced.cancel();
-      //   this.debounced=null;
-      //   // console.log("debounce canceled");
-      // }
-      // this.debounced=_debounce(()=>{this.loadCzk(v)},2000);
-      // this.debounced();
     };
 
     _this2.czkKeyboardOnOk = function (e) {
@@ -2808,7 +2797,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 () {
@@ -3379,12 +3367,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref29 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
-        MemberMeStorageCardInputByKeyBoard = _ref29.MemberMeStorageCardInputByKeyBoard,
-        ICCardServer = _ref29.ICCardServer,
-        ICCardPassword = _ref29.ICCardPassword,
-        PreSellOrBook = _ref29.PreSellOrBook,
-        PercentageWhenBook = _ref29.PercentageWhenBook;
+    var _ref26 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        MemberMeStorageCardInputByKeyBoard = _ref26.MemberMeStorageCardInputByKeyBoard,
+        ICCardServer = _ref26.ICCardServer,
+        ICCardPassword = _ref26.ICCardPassword,
+        PreSellOrBook = _ref26.PreSellOrBook,
+        PercentageWhenBook = _ref26.PercentageWhenBook;
 
     _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
@@ -3393,9 +3381,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.percentageWhenBook = PercentageWhenBook;
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref30 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref30.isHorizontalPad,
-        isHorizontalSunMi = _ref30.isHorizontalSunMi;
+    var _ref27 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref27.isHorizontalPad,
+        isHorizontalSunMi = _ref27.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3432,6 +3420,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     }
 
+    //是否退货
+
+
+    //原单退货状态
+
+
+    //非原单退货状态
+
+
     //对结算按钮超出的处理
 
   }, {
@@ -3527,22 +3524,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       return true;
     }
 
-    /**
-     *
-     * @param {*} thePaymodes 支付方式列表
-     * @param {*} currenIndex  当前支付方式下标
-     * @param {*} symbol  从当前currenIndex开始 还是从当前currenIndex截止
+    /**
+     *
+     * @param {*} thePaymodes 支付方式列表
+     * @param {*} currenIndex  当前支付方式下标
+     * @param {*} symbol  从当前currenIndex开始 还是从当前currenIndex截止
      */
 
     // 处理客显显示功能
 
+
     //that[`inputS${paymode.paymethodId}`]
 
   }, {
     key: 'isNoProductTip',
     value: function isNoProductTip(nonProductMap) {
-      var _ref31 = this.context.viewModel.data || {},
-          RetailDetails = _ref31.RetailDetails;
+      var _ref28 = this.context.viewModel.data || {},
+          RetailDetails = _ref28.RetailDetails;
 
       var temphtml = [];
       if ((0, _keys2.default)(nonProductMap).length > 0) {
@@ -3729,10 +3727,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 +3742,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 +3811,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 _ref29 = quantityDetail || {},
+          _ref29$buyQuantity = _ref29.buyQuantity,
+          buyQuantity = _ref29$buyQuantity === undefined ? 0 : _ref29$buyQuantity,
+          _ref29$returnQuantity = _ref29.returnQuantity,
+          returnQuantity = _ref29$returnQuantity === undefined ? 0 : _ref29$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4706,7 +4700,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 _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(e) {
                       var time, _paymode;
 
                       return _regenerator2.default.wrap(function _callee17$(_context17) {
@@ -4762,7 +4756,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     }));
 
                     return function (_x13) {
-                      return _ref34.apply(this, arguments);
+                      return _ref30.apply(this, arguments);
                     };
                   }(),
                   onFocus: function onFocus(e) {
@@ -4819,8 +4813,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(_ref31) {
+                    return _this8["inputCzkAmount"] = _ref31;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5490,8 +5484,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(_ref32) {
+                    return _this8["inputJfdxAmount"] = _ref32;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";