tplus-components-touch 3.22.3 → 3.22.4

package/dist/components/settlement/settlement.less

@@ -1356,6 +1356,7 @@
       line-height: 32px;
       padding:4px 8px;
       background: #FFFFFF;
+      border: 1px solid #C8C8CD;
       border-radius: 2px;
     }
     .notext{
@@ -1515,6 +1516,17 @@
     }
   }
 }
+.receivedNumber {
+  padding-top: 10px;
+  .receivedInput {
+    padding: 0 !important;
+    border: none !important;
+    span:first-child {
+      margin-top: 5px;
+      text-align: left !important;
+    }
+  }
+}
 .unReturn{
   .title{
     font-size: 18px;

package/dist/components/settlement/settlementStore.js

@@ -980,6 +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;
+
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
                         switch (_context2.prev = _context2.next) {
@@ -994,43 +996,59 @@ var SettlementStore = (_class = function () {
                                 return _context2.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _context2.prev = 3;
+                                _ref12 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref12.isNewRetailBCPos;
+                                _context2.prev = 4;
 
                                 if (!(this.type == 1)) {
-                                    _context2.next = 9;
+                                    _context2.next = 10;
                                     break;
                                 }
 
-                                _context2.next = 7;
+                                _context2.next = 8;
                                 return this.saveMember();
 
-                            case 7:
-                                _context2.next = 11;
+                            case 8:
+                                _context2.next = 18;
                                 break;
 
-                            case 9:
-                                _context2.next = 11;
+                            case 10:
+                                if (!isNewRetailBCPos) {
+                                    _context2.next = 13;
+                                    break;
+                                }
+
+                                _context2.next = 13;
+                                return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
+
+                            case 13:
+                                _context2.next = 15;
                                 return this.save();
 
-                            case 11:
+                            case 15:
+                                if (!isNewRetailBCPos) {
+                                    _context2.next = 18;
+                                    break;
+                                }
+
+                                _context2.next = 18;
+                                return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
+
+                            case 18:
                                 return _context2.abrupt('return', _promise2.default.resolve(true));
 
-                            case 14:
-                                _context2.prev = 14;
-                                _context2.t0 = _context2['catch'](3);
+                            case 21:
+                                _context2.prev = 21;
+                                _context2.t0 = _context2['catch'](4);
 
                                 console.error('settlementStore.commit失败，错误信息：' + _context2.t0);
                                 return _context2.abrupt('return', _promise2.default.resolve(_context2.t0));
 
-                            case 18:
-                                console.error('settlementStore.commit失败，错误信息：' + err);
-
-                            case 19:
+                            case 25:
                             case 'end':
                                 return _context2.stop();
                         }
                     }
-                }, _callee2, this, [[3, 14]]);
+                }, _callee2, this, [[4, 21]]);
             }));
 
             function commit(_x2) {
@@ -1092,10 +1110,10 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
                 var _this12 = this;
 
-                var _enumController$getEn13, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn13, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
@@ -1177,8 +1195,8 @@ var SettlementStore = (_class = function () {
                                         }
                                     });
 
-                                    var _ref13 = _mutantsUtil.platform || {},
-                                        isNewRetailBCPos = _ref13.isNewRetailBCPos;
+                                    var _ref14 = _mutantsUtil.platform || {},
+                                        isNewRetailBCPos = _ref14.isNewRetailBCPos;
 
                                     if (_this12.dto.RetailStorageDetails.length > 0) {
                                         var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
@@ -1212,7 +1230,7 @@ var SettlementStore = (_class = function () {
                                         _this12.dto.Idmember = Idmember;
                                     }
                                 });
-                                _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
+                                _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
 
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
@@ -1281,7 +1299,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function save() {
-                return _ref12.apply(this, arguments);
+                return _ref13.apply(this, arguments);
             }
 
             return save;
@@ -1294,7 +1312,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
                         switch (_context4.prev = _context4.next) {
@@ -1322,7 +1340,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function querySettleResult() {
-                return _ref15.apply(this, arguments);
+                return _ref16.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1348,14 +1366,14 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
-                var _ref17, isNewRetailBCPos, cook1, cook2, message, result, count, _result;
+            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
+                var _ref18, isNewRetailBCPos, cook1, cook2, message, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
                         switch (_context5.prev = _context5.next) {
                             case 0:
-                                _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
+                                _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
                                 _context5.prev = 1;
 
                                 if (!isNewRetailBCPos) {
@@ -1439,7 +1457,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function validePwd(_x3) {
-                return _ref16.apply(this, arguments);
+                return _ref17.apply(this, arguments);
             }
 
             return validePwd;
@@ -1478,7 +1496,7 @@ var SettlementStore = (_class = function () {
         var _this14 = this;
 
         return function () {
-            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
                 return _regenerator2.default.wrap(function _callee6$(_context6) {
@@ -1505,7 +1523,7 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x4) {
-                return _ref18.apply(this, arguments);
+                return _ref19.apply(this, arguments);
             };
         }();
     }
@@ -1594,8 +1612,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 return;
             }
 
-            var _ref19 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref19.isNewRetailBCPos;
+            var _ref20 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref20.isNewRetailBCPos;
 
             var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn14.PayStyle,
@@ -1702,18 +1720,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             return djq.id === element.id;
                         });
 
-                        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 _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 condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -1755,8 +1773,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref21 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref21.isNewRetailBCPos;
+            var _ref22 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref22.isNewRetailBCPos;
 
             var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
                 Differentiate = _enumController$getEn15.Differentiate;
@@ -1846,7 +1864,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
+            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
                 var _this16 = this;
 
                 var _enumController$getEn17, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
@@ -1879,6 +1897,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 isQuick: (0, _findIndex3.default)(modes.QuickSettleStyles, { 'Code': mode.Code }) >= 0,
                                                 orderBy: 1,
                                                 paymentType: mode.Code,
+                                                offlineDisable: mode.offlineDisable,
                                                 idSettleStyle: mode.IdSettleStyle,
                                                 idBankAccount: mode.IdBankAccount,
                                                 exchangeRate: mode.Currency ? mode.Currency.ExchangeRate : 1,
@@ -1900,7 +1919,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x5, _x6) {
-                return _ref22.apply(this, arguments);
+                return _ref23.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -2020,8 +2039,8 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref23 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref23.isNewRetailBCPos;
+            var _ref24 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref24.isNewRetailBCPos;
 
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
             m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);