tplus-components-touch 3.18.13 → 3.20.2

package/dist/components/settlement/settlementStore.js

@@ -621,49 +621,93 @@ var SettlementStore = (_class = function () {
 
             var address = '';
             if (isNewRetailBCPos) {
-                address = 'chanjet.AA.DR.INewRetailMember.SearchMember';
+                // address = '/member/memberProfile/FindByStorageCode/'+v;
+                address = '/member/MeMemberWallet/FindByStorageCode';
+                return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function (result) {
+                    var data = result.data;
+                    var m = data;
+
+                    var _ref8 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref8.isNewRetailBCPos;
+
+                    if (isNewRetailBCPos) {
+                        _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
+                        _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
+                        _this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
+                        _this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
+                    }
+                    if (!m || !m.ID) {
+                        (0, _mobx.runInAction)(function () {
+                            _this7.paymode.currentMode.errinfo = "无效的会员卡号";
+                        });
+                    } else {
+                        (0, _mobx.runInAction)(function () {
+                            _this7.paymode.currentMode.errinfo = "";
+                            _this7.paymode.currentMode.member = new Member(m);
+                            _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
+                            _this7.updateEvent();
+                            var message = '';
+                            if (global.CheckMemberStorageProcessorBlock) {
+                                message = CheckMemberStorageProcessorBlock.execute(m);
+                            }
+                            if (!String.isNullOrEmpty(message)) {
+                                _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) {
+                                _this7.paymode.currentMode.errinfo = "实收金额必须录入";
+                            } else {
+                                // 查询成功后将焦点移入下一个输入框
+                                var nextInput = document.querySelector('.czk .received .input');
+                                nextInput && nextInput.focus();
+                            }
+                        });
+                    }
+                });
             } else {
                 address = 'AA.DR.newRetailMember.SearchMember';
+                return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
+                    var data = JSON.parse(result.Data);
+                    var m = data && data.length > 0 && data[0];
+
+                    var _ref9 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref9.isNewRetailBCPos;
+
+                    if (isNewRetailBCPos) {
+                        _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
+                        _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
+                        _this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
+                        _this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
+                    }
+                    if (!m || !m.ID) {
+                        (0, _mobx.runInAction)(function () {
+                            _this7.paymode.currentMode.errinfo = "无效的会员卡号";
+                        });
+                    } else {
+                        (0, _mobx.runInAction)(function () {
+                            _this7.paymode.currentMode.errinfo = "";
+                            _this7.paymode.currentMode.member = new Member(m);
+                            _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
+                            _this7.updateEvent();
+                            var message = '';
+                            if (global.CheckMemberStorageProcessorBlock) {
+                                message = CheckMemberStorageProcessorBlock.execute(data[0]);
+                            }
+                            if (!String.isNullOrEmpty(message)) {
+                                _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) {
+                                _this7.paymode.currentMode.errinfo = "实收金额必须录入";
+                            } else {
+                                // 查询成功后将焦点移入下一个输入框
+                                var nextInput = document.querySelector('.czk .received .input');
+                                nextInput && nextInput.focus();
+                            }
+                        });
+                    }
+                });
             }
