tplus-components-touch 3.37.1 → 3.38.2

package/dist/components/settlement/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["tplus-components-touch/components/settlement/index.js"],"names":["Settlement"],"mappings":";;;;;;AAAA;;;;AACA;;;;kBAEeA,oB","file":"index.js","sourcesContent":["import Settlement from './settlement'\r\nimport './settlement.less'\r\n\r\nexport default Settlement;"]}
+{"version":3,"sources":["tplus-components-touch/components/settlement/index.js"],"names":["Settlement","settlementVoucherStore","SettlementStore","settlementMemberStore"],"mappings":";;;;;;AAAA;;AACA;;;;AACA;;;;AACA;;;;kBAEeA,oB;;;AAEf,oCAAe,EAAEC,wBAAwB,IAAIC,yBAAJ,EAA1B,EAAiDC,uBAAuB,IAAID,yBAAJ,EAAxE,EAAf","file":"index.js","sourcesContent":["import { registerStores } from 'mutants-microfx';\r\nimport Settlement from './settlement';\r\nimport SettlementStore from './settlementStore';\r\nimport './settlement.less';\r\n\r\nexport default Settlement;\r\n\r\nregisterStores({ settlementVoucherStore: new SettlementStore(), settlementMemberStore: new SettlementStore() })"]}

package/dist/components/settlement/settlement.js

@@ -160,10 +160,6 @@ var _modalWraper2 = _interopRequireDefault(_modalWraper);
 
 var _utils = require('./utils');
 
-var _settlementStore = require('./settlementStore');
-
-var _settlementStore2 = _interopRequireDefault(_settlementStore);
-
 var _keyboard = require('../keyboard');
 
 var _keyboard2 = _interopRequireDefault(_keyboard);
@@ -221,7 +217,6 @@ var hasElectron = _mutantsMicrofx.env.platform === _mutantsMicrofx.env.constant.
 var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_React$Component) {
   (0, _inherits3.default)(Settlement, _React$Component);
 
-  // 复核结算方式快捷键列表
   function Settlement(props) {
     var _this3 = this;
 
@@ -263,14 +258,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       storageValue: '0.00',
       czkValue: null,
       isInputMember: false,
-      selectedRowIndex: 0 };
+      selectedRowIndex: 0
+      // 复核结算方式快捷键列表
+    };
     _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
       return key.toLocaleUpperCase();
     });
     _this2.hotkeydebounced = null;
     _this2.hotkeydebouncedPayMode = "";
     _this2.currentInput = null;
-    _this2.store = new _settlementStore2.default();
 
     _this2.resizeSettlementToolBtns = function () {
       var newStyle = _this2.store.newStyle;
@@ -365,7 +361,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           isReturn = _this2$props.isReturn,
           type = _this2$props.type;
 
-      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate()).then(function (result) {
+      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ isNotAutoFocus: true })).then(function (result) {
         if (result) {
           _this2.setState({
             settleDisabled: false
@@ -1055,7 +1051,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       setTimeout(function () {
         _this2.inputJfdxAmount.input.focus();
         _this2.inputJfdxAmount.input.setSelectionRange(0, _this2.inputJfdxAmount.input.value.length);
-      }, 300);
+      }, 200);
     };
 
     _this2.handleJfdxOk = function (e) {
@@ -1353,6 +1349,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           }
         }
       }
+      // let bjfdx=this.store.paymode.currentMode.paymentType==PayStyle.jfdx;
       _this2.store.paymode.setCurrentModeValue(val, max);
     };
 
@@ -2048,16 +2045,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';
@@ -3269,14 +3256,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
     _this2.setTimer = null;
     _this2.keypressStime = null;
+    _this2.store = !(props.type == 1) ? _mutantsMicrofx.stores.settlementVoucherStore : _mutantsMicrofx.stores.settlementMemberStore;
     return _this2;
   }
 
   (0, _createClass3.default)(Settlement, [{
     key: 'componentDidMount',
     value: function componentDidMount() {
-      //let retailDetails=this.context.viewModel.data.RetailDetails;//明细
-      //let totalRetailAmount=this.context.viewModel.data.TotalRetailAmount;//零售金额合计
       this.store.initPaymodes(this.updateInput, this.props.type, this.props.MemberPoints);
     }
   }, {
@@ -3399,7 +3385,16 @@ 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) {
+          var paymentType1 = this.store.paymode.currentMode.paymentType;
+          if (paymentType1 === PayStyle.djq || paymentType1 === PayStyle.hyczk || paymentType1 === PayStyle.jfdx) {
+            return;
+          }
+        }
         var value = _keyboard2.default.getNewValue(this.currentInput, this.currentInput.value, key, true);
         if (!isNaN(value) || value == '-') {
           this.currentInput.value = value;
@@ -3412,9 +3407,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function renderToolbtn(mode, index) {
       var _this7 = 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,
@@ -3486,11 +3481,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function render() {
       var _this8 = 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,
@@ -5339,7 +5334,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         _react2.default.createElement(
                           'span',
                           null,
-                          q.amount
+                          q.nominalAmount
                         ),
                         _react2.default.createElement(
                           'span',
@@ -5611,12 +5606,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && currentMode.member && (0, _utils.getFixedNumber)(currentMode.steadCashIntegral)
+                  currentMode && currentMode.member && (0, _utils.getFixedNumber)(currentMode.member.exchangable)
                 ),
                 _react2.default.createElement(
                   'div',
                   { className: 'name' },
-                  '\u672C\u5355\u4F7F\u7528\u79EF\u5206'
+                  '\u53EF\u62B5\u73B0\u91D1\u989D'
                 )
               ),
               _react2.default.createElement(
@@ -5637,7 +5632,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'name' },
-                  '\u672C\u5355\u53EF\u62B5\u73B0\u91D1\u989D'
+                  '\u672C\u5355\u53EF\u7528'
                 )
               )
             ),