tplus-components-touch 3.24.1 → 3.25.3

package/dist/components/settlement/settlement.less

@@ -484,11 +484,12 @@
           cursor: pointer;
           .name{
             // padding-left:23px;
-            padding-top:16px;
+            padding-top: 15px;
             padding-bottom: 19px;
-            font-size: 17px;
-            line-height: 16px;
-            width: 130px;
+            font-size: 14px;
+            line-height: 1.3;
+            width: 120px;
+            height: 58px;
             text-indent: 0;
             padding-left: 14px;
             display: -webkit-box;

package/dist/components/settlement/settlementStore.js

@@ -109,6 +109,10 @@ var _moment = require('moment');
 
 var _moment2 = _interopRequireDefault(_moment);
 
+var _reduce2 = require('lodash/reduce');
+
+var _reduce3 = _interopRequireDefault(_reduce2);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _initDefineProp(target, property, descriptor, context) {
@@ -607,11 +611,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'getLoginInfo',
         value: function getLoginInfo() {
-            var _ref7 = _mutantsMicrofx.localStore.get('user') || {},
-                _ref7$loginInfo = _ref7.loginInfo,
-                loginInfo = _ref7$loginInfo === undefined ? {} : _ref7$loginInfo;
-
-            return loginInfo;
+            return _mutantsMicrofx.stores.user.options.get('loginInfo');
         }
     }, {
         key: 'loadCzk',
@@ -628,8 +628,8 @@ var SettlementStore = (_class = function () {
             var IdStore = this.storeInfo.storeID;
             var StoreCode = this.storeInfo.storeCode; //_find(this.storeInfo.storeInfos,(store)=>{return store.ID==IdStore;}).Code;
 
-            var _ref8 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref8.isNewRetailBCPos;
+            var _ref7 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref7.isNewRetailBCPos;
 
             var address = '';
             if (isNewRetailBCPos) {
@@ -639,8 +639,8 @@ var SettlementStore = (_class = function () {
                     var data = result.data;
                     var m = data;
 
-                    var _ref9 = _mutantsUtil.platform || {},
-                        isNewRetailBCPos = _ref9.isNewRetailBCPos;
+                    var _ref8 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref8.isNewRetailBCPos;
 
                     if (isNewRetailBCPos) {
                         _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
@@ -659,6 +659,9 @@ var SettlementStore = (_class = function () {
                             _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
                             _this7.updateEvent();
                             var message = '';
+                            var sum = (0, _reduce3.default)(_this7.paymode.thePaymodes, function (total, cur) {
+                                return total + cur.value;
+                            }, 0);
                             if (global.CheckMemberStorageProcessorBlock) {
                                 message = CheckMemberStorageProcessorBlock.execute(m);
                             }
@@ -666,7 +669,7 @@ var SettlementStore = (_class = function () {
                                 _this7.paymode.currentMode.errinfo = message;
                             } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
                                 _this7.paymode.currentMode.errinfo = "余额不足";
-                            } else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
+                            } else if (_this7.paymode.amount > 0 && parseFloat(_this7.paymode.amount) !== sum && _this7.paymode.currentMode.value == 0) {
                                 _this7.paymode.currentMode.errinfo = "实收金额必须录入";
                             } else {
                                 // 查询成功后将焦点移入下一个输入框
@@ -682,8 +685,8 @@ var SettlementStore = (_class = function () {
                     var data = JSON.parse(result.Data);
                     var m = data && data.length > 0 && data[0];
 
-                    var _ref10 = _mutantsUtil.platform || {},
-                        isNewRetailBCPos = _ref10.isNewRetailBCPos;
+                    var _ref9 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref9.isNewRetailBCPos;
 
                     if (isNewRetailBCPos) {
                         _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
@@ -977,8 +980,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
-                var _ref12, isNewRetailBCPos;
+            var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
+                var _ref11, isNewRetailBCPos;
 
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
@@ -994,7 +997,7 @@ var SettlementStore = (_class = function () {
                                 return _context2.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _ref12 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref12.isNewRetailBCPos;
+                                _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
                                 _context2.prev = 4;
 
                                 if (!(this.type == 1)) {
@@ -1050,7 +1053,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function commit(_x2) {
-                return _ref11.apply(this, arguments);
+                return _ref10.apply(this, arguments);
             }
 
             return commit;
@@ -1108,10 +1111,10 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
                 var _this11 = this;
 
-                var _enumController$getEn14, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn14, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
@@ -1191,8 +1194,8 @@ var SettlementStore = (_class = function () {
                                         }
                                     });
 
-                                    var _ref14 = _mutantsUtil.platform || {},
-                                        isNewRetailBCPos = _ref14.isNewRetailBCPos;
+                                    var _ref13 = _mutantsUtil.platform || {},
+                                        isNewRetailBCPos = _ref13.isNewRetailBCPos;
 
                                     if (_this11.dto.RetailStorageDetails.length > 0) {
                                         var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
@@ -1226,7 +1229,7 @@ var SettlementStore = (_class = function () {
                                         _this11.dto.Idmember = Idmember;
                                     }
                                 });
-                                _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
+                                _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
 
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
@@ -1296,7 +1299,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function save() {
-                return _ref13.apply(this, arguments);
+                return _ref12.apply(this, arguments);
             }
 
             return save;
@@ -1309,7 +1312,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+            var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
                         switch (_context4.prev = _context4.next) {
@@ -1337,7 +1340,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function querySettleResult() {
-                return _ref16.apply(this, arguments);
+                return _ref15.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1363,98 +1366,99 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
-                var _ref18, isNewRetailBCPos, cook1, cook2, message, result, count, _result;
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
+                var _ref17, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
                         switch (_context5.prev = _context5.next) {
                             case 0:
-                                _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
+                                _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
                                 _context5.prev = 1;
 
                                 if (!isNewRetailBCPos) {
-                                    _context5.next = 18;
+                                    _context5.next = 19;
                                     break;
                                 }
 
                                 cook1 = this.getAllCookies()['errorPwd'];
                                 cook2 = cook1 && JSON.parse(cook1);
                                 message = '密码输入错误';
+                                memberId = this.paymode.currentMode.member.MeStorageCardId;
 
                                 if (!cook2) {
-                                    _context5.next = 11;
+                                    _context5.next = 12;
                                     break;
                                 }
 
-                                if (!cook2.hasOwnProperty(this.member.MeStorageCardId + "")) {
-                                    _context5.next = 11;
+                                if (!cook2.hasOwnProperty(memberId + "")) {
+                                    _context5.next = 12;
                                     break;
                                 }
 
-                                if (!(cook2[this.member.MeStorageCardId] > 3)) {
-                                    _context5.next = 11;
+                                if (!(cook2[memberId] > 3)) {
+                                    _context5.next = 12;
                                     break;
                                 }
 
                                 message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
                                 return _context5.abrupt('return', _promise2.default.resolve(message));
 
-                            case 11:
-                                _context5.next = 13;
+                            case 12:
+                                _context5.next = 14;
                                 return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd) }, '/member/MeMemberWallet/checkPaymentPassword/' + value.id, false, false);
 
-                            case 13:
+                            case 14:
                                 result = _context5.sent;
 
                                 if (!result.data) {
                                     if (cook2) {
-                                        if (cook2.hasOwnProperty(this.member.MeStorageCardId + "")) {
-                                            count = cook2[this.member.MeStorageCardId];
+                                        if (cook2.hasOwnProperty(memberId + "")) {
+                                            count = cook2[memberId];
 
-                                            cook2[this.member.MeStorageCardId] = count + 1;
+                                            cook2[memberId] = count + 1;
                                         } else {
-                                            cook2[this.member.MeStorageCardId] = 1;
+                                            cook2[memberId] = 1;
                                         }
                                     } else {
                                         cook2 = {};
-                                        cook2[this.member.MeStorageCardId] = 1;
+                                        cook2[memberId] = 1;
                                     }
                                     this.setCookie('errorPwd', '', -1);
                                     this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
                                 }
                                 return _context5.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
 
-                            case 18:
-                                _context5.next = 20;
+                            case 19:
+                                _context5.next = 21;
                                 return (0, _tplusApi.tApi)({ "CheckoutParams": {
                                         "Idmember": value.id,
                                         "Password": value.pwd
                                     } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
 
-                            case 20:
+                            case 21:
                                 _result = _context5.sent;
                                 return _context5.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
 
-                            case 22:
-                                _context5.next = 27;
+                            case 23:
+                                _context5.next = 28;
                                 break;
 
-                            case 24:
-                                _context5.prev = 24;
+                            case 25:
+                                _context5.prev = 25;
                                 _context5.t0 = _context5['catch'](1);
                                 return _context5.abrupt('return', "failed");
 
-                            case 27:
+                            case 28:
                             case 'end':
                                 return _context5.stop();
                         }
                     }
-                }, _callee5, this, [[1, 24]]);
+                }, _callee5, this, [[1, 25]]);
             }));
 
             function validePwd(_x3) {
-                return _ref17.apply(this, arguments);
+                return _ref16.apply(this, arguments);
             }
 
             return validePwd;
@@ -1493,7 +1497,7 @@ var SettlementStore = (_class = function () {
         var _this13 = this;
 
         return function () {
-            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
                 return _regenerator2.default.wrap(function _callee6$(_context6) {
@@ -1520,7 +1524,7 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x4) {
-                return _ref19.apply(this, arguments);
+                return _ref18.apply(this, arguments);
             };
         }();
     }
@@ -1612,8 +1616,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _ref20 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref20.isNewRetailBCPos;
+            var _ref19 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref19.isNewRetailBCPos;
 
             var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn15.PayStyle,
@@ -1679,12 +1683,21 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 detailDTO.isManualFreeGift = item.IsPresent;
                 detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
                 detailDTO.IsManualChangePrice = item.IsManualChangePrice;
+
+                // if(detailDTO.IsManualChangePrice)//如果是手工改价
+                // {
+                //     detailDTO.listPrice = item.TaxPrice;
+                //     detailDTO.netAmountWithTax = item.TaxAmount;
+                // }
+                // else
+                // {
                 var bookingQuantity = 0;
                 if (item.BookingQuantity) {
                     bookingQuantity = item.BookingQuantity;
                 }
                 detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
                 detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
+                //} 
                 detailDTO.taxRate = item.TaxRate;
                 detailDTO.quantity = item.Quantity;
 
@@ -1714,18 +1727,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             }
                         });
 
-                        var _ref21 = element || {},
-                            couponCode = _ref21.couponCode,
-                            name = _ref21.name,
-                            tieredAmountResult = _ref21.tieredAmountResult,
-                            fromDate = _ref21.fromDate,
-                            dateMount = _ref21.dateMount,
-                            promoMethodEnum = _ref21.promoMethodEnum,
-                            discountPct = _ref21.discountPct,
-                            nominalAmount = _ref21.nominalAmount,
-                            promoId = _ref21.promoId,
-                            id = _ref21.id,
-                            doorsill = _ref21.doorsill;
+                        var _ref20 = element || {},
+                            couponCode = _ref20.couponCode,
+                            name = _ref20.name,
+                            tieredAmountResult = _ref20.tieredAmountResult,
+                            fromDate = _ref20.fromDate,
+                            dateMount = _ref20.dateMount,
+                            promoMethodEnum = _ref20.promoMethodEnum,
+                            discountPct = _ref20.discountPct,
+                            nominalAmount = _ref20.nominalAmount,
+                            promoId = _ref20.promoId,
+                            id = _ref20.id,
+                            doorsill = _ref20.doorsill;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -1769,8 +1782,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref22 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref22.isNewRetailBCPos;
+            var _ref21 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
             var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
                 Differentiate = _enumController$getEn16.Differentiate;
@@ -1838,13 +1851,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
             var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn17.PayStyle;
 
-            this.paymodes.thePaymodes && this.paymodes.thePaymodes.forEach(function (mode) {
+            this.thePaymodes && this.thePaymodes.forEach(function (mode) {
                 if (mode.paymentType === PayStyle.hyczk) {
                     sum -= mode.value;
                 }
             });
 
-            if (this.amount > 0 && (v === '' || v === '0.00')) {
+            if (this.amount > 0 && (v === '' || v === '0.00') && sum !== 0) {
                 this.currentMode.errinfo = "实收金额必须录入";
             } else if (Math.abs(parseFloat(v)) > Math.abs(sum)) {
                 this.currentMode.errinfo = "实收不应大于应收";
@@ -1860,7 +1873,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
+            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
                 var _this15 = this;
 
                 var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
@@ -1915,7 +1928,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x5, _x6) {
-                return _ref23.apply(this, arguments);
+                return _ref22.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -2036,8 +2049,8 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref24 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref24.isNewRetailBCPos;
+            var _ref23 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref23.isNewRetailBCPos;
 
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
             m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);