tplus-components-touch 3.41.4 → 3.42.1

package/dist/components/progressState/EmptyAndErrorView.js.map

@@ -1 +1 @@
-{"version":3,"sources":["tplus-components-touch/components/progressState/EmptyAndErrorView.js"],"names":["EmptyAndErrorView","sys_parms","empty","window","ossAliyuncsFileURL","error","onButtonClick","e","onClick","props","iconVisible","info","buttonVisible","buttonTitle","secondaryTip","style","type","imgStyle","imgURL","Component","propTypes","PropTypes","bool","string","func","object"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;AAEA;;;;;;IAEMA,iB;;;;;;;;;;;;;;sOAaFC,S,GAAY;AACRC,mBAAUC,OAAOC,kBAAjB,eADQ;AAERC,mBAAUF,OAAOC,kBAAjB;AAFQ,S,QAsCZE,a,GAAgB,UAACC,CAAD,EAAK;AAAA,gBACVC,OADU,GACC,MAAKC,KADN,CACVD,OADU;;AAEjBA,uBAAWA,QAAQD,CAAR,CAAX;AACH,S;;;;;iCApCQ;AAAA,yBACoG,KAAKE,KADzG;AAAA,gBACEC,WADF,UACEA,WADF;AAAA,gBACeC,IADf,UACeA,IADf;AAAA,gBACqBC,aADrB,UACqBA,aADrB;AAAA,gBACoCC,WADpC,UACoCA,WADpC;AAAA,gBACgDC,YADhD,UACgDA,YADhD;AAAA,sCAC6DC,KAD7D;AAAA,gBAC6DA,KAD7D,gCACmE,EADnE;AAAA,qCACsEC,IADtE;AAAA,gBACsEA,IADtE,+BAC2E,OAD3E;AAAA,yCACmFC,QADnF;AAAA,gBACmFA,QADnF,mCAC8F,EAD9F;;AAEL,gBAAMC,SAAS,KAAKjB,SAAL,CAAee,IAAf,CAAf;AACA,mBACI;AAAA;AAAA,kBAAK,WAAU,eAAf,EAA+B,OAAOD,KAAtC;AACI;AAAA;AAAA;AACKL,mCACD;AAAA;AAAA,0BAAK,WAAU,MAAf;AACI,+DAAK,OAAOO,QAAZ,EAAsB,KAAKC,MAA3B;AADJ,qBAFJ;AAMKP,4BACD;AAAA;AAAA,0BAAK,WAAU,MAAf;AAAuBA;AAAvB,qBAPJ;AASKC,qCACD;AAAA;AAAA,0BAAK,WAAU,QAAf;AACI;AAAA;AAAA,8BAAQ,MAAK,SAAb,EAAuB,SAAS,KAAKN,aAArC;AACMO;AADN;AADJ;AAVJ,iBADJ;AAkBKC,gCACG;AAAA;AAAA,sBAAK,WAAU,cAAf;AACI;AAAA;AAAA,0BAAM,WAAU,UAAhB;AAAA;AAAA,qBADJ;AAEI;AAAA;AAAA,0BAAK,WAAU,YAAf;AAAA;AAA+BA;AAA/B;AAFJ;AAnBR,aADJ;AA4BH;;;EAjD2BK,gB,UAErBC,S,GAAY;AACfV,iBAAaW,oBAAUC,IADR;AAEfX,UAAMU,oBAAUE,MAFD;AAGfX,mBAAeS,oBAAUC,IAHV;AAIfT,iBAAaQ,oBAAUE,MAJR;AAKfT,kBAAcO,oBAAUE,MALT;AAMff,aAASa,oBAAUG,IANJ;AAOfT,WAAOM,oBAAUI,MAPF;AAQfT,UAAMK,oBAAUE;AARD,C;kBAwDRvB,iB","file":"EmptyAndErrorView.js","sourcesContent":["import React, {Component} from 'react';\r\nimport { Button } from 'antd';\r\nimport PropTypes from 'prop-types';\r\n\r\nclass EmptyAndErrorView extends Component{\r\n\r\n    static propTypes = {\r\n        iconVisible: PropTypes.bool,\r\n        info: PropTypes.string,\r\n        buttonVisible: PropTypes.bool,\r\n        buttonTitle: PropTypes.string,\r\n        secondaryTip: PropTypes.string,\r\n        onClick: PropTypes.func,\r\n        style: PropTypes.object,\r\n        type: PropTypes.string\r\n    };\r\n\r\n    sys_parms = {\r\n        empty: `${window.ossAliyuncsFileURL}/empty.png`,\r\n        error: `${window.ossAliyuncsFileURL}/operation_error.png`\r\n    }\r\n\r\n    render() {\r\n        const {iconVisible, info, buttonVisible, buttonTitle,secondaryTip,style={},type='error',imgStyle = {}} = this.props;\r\n        const imgURL = this.sys_parms[type];\r\n        return (\r\n            <div className=\"progressState\" style={style}>\r\n                <div>\r\n                    {iconVisible &&\r\n                    <div className=\"icon\">\r\n                        <img style={imgStyle} src={imgURL}/>\r\n                    </div>\r\n                    }\r\n                    {info &&\r\n                    <div className=\"text\">{info}</div>\r\n                    }\r\n                    {buttonVisible &&\r\n                    <div className=\"addBtn\">\r\n                        <Button type=\"primary\" onClick={this.onButtonClick}>\r\n                             {buttonTitle}\r\n                        </Button>\r\n                    </div>\r\n                    }\r\n                </div>\r\n                {secondaryTip &&\r\n                    <div className=\"secondaryTip\">\r\n                        <span className=\"tipLabel\">提示 :</span>\r\n                        <div className=\"tipContent\">  {secondaryTip}</div>\r\n                    </div>\r\n                }\r\n\r\n            </div>\r\n        );\r\n    }\r\n\r\n    onButtonClick = (e)=>{\r\n        const {onClick} = this.props;\r\n        onClick && onClick(e);\r\n    }\r\n\r\n}\r\n\r\nexport default EmptyAndErrorView;"]}
+{"version":3,"sources":["tplus-components-touch/components/progressState/EmptyAndErrorView.js"],"names":["imgRef","empty","error","EmptyAndErrorView","onButtonClick","e","onClick","props","iconVisible","info","buttonVisible","buttonTitle","secondaryTip","style","type","imgStyle","imgURL","Component","propTypes","PropTypes","bool","string","func","object"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;AAEA;;;;;;AAGA,IAAMA,SAAS;AACXC,WAAM,gDADK;AAEXC,WAAM;AAFK,CAAf;;IAKMC,iB;;;;;;;;;;;;;;sOA+CFC,a,GAAgB,UAACC,CAAD,EAAK;AAAA,gBACVC,OADU,GACC,MAAKC,KADN,CACVD,OADU;;AAEjBA,uBAAWA,QAAQD,CAAR,CAAX;AACH,S;;;;;iCArCQ;AAAA,yBAEoG,KAAKE,KAFzG;AAAA,gBAEEC,WAFF,UAEEA,WAFF;AAAA,gBAEeC,IAFf,UAEeA,IAFf;AAAA,gBAEqBC,aAFrB,UAEqBA,aAFrB;AAAA,gBAEoCC,WAFpC,UAEoCA,WAFpC;AAAA,gBAEgDC,YAFhD,UAEgDA,YAFhD;AAAA,sCAE6DC,KAF7D;AAAA,gBAE6DA,KAF7D,gCAEmE,EAFnE;AAAA,qCAEsEC,IAFtE;AAAA,gBAEsEA,IAFtE,+BAE2E,OAF3E;AAAA,yCAEmFC,QAFnF;AAAA,gBAEmFA,QAFnF,mCAE8F,EAF9F;;AAGL,gBAAMC,SAAShB,OAAOc,IAAP,CAAf;AACA,mBACI;AAAA;AAAA,kBAAK,WAAU,eAAf,EAA+B,OAAOD,KAAtC;AACI;AAAA;AAAA;AACKL,mCACD;AAAA;AAAA,0BAAK,WAAU,MAAf;AACI,+DAAK,OAAOO,QAAZ,EAAsB,KAAKC,MAA3B;AADJ,qBAFJ;AAMKP,4BACD;AAAA;AAAA,0BAAK,WAAU,MAAf;AAAuBA;AAAvB,qBAPJ;AASKC,qCACD;AAAA;AAAA,0BAAK,WAAU,QAAf;AACI;AAAA;AAAA,8BAAQ,MAAK,SAAb,EAAuB,SAAS,KAAKN,aAArC;AACMO;AADN;AADJ;AAVJ,iBADJ;AAkBKC,gCACG;AAAA;AAAA,sBAAK,WAAU,cAAf;AACI;AAAA;AAAA,0BAAM,WAAU,UAAhB;AAAA;AAAA,qBADJ;AAEI;AAAA;AAAA,0BAAK,WAAU,YAAf;AAAA;AAA+BA;AAA/B;AAFJ;AAnBR,aADJ;AA4BH;;;EA7C2BK,gB,UAErBC,S,GAAY;AACfV,iBAAaW,oBAAUC,IADR;AAEfX,UAAMU,oBAAUE,MAFD;AAGfX,mBAAeS,oBAAUC,IAHV;AAIfT,iBAAaQ,oBAAUE,MAJR;AAKfT,kBAAcO,oBAAUE,MALT;AAMff,aAASa,oBAAUG,IANJ;AAOfT,WAAOM,oBAAUI,MAPF;AAQfT,UAAMK,oBAAUE;AARD,C;kBAoDRlB,iB","file":"EmptyAndErrorView.js","sourcesContent":["import React, {Component} from 'react';\r\nimport { Button } from 'antd';\r\nimport PropTypes from 'prop-types';\r\n\r\n\r\nconst imgRef = {\r\n    empty:'https://newretail.static.chanjet.com/empty.png',\r\n    error:'https://newretail.static.chanjet.com/operation_error.png'\r\n}\r\n\r\nclass EmptyAndErrorView extends Component{\r\n\r\n    static propTypes = {\r\n        iconVisible: PropTypes.bool,\r\n        info: PropTypes.string,\r\n        buttonVisible: PropTypes.bool,\r\n        buttonTitle: PropTypes.string,\r\n        secondaryTip: PropTypes.string,\r\n        onClick: PropTypes.func,\r\n        style: PropTypes.object,\r\n        type: PropTypes.string\r\n    };\r\n\r\n    render() {\r\n\r\n        const {iconVisible, info, buttonVisible, buttonTitle,secondaryTip,style={},type='error',imgStyle = {}} = this.props;\r\n        const imgURL = imgRef[type];\r\n        return (\r\n            <div className=\"progressState\" style={style}>\r\n                <div>\r\n                    {iconVisible &&\r\n                    <div className=\"icon\">\r\n                        <img style={imgStyle} src={imgURL}/>\r\n                    </div>\r\n                    }\r\n                    {info &&\r\n                    <div className=\"text\">{info}</div>\r\n                    }\r\n                    {buttonVisible &&\r\n                    <div className=\"addBtn\">\r\n                        <Button type=\"primary\" onClick={this.onButtonClick}>\r\n                             {buttonTitle}\r\n                        </Button>\r\n                    </div>\r\n                    }\r\n                </div>\r\n                {secondaryTip &&\r\n                    <div className=\"secondaryTip\">\r\n                        <span className=\"tipLabel\">提示 :</span>\r\n                        <div className=\"tipContent\">  {secondaryTip}</div>\r\n                    </div>\r\n                }\r\n\r\n            </div>\r\n        );\r\n    }\r\n\r\n    onButtonClick = (e)=>{\r\n        const {onClick} = this.props;\r\n        onClick && onClick(e);\r\n    }\r\n\r\n}\r\n\r\nexport default EmptyAndErrorView;"]}

package/dist/components/settlement/settlement.js

@@ -463,17 +463,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         } else {
           item.badge = { text: '', position: '', className: '' };
         }
-        if (!item.IsPresent) {
-          discountRetailTotalAount += item.RetailPrice * item.Quantity;
-        }
         if (item.PromotionDetails && item.PromotionDetails.length > 0) {
           count++;
         }
         item.InventoryName = item.Inventory.Name;
         item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
-        discountPrototypeTotalAmount += item.DetailDiscountAmount;
+        if (!item.IsPresent) {
+          discountPrototypeTotalAmount += item.DetailDiscountAmount;
+          item.TotalDiscount = item.DetailDiscountAmount;
+        } else {
+          item.TotalDiscount = 0;
+        }
         //item.TotalDiscount = getFixedNumber(item.Discount * item.Quantity);
-        item.TotalDiscount = item.DetailDiscountAmount;
         item.nAmount = (0, _utils.getFixedNumber)(item.TaxAmount);
         item.UnitName = item.Unit.Name;
         item.nQuantity = (0, _utils.getRoundValue)(item.Quantity, quantityPrecision);
@@ -484,7 +485,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         dataSource: dataSource,
         discountTotalAmount: (0, _utils.getFixedNumber)(_this2.props.amount),
         discountPrototypeTotalAmount: (0, _utils.getFixedNumber)(discountPrototypeTotalAmount),
-        discountRetailTotalAount: (0, _utils.getFixedNumber)(_this2.props.amount + discountPrototypeTotalAmount)
+        discountRetailTotalAount: (0, _utils.getFixedNumber)(_this2.props.amount + parseFloat(discountPrototypeTotalAmount))
       });
       return count;
     };
@@ -1007,7 +1008,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }, 200);
 
       // TODO: 测试优惠券支付