-            return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
-                var data = JSON.parse(result.Data);
-                var m = data && data.length > 0 && data[0];
-
-                var _ref8 = _mutantsUtil.platform || {},
-                    isNewRetailBCPos = _ref8.isNewRetailBCPos;
-
-                if (isNewRetailBCPos) {
-                    _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
-                    _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
-                }
-                if (!m || !m.ID) {
-                    (0, _mobx.runInAction)(function () {
-                        _this7.paymode.currentMode.errinfo = "无效的会员卡号";
-                    });
-                } else {
-                    (0, _mobx.runInAction)(function () {
-                        _this7.paymode.currentMode.errinfo = "";
-                        _this7.paymode.currentMode.member = new Member(m);
-                        _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
-                        _this7.updateEvent();
-                        var message = '';
-                        if (global.CheckMemberStorageProcessorBlock) {
-                            message = CheckMemberStorageProcessorBlock.execute(data[0]);
-                        }
-                        if (!String.isNullOrEmpty(message)) {
-                            _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) {
-                            _this7.paymode.currentMode.errinfo = "实收金额必须录入";
-                        } else {
-                            // 查询成功后将焦点移入下一个输入框
-                            var nextInput = document.querySelector('.czk .received .input');
-                            nextInput && nextInput.focus();
-                        }
-                    });
-                }
-            });
         }
     }, {
         key: 'addDjq',
@@ -913,7 +957,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
+            var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
                         switch (_context2.prev = _context2.next) {
@@ -968,7 +1012,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function commit(_x2) {
-                return _ref9.apply(this, arguments);
+                return _ref10.apply(this, arguments);
             }
 
             return commit;
@@ -1014,20 +1058,20 @@ var SettlementStore = (_class = function () {
                 IPMSG = JSON.parse(window.localStorage.IPMSG);
             }
             return (0, _tplusApi.tApi)({ dto: this.dto }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
-                var _ref10 = _mutantsUtil.platform || {},
-                    isHorizontalPad = _ref10.isHorizontalPad,
-                    isHorizontalSunMi = _ref10.isHorizontalSunMi;
+                var _ref11 = _mutantsUtil.platform || {},
+                    isHorizontalPad = _ref11.isHorizontalPad,
+                    isHorizontalSunMi = _ref11.isHorizontalSunMi;
 
                 if (isHorizontalPad === true) {
                     // pad打印
                     //执行移动端云打印
                     if (_this10.cloudPrintArguments) {
-                        var _ref11 = _this10.cloudPrintArguments || {},
-                            Open = _ref11.Open,
-                            Key = _ref11.Key,
-                            Sign = _ref11.Sign,
-                            Name = _ref11.Name,
-                            Card = _ref11.Card;
+                        var _ref12 = _this10.cloudPrintArguments || {},
+                            Open = _ref12.Open,
+                            Key = _ref12.Key,
+                            Sign = _ref12.Sign,
+                            Name = _ref12.Name,
+                            Card = _ref12.Card;
 
                         if (!Open) {
                             _message2.default.warn(t('云打印未启用，请设置。'));
@@ -1065,8 +1109,8 @@ var SettlementStore = (_class = function () {
                     return;
                 } else {
                     if (global.StoragePrintProcessBlock) {
-                        var _ref12 = _mutantsUtil.platform || {},
-                            isNewRetailBCPos = _ref12.isNewRetailBCPos;
+                        var _ref13 = _mutantsUtil.platform || {},
+                            isNewRetailBCPos = _ref13.isNewRetailBCPos;
 
                         if (isNewRetailBCPos) {
                             global.StoragePrintProcessBlock.execute(resp);
@@ -1084,10 +1128,10 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+            var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
                 var _this11 = this;
 
-                var _enumController$getEn13, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn13, PayStyle, _ref16, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
@@ -1101,19 +1145,21 @@ var SettlementStore = (_class = function () {
                                     _this11.dto.RetailCouponDetails = [];
                                     var czkSum = 0;
                                     var Idmember = _this11.dto.Idmember;
+                                    var count = 0;
                                     var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
                                         return parseFloat(mode.value) != 0;
                                     }) : _this11.paymode.thePaymodes;
-                                    (0, _each3.default)(thePaymodes, function (mode) {
+                                    (0, _each3.default)(thePaymodes, function (mode, index) {
                                         var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
                                         if (mode.paymentType == PayStyle.hyczk) {
                                             if (!Idmember) {
                                                 Idmember = mode.member.id;
                                             }
                                             czkSum = Math.Add(czkSum, mode.value);
-
+                                            var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this11.member.MeStorageCardId;
                                             _this11.dto.RetailStorageDetails.push({
                                                 Code: mode.paymethodId,
+                                                MeStorageCardId: MeStorageCardId,
                                                 StoragePaymentAmount: mode.value,
                                                 IsOrigReturn: false,
                                                 BalanceStorage: mode.balance,
@@ -1167,15 +1213,15 @@ var SettlementStore = (_class = function () {
                                         }
                                     });
 
-                                    var _ref14 = _mutantsUtil.platform || {},
-                                        isNewRetailBCPos = _ref14.isNewRetailBCPos;
+                                    var _ref15 = _mutantsUtil.platform || {},
+                                        isNewRetailBCPos = _ref15.isNewRetailBCPos;
 
                                     if (_this11.dto.RetailStorageDetails.length > 0) {
                                         var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
                                         if (isNewRetailBCPos) {
-                                            _this11.dto.RetailStorageDetails && _this11.dto.RetailStorageDetails.forEach(function (value) {
-                                                value.MeStorageCardId = _this11.member.MeStorageCardId;
-                                            });
+                                            // this.dto.RetailStorageDetails && this.dto.RetailStorageDetails.forEach((value, index) => {
+                                            //     value.MeStorageCardId = (mode.MeStorageCardId ? mode.MeStorageCardId : this.member.MeStorageCardId);
+                                            // })
                                             _this11.dto.RetailPaymentDetails.push({
                                                 Code: _this11.paymode.counter,
                                                 OrigAmount: czkSum,
@@ -1202,7 +1248,7 @@ var SettlementStore = (_class = function () {
                                         _this11.dto.Idmember = Idmember;
                                     }
                                 });
-                                _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
+                                _ref16 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref16.isNewRetailBCPos;
 
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
@@ -1271,7 +1317,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function save() {
-                return _ref13.apply(this, arguments);
+                return _ref14.apply(this, arguments);
             }
 
             return save;
@@ -1284,7 +1330,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
                         switch (_context4.prev = _context4.next) {
@@ -1312,7 +1358,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function querySettleResult() {
-                return _ref16.apply(this, arguments);
+                return _ref17.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1338,14 +1384,14 @@ 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 _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
+                var _ref19, isNewRetailBCPos, cook1, cook2, message, 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;
+                                _ref19 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref19.isNewRetailBCPos;
                                 _context5.prev = 1;
 
                                 if (!isNewRetailBCPos) {
@@ -1429,7 +1475,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function validePwd(_x3) {
-                return _ref17.apply(this, arguments);
+                return _ref18.apply(this, arguments);
             }
 
             return validePwd;
@@ -1468,7 +1514,7 @@ var SettlementStore = (_class = function () {
         var _this13 = this;
 
         return function () {
-            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+            var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
                 return _regenerator2.default.wrap(function _callee6$(_context6) {
@@ -1495,7 +1541,7 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x4) {
-                return _ref19.apply(this, arguments);
+                return _ref20.apply(this, arguments);
             };
         }();
     }
@@ -1566,8 +1612,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
         value: function calcDjqValue(q1) {
             var _this14 = this;
 
-            var _ref20 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref20.isNewRetailBCPos;
+            var _ref21 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
             var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
                 Differentiate = _enumController$getEn14.Differentiate;
@@ -1644,7 +1690,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref21 = (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$getEn15, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
@@ -1698,7 +1744,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x5, _x6) {
-                return _ref21.apply(this, arguments);
+                return _ref22.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -1753,7 +1799,7 @@ var Member = exports.Member = (_class5 = function () {
 
         _initDefineProp(this, 'exchangable', _descriptor10, this);
 
-        _initDefineProp(this, 'meStorageCardId', _descriptor11, this);
+        _initDefineProp(this, 'MeStorageCardId', _descriptor11, this);
 
         _initDefineProp(this, 'StorageCardNo', _descriptor12, this);
 
@@ -1766,10 +1812,11 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref22 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref22.isNewRetailBCPos;
+            var _ref23 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref23.isNewRetailBCPos;
 
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
+            m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
             (0, _mobx.runInAction)(function () {
                 _this16.cardNo = m.CardCode;
                 if (index >= 0) {
@@ -1798,7 +1845,7 @@ var Member = exports.Member = (_class5 = function () {
     }, {
         key: 'setMeStorageCardId',
         value: function setMeStorageCardId(v) {
-            this.meStorageCardId = v;
+            this.MeStorageCardId = v;
         }
     }, {
         key: 'setStorageCardNo',
@@ -1816,7 +1863,7 @@ var Member = exports.Member = (_class5 = function () {
 }), _descriptor10 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
+}), _descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
     enumerable: true,
     initializer: null
 }), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {