tplus-components-touch 3.27.1 → 3.27.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/billSearch/index.js +14 -14
- package/dist/components/billSearch/index.js.map +1 -1
- package/dist/components/cloudPrint/index.js +57 -4
- package/dist/components/cloudPrint/index.js.map +1 -1
- package/dist/components/commonForm/addressPicker/index.js +16 -7
- package/dist/components/commonForm/addressPicker/index.js.map +1 -1
- package/dist/components/commonForm/index.js +9 -3
- package/dist/components/commonForm/index.js.map +1 -1
- package/dist/components/deliverySearch/index.js +12 -8
- package/dist/components/deliverySearch/index.js.map +1 -1
- package/dist/components/input/scanInput.js +98 -0
- package/dist/components/input/scanInput.js.map +1 -0
- package/dist/components/input/scanInput.less +28 -0
- package/dist/components/inventorySearch/store.js +31 -12
- package/dist/components/inventorySearch/store.js.map +1 -1
- package/dist/components/inventorySearch/tab.js +9 -2
- package/dist/components/inventorySearch/tab.js.map +1 -1
- package/dist/components/loading/loadingContent.js +13 -4
- package/dist/components/loading/loadingContent.js.map +1 -1
- package/dist/components/loading/style.less +13 -4
- package/dist/components/message/index.js +8 -5
- package/dist/components/message/index.js.map +1 -1
- package/dist/components/presale/pickup.js +3 -3
- package/dist/components/presale/pickup.js.map +1 -1
- package/dist/components/settlement/settlement.js +107 -78
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlement.less +7 -1
- package/dist/components/settlement/settlementStore.js +96 -109
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/socket/index.js +6 -5
- package/dist/components/socket/index.js.map +1 -1
- package/dist/components/touchTable/index.js +8 -3
- package/dist/components/touchTable/index.js.map +1 -1
- package/dist/index.js +6 -1
- package/dist/index.js.map +1 -1
- package/dist/util/tools.js +5 -7
- package/dist/util/tools.js.map +1 -1
- package/package.json +1 -1
|
@@ -999,7 +999,7 @@
|
|
|
999
999
|
button{
|
|
1000
1000
|
background-color: white ;
|
|
1001
1001
|
opacity:1;
|
|
1002
|
-
}
|
|
1002
|
+
}
|
|
1003
1003
|
}
|
|
1004
1004
|
}
|
|
1005
1005
|
.paymode{
|
|
@@ -1592,4 +1592,10 @@
|
|
|
1592
1592
|
}
|
|
1593
1593
|
}
|
|
1594
1594
|
}
|
|
1595
|
+
}
|
|
1596
|
+
.freight{
|
|
1597
|
+
margin-left: 5px;
|
|
1598
|
+
vertical-align: middle;
|
|
1599
|
+
color: #666666;
|
|
1600
|
+
font-size: 12px;
|
|
1595
1601
|
}
|
|
@@ -41,7 +41,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
|
|
|
41
41
|
|
|
42
42
|
var _createClass3 = _interopRequireDefault(_createClass2);
|
|
43
43
|
|
|
44
|
-
var _desc, _value, _class, _descriptor, _descriptor2,
|
|
44
|
+
var _desc, _value, _class, _descriptor, _descriptor2, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _desc3, _value3, _class5, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15;
|
|
45
45
|
|
|
46
46
|
var _mobx = require('mobx');
|
|
47
47
|
|
|
@@ -161,6 +161,7 @@ function _initializerWarningHelper(descriptor, context) {
|
|
|
161
161
|
var t = _mutantsMicrofx.i18n.getFixedT(null, 'newretail');
|
|
162
162
|
|
|
163
163
|
var SettlementStore = (_class = function () {
|
|
164
|
+
//type==2
|
|
164
165
|
function SettlementStore() {
|
|
165
166
|
var _this2 = this;
|
|
166
167
|
|
|
@@ -172,7 +173,6 @@ var SettlementStore = (_class = function () {
|
|
|
172
173
|
this.bquick = false;
|
|
173
174
|
this.boriginReturn = false;
|
|
174
175
|
this.newStyle = true;
|
|
175
|
-
this.freight = 0;
|
|
176
176
|
|
|
177
177
|
_initDefineProp(this, 'queryPwd', _descriptor, this);
|
|
178
178
|
|
|
@@ -319,8 +319,6 @@ var SettlementStore = (_class = function () {
|
|
|
319
319
|
return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPosFreight', false, false);
|
|
320
320
|
};
|
|
321
321
|
|
|
322
|
-
_initDefineProp(this, 'updataFreight', _descriptor3, this);
|
|
323
|
-
|
|
324
322
|
this.checkCoupon = function () {
|
|
325
323
|
var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
|
|
326
324
|
var _ref4, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
|
|
@@ -428,8 +426,7 @@ var SettlementStore = (_class = function () {
|
|
|
428
426
|
var params = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('cloudPrintArguments');
|
|
429
427
|
if (params) this.cloudPrintArguments = params;
|
|
430
428
|
this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
|
|
431
|
-
}
|
|
432
|
-
|
|
429
|
+
}
|
|
433
430
|
|
|
434
431
|
(0, _createClass3.default)(SettlementStore, [{
|
|
435
432
|
key: 'initPaymodes',
|
|
@@ -477,9 +474,12 @@ var SettlementStore = (_class = function () {
|
|
|
477
474
|
|
|
478
475
|
if (IdbusiType == 38 && Book && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
|
|
479
476
|
value = value * PercentageWhenBook / 100;
|
|
477
|
+
(0, _mobx.runInAction)(function () {
|
|
478
|
+
_this3.dto.PrepaidAmount = value;
|
|
479
|
+
});
|
|
480
480
|
}
|
|
481
481
|
if (IdbusiType == 38 && Book && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
|
|
482
|
-
value += this.
|
|
482
|
+
value += this.dto.BuyerPayFreight || 0;
|
|
483
483
|
}
|
|
484
484
|
if (IdbusiType == 39) {
|
|
485
485
|
value = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
|
|
@@ -648,11 +648,7 @@ var SettlementStore = (_class = function () {
|
|
|
648
648
|
}, {
|
|
649
649
|
key: 'getLoginInfo',
|
|
650
650
|
value: function getLoginInfo() {
|
|
651
|
-
|
|
652
|
-
_ref8$loginInfo = _ref8.loginInfo,
|
|
653
|
-
loginInfo = _ref8$loginInfo === undefined ? {} : _ref8$loginInfo;
|
|
654
|
-
|
|
655
|
-
return loginInfo;
|
|
651
|
+
return _mutantsMicrofx.stores.user.options.get('loginInfo');
|
|
656
652
|
}
|
|
657
653
|
}, {
|
|
658
654
|
key: 'loadCzk',
|
|
@@ -669,8 +665,8 @@ var SettlementStore = (_class = function () {
|
|
|
669
665
|
var IdStore = this.storeInfo.storeID;
|
|
670
666
|
var StoreCode = this.storeInfo.storeCode; //_find(this.storeInfo.storeInfos,(store)=>{return store.ID==IdStore;}).Code;
|
|
671
667
|
|
|
672
|
-
var
|
|
673
|
-
isNewRetailBCPos =
|
|
668
|
+
var _ref8 = _mutantsUtil.platform || {},
|
|
669
|
+
isNewRetailBCPos = _ref8.isNewRetailBCPos;
|
|
674
670
|
|
|
675
671
|
var address = '';
|
|
676
672
|
if (isNewRetailBCPos) {
|
|
@@ -680,8 +676,8 @@ var SettlementStore = (_class = function () {
|
|
|
680
676
|
var data = result.data;
|
|
681
677
|
var m = data;
|
|
682
678
|
|
|
683
|
-
var
|
|
684
|
-
isNewRetailBCPos =
|
|
679
|
+
var _ref9 = _mutantsUtil.platform || {},
|
|
680
|
+
isNewRetailBCPos = _ref9.isNewRetailBCPos;
|
|
685
681
|
|
|
686
682
|
if (isNewRetailBCPos) {
|
|
687
683
|
_this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
|
|
@@ -726,8 +722,8 @@ var SettlementStore = (_class = function () {
|
|
|
726
722
|
var data = JSON.parse(result.Data);
|
|
727
723
|
var m = data && data.length > 0 && data[0];
|
|
728
724
|
|
|
729
|
-
var
|
|
730
|
-
isNewRetailBCPos =
|
|
725
|
+
var _ref10 = _mutantsUtil.platform || {},
|
|
726
|
+
isNewRetailBCPos = _ref10.isNewRetailBCPos;
|
|
731
727
|
|
|
732
728
|
if (isNewRetailBCPos) {
|
|
733
729
|
_this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
|
|
@@ -1021,8 +1017,8 @@ var SettlementStore = (_class = function () {
|
|
|
1021
1017
|
}, {
|
|
1022
1018
|
key: 'commit',
|
|
1023
1019
|
value: function () {
|
|
1024
|
-
var
|
|
1025
|
-
var
|
|
1020
|
+
var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
|
|
1021
|
+
var _ref12, isNewRetailBCPos;
|
|
1026
1022
|
|
|
1027
1023
|
return _regenerator2.default.wrap(function _callee2$(_context2) {
|
|
1028
1024
|
while (1) {
|
|
@@ -1038,7 +1034,7 @@ var SettlementStore = (_class = function () {
|
|
|
1038
1034
|
return _context2.abrupt('return', _promise2.default.resolve(true));
|
|
1039
1035
|
|
|
1040
1036
|
case 3:
|
|
1041
|
-
|
|
1037
|
+
_ref12 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref12.isNewRetailBCPos;
|
|
1042
1038
|
_context2.prev = 4;
|
|
1043
1039
|
|
|
1044
1040
|
if (!(this.type == 1)) {
|
|
@@ -1094,7 +1090,7 @@ var SettlementStore = (_class = function () {
|
|
|
1094
1090
|
}));
|
|
1095
1091
|
|
|
1096
1092
|
function commit(_x2) {
|
|
1097
|
-
return
|
|
1093
|
+
return _ref11.apply(this, arguments);
|
|
1098
1094
|
}
|
|
1099
1095
|
|
|
1100
1096
|
return commit;
|
|
@@ -1152,10 +1148,10 @@ var SettlementStore = (_class = function () {
|
|
|
1152
1148
|
}, {
|
|
1153
1149
|
key: 'save',
|
|
1154
1150
|
value: function () {
|
|
1155
|
-
var
|
|
1151
|
+
var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
|
|
1156
1152
|
var _this11 = this;
|
|
1157
1153
|
|
|
1158
|
-
var _enumController$getEn14, PayStyle,
|
|
1154
|
+
var _enumController$getEn14, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
|
|
1159
1155
|
|
|
1160
1156
|
return _regenerator2.default.wrap(function _callee3$(_context3) {
|
|
1161
1157
|
while (1) {
|
|
@@ -1235,8 +1231,8 @@ var SettlementStore = (_class = function () {
|
|
|
1235
1231
|
}
|
|
1236
1232
|
});
|
|
1237
1233
|
|
|
1238
|
-
var
|
|
1239
|
-
isNewRetailBCPos =
|
|
1234
|
+
var _ref14 = _mutantsUtil.platform || {},
|
|
1235
|
+
isNewRetailBCPos = _ref14.isNewRetailBCPos;
|
|
1240
1236
|
|
|
1241
1237
|
if (_this11.dto.RetailStorageDetails.length > 0) {
|
|
1242
1238
|
var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
|
|
@@ -1270,7 +1266,7 @@ var SettlementStore = (_class = function () {
|
|
|
1270
1266
|
_this11.dto.Idmember = Idmember;
|
|
1271
1267
|
}
|
|
1272
1268
|
});
|
|
1273
|
-
|
|
1269
|
+
_ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
|
|
1274
1270
|
|
|
1275
1271
|
console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
|
|
1276
1272
|
|
|
@@ -1340,7 +1336,7 @@ var SettlementStore = (_class = function () {
|
|
|
1340
1336
|
}));
|
|
1341
1337
|
|
|
1342
1338
|
function save() {
|
|
1343
|
-
return
|
|
1339
|
+
return _ref13.apply(this, arguments);
|
|
1344
1340
|
}
|
|
1345
1341
|
|
|
1346
1342
|
return save;
|
|
@@ -1353,7 +1349,7 @@ var SettlementStore = (_class = function () {
|
|
|
1353
1349
|
}, {
|
|
1354
1350
|
key: 'querySettleResult',
|
|
1355
1351
|
value: function () {
|
|
1356
|
-
var
|
|
1352
|
+
var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
|
|
1357
1353
|
return _regenerator2.default.wrap(function _callee4$(_context4) {
|
|
1358
1354
|
while (1) {
|
|
1359
1355
|
switch (_context4.prev = _context4.next) {
|
|
@@ -1381,7 +1377,7 @@ var SettlementStore = (_class = function () {
|
|
|
1381
1377
|
}));
|
|
1382
1378
|
|
|
1383
1379
|
function querySettleResult() {
|
|
1384
|
-
return
|
|
1380
|
+
return _ref16.apply(this, arguments);
|
|
1385
1381
|
}
|
|
1386
1382
|
|
|
1387
1383
|
return querySettleResult;
|
|
@@ -1407,14 +1403,14 @@ var SettlementStore = (_class = function () {
|
|
|
1407
1403
|
}, {
|
|
1408
1404
|
key: 'validePwd',
|
|
1409
1405
|
value: function () {
|
|
1410
|
-
var
|
|
1411
|
-
var
|
|
1406
|
+
var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
|
|
1407
|
+
var _ref18, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
|
|
1412
1408
|
|
|
1413
1409
|
return _regenerator2.default.wrap(function _callee5$(_context5) {
|
|
1414
1410
|
while (1) {
|
|
1415
1411
|
switch (_context5.prev = _context5.next) {
|
|
1416
1412
|
case 0:
|
|
1417
|
-
|
|
1413
|
+
_ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
|
|
1418
1414
|
_context5.prev = 1;
|
|
1419
1415
|
|
|
1420
1416
|
if (!isNewRetailBCPos) {
|
|
@@ -1499,7 +1495,7 @@ var SettlementStore = (_class = function () {
|
|
|
1499
1495
|
}));
|
|
1500
1496
|
|
|
1501
1497
|
function validePwd(_x3) {
|
|
1502
|
-
return
|
|
1498
|
+
return _ref17.apply(this, arguments);
|
|
1503
1499
|
}
|
|
1504
1500
|
|
|
1505
1501
|
return validePwd;
|
|
@@ -1538,7 +1534,7 @@ var SettlementStore = (_class = function () {
|
|
|
1538
1534
|
var _this13 = this;
|
|
1539
1535
|
|
|
1540
1536
|
return function () {
|
|
1541
|
-
var
|
|
1537
|
+
var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
|
|
1542
1538
|
var _getLoginInfo2, IdStore, StoreCode, resp;
|
|
1543
1539
|
|
|
1544
1540
|
return _regenerator2.default.wrap(function _callee6$(_context6) {
|
|
@@ -1565,19 +1561,10 @@ var SettlementStore = (_class = function () {
|
|
|
1565
1561
|
}));
|
|
1566
1562
|
|
|
1567
1563
|
return function (_x4) {
|
|
1568
|
-
return
|
|
1564
|
+
return _ref19.apply(this, arguments);
|
|
1569
1565
|
};
|
|
1570
1566
|
}();
|
|
1571
1567
|
}
|
|
1572
|
-
}), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'updataFreight', [_mobx.action], {
|
|
1573
|
-
enumerable: true,
|
|
1574
|
-
initializer: function initializer() {
|
|
1575
|
-
var _this14 = this;
|
|
1576
|
-
|
|
1577
|
-
return function (freight) {
|
|
1578
|
-
_this14.freight = freight;
|
|
1579
|
-
};
|
|
1580
|
-
}
|
|
1581
1568
|
}), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
|
|
1582
1569
|
exports.default = SettlementStore;
|
|
1583
1570
|
var PayMode = exports.PayMode = (_class3 = function () {
|
|
@@ -1592,15 +1579,15 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1592
1579
|
this.onlineamount = 0;
|
|
1593
1580
|
this.maxamount = 0;
|
|
1594
1581
|
|
|
1595
|
-
_initDefineProp(this, 'currentFocus',
|
|
1582
|
+
_initDefineProp(this, 'currentFocus', _descriptor3, this);
|
|
1596
1583
|
|
|
1597
|
-
_initDefineProp(this, 'received',
|
|
1584
|
+
_initDefineProp(this, 'received', _descriptor4, this);
|
|
1598
1585
|
|
|
1599
|
-
_initDefineProp(this, 'receivable',
|
|
1586
|
+
_initDefineProp(this, 'receivable', _descriptor5, this);
|
|
1600
1587
|
|
|
1601
|
-
_initDefineProp(this, 'paymodes',
|
|
1588
|
+
_initDefineProp(this, 'paymodes', _descriptor6, this);
|
|
1602
1589
|
|
|
1603
|
-
_initDefineProp(this, 'thePaymodes',
|
|
1590
|
+
_initDefineProp(this, 'thePaymodes', _descriptor7, this);
|
|
1604
1591
|
|
|
1605
1592
|
this.currentMode = null;
|
|
1606
1593
|
this.checkList = [];
|
|
@@ -1609,11 +1596,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1609
1596
|
hotKey: "Ctrl+M"
|
|
1610
1597
|
};
|
|
1611
1598
|
|
|
1612
|
-
_initDefineProp(this, 'calcCheckList',
|
|
1599
|
+
_initDefineProp(this, 'calcCheckList', _descriptor8, this);
|
|
1613
1600
|
|
|
1614
|
-
_initDefineProp(this, 'setCouponNum',
|
|
1601
|
+
_initDefineProp(this, 'setCouponNum', _descriptor9, this);
|
|
1615
1602
|
|
|
1616
|
-
_initDefineProp(this, 'addDjqs',
|
|
1603
|
+
_initDefineProp(this, 'addDjqs', _descriptor10, this);
|
|
1617
1604
|
}
|
|
1618
1605
|
// @observable store = null;
|
|
1619
1606
|
|
|
@@ -1652,7 +1639,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1652
1639
|
}, {
|
|
1653
1640
|
key: 'calcDjqCheckValue',
|
|
1654
1641
|
value: function calcDjqCheckValue(q1, dto, params) {
|
|
1655
|
-
var
|
|
1642
|
+
var _this14 = this;
|
|
1656
1643
|
|
|
1657
1644
|
var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
|
|
1658
1645
|
var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
|
|
@@ -1666,8 +1653,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1666
1653
|
this.checkList = [];
|
|
1667
1654
|
}
|
|
1668
1655
|
|
|
1669
|
-
var
|
|
1670
|
-
isNewRetailBCPos =
|
|
1656
|
+
var _ref20 = _mutantsUtil.platform || {},
|
|
1657
|
+
isNewRetailBCPos = _ref20.isNewRetailBCPos;
|
|
1671
1658
|
|
|
1672
1659
|
var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
|
|
1673
1660
|
PayStyle = _enumController$getEn15.PayStyle,
|
|
@@ -1699,7 +1686,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1699
1686
|
if (!q1.checked) {
|
|
1700
1687
|
this.checkList.forEach(function (ele, i) {
|
|
1701
1688
|
if (ele.id === q1.id) {
|
|
1702
|
-
|
|
1689
|
+
_this14.checkList.splice(i, 1);
|
|
1703
1690
|
}
|
|
1704
1691
|
});
|
|
1705
1692
|
} else {
|
|
@@ -1771,24 +1758,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1771
1758
|
if (result && result.length != 0) {
|
|
1772
1759
|
result.forEach(function (element, index) {
|
|
1773
1760
|
var djq1 = false;
|
|
1774
|
-
|
|
1761
|
+
_this14.currentMode.djqs.forEach(function (djq) {
|
|
1775
1762
|
if (element.id === djq.id) {
|
|
1776
1763
|
djq1 = true;
|
|
1777
1764
|
}
|
|
1778
1765
|
});
|
|
1779
1766
|
|
|
1780
|
-
var
|
|
1781
|
-
couponCode =
|
|
1782
|
-
name =
|
|
1783
|
-
tieredAmountResult =
|
|
1784
|
-
fromDate =
|
|
1785
|
-
dateMount =
|
|
1786
|
-
promoMethodEnum =
|
|
1787
|
-
discountPct =
|
|
1788
|
-
nominalAmount =
|
|
1789
|
-
promoId =
|
|
1790
|
-
id =
|
|
1791
|
-
doorsill =
|
|
1767
|
+
var _ref21 = element || {},
|
|
1768
|
+
couponCode = _ref21.couponCode,
|
|
1769
|
+
name = _ref21.name,
|
|
1770
|
+
tieredAmountResult = _ref21.tieredAmountResult,
|
|
1771
|
+
fromDate = _ref21.fromDate,
|
|
1772
|
+
dateMount = _ref21.dateMount,
|
|
1773
|
+
promoMethodEnum = _ref21.promoMethodEnum,
|
|
1774
|
+
discountPct = _ref21.discountPct,
|
|
1775
|
+
nominalAmount = _ref21.nominalAmount,
|
|
1776
|
+
promoId = _ref21.promoId,
|
|
1777
|
+
id = _ref21.id,
|
|
1778
|
+
doorsill = _ref21.doorsill;
|
|
1792
1779
|
|
|
1793
1780
|
var condValue = tieredAmountResult.condValue,
|
|
1794
1781
|
promoDiscount = tieredAmountResult.promoDiscount,
|
|
@@ -1816,10 +1803,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1816
1803
|
// couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
|
|
1817
1804
|
// id
|
|
1818
1805
|
// })
|
|
1819
|
-
|
|
1806
|
+
_this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
|
|
1820
1807
|
djq1 = false;
|
|
1821
1808
|
} else {
|
|
1822
|
-
|
|
1809
|
+
_this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
|
|
1823
1810
|
// this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
|
|
1824
1811
|
// djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
|
|
1825
1812
|
}
|
|
@@ -1832,8 +1819,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1832
1819
|
}, {
|
|
1833
1820
|
key: 'calcDjqValue',
|
|
1834
1821
|
value: function calcDjqValue(q1) {
|
|
1835
|
-
var
|
|
1836
|
-
isNewRetailBCPos =
|
|
1822
|
+
var _ref22 = _mutantsUtil.platform || {},
|
|
1823
|
+
isNewRetailBCPos = _ref22.isNewRetailBCPos;
|
|
1837
1824
|
|
|
1838
1825
|
var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
|
|
1839
1826
|
Differentiate = _enumController$getEn16.Differentiate;
|
|
@@ -1909,7 +1896,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1909
1896
|
|
|
1910
1897
|
if (this.amount > 0 && (v === '' || v === '0.00') && sum !== 0) {
|
|
1911
1898
|
this.currentMode.errinfo = "实收金额必须录入";
|
|
1912
|
-
} else if (Math.abs(parseFloat(v)) > Math.abs(sum)) {
|
|
1899
|
+
} else if (Math.abs(parseFloat(v)) > Math.abs((0, _utils.getFixedNumber)(sum))) {
|
|
1913
1900
|
this.currentMode.errinfo = "实收不应大于应收";
|
|
1914
1901
|
} else if (parseFloat(v) > 0 && parseFloat(v) > (max || 0)) {
|
|
1915
1902
|
this.currentMode.errinfo = "余额不足";
|
|
@@ -1923,8 +1910,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1923
1910
|
}, {
|
|
1924
1911
|
key: 'setPaymodes',
|
|
1925
1912
|
value: function () {
|
|
1926
|
-
var
|
|
1927
|
-
var
|
|
1913
|
+
var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
|
|
1914
|
+
var _this15 = this;
|
|
1928
1915
|
|
|
1929
1916
|
var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
|
|
1930
1917
|
|
|
@@ -1964,7 +1951,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1964
1951
|
calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
|
|
1965
1952
|
});
|
|
1966
1953
|
});
|
|
1967
|
-
|
|
1954
|
+
_this15.paymodes = paymodes;
|
|
1968
1955
|
//modes.QuickSettleStyles
|
|
1969
1956
|
});
|
|
1970
1957
|
}
|
|
@@ -1978,7 +1965,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1978
1965
|
}));
|
|
1979
1966
|
|
|
1980
1967
|
function setPaymodes(_x5, _x6) {
|
|
1981
|
-
return
|
|
1968
|
+
return _ref23.apply(this, arguments);
|
|
1982
1969
|
}
|
|
1983
1970
|
|
|
1984
1971
|
return setPaymodes;
|
|
@@ -1995,47 +1982,47 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1995
1982
|
}
|
|
1996
1983
|
}]);
|
|
1997
1984
|
return PayMode;
|
|
1998
|
-
}(), (
|
|
1985
|
+
}(), (_descriptor3 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
|
|
1999
1986
|
enumerable: true,
|
|
2000
1987
|
initializer: function initializer() {
|
|
2001
1988
|
return "";
|
|
2002
1989
|
}
|
|
2003
|
-
}),
|
|
1990
|
+
}), _descriptor4 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
|
|
2004
1991
|
enumerable: true,
|
|
2005
1992
|
initializer: function initializer() {
|
|
2006
1993
|
return 0;
|
|
2007
1994
|
}
|
|
2008
|
-
}),
|
|
1995
|
+
}), _descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
|
|
2009
1996
|
enumerable: true,
|
|
2010
1997
|
initializer: function initializer() {
|
|
2011
1998
|
return 0;
|
|
2012
1999
|
}
|
|
2013
|
-
}),
|
|
2000
|
+
}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
|
|
2014
2001
|
enumerable: true,
|
|
2015
2002
|
initializer: function initializer() {
|
|
2016
2003
|
return [];
|
|
2017
2004
|
}
|
|
2018
|
-
}),
|
|
2005
|
+
}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
|
|
2019
2006
|
enumerable: true,
|
|
2020
2007
|
initializer: function initializer() {
|
|
2021
2008
|
return [];
|
|
2022
2009
|
}
|
|
2023
|
-
}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype),
|
|
2010
|
+
}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
|
|
2024
2011
|
enumerable: true,
|
|
2025
2012
|
initializer: function initializer() {
|
|
2026
|
-
var
|
|
2013
|
+
var _this16 = this;
|
|
2027
2014
|
|
|
2028
2015
|
return function () {
|
|
2029
|
-
|
|
2016
|
+
_this16.checkList = [];
|
|
2030
2017
|
};
|
|
2031
2018
|
}
|
|
2032
|
-
}), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype),
|
|
2019
|
+
}), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
|
|
2033
2020
|
enumerable: true,
|
|
2034
2021
|
initializer: function initializer() {
|
|
2035
|
-
var
|
|
2022
|
+
var _this17 = this;
|
|
2036
2023
|
|
|
2037
2024
|
return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
|
|
2038
|
-
|
|
2025
|
+
_this17.currentMode.djqs.forEach(function (ele) {
|
|
2039
2026
|
if (ele.id === id) {
|
|
2040
2027
|
promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
|
|
2041
2028
|
ele.couponCategoryEnum = couponNum;
|
|
@@ -2045,10 +2032,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
2045
2032
|
});
|
|
2046
2033
|
};
|
|
2047
2034
|
}
|
|
2048
|
-
}),
|
|
2035
|
+
}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
|
|
2049
2036
|
enumerable: true,
|
|
2050
2037
|
initializer: function initializer() {
|
|
2051
|
-
var
|
|
2038
|
+
var _this18 = this;
|
|
2052
2039
|
|
|
2053
2040
|
return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
|
|
2054
2041
|
var djq = {
|
|
@@ -2070,25 +2057,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
2070
2057
|
couponCategoryEnum: couponCategoryEnum,
|
|
2071
2058
|
id: id
|
|
2072
2059
|
};
|
|
2073
|
-
|
|
2060
|
+
_this18.currentMode.djqs.push(djq);
|
|
2074
2061
|
};
|
|
2075
2062
|
}
|
|
2076
2063
|
}), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
|
|
2077
2064
|
var Member = exports.Member = (_class5 = function () {
|
|
2078
2065
|
function Member(m) {
|
|
2079
|
-
var
|
|
2066
|
+
var _this19 = this;
|
|
2080
2067
|
|
|
2081
2068
|
(0, _classCallCheck3.default)(this, Member);
|
|
2082
2069
|
|
|
2083
|
-
_initDefineProp(this, 'cardNo',
|
|
2070
|
+
_initDefineProp(this, 'cardNo', _descriptor11, this);
|
|
2084
2071
|
|
|
2085
|
-
_initDefineProp(this, 'balance',
|
|
2072
|
+
_initDefineProp(this, 'balance', _descriptor12, this);
|
|
2086
2073
|
|
|
2087
|
-
_initDefineProp(this, 'exchangable',
|
|
2074
|
+
_initDefineProp(this, 'exchangable', _descriptor13, this);
|
|
2088
2075
|
|
|
2089
|
-
_initDefineProp(this, 'MeStorageCardId',
|
|
2076
|
+
_initDefineProp(this, 'MeStorageCardId', _descriptor14, this);
|
|
2090
2077
|
|
|
2091
|
-
_initDefineProp(this, 'StorageCardNo',
|
|
2078
|
+
_initDefineProp(this, 'StorageCardNo', _descriptor15, this);
|
|
2092
2079
|
|
|
2093
2080
|
if (m) {
|
|
2094
2081
|
this.id = m.ID;
|
|
@@ -2099,17 +2086,17 @@ var Member = exports.Member = (_class5 = function () {
|
|
|
2099
2086
|
return key == 'canusedbalancestorage';
|
|
2100
2087
|
});
|
|
2101
2088
|
|
|
2102
|
-
var
|
|
2103
|
-
isNewRetailBCPos =
|
|
2089
|
+
var _ref24 = _mutantsUtil.platform || {},
|
|
2090
|
+
isNewRetailBCPos = _ref24.isNewRetailBCPos;
|
|
2104
2091
|
|
|
2105
2092
|
m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
|
|
2106
2093
|
m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
|
|
2107
2094
|
(0, _mobx.runInAction)(function () {
|
|
2108
|
-
|
|
2095
|
+
_this19.cardNo = m.CardCode;
|
|
2109
2096
|
if (index >= 0) {
|
|
2110
|
-
|
|
2097
|
+
_this19.balance = parseFloat(m.DynamicPropertyValues[index]);
|
|
2111
2098
|
} else {
|
|
2112
|
-
|
|
2099
|
+
_this19.balance = _this19.rawbalance;
|
|
2113
2100
|
}
|
|
2114
2101
|
});
|
|
2115
2102
|
this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
|
|
@@ -2141,19 +2128,19 @@ var Member = exports.Member = (_class5 = function () {
|
|
|
2141
2128
|
}
|
|
2142
2129
|
}]);
|
|
2143
2130
|
return Member;
|
|
2144
|
-
}(), (
|
|
2131
|
+
}(), (_descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
|
|
2145
2132
|
enumerable: true,
|
|
2146
2133
|
initializer: null
|
|
2147
|
-
}),
|
|
2134
|
+
}), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
|
|
2148
2135
|
enumerable: true,
|
|
2149
2136
|
initializer: null
|
|
2150
|
-
}),
|
|
2137
|
+
}), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
|
|
2151
2138
|
enumerable: true,
|
|
2152
2139
|
initializer: null
|
|
2153
|
-
}),
|
|
2140
|
+
}), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
|
|
2154
2141
|
enumerable: true,
|
|
2155
2142
|
initializer: null
|
|
2156
|
-
}),
|
|
2143
|
+
}), _descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
|
|
2157
2144
|
enumerable: true,
|
|
2158
2145
|
initializer: null
|
|
2159
2146
|
}), _applyDecoratedDescriptor(_class5.prototype, 'setExchangable', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setExchangable'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setCardNo'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setMeStorageCardId', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setMeStorageCardId'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setStorageCardNo'), _class5.prototype)), _class5);
|