-      if (!_this2.store.paymode.currentMode.boriginReturn) {
+
+      var _ref10 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref10.isNewRetailBCPos;
+
+      if (isNewRetailBCPos && !_this2.store.paymode.currentMode.boriginReturn) {
         _this2.store.getCouponList();
       }
     };
@@ -1089,8 +1094,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkOfflineEnable = function (paymode, key) {
-      var _ref10 = paymode || {},
-          paymodes = _ref10.paymodes;
+      var _ref11 = paymode || {},
+          paymodes = _ref11.paymodes;
 
       var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
 
@@ -1212,6 +1217,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.onTabsClick = function (key, bookType) {
+      if (!_this2.isDjqValidated(key)) {
+        return;
+      };
+      var _this2$store3 = _this2.store,
+          paymode = _this2$store3.paymode,
+          brefund = _this2$store3.brefund,
+          boriginReturn = _this2$store3.boriginReturn;
+
       var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn9.PayStyle,
           Differentiate = _enumController$getEn9.Differentiate;
@@ -1228,10 +1241,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
           MultiPay = _enumController$getEn10.MultiPay;
 
-      var _this2$store3 = _this2.store,
-          paymode = _this2$store3.paymode,
-          brefund = _this2$store3.brefund,
-          boriginReturn = _this2$store3.boriginReturn;
       var noAlreadyWarn = _this2.state.noAlreadyWarn;
 
       if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(key)) return false;
@@ -1437,7 +1446,15 @@ 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;
       }
