tplus-components-touch 3.20.2 → 3.20.6

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.
@@ -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, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _desc3, _value3, _class5, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12;
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
 
@@ -948,7 +948,12 @@ var SettlementStore = (_class = function () {
948
948
  }, {
949
949
  key: 'delPay',
950
950
  value: function delPay(index) {
951
+ var _this10 = this;
952
+
951
953
  (0, _remove3.default)(this.paymode.thePaymodes, function (mode) {
954
+ if (mode.paymethodId === index) {
955
+ _this10.paymode.amount = _this10.paymode.amount + mode.value;
956
+ }
952
957
  return mode.paymethodId === index;
953
958
  });
954
959
  this.paymode.currentFocus = -1;
@@ -1020,26 +1025,26 @@ var SettlementStore = (_class = function () {
1020
1025
  }, {
1021
1026
  key: 'saveMember',
1022
1027
  value: function saveMember() {
1023
- var _this10 = this;
1028
+ var _this11 = this;
1024
1029
 
1025
1030
  var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1026
1031
  PayStyle = _enumController$getEn12.PayStyle;
1027
1032
 
1028
1033
  (0, _mobx.runInAction)(function () {
1029
- _this10.dto.StorageMutiSettleDetails = [];
1030
- var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
1034
+ _this11.dto.StorageMutiSettleDetails = [];
1035
+ var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
1031
1036
  return parseFloat(mode.value) != 0;
1032
- }) : _this10.paymode.thePaymodes;
1037
+ }) : _this11.paymode.thePaymodes;
1033
1038
  (0, _each3.default)(thePaymodes, function (mode) {
1034
- var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
1039
+ var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
1035
1040
 
1036
1041
  var value = parseFloat(mode.value);
1037
1042
  var giveChange = null;
1038
- if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
1039
- value = Math.Add(value, _this10.paymode.receivable);
1040
- giveChange = Math.abs(_this10.paymode.receivable);
1043
+ if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
1044
+ value = Math.Add(value, _this11.paymode.receivable);
1045
+ giveChange = Math.abs(_this11.paymode.receivable);
1041
1046
  }
1042
- _this10.dto.StorageMutiSettleDetails.push({
1047
+ _this11.dto.StorageMutiSettleDetails.push({
1043
1048
  Code: mode.paymethodId,
1044
1049
  StorageAmount: value,
1045
1050
  GiveChange: giveChange,
@@ -1048,7 +1053,7 @@ var SettlementStore = (_class = function () {
1048
1053
  PaymentCode: mode.authCode,
1049
1054
  DynamicPropertyKeys: [],
1050
1055
  DynamicPropertyValues: [],
1051
- DataSource: { Id: _this10.dataSource }
1056
+ DataSource: { Id: _this11.dataSource }
1052
1057
  });
1053
1058
  });
1054
1059
  });
@@ -1065,8 +1070,8 @@ var SettlementStore = (_class = function () {
1065
1070
  if (isHorizontalPad === true) {
1066
1071
  // pad打印
1067
1072
  //执行移动端云打印
1068
- if (_this10.cloudPrintArguments) {
1069
- var _ref12 = _this10.cloudPrintArguments || {},
1073
+ if (_this11.cloudPrintArguments) {
1074
+ var _ref12 = _this11.cloudPrintArguments || {},
1070
1075
  Open = _ref12.Open,
1071
1076
  Key = _ref12.Key,
1072
1077
  Sign = _ref12.Sign,
@@ -1077,7 +1082,7 @@ var SettlementStore = (_class = function () {
1077
1082
  _message2.default.warn(t('云打印未启用,请设置。'));
1078
1083
  return;
1079
1084
  }
1080
- _this10.printUtil.doStoragePrint({ Key: Key, Sign: Sign, Name: Name, Card: Card }, resp.ID, function (s) {
1085
+ _this11.printUtil.doStoragePrint({ Key: Key, Sign: Sign, Name: Name, Card: Card }, resp.ID, function (s) {
1081
1086
  var msg = s.msg,
1082
1087
  ret = s.ret;
1083
1088
 
@@ -1094,7 +1099,7 @@ var SettlementStore = (_class = function () {
1094
1099
  }
1095
1100
  return;
1096
1101
  } else if (isHorizontalSunMi === true) {
1097
- _this10.printUtil.doStoragePrint({}, resp.ID, function (s) {
1102
+ _this11.printUtil.doStoragePrint({}, resp.ID, function (s) {
1098
1103
  var msg = s.msg,
1099
1104
  ret = s.ret;
1100
1105
 
@@ -1129,7 +1134,7 @@ var SettlementStore = (_class = function () {
1129
1134
  key: 'save',
1130
1135
  value: function () {
1131
1136
  var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
1132
- var _this11 = this;
1137
+ var _this12 = this;
1133
1138
 
1134
1139
  var _enumController$getEn13, PayStyle, _ref16, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1135
1140
 
@@ -1140,24 +1145,24 @@ var SettlementStore = (_class = function () {
1140
1145
  _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn13.PayStyle;
1141
1146
 
1142
1147
  (0, _mobx.runInAction)(function () {
1143
- _this11.dto.RetailPaymentDetails = [];
1144
- _this11.dto.RetailStorageDetails = [];
1145
- _this11.dto.RetailCouponDetails = [];
1148
+ _this12.dto.RetailPaymentDetails = [];
1149
+ _this12.dto.RetailStorageDetails = [];
1150
+ _this12.dto.RetailCouponDetails = [];
1146
1151
  var czkSum = 0;
1147
- var Idmember = _this11.dto.Idmember;
1152
+ var Idmember = _this12.dto.Idmember;
1148
1153
  var count = 0;
1149
- var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
1154
+ var thePaymodes = _this12.newStyle ? (0, _filter3.default)(_this12.paymode.thePaymodes, function (mode) {
1150
1155
  return parseFloat(mode.value) != 0;
1151
- }) : _this11.paymode.thePaymodes;
1156
+ }) : _this12.paymode.thePaymodes;
1152
1157
  (0, _each3.default)(thePaymodes, function (mode, index) {
1153
- var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
1158
+ var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': mode.paymentType });
1154
1159
  if (mode.paymentType == PayStyle.hyczk) {
1155
1160
  if (!Idmember) {
1156
1161
  Idmember = mode.member.id;
1157
1162
  }
1158
1163
  czkSum = Math.Add(czkSum, mode.value);
1159
- var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this11.member.MeStorageCardId;
1160
- _this11.dto.RetailStorageDetails.push({
1164
+ var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this12.member.MeStorageCardId;
1165
+ _this12.dto.RetailStorageDetails.push({
1161
1166
  Code: mode.paymethodId,
1162
1167
  MeStorageCardId: MeStorageCardId,
1163
1168
  StoragePaymentAmount: mode.value,
@@ -1166,17 +1171,17 @@ var SettlementStore = (_class = function () {
1166
1171
  Idmember: mode.member.id,
1167
1172
  DynamicPropertyKeys: [],
1168
1173
  DynamicPropertyValues: [],
1169
- DataSource: { Id: _this11.dataSource },
1174
+ DataSource: { Id: _this12.dataSource },
1170
1175
  Password: mode.authCode
1171
1176
  });
1172
1177
  } else {
1173
1178
  var value = parseFloat(mode.value);
1174
1179
  var giveChange = null;
1175
- if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
1176
- value = Math.Add(value, _this11.paymode.receivable);
1177
- giveChange = Math.abs(_this11.paymode.receivable);
1180
+ if (mode.paymentType == PayStyle.xianjin && _this12.paymode.receivable < 0 && value > Math.abs(_this12.paymode.receivable)) {
1181
+ value = Math.Add(value, _this12.paymode.receivable);
1182
+ giveChange = Math.abs(_this12.paymode.receivable);
1178
1183
  }
1179
- _this11.dto.RetailPaymentDetails.push({
1184
+ _this12.dto.RetailPaymentDetails.push({
1180
1185
  Code: mode.paymethodId,
1181
1186
  OrigAmount: mode.exchangeRate != 1 ? mode.value2 : value,
1182
1187
  Amount: value,
@@ -1190,12 +1195,12 @@ var SettlementStore = (_class = function () {
1190
1195
  OverchargesAmount: mode.overchargesAmount,
1191
1196
  DynamicPropertyKeys: [],
1192
1197
  DynamicPropertyValues: [],
1193
- DataSource: { Id: _this11.dataSource }
1198
+ DataSource: { Id: _this12.dataSource }
1194
1199
  });
1195
1200
  if (mode.paymentType == PayStyle.djq) {
1196
1201
  (0, _each3.default)(mode.djqs, function (djq) {
1197
1202
  if (djq.checked) {
1198
- _this11.dto.RetailCouponDetails.push({
1203
+ _this12.dto.RetailCouponDetails.push({
1199
1204
  CouponCode: djq.code,
1200
1205
  ReductionAmount: djq.amount,
1201
1206
  EnableAmount: djq.doorsill,
@@ -1205,7 +1210,7 @@ var SettlementStore = (_class = function () {
1205
1210
  PromotionId: djq.promoId,
1206
1211
  PromotionRuleId: djq.promoRuleId,
1207
1212
  PromoCouponAllocatedId: djq.id,
1208
- DataSource: { Id: _this11.dataSource }
1213
+ DataSource: { Id: _this12.dataSource }
1209
1214
  });
1210
1215
  }
1211
1216
  });
@@ -1216,36 +1221,36 @@ var SettlementStore = (_class = function () {
1216
1221
  var _ref15 = _mutantsUtil.platform || {},
1217
1222
  isNewRetailBCPos = _ref15.isNewRetailBCPos;
1218
1223
 
1219
- if (_this11.dto.RetailStorageDetails.length > 0) {
1220
- var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
1224
+ if (_this12.dto.RetailStorageDetails.length > 0) {
1225
+ var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
1221
1226
  if (isNewRetailBCPos) {
1222
1227
  // this.dto.RetailStorageDetails && this.dto.RetailStorageDetails.forEach((value, index) => {
1223
1228
  // value.MeStorageCardId = (mode.MeStorageCardId ? mode.MeStorageCardId : this.member.MeStorageCardId);
1224
1229
  // })
1225
- _this11.dto.RetailPaymentDetails.push({
1226
- Code: _this11.paymode.counter,
1230
+ _this12.dto.RetailPaymentDetails.push({
1231
+ Code: _this12.paymode.counter,
1227
1232
  OrigAmount: czkSum,
1228
1233
  Amount: czkSum,
1229
1234
  IdsettleStyle: themode.idSettleStyle,
1230
1235
  IdbankAccount: themode.idBankAccount,
1231
1236
  DynamicPropertyKeys: [],
1232
1237
  DynamicPropertyValues: [],
1233
- DataSource: { Id: _this11.dataSource },
1234
- RetailStorageDetails: _this11.dto.RetailStorageDetails
1238
+ DataSource: { Id: _this12.dataSource },
1239
+ RetailStorageDetails: _this12.dto.RetailStorageDetails
1235
1240
  });
1236
1241
  } else {
1237
- _this11.dto.RetailPaymentDetails.push({
1238
- Code: _this11.paymode.counter,
1242
+ _this12.dto.RetailPaymentDetails.push({
1243
+ Code: _this12.paymode.counter,
1239
1244
  OrigAmount: czkSum,
1240
1245
  Amount: czkSum,
1241
1246
  IdsettleStyle: themode.idSettleStyle,
1242
1247
  IdbankAccount: themode.idBankAccount,
1243
1248
  DynamicPropertyKeys: [],
1244
1249
  DynamicPropertyValues: [],
1245
- DataSource: { Id: _this11.dataSource }
1250
+ DataSource: { Id: _this12.dataSource }
1246
1251
  });
1247
1252
  }
1248
- _this11.dto.Idmember = Idmember;
1253
+ _this12.dto.Idmember = Idmember;
1249
1254
  }
1250
1255
  });
1251
1256
  _ref16 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref16.isNewRetailBCPos;
@@ -1294,8 +1299,8 @@ var SettlementStore = (_class = function () {
1294
1299
  }
1295
1300
 
1296
1301
  return _context3.abrupt('return', (0, _tplusApi.ccApi)({ dto: (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } }), cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
1297
- _this11.setDtoID(resp.ID);
1298
- _this11.billID = resp.ID;
1302
+ _this12.setDtoID(resp.ID);
1303
+ _this12.billID = resp.ID;
1299
1304
  }));
1300
1305
 
1301
1306
  case 18:
@@ -1304,8 +1309,8 @@ var SettlementStore = (_class = function () {
1304
1309
 
1305
1310
  case 20:
1306
1311
  return _context3.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
1307
- _this11.setDtoID(resp.ID);
1308
- _this11.billID = resp.ID;
1312
+ _this12.setDtoID(resp.ID);
1313
+ _this12.billID = resp.ID;
1309
1314
  }));
1310
1315
 
1311
1316
  case 21:
@@ -1485,7 +1490,7 @@ var SettlementStore = (_class = function () {
1485
1490
  }(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, 'queryPwd', [_mobx.action], {
1486
1491
  enumerable: true,
1487
1492
  initializer: function initializer() {
1488
- var _this12 = this;
1493
+ var _this13 = this;
1489
1494
 
1490
1495
  return function (newPass, newPassConfirm) {
1491
1496
  if (!newPass || !newPassConfirm) {
@@ -1497,7 +1502,7 @@ var SettlementStore = (_class = function () {
1497
1502
  var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
1498
1503
  return (0, _tplusApi.ccApi)({
1499
1504
  Idstore: idstore,
1500
- meMemberId: _this12.member.ID,
1505
+ meMemberId: _this13.member.ID,
1501
1506
  oldPassword: null,
1502
1507
  newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
1503
1508
  dataSource: "POS"
@@ -1511,7 +1516,7 @@ var SettlementStore = (_class = function () {
1511
1516
  }), _applyDecoratedDescriptor(_class.prototype, 'initByOriginReturn', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'initByOriginReturn'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'quickSettle', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'quickSettle'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusAndAddPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusAndAddPay'), _class.prototype), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, 'updateMemberInfo', [_mobx.action], {
1512
1517
  enumerable: true,
1513
1518
  initializer: function initializer() {
1514
- var _this13 = this;
1519
+ var _this14 = this;
1515
1520
 
1516
1521
  return function () {
1517
1522
  var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
@@ -1521,9 +1526,9 @@ var SettlementStore = (_class = function () {
1521
1526
  while (1) {
1522
1527
  switch (_context6.prev = _context6.next) {
1523
1528
  case 0:
1524
- _getLoginInfo = _this13.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
1529
+ _getLoginInfo = _this14.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
1525
1530
  _context6.next = 3;
1526
- return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
1531
+ return (0, _tplusApi.tApi)({ Idmember: _this14.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
1527
1532
 
1528
1533
  case 3:
1529
1534
  resp = _context6.sent;
@@ -1537,7 +1542,7 @@ var SettlementStore = (_class = function () {
1537
1542
  return _context6.stop();
1538
1543
  }
1539
1544
  }
1540
- }, _callee6, _this13);
1545
+ }, _callee6, _this14);
1541
1546
  }));
1542
1547
 
1543
1548
  return function (_x4) {
@@ -1573,6 +1578,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
1573
1578
  name: "复合结算",
1574
1579
  hotKey: "Ctrl+M"
1575
1580
  };
1581
+
1582
+ _initDefineProp(this, 'calcCheckList', _descriptor8, this);
1583
+
1584
+ _initDefineProp(this, 'setCouponNum', _descriptor9, this);
1585
+
1586
+ _initDefineProp(this, 'addDjqs', _descriptor10, this);
1576
1587
  } //应收
1577
1588
 
1578
1589
 
@@ -1608,16 +1619,188 @@ var PayMode = exports.PayMode = (_class3 = function () {
1608
1619
  this.receivable = (0, _utils.getFixedNumber)(this.amount - sum);
1609
1620
  }
1610
1621
  }, {
1611
- key: 'calcDjqValue',
1612
- value: function calcDjqValue(q1) {
1613
- var _this14 = this;
1622
+ key: 'calcDjqCheckValue',
1623
+ value: function calcDjqCheckValue(q1, dto) {
1624
+ var _this15 = this;
1625
+
1626
+ var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
1627
+ var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
1628
+ return djq.checked;
1629
+ });
1630
+ if (qList.length === useLimitPerOrder && !q1.checked) {
1631
+ _message2.default.warn('本单最多可用' + useLimitPerOrder + '张');
1632
+ return;
1633
+ }
1614
1634
 
1615
1635
  var _ref21 = _mutantsUtil.platform || {},
1616
1636
  isNewRetailBCPos = _ref21.isNewRetailBCPos;
1617
1637
 
1618
1638
  var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
1639
+ PayStyle = _enumController$getEn14.PayStyle,
1619
1640
  Differentiate = _enumController$getEn14.Differentiate;
1620
1641
 
1642
+ if (q1) {
1643
+ if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
1644
+ _message2.default.error('\u672C\u5355\u6CA1\u6709' + Differentiate.COUPON + '\u53EF\u7528\u91D1\u989D\uFF0C\u8BE5\u5238\u4E0D\u53EF\u4F7F\u7528\u3002');
1645
+ return;
1646
+ }
1647
+ var q = (0, _find3.default)(this.currentMode.djqs, function (djq) {
1648
+ return djq.promoCouponCode == q1.promoCouponCode;
1649
+ });
1650
+ if (q && !q.checked && parseFloat(this.amount) < parseFloat(q.doorsill)) {
1651
+ _message2.default.error("本单金额低于使用门槛,该券不可使用。");
1652
+ return;
1653
+ }
1654
+ //判断是否是选择优惠券 //CC优惠券只能使用一个
1655
+ // if (q1 && !q1.checked && isNewRetailBCPos) {
1656
+ // // 检查是否有已经选定优惠券 并且去除选定的优惠券
1657
+ // this.currentMode.djqs.forEach((djq, index) => {
1658
+ // if (djq.checked) this.currentMode.djqs[index].checked = false;
1659
+ // })
1660
+ // }
1661
+ q && (q.checked = !q.checked);
1662
+ }
1663
+ var sum = 0;
1664
+ // console.log(this.store, 'stores-------');
1665
+ if (!q1.checked) {
1666
+ this.checkList.forEach(function (ele, i) {
1667
+ if (ele.id === q1.id) {
1668
+ _this15.checkList.splice(i, 1);
1669
+ }
1670
+ });
1671
+ } else {
1672
+ if (q1.discountPct > 0) {
1673
+ q1.amount = 0;
1674
+ }
1675
+ this.checkList.push(q1);
1676
+ }
1677
+ this.checkList.forEach(function (ele, i) {
1678
+ if (ele.discountPct > 0) {
1679
+ if (ele.amount === 0) {
1680
+ ele.amount = (1 - ele.discountPct) * _this15.currentMode.receivable;
1681
+ }
1682
+ }
1683
+ sum = Math.Add(sum, ele.amount);
1684
+ });
1685
+ this.currentMode.value = (0, _utils.getFixedNumber)(Math.min(this.receivable, sum, this.currentMode.maxamount));
1686
+ this.currentMode.receivable = (0, _utils.getFixedNumber)(this.receivable - this.currentMode.value);
1687
+ this.currentMode.overchargesAmount = (0, _utils.getFixedNumber)(sum - this.currentMode.value);
1688
+ var promoVoucher = {};
1689
+ promoVoucher.boName = "Retail";
1690
+ // promoVoucher.promoLinks = _filter(this.currentMode.djqs,djq=>djq.checked);
1691
+ promoVoucher.meMemberId = this.currentMode.member.id;
1692
+ promoVoucher.storeFactorId = (0, _tplusPoslogin.PosInitData)('storeID');
1693
+ promoVoucher.voucherDetailList = [];
1694
+ dto.RetailDetails.forEach(function (item) {
1695
+ var detailDTO = {};
1696
+ detailDTO.uuid = item.Code;
1697
+ detailDTO.detailBoName = "RetailDetail";
1698
+ detailDTO.voucherDetailId = item.ID;
1699
+ detailDTO.productId = item.Idinventory;
1700
+ detailDTO.uomId = item.Idunit;
1701
+ detailDTO.productSpecId = item.ProductSpecId;
1702
+ detailDTO.isManualFreeGift = item.IsPresent;
1703
+ detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
1704
+ detailDTO.IsManualChangePrice = item.IsManualChangePrice;
1705
+ if (detailDTO.IsManualChangePrice) //如果是手工改价
1706
+ {
1707
+ detailDTO.listPrice = item.TaxPrice;
1708
+ detailDTO.netAmountWithTax = item.TaxAmount;
1709
+ } else {
1710
+ var bookingQuantity = 0;
1711
+ if (item.BookingQuantity) {
1712
+ bookingQuantity = item.BookingQuantity;
1713
+ }
1714
+ detailDTO.listPrice = item.MemberPrice;
1715
+ detailDTO.netAmountWithTax = Math.Multiply(item.MemberPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
1716
+ }
1717
+ detailDTO.taxRate = item.TaxRate;
1718
+ detailDTO.quantity = item.Quantity;
1719
+
1720
+ detailDTO.amountWithTax = item.RetailAmount;
1721
+ // 促销 start
1722
+ if (item.PromotionDetails && item.PromotionDetails.length != 0) {
1723
+ var promoLinks = [];
1724
+ item.PromotionDetails.forEach(function (promotion) {
1725
+ promoLinks.push({
1726
+ promoId: promotion.IdSalesPromotionDTO,
1727
+ promoRuleId: promotion.PromotionRuleId
1728
+ });
1729
+ });
1730
+ if (promoLinks.length != 0) detailDTO.promoLinks = promoLinks;
1731
+ }
1732
+ // 促销 end
1733
+ promoVoucher.voucherDetailList.push(detailDTO);
1734
+ });
1735
+ promoVoucher.promoLinks = this.checkList;
1736
+ return (0, _tplusApi.ccApi)((0, _extends3.default)({}, promoVoucher), 'promotion/PromoCalculate/findUsefulCouponPromoList', false, false, { method: 'post', timeout_skip: true }).then(function (result) {
1737
+ if (result && result.length != 0) {
1738
+ result.forEach(function (element) {
1739
+ var djq1 = (0, _filter3.default)(_this15.currentMode.djqs, function (djq) {
1740
+ return djq.id === element.id;
1741
+ });
1742
+
1743
+ var _ref22 = element || {},
1744
+ couponCode = _ref22.couponCode,
1745
+ name = _ref22.name,
1746
+ tieredAmountResult = _ref22.tieredAmountResult,
1747
+ fromDate = _ref22.fromDate,
1748
+ dateMount = _ref22.dateMount,
1749
+ promoMethodEnum = _ref22.promoMethodEnum,
1750
+ discountPct = _ref22.discountPct,
1751
+ nominalAmount = _ref22.nominalAmount,
1752
+ promoId = _ref22.promoId,
1753
+ id = _ref22.id,
1754
+ doorsill = _ref22.doorsill;
1755
+
1756
+ var condValue = tieredAmountResult.condValue,
1757
+ promoDiscount = tieredAmountResult.promoDiscount,
1758
+ displayText = tieredAmountResult.displayText,
1759
+ promoRuleId = tieredAmountResult.promoRuleId,
1760
+ couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
1761
+
1762
+ if (!djq1.length) {
1763
+ // this.currentMode.djqs.push({
1764
+ // promoCouponCode: element.CouponCode,
1765
+ // name: element.CouponTitle,
1766
+ // IsEnable: true,
1767
+ // amount: element.ReductionAmount,
1768
+ // doorsill: element.EnableAmount,
1769
+ // LastTS: element.LastTS,
1770
+ // checked: false,
1771
+ // IsRepelWithPoints: true,
1772
+ // UMemberID: dto.Idmember,
1773
+ // expired: null,
1774
+ // displayText,
1775
+ // promoMethodEnum,
1776
+ // discountPct,
1777
+ // promoId,
1778
+ // promoRuleId,
1779
+ // couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
1780
+ // id
1781
+ // })
1782
+ _this15.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
1783
+ } else {
1784
+ _this15.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum);
1785
+ // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
1786
+ // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
1787
+ }
1788
+ });
1789
+ }
1790
+ });
1791
+ //this.receivable = getFixedNumber(this.receivable - sum);
1792
+ }
1793
+ }, {
1794
+ key: 'calcDjqValue',
1795
+ value: function calcDjqValue(q1) {
1796
+ var _this16 = this;
1797
+
1798
+ var _ref23 = _mutantsUtil.platform || {},
1799
+ isNewRetailBCPos = _ref23.isNewRetailBCPos;
1800
+
1801
+ var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
1802
+ Differentiate = _enumController$getEn15.Differentiate;
1803
+
1621
1804
  if (q1) {
1622
1805
  if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
1623
1806
  _message2.default.error('\u672C\u5355\u6CA1\u6709' + Differentiate.COUPON + '\u53EF\u7528\u91D1\u989D\uFF0C\u8BE5\u5238\u4E0D\u53EF\u4F7F\u7528\u3002');
@@ -1634,7 +1817,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1634
1817
  if (q1 && !q1.checked && isNewRetailBCPos) {
1635
1818
  // 检查是否有已经选定优惠券 并且去除选定的优惠券
1636
1819
  this.currentMode.djqs.forEach(function (djq, index) {
1637
- if (djq.checked) _this14.currentMode.djqs[index].checked = false;
1820
+ if (djq.checked) _this16.currentMode.djqs[index].checked = false;
1638
1821
  });
1639
1822
  }
1640
1823
  q && (q.checked = !q.checked);
@@ -1674,9 +1857,20 @@ var PayMode = exports.PayMode = (_class3 = function () {
1674
1857
  value: function setCurrentModeValue(v, max) {
1675
1858
  this.currentMode.value = parseFloat(v) || 0;
1676
1859
  this.currentMode.errinfo = '';
1860
+ var sum = this.amount;
1861
+
1862
+ var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
1863
+ PayStyle = _enumController$getEn16.PayStyle;
1864
+
1865
+ this.paymodes.thePaymodes && this.paymodes.thePaymodes.forEach(function (mode) {
1866
+ if (mode.paymentType === PayStyle.hyczk) {
1867
+ sum -= mode.value;
1868
+ }
1869
+ });
1870
+
1677
1871
  if (this.amount > 0 && (v === '' || v === '0.00')) {
1678
1872
  this.currentMode.errinfo = "实收金额必须录入";
1679
- } else if (Math.abs(parseFloat(v)) > Math.abs(this.amount)) {
1873
+ } else if (Math.abs(parseFloat(v)) > Math.abs(sum)) {
1680
1874
  this.currentMode.errinfo = "实收不应大于应收";
1681
1875
  } else if (parseFloat(v) > 0 && parseFloat(v) > (max || 0)) {
1682
1876
  this.currentMode.errinfo = "余额不足";
@@ -1690,16 +1884,16 @@ var PayMode = exports.PayMode = (_class3 = function () {
1690
1884
  }, {
1691
1885
  key: 'setPaymodes',
1692
1886
  value: function () {
1693
- var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
1694
- var _this15 = this;
1887
+ var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
1888
+ var _this17 = this;
1695
1889
 
1696
- var _enumController$getEn15, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
1890
+ var _enumController$getEn17, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
1697
1891
 
1698
1892
  return _regenerator2.default.wrap(function _callee7$(_context7) {
1699
1893
  while (1) {
1700
1894
  switch (_context7.prev = _context7.next) {
1701
1895
  case 0:
1702
- _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn15.settleStyleType, PayStyle = _enumController$getEn15.PayStyle;
1896
+ _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn17.settleStyleType, PayStyle = _enumController$getEn17.PayStyle;
1703
1897
  memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
1704
1898
  param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
1705
1899
  _context7.next = 5;
@@ -1730,7 +1924,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1730
1924
  calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
1731
1925
  });
1732
1926
  });
1733
- _this15.paymodes = paymodes;
1927
+ _this17.paymodes = paymodes;
1734
1928
  //modes.QuickSettleStyles
1735
1929
  });
1736
1930
  }
@@ -1744,7 +1938,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1744
1938
  }));
1745
1939
 
1746
1940
  function setPaymodes(_x5, _x6) {
1747
- return _ref22.apply(this, arguments);
1941
+ return _ref24.apply(this, arguments);
1748
1942
  }
1749
1943
 
1750
1944
  return setPaymodes;
@@ -1786,22 +1980,74 @@ var PayMode = exports.PayMode = (_class3 = function () {
1786
1980
  initializer: function initializer() {
1787
1981
  return [];
1788
1982
  }
1789
- }), _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), _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);
1983
+ }), _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], {
1984
+ enumerable: true,
1985
+ initializer: function initializer() {
1986
+ var _this18 = this;
1987
+
1988
+ return function () {
1989
+ _this18.checkList = [];
1990
+ };
1991
+ }
1992
+ }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
1993
+ enumerable: true,
1994
+ initializer: function initializer() {
1995
+ var _this19 = this;
1996
+
1997
+ return function (id, couponNum, code) {
1998
+ _this19.currentMode.djqs.forEach(function (ele) {
1999
+ if (ele.id === id) {
2000
+ ele.couponCategoryEnum = couponNum;
2001
+ var IsEnable = ele.couponCategoryEnum === 'RIGUP' || ele.couponCategoryEnum === 'UN_MATCH' || ele.couponCategoryEnum === "PREPARING" || ele.couponCategoryEnum === 'PROMO_LIMITED' || ele.couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
2002
+ ele.IsEnable = IsEnable;
2003
+ }
2004
+ });
2005
+ };
2006
+ }
2007
+ }), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
2008
+ enumerable: true,
2009
+ initializer: function initializer() {
2010
+ var _this20 = this;
2011
+
2012
+ return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
2013
+ var djq = {
2014
+ promoCouponCode: promoCouponCode,
2015
+ name: name,
2016
+ IsEnable: IsEnable,
2017
+ amount: amount,
2018
+ doorsill: doorsill,
2019
+ LastTS: LastTS,
2020
+ checked: checked,
2021
+ IsRepelWithPoints: IsRepelWithPoints,
2022
+ UMemberID: UMemberID,
2023
+ expired: expired,
2024
+ displayText: displayText,
2025
+ promoMethodEnum: promoMethodEnum,
2026
+ discountPct: discountPct,
2027
+ promoId: promoId,
2028
+ promoRuleId: promoRuleId,
2029
+ couponCategoryEnum: couponCategoryEnum,
2030
+ id: id
2031
+ };
2032
+ _this20.currentMode.djqs.push(djq);
2033
+ };
2034
+ }
2035
+ }), _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);
1790
2036
  var Member = exports.Member = (_class5 = function () {
1791
2037
  function Member(m) {
1792
- var _this16 = this;
2038
+ var _this21 = this;
1793
2039
 
1794
2040
  (0, _classCallCheck3.default)(this, Member);
1795
2041
 
1796
- _initDefineProp(this, 'cardNo', _descriptor8, this);
2042
+ _initDefineProp(this, 'cardNo', _descriptor11, this);
1797
2043
 
1798
- _initDefineProp(this, 'balance', _descriptor9, this);
2044
+ _initDefineProp(this, 'balance', _descriptor12, this);
1799
2045
 
1800
- _initDefineProp(this, 'exchangable', _descriptor10, this);
2046
+ _initDefineProp(this, 'exchangable', _descriptor13, this);
1801
2047
 
1802
- _initDefineProp(this, 'MeStorageCardId', _descriptor11, this);
2048
+ _initDefineProp(this, 'MeStorageCardId', _descriptor14, this);
1803
2049
 
1804
- _initDefineProp(this, 'StorageCardNo', _descriptor12, this);
2050
+ _initDefineProp(this, 'StorageCardNo', _descriptor15, this);
1805
2051
 
1806
2052
  if (m) {
1807
2053
  this.id = m.ID;
@@ -1812,17 +2058,17 @@ var Member = exports.Member = (_class5 = function () {
1812
2058
  return key == 'canusedbalancestorage';
1813
2059
  });
1814
2060
 
1815
- var _ref23 = _mutantsUtil.platform || {},
1816
- isNewRetailBCPos = _ref23.isNewRetailBCPos;
2061
+ var _ref25 = _mutantsUtil.platform || {},
2062
+ isNewRetailBCPos = _ref25.isNewRetailBCPos;
1817
2063
 
1818
2064
  m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
1819
2065
  m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
1820
2066
  (0, _mobx.runInAction)(function () {
1821
- _this16.cardNo = m.CardCode;
2067
+ _this21.cardNo = m.CardCode;
1822
2068
  if (index >= 0) {
1823
- _this16.balance = parseFloat(m.DynamicPropertyValues[index]);
2069
+ _this21.balance = parseFloat(m.DynamicPropertyValues[index]);
1824
2070
  } else {
1825
- _this16.balance = _this16.rawbalance;
2071
+ _this21.balance = _this21.rawbalance;
1826
2072
  }
1827
2073
  });
1828
2074
  this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -1854,19 +2100,19 @@ var Member = exports.Member = (_class5 = function () {
1854
2100
  }
1855
2101
  }]);
1856
2102
  return Member;
1857
- }(), (_descriptor8 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
2103
+ }(), (_descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
1858
2104
  enumerable: true,
1859
2105
  initializer: null
1860
- }), _descriptor9 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
2106
+ }), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
1861
2107
  enumerable: true,
1862
2108
  initializer: null
1863
- }), _descriptor10 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
2109
+ }), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
1864
2110
  enumerable: true,
1865
2111
  initializer: null
1866
- }), _descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
2112
+ }), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
1867
2113
  enumerable: true,
1868
2114
  initializer: null
1869
- }), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
2115
+ }), _descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
1870
2116
  enumerable: true,
1871
2117
  initializer: null
1872
2118
  }), _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);