-      _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
+
+      var _ref12 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref12.isNewRetailBCPos;
+
+      if (isNewRetailBCPos) {
+        _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
+      } else {
+        _this2.store.paymode.calcDjqValue(q);
+      }
       // 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);
     };
@@ -1510,6 +1527,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.onHotKeyClick1 = function (mode, index, boriginReturn, bookType) {
+      if (!_this2.isDjqValidated(mode.paymentType)) {
+        return;
+      };
       // if (bookType == 'bookPay' && this.store.paymode.isNotFullOnlyBook && mode.virtualPay){
       //   return Message.error("付订金时不可使用零售抵现类结算方式!");
       // }
@@ -1927,13 +1947,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.hasElectron === false) return;
       var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
 
-      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 _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 hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
       if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -1968,9 +1988,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
+      var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
         var handleUserInputs = function () {
-          var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
+          var _ref19 = (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) {
@@ -2061,7 +2081,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           }));
 
           return function handleUserInputs(_x6) {
-            return _ref17.apply(this, arguments);
+            return _ref19.apply(this, arguments);
           };
         }();
 
@@ -2154,7 +2174,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref16 = (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) {
@@ -2228,7 +2248,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }));
 
                   return function commit(_x5) {
-                    return _ref16.apply(this, arguments);
+                    return _ref18.apply(this, arguments);
                   };
                 }();
 
@@ -2243,13 +2263,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x4) {
-        return _ref15.apply(this, arguments);
+        return _ref17.apply(this, arguments);
       };
     }();
 
     _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
       var handleUserInputs = function () {
-        var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
+        var _ref23 = (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) {
@@ -2346,11 +2366,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }));
 
         return function handleUserInputs(_x8) {
-          return _ref20.apply(this, arguments);
+          return _ref23.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _enumController$getEn22, PayStyle, commit;
+      var that, curmode, promises, _ref21, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
 
       return _regenerator2.default.wrap(function _callee14$(_context14) {
         while (1) {
@@ -2359,21 +2379,28 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
+              _ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
-              if (curmode.value > 0) {
-                _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
+              if (isNewRetailBCPos) {
+                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 _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
+                var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
                   var result;
                   return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
@@ -2423,13 +2450,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }));
 
                 return function commit(_x7) {
-                  return _ref19.apply(this, arguments);
+                  return _ref22.apply(this, arguments);
                 };
               }();
 
               handleUserInputs(promises);
 
-            case 6:
+            case 7:
             case 'end':
               return _context14.stop();
           }
@@ -2474,7 +2501,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
+      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
         var that, confirmPwd;
         return _regenerator2.default.wrap(function _callee15$(_context15) {
           while (1) {
@@ -2490,8 +2517,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       // if (v !== '') {
                       modal.destroy();
 
-                      var _ref22 = that.state || {},
-                          confirmPwd = _ref22.confirmPwd;
+                      var _ref25 = that.state || {},
+                          confirmPwd = _ref25.confirmPwd;
 
                       setTimeout(function () {
                         paymode.authCode = v;
@@ -2582,8 +2609,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 _ref23 = that.state || {},
-                                    confirmPwd = _ref23.confirmPwd;
+                                var _ref26 = that.state || {},
+                                    confirmPwd = _ref26.confirmPwd;
                                 // if (v !== '') {
 
 
@@ -2624,12 +2651,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x9) {
-        return _ref21.apply(this, arguments);
+        return _ref24.apply(this, arguments);
       };
     }();
 
     _this2.btnDebounced = function () {
-      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(type, bquick) {
+      var _ref27 = (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) {
@@ -2736,14 +2763,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x10, _x11) {
-        return _ref24.apply(this, arguments);
+        return _ref27.apply(this, arguments);
       };
     }();
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref25 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref25.isNewRetailBCPos;
+      var _ref28 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref28.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -3352,12 +3379,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref26 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
-        MemberMeStorageCardInputByKeyBoard = _ref26.MemberMeStorageCardInputByKeyBoard,
-        ICCardServer = _ref26.ICCardServer,
-        ICCardPassword = _ref26.ICCardPassword,
-        PreSellOrBook = _ref26.PreSellOrBook,
-        PercentageWhenBook = _ref26.PercentageWhenBook;
+    var _ref29 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        MemberMeStorageCardInputByKeyBoard = _ref29.MemberMeStorageCardInputByKeyBoard,
+        ICCardServer = _ref29.ICCardServer,
+        ICCardPassword = _ref29.ICCardPassword,
+        PreSellOrBook = _ref29.PreSellOrBook,
+        PercentageWhenBook = _ref29.PercentageWhenBook;
 
     _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
@@ -3366,9 +3393,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.percentageWhenBook = PercentageWhenBook;
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref27 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref27.isHorizontalPad,
-        isHorizontalSunMi = _ref27.isHorizontalSunMi;
+    var _ref30 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref30.isHorizontalPad,
+        isHorizontalSunMi = _ref30.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3485,6 +3512,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     //jfdx
 
+  }, {
+    key: 'isDjqValidated',
+    value: function isDjqValidated(key) {
+      var paymode = this.store.paymode;
+
+      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn32.PayStyle;
+
+      if (key === PayStyle.djq && Math.Minus(paymode.received, paymode.amount) > 0) {
+        _message2.default.warn('实收金额已大于应收金额，不允许使用优惠券');
+        return false;
+      }
+      return true;
+    }
 
     /**
      *
@@ -3500,8 +3541,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
   }, {
     key: 'isNoProductTip',
     value: function isNoProductTip(nonProductMap) {
-      var _ref28 = this.context.viewModel.data || {},
-          RetailDetails = _ref28.RetailDetails;
+      var _ref31 = this.context.viewModel.data || {},
+          RetailDetails = _ref31.RetailDetails;
 
       var temphtml = [];
       if ((0, _keys2.default)(nonProductMap).length > 0) {
@@ -3575,8 +3616,8 @@ 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;
+      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn33.PayStyle;
 
       if (this.currentInput) {
         if (this.store.paymode.currentMode) {
@@ -3597,9 +3638,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function renderToolbtn(mode, index, bookType) {
       var _this7 = this;
 
-      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn33.PayIcon,
-          PayStyle = _enumController$getEn33.PayStyle;
+      var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn34.PayIcon,
+          PayStyle = _enumController$getEn34.PayStyle;
 
       var isReturn = this.props.isReturn;
       var _store = this.store,
@@ -3671,11 +3712,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function render() {
       var _this8 = this;
 
-      var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn34.PayIcon,
-          PayIcon2 = _enumController$getEn34.PayIcon2,
-          PayStyle = _enumController$getEn34.PayStyle,
-          Differentiate = _enumController$getEn34.Differentiate;
+      var _enumController$getEn35 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn35.PayIcon,
+          PayIcon2 = _enumController$getEn35.PayIcon2,
+          PayStyle = _enumController$getEn35.PayStyle,
+          Differentiate = _enumController$getEn35.Differentiate;
 
       var _state2 = this.state,
           btnDissabled = _state2.btnDissabled,
@@ -3688,6 +3729,10 @@ 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,
@@ -3772,11 +3817,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      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 _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 quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4661,7 +4706,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     return _this8.czkInput = input;
                   },
                   onKeyDown: function () {
-                    var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(e) {
+                    var _ref34 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(e) {
                       var time, _paymode;
 
                       return _regenerator2.default.wrap(function _callee17$(_context17) {
@@ -4717,7 +4762,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     }));
 
                     return function (_x13) {
-                      return _ref30.apply(this, arguments);
+                      return _ref34.apply(this, arguments);
                     };
                   }(),
                   onFocus: function onFocus(e) {
@@ -4774,8 +4819,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(_ref31) {
-                    return _this8["inputCzkAmount"] = _ref31;
+                  ref: function ref(_ref35) {
+                    return _this8["inputCzkAmount"] = _ref35;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5445,8 +5490,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(_ref32) {
-                    return _this8["inputJfdxAmount"] = _ref32;
+                  ref: function ref(_ref36) {
+                    return _this8["inputJfdxAmount"] = _ref36;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";