tplus-components-touch 3.49.2 → 3.51.2
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/inventorySearch/store.js +2 -6
- package/dist/components/inventorySearch/store.js.map +1 -1
- package/dist/components/message/index.js +3 -4
- package/dist/components/message/index.js.map +1 -1
- package/dist/components/modalWraper/index.js +16 -1
- package/dist/components/modalWraper/index.js.map +1 -1
- package/dist/components/modalWraper/style.less +6 -0
- package/dist/components/settlement/asyncModal.js +4 -1
- package/dist/components/settlement/asyncModal.js.map +1 -1
- package/dist/components/settlement/settlement.js +279 -246
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlement.less +3 -0
- package/dist/components/settlement/settlementApi.js +512 -0
- package/dist/components/settlement/settlementApi.js.map +1 -0
- package/dist/components/settlement/settlementStore.js +714 -706
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/ticon/iconfont/demo_index.html +3 -3
- package/dist/components/ticon/iconfont/iconfont.css +3 -3
- package/dist/components/ticon/iconfont/iconfont.js +2 -1
- package/dist/components/ticon/iconfont/iconfont.js.map +1 -1
- package/dist/components/ticon/iconfont/iconfont.ttf +0 -0
- package/dist/components/ticon/iconfont/iconfont.woff +0 -0
- package/dist/components/ticon/iconfont/iconfont.woff2 +0 -0
- package/dist/components/touchTable/index.js +21 -16
- package/dist/components/touchTable/index.js.map +1 -1
- package/dist/index.js +8 -3
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
- package/dist/components/ticon/iconfont/iconfont.eot +0 -0
- package/dist/components/ticon/iconfont/iconfont.svg +0 -593
@@ -227,6 +227,7 @@ var hasElectron = _mutantsMicrofx.env.platform === _mutantsMicrofx.env.constant.
|
|
227
227
|
var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_React$Component) {
|
228
228
|
(0, _inherits3.default)(Settlement, _React$Component);
|
229
229
|
|
230
|
+
// 复核结算方式快捷键列表
|
230
231
|
function Settlement(props) {
|
231
232
|
var _this3 = this;
|
232
233
|
|
@@ -267,16 +268,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
267
268
|
couponLight: true,
|
268
269
|
storageValue: '0.00',
|
269
270
|
czkValue: null,
|
270
|
-
isInputMember: false,
|
271
271
|
selectedRowIndex: 0,
|
272
|
-
isNotAutoFocus: true
|
273
|
-
// 复核结算方式快捷键列表
|
274
|
-
};
|
272
|
+
isNotAutoFocus: true };
|
275
273
|
_this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
|
276
274
|
return key.toLocaleUpperCase();
|
277
275
|
});
|
278
276
|
_this2.hotkeydebounced = null;
|
279
277
|
_this2.hotkeydebouncedPayMode = "";
|
278
|
+
_this2.voucherRunningFast = false;
|
280
279
|
_this2.currentInput = null;
|
281
280
|
|
282
281
|
_this2.getIsReturn = function () {
|
@@ -390,7 +389,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
390
389
|
|
391
390
|
_promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ isNotAutoFocus: true, fn: function fn(data) {
|
392
391
|
return _this2.isNoProductTip(data);
|
393
|
-
} })).then(function (result) {
|
392
|
+
}, type: type })).then(function (result) {
|
394
393
|
if (result) {
|
395
394
|
_this2.setState({
|
396
395
|
settleDisabled: false
|
@@ -513,7 +512,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
513
512
|
// 支持异步验证过程
|
514
513
|
_promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ fn: function fn(data) {
|
515
514
|
return _this2.isNoProductTip(data);
|
516
|
-
} })).then(function (result) {
|
515
|
+
}, type: type })).then(function (result) {
|
517
516
|
if (result) {
|
518
517
|
_this2.setState({
|
519
518
|
settleDisabled: false
|
@@ -646,33 +645,32 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
646
645
|
|
647
646
|
_this2.showCzkModal = function () {
|
648
647
|
var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(id, append) {
|
649
|
-
var
|
648
|
+
var returnType, _enumController$getEn2, PayStyle, memberId, memberdata1;
|
650
649
|
|
651
650
|
return _regenerator2.default.wrap(function _callee$(_context) {
|
652
651
|
while (1) {
|
653
652
|
switch (_context.prev = _context.next) {
|
654
653
|
case 0:
|
655
|
-
_ref2 = _this2.state || {}, isInputMember = _ref2.isInputMember;
|
656
654
|
returnType = _this2.getNotBoriginReturn();
|
657
655
|
_enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn2.PayStyle;
|
658
656
|
|
659
657
|
_this2.store.setCurrentMode(id, PayStyle.hyczk, append);
|
660
658
|
_this2.connectRfCard();
|
661
659
|
memberId = _this2.store && _this2.store.member && _this2.store.member.ID;
|
662
|
-
_context.t0 =
|
660
|
+
_context.t0 = memberId;
|
663
661
|
|
664
662
|
if (!_context.t0) {
|
665
|
-
_context.next =
|
663
|
+
_context.next = 10;
|
666
664
|
break;
|
667
665
|
}
|
668
666
|
|
669
|
-
_context.next =
|
667
|
+
_context.next = 9;
|
670
668
|
return _this2.store.updateCurrentMode(memberId, returnType);
|
671
669
|
|
672
|
-
case
|
670
|
+
case 9:
|
673
671
|
_context.t0 = _context.sent;
|
674
672
|
|
675
|
-
case
|
673
|
+
case 10:
|
676
674
|
memberdata1 = _context.t0;
|
677
675
|
|
678
676
|
_this2.setState({ czkVisible: true });
|
@@ -691,7 +689,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
691
689
|
}, 300);
|
692
690
|
}
|
693
691
|
|
694
|
-
case
|
692
|
+
case 13:
|
695
693
|
case 'end':
|
696
694
|
return _context.stop();
|
697
695
|
}
|
@@ -741,61 +739,57 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
741
739
|
while (1) {
|
742
740
|
switch (_context2.prev = _context2.next) {
|
743
741
|
case 0:
|
744
|
-
_this2.setState({
|
745
|
-
isInputMember: false
|
746
|
-
});
|
747
742
|
_enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle;
|
748
743
|
|
749
744
|
if (_this2.store.paymode.currentMode.storageCardNo) {
|
750
|
-
_context2.next =
|
745
|
+
_context2.next = 5;
|
751
746
|
break;
|
752
747
|
}
|
753
748
|
|
754
749
|
returnType = _this2.getNotBoriginReturn();
|
755
|
-
_context2.next =
|
750
|
+
_context2.next = 5;
|
756
751
|
return _this2.store.loadCzk(_this2.czkInput.input.value, returnType);
|
757
752
|
|
758
|
-
case
|
753
|
+
case 5:
|
759
754
|
if (_this2.store.paymode.currentMode.storageCardNo) {
|
760
|
-
_context2.next =
|
755
|
+
_context2.next = 8;
|
761
756
|
break;
|
762
757
|
}
|
763
758
|
|
764
759
|
_message2.default.error("请录入储值卡!");
|
765
760
|
return _context2.abrupt('return');
|
766
761
|
|
767
|
-
case
|
762
|
+
case 8:
|
768
763
|
if (!(0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
|
769
764
|
return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.storageCardNo == _this2.store.paymode.currentMode.storageCardNo;
|
770
765
|
})) {
|
771
|
-
_context2.next =
|
766
|
+
_context2.next = 11;
|
772
767
|
break;
|
773
768
|
}
|
774
769
|
|
775
770
|
_message2.default.error("该储值卡已使用。");
|
776
771
|
return _context2.abrupt('return');
|
777
772
|
|
778
|
-
case
|
773
|
+
case 11:
|
779
774
|
if (!(_this2.store.bquick && _this2.store.paymode.amount != _this2.store.paymode.currentMode.value)) {
|
780
|
-
_context2.next =
|
775
|
+
_context2.next = 14;
|
781
776
|
break;
|
782
777
|
}
|
783
778
|
|
784
779
|
_message2.default.error("实收金额应等于应收金额。");
|
785
780
|
return _context2.abrupt('return');
|
786
781
|
|
787
|
-
case
|
782
|
+
case 14:
|
788
783
|
|
789
784
|
_this2.setState({
|
790
785
|
czkVisible: false,
|
791
786
|
storageValue: '0.00',
|
792
787
|
czkValue: null
|
793
788
|
});
|
794
|
-
_this2.closeRfCard();
|
795
789
|
_this2.store.paymode.calcMemberBalance();
|
796
790
|
_this2.handleCzk();
|
797
791
|
|
798
|
-
case
|
792
|
+
case 17:
|
799
793
|
case 'end':
|
800
794
|
return _context2.stop();
|
801
795
|
}
|
@@ -804,7 +798,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
804
798
|
}));
|
805
799
|
|
806
800
|
_this2.handleCzkOk = function () {
|
807
|
-
var
|
801
|
+
var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(e) {
|
808
802
|
var _this2$store$paymode$, walletEnabled, cardTypeEnum, freePaymentPasswordStore, isNeedPassword;
|
809
803
|
|
810
804
|
return _regenerator2.default.wrap(function _callee3$(_context3) {
|
@@ -834,7 +828,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
834
828
|
}));
|
835
829
|
|
836
830
|
return function (_x3) {
|
837
|
-
return
|
831
|
+
return _ref3.apply(this, arguments);
|
838
832
|
};
|
839
833
|
}();
|
840
834
|
|
@@ -848,7 +842,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
848
842
|
storageValue: '0.00',
|
849
843
|
czkValue: null
|
850
844
|
});
|
851
|
-
_this2.closeRfCard();
|
852
845
|
_keyboard2.default.close();
|
853
846
|
_this2.setInventoryFocus();
|
854
847
|
};
|
@@ -860,13 +853,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
860
853
|
};
|
861
854
|
|
862
855
|
_this2.handleSetModal = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
|
863
|
-
var _this2$state2, newPass, newPassConfirm,
|
856
|
+
var _this2$state2, newPass, newPassConfirm, updataMemberInfo, result, cardTypeEnum, resp;
|
864
857
|
|
865
858
|
return _regenerator2.default.wrap(function _callee4$(_context4) {
|
866
859
|
while (1) {
|
867
860
|
switch (_context4.prev = _context4.next) {
|
868
861
|
case 0:
|
869
|
-
_this2$state2 = _this2.state, newPass = _this2$state2.newPass, newPassConfirm = _this2$state2.newPassConfirm
|
862
|
+
_this2$state2 = _this2.state, newPass = _this2$state2.newPass, newPassConfirm = _this2$state2.newPassConfirm;
|
870
863
|
updataMemberInfo = _this2.props.updataMemberInfo;
|
871
864
|
_context4.next = 4;
|
872
865
|
return _this2.store.queryPwd(newPass, newPassConfirm);
|
@@ -876,7 +869,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
876
869
|
cardTypeEnum = _this2.store.paymode.currentMode.cardTypeEnum;
|
877
870
|
|
878
871
|
if (!result) {
|
879
|
-
_context4.next =
|
872
|
+
_context4.next = 17;
|
880
873
|
break;
|
881
874
|
}
|
882
875
|
|
@@ -895,7 +888,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
895
888
|
}
|
896
889
|
}, 350);
|
897
890
|
|
898
|
-
if (!
|
891
|
+
if (!_this2.store.member.ID) {
|
899
892
|
_context4.next = 16;
|
900
893
|
break;
|
901
894
|
}
|
@@ -912,11 +905,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
912
905
|
if (cardTypeEnum === 'BALANCE_CARD') {
|
913
906
|
_this2.store.paymode.updateCardInfo();
|
914
907
|
}
|
915
|
-
_this2.setState({
|
916
|
-
isInputMember: false
|
917
|
-
});
|
918
908
|
|
919
|
-
case
|
909
|
+
case 17:
|
920
910
|
case 'end':
|
921
911
|
return _context4.stop();
|
922
912
|
}
|
@@ -925,11 +915,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
925
915
|
}));
|
926
916
|
|
927
917
|
_this2.onPressEnterCzk = function (field) {
|
928
|
-
var
|
929
|
-
|
930
|
-
newPass =
|
931
|
-
|
932
|
-
newPassConfirm =
|
918
|
+
var _ref5 = _this2.state || {},
|
919
|
+
_ref5$newPass = _ref5.newPass,
|
920
|
+
newPass = _ref5$newPass === undefined ? '' : _ref5$newPass,
|
921
|
+
_ref5$newPassConfirm = _ref5.newPassConfirm,
|
922
|
+
newPassConfirm = _ref5$newPassConfirm === undefined ? '' : _ref5$newPassConfirm;
|
933
923
|
|
934
924
|
if (field === 'newPass' && newPass.length === 6) {
|
935
925
|
_this2.inputConfirmAmount.input.focus();
|
@@ -944,11 +934,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
944
934
|
return;
|
945
935
|
}
|
946
936
|
_this2.setState((0, _defineProperty3.default)({}, field, value), function () {
|
947
|
-
var
|
948
|
-
|
949
|
-
newPass =
|
950
|
-
|
951
|
-
newPassConfirm =
|
937
|
+
var _ref6 = _this2.state || {},
|
938
|
+
_ref6$newPass = _ref6.newPass,
|
939
|
+
newPass = _ref6$newPass === undefined ? '' : _ref6$newPass,
|
940
|
+
_ref6$newPassConfirm = _ref6.newPassConfirm,
|
941
|
+
newPassConfirm = _ref6$newPassConfirm === undefined ? '' : _ref6$newPassConfirm;
|
952
942
|
|
953
943
|
if (newPassConfirm.length === 6 && newPass.length === 6 && newPass === newPassConfirm) {
|
954
944
|
_this2.setState({
|
@@ -959,15 +949,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
959
949
|
};
|
960
950
|
|
961
951
|
_this2.handleBlur = function (field) {
|
962
|
-
var
|
963
|
-
|
964
|
-
newPass =
|
965
|
-
|
966
|
-
newPassConfirm =
|
952
|
+
var _ref7 = _this2.state || {},
|
953
|
+
_ref7$newPass = _ref7.newPass,
|
954
|
+
newPass = _ref7$newPass === undefined ? '' : _ref7$newPass,
|
955
|
+
_ref7$newPassConfirm = _ref7.newPassConfirm,
|
956
|
+
newPassConfirm = _ref7$newPassConfirm === undefined ? '' : _ref7$newPassConfirm;
|
967
957
|
|
968
958
|
setTimeout(function () {
|
969
|
-
var
|
970
|
-
showSetPwdModal =
|
959
|
+
var _ref8 = _this2.state || {},
|
960
|
+
showSetPwdModal = _ref8.showSetPwdModal;
|
971
961
|
|
972
962
|
if (!showSetPwdModal) return;
|
973
963
|
if (field === 'newPass' && newPass.length < 6) {
|
@@ -1105,8 +1095,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1105
1095
|
};
|
1106
1096
|
|
1107
1097
|
_this2.checkOfflineEnable = function (paymode, key) {
|
1108
|
-
var
|
1109
|
-
paymodes =
|
1098
|
+
var _ref9 = paymode || {},
|
1099
|
+
paymodes = _ref9.paymodes;
|
1110
1100
|
|
1111
1101
|
var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
|
1112
1102
|
|
@@ -1137,11 +1127,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1137
1127
|
paymode.currentMode = null;
|
1138
1128
|
switch (key) {
|
1139
1129
|
case PayStyle.hyczk:
|
1140
|
-
_this2.
|
1141
|
-
isInputMember: true
|
1142
|
-
}, function () {
|
1143
|
-
_this2.showCzkModal(-1);
|
1144
|
-
});
|
1130
|
+
_this2.showCzkModal(-1);
|
1145
1131
|
break;
|
1146
1132
|
case PayStyle.jfdx:
|
1147
1133
|
_this2.showJfdxModal(-1);
|
@@ -1821,7 +1807,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1821
1807
|
};
|
1822
1808
|
|
1823
1809
|
_this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
|
1824
|
-
var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen,
|
1810
|
+
var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, isFull, resp1;
|
1825
1811
|
|
1826
1812
|
return _regenerator2.default.wrap(function _callee8$(_context8) {
|
1827
1813
|
while (1) {
|
@@ -1881,31 +1867,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1881
1867
|
}
|
1882
1868
|
};
|
1883
1869
|
|
1884
|
-
|
1885
|
-
|
1886
|
-
|
1887
|
-
|
1888
|
-
if (!(type !== 1)) {
|
1889
|
-
_context8.next = 20;
|
1890
|
-
break;
|
1891
|
-
}
|
1892
|
-
|
1893
|
-
_context8.prev = 11;
|
1894
|
-
_context8.next = 14;
|
1895
|
-
return getSettleGift();
|
1870
|
+
isFull = _this2.store.isFull;
|
1871
|
+
_context8.next = 10;
|
1872
|
+
return _this2.settleGiftOpenedInRunningFast();
|
1896
1873
|
|
1897
|
-
case
|
1874
|
+
case 10:
|
1898
1875
|
resp1 = _context8.sent;
|
1899
|
-
_context8.next = 20;
|
1900
|
-
break;
|
1901
1876
|
|
1902
|
-
case 17:
|
1903
|
-
_context8.prev = 17;
|
1904
|
-
_context8.t0 = _context8['catch'](11);
|
1905
|
-
|
1906
|
-
console.log("获取支付礼包getSettleGift失败");
|
1907
|
-
|
1908
|
-
case 20:
|
1909
1877
|
|
1910
1878
|
setTimeout(function () {
|
1911
1879
|
if (window.__loadingModal) {
|
@@ -1939,12 +1907,67 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1939
1907
|
_this2.cancelState();
|
1940
1908
|
}, 0);
|
1941
1909
|
|
1942
|
-
case
|
1910
|
+
case 12:
|
1943
1911
|
case 'end':
|
1944
1912
|
return _context8.stop();
|
1945
1913
|
}
|
1946
1914
|
}
|
1947
|
-
}, _callee8, _this3
|
1915
|
+
}, _callee8, _this3);
|
1916
|
+
}));
|
1917
|
+
_this2.settleGiftOpenedInRunningFast = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
|
1918
|
+
var resp, isCheckGift, vocherPayGift, getSettleGift, type;
|
1919
|
+
return _regenerator2.default.wrap(function _callee9$(_context9) {
|
1920
|
+
while (1) {
|
1921
|
+
switch (_context9.prev = _context9.next) {
|
1922
|
+
case 0:
|
1923
|
+
resp = false;
|
1924
|
+
isCheckGift = true;
|
1925
|
+
|
1926
|
+
if (_this2.voucherRunningFast) {
|
1927
|
+
vocherPayGift = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('vocherPayGift');
|
1928
|
+
|
1929
|
+
if (!vocherPayGift || vocherPayGift == 'false') {
|
1930
|
+
isCheckGift = false;
|
1931
|
+
}
|
1932
|
+
}
|
1933
|
+
|
1934
|
+
if (!isCheckGift) {
|
1935
|
+
_context9.next = 16;
|
1936
|
+
break;
|
1937
|
+
}
|
1938
|
+
|
1939
|
+
getSettleGift = _this2.store.getSettleGift;
|
1940
|
+
type = _this2.props.type;
|
1941
|
+
|
1942
|
+
if (!(type != 1)) {
|
1943
|
+
_context9.next = 16;
|
1944
|
+
break;
|
1945
|
+
}
|
1946
|
+
|
1947
|
+
_context9.prev = 7;
|
1948
|
+
_context9.next = 10;
|
1949
|
+
return getSettleGift();
|
1950
|
+
|
1951
|
+
case 10:
|
1952
|
+
resp = _context9.sent;
|
1953
|
+
_context9.next = 16;
|
1954
|
+
break;
|
1955
|
+
|
1956
|
+
case 13:
|
1957
|
+
_context9.prev = 13;
|
1958
|
+
_context9.t0 = _context9['catch'](7);
|
1959
|
+
|
1960
|
+
console.log("获取支付礼包getSettleGift失败");
|
1961
|
+
|
1962
|
+
case 16:
|
1963
|
+
return _context9.abrupt('return', resp);
|
1964
|
+
|
1965
|
+
case 17:
|
1966
|
+
case 'end':
|
1967
|
+
return _context9.stop();
|
1968
|
+
}
|
1969
|
+
}
|
1970
|
+
}, _callee9, _this3, [[7, 13]]);
|
1948
1971
|
}));
|
1949
1972
|
|
1950
1973
|
_this2.handleGuestShow = function (dtype, value) {
|
@@ -1992,96 +2015,96 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1992
2015
|
};
|
1993
2016
|
|
1994
2017
|
_this2.handleSettle = function () {
|
1995
|
-
var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function
|
2018
|
+
var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(args) {
|
1996
2019
|
var handleUserInputs = function () {
|
1997
|
-
var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function
|
2020
|
+
var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(promises) {
|
1998
2021
|
var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
|
1999
2022
|
|
2000
|
-
return _regenerator2.default.wrap(function
|
2023
|
+
return _regenerator2.default.wrap(function _callee11$(_context11) {
|
2001
2024
|
while (1) {
|
2002
|
-
switch (
|
2025
|
+
switch (_context11.prev = _context11.next) {
|
2003
2026
|
case 0:
|
2004
2027
|
results = [];
|
2005
|
-
|
2028
|
+
_context11.prev = 1;
|
2006
2029
|
_iteratorNormalCompletion = true;
|
2007
2030
|
_didIteratorError = false;
|
2008
2031
|
_iteratorError = undefined;
|
2009
|
-
|
2032
|
+
_context11.prev = 5;
|
2010
2033
|
_iterator = (0, _getIterator3.default)(promises);
|
2011
2034
|
|
2012
2035
|
case 7:
|
2013
2036
|
if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
|
2014
|
-
|
2037
|
+
_context11.next = 16;
|
2015
2038
|
break;
|
2016
2039
|
}
|
2017
2040
|
|
2018
2041
|
p = _step.value;
|
2019
|
-
|
2042
|
+
_context11.next = 11;
|
2020
2043
|
return p;
|
2021
2044
|
|
2022
2045
|
case 11:
|
2023
|
-
_result =
|
2046
|
+
_result = _context11.sent;
|
2024
2047
|
|
2025
2048
|
results.push(_result);
|
2026
2049
|
|
2027
2050
|
case 13:
|
2028
2051
|
_iteratorNormalCompletion = true;
|
2029
|
-
|
2052
|
+
_context11.next = 7;
|
2030
2053
|
break;
|
2031
2054
|
|
2032
2055
|
case 16:
|
2033
|
-
|
2056
|
+
_context11.next = 22;
|
2034
2057
|
break;
|
2035
2058
|
|
2036
2059
|
case 18:
|
2037
|
-
|
2038
|
-
|
2060
|
+
_context11.prev = 18;
|
2061
|
+
_context11.t0 = _context11['catch'](5);
|
2039
2062
|
_didIteratorError = true;
|
2040
|
-
_iteratorError =
|
2063
|
+
_iteratorError = _context11.t0;
|
2041
2064
|
|
2042
2065
|
case 22:
|
2043
|
-
|
2044
|
-
|
2066
|
+
_context11.prev = 22;
|
2067
|
+
_context11.prev = 23;
|
2045
2068
|
|
2046
2069
|
if (!_iteratorNormalCompletion && _iterator.return) {
|
2047
2070
|
_iterator.return();
|
2048
2071
|
}
|
2049
2072
|
|
2050
2073
|
case 25:
|
2051
|
-
|
2074
|
+
_context11.prev = 25;
|
2052
2075
|
|
2053
2076
|
if (!_didIteratorError) {
|
2054
|
-
|
2077
|
+
_context11.next = 28;
|
2055
2078
|
break;
|
2056
2079
|
}
|
2057
2080
|
|
2058
2081
|
throw _iteratorError;
|
2059
2082
|
|
2060
2083
|
case 28:
|
2061
|
-
return
|
2084
|
+
return _context11.finish(25);
|
2062
2085
|
|
2063
2086
|
case 29:
|
2064
|
-
return
|
2087
|
+
return _context11.finish(22);
|
2065
2088
|
|
2066
2089
|
case 30:
|
2067
2090
|
window.__loadingModal = (0, _utils.openLoadingModal)();
|
2068
|
-
|
2091
|
+
_context11.next = 33;
|
2069
2092
|
return commit(results);
|
2070
2093
|
|
2071
2094
|
case 33:
|
2072
|
-
|
2095
|
+
_context11.next = 37;
|
2073
2096
|
break;
|
2074
2097
|
|
2075
2098
|
case 35:
|
2076
|
-
|
2077
|
-
|
2099
|
+
_context11.prev = 35;
|
2100
|
+
_context11.t1 = _context11['catch'](1);
|
2078
2101
|
|
2079
2102
|
case 37:
|
2080
2103
|
case 'end':
|
2081
|
-
return
|
2104
|
+
return _context11.stop();
|
2082
2105
|
}
|
2083
2106
|
}
|
2084
|
-
},
|
2107
|
+
}, _callee11, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
|
2085
2108
|
}));
|
2086
2109
|
|
2087
2110
|
return function handleUserInputs(_x6) {
|
@@ -2089,18 +2112,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2089
2112
|
};
|
2090
2113
|
}();
|
2091
2114
|
|
2092
|
-
var _enumController$getEn21, PayStyle, _this2$
|
2115
|
+
var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
|
2093
2116
|
|
2094
|
-
return _regenerator2.default.wrap(function
|
2117
|
+
return _regenerator2.default.wrap(function _callee12$(_context12) {
|
2095
2118
|
while (1) {
|
2096
|
-
switch (
|
2119
|
+
switch (_context12.prev = _context12.next) {
|
2097
2120
|
case 0:
|
2098
2121
|
_this2.setState({
|
2099
2122
|
settleDisabled: true
|
2100
2123
|
});
|
2101
2124
|
console.log("settlement.handleSettle开始执行,参数:", +args);
|
2102
2125
|
_enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
|
2103
|
-
_this2$
|
2126
|
+
_this2$store6 = _this2.store, paymode = _this2$store6.paymode, brefund = _this2$store6.brefund, boriginReturn = _this2$store6.boriginReturn, newStyle = _this2$store6.newStyle;
|
2104
2127
|
isQuickPay = args === 'quickPay';
|
2105
2128
|
that = _this2;
|
2106
2129
|
status = false;
|
@@ -2115,7 +2138,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2115
2138
|
});
|
2116
2139
|
|
2117
2140
|
if (!(that.checkCharge() && Math.abs(paymode.receivable) > that.props.initData("posChangeUpperAmount"))) {
|
2118
|
-
|
2141
|
+
_context12.next = 13;
|
2119
2142
|
break;
|
2120
2143
|
}
|
2121
2144
|
|
@@ -2123,11 +2146,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2123
2146
|
_this2.setState({
|
2124
2147
|
settleDisabled: false
|
2125
2148
|
});
|
2126
|
-
return
|
2149
|
+
return _context12.abrupt('return');
|
2127
2150
|
|
2128
2151
|
case 13:
|
2129
2152
|
if (!(args !== "zero" && !newStyle)) {
|
2130
|
-
|
2153
|
+
_context12.next = 19;
|
2131
2154
|
break;
|
2132
2155
|
}
|
2133
2156
|
|
@@ -2136,7 +2159,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2136
2159
|
});
|
2137
2160
|
|
2138
2161
|
if (!zeromode) {
|
2139
|
-
|
2162
|
+
_context12.next = 19;
|
2140
2163
|
break;
|
2141
2164
|
}
|
2142
2165
|
|
@@ -2144,7 +2167,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2144
2167
|
settleDisabled: false
|
2145
2168
|
});
|
2146
2169
|
_message2.default.error(zeromode.name + ' 的结算金额为零,不可以结算。');
|
2147
|
-
return
|
2170
|
+
return _context12.abrupt('return');
|
2148
2171
|
|
2149
2172
|
case 19:
|
2150
2173
|
promises = [];
|
@@ -2153,14 +2176,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2153
2176
|
}) : paymode.thePaymodes, 'orderBy');
|
2154
2177
|
|
2155
2178
|
if (!isQuickPay) {
|
2156
|
-
|
2179
|
+
_context12.next = 27;
|
2157
2180
|
break;
|
2158
2181
|
}
|
2159
2182
|
|
2160
2183
|
quickmode = thePaymodes[0];
|
2161
2184
|
|
2162
2185
|
if (!_this2.checkModeDisabled(quickmode.paymentType, brefund, boriginReturn)) {
|
2163
|
-
|
2186
|
+
_context12.next = 27;
|
2164
2187
|
break;
|
2165
2188
|
}
|
2166
2189
|
|
@@ -2168,7 +2191,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2168
2191
|
settleDisabled: false
|
2169
2192
|
});
|
2170
2193
|
_message2.default.error('退款不能使用' + quickmode.name + '结算,请使用其他结算方式!');
|
2171
|
-
return
|
2194
|
+
return _context12.abrupt('return');
|
2172
2195
|
|
2173
2196
|
case 27:
|
2174
2197
|
(0, _forEach3.default)(thePaymodes, function (mode) {
|
@@ -2178,27 +2201,27 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2178
2201
|
});
|
2179
2202
|
|
2180
2203
|
commit = function () {
|
2181
|
-
var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function
|
2204
|
+
var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(values) {
|
2182
2205
|
var result;
|
2183
|
-
return _regenerator2.default.wrap(function
|
2206
|
+
return _regenerator2.default.wrap(function _callee10$(_context10) {
|
2184
2207
|
while (1) {
|
2185
|
-
switch (
|
2208
|
+
switch (_context10.prev = _context10.next) {
|
2186
2209
|
case 0:
|
2187
|
-
|
2210
|
+
_context10.next = 2;
|
2188
2211
|
return _this2.store.commit(_this2.props.bTest);
|
2189
2212
|
|
2190
2213
|
case 2:
|
2191
|
-
result =
|
2214
|
+
result = _context10.sent;
|
2192
2215
|
|
2193
2216
|
if (!(result === true)) {
|
2194
|
-
|
2217
|
+
_context10.next = 8;
|
2195
2218
|
break;
|
2196
2219
|
}
|
2197
2220
|
|
2198
2221
|
//成功
|
2199
2222
|
that.settleSuccess();
|
2200
2223
|
_promise2.default.resolve();
|
2201
|
-
|
2224
|
+
_context10.next = 23;
|
2202
2225
|
break;
|
2203
2226
|
|
2204
2227
|
case 8:
|
@@ -2215,24 +2238,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2215
2238
|
}, 0);
|
2216
2239
|
|
2217
2240
|
if (!(result && (result.Code || result.code))) {
|
2218
|
-
|
2241
|
+
_context10.next = 20;
|
2219
2242
|
break;
|
2220
2243
|
}
|
2221
2244
|
|
2222
|
-
|
2223
|
-
|
2245
|
+
_context10.t0 = result.Code || result.code;
|
2246
|
+
_context10.next = _context10.t0 === 'RE_Settle_UnReturn' ? 14 : _context10.t0 === 'ECONNABORTED' ? 18 : 20;
|
2224
2247
|
break;
|
2225
2248
|
|
2226
2249
|
case 14:
|
2227
2250
|
console.log('settlement--RE_Settle_UnReturn--调用清除数据==Focus==');
|
2228
2251
|
_this2.props.clearVoucherData && _this2.props.clearVoucherData();
|
2229
2252
|
_this2.cancelState();
|
2230
|
-
return
|
2253
|
+
return _context10.abrupt('break', 20);
|
2231
2254
|
|
2232
2255
|
case 18:
|
2233
2256
|
//error.code === 'ECONNABORTED' && error.message.indexOf('timeout')
|
2234
2257
|
result.message.indexOf('timeout') > -1 && that.settleUnReturn();
|
2235
|
-
return
|
2258
|
+
return _context10.abrupt('break', 20);
|
2236
2259
|
|
2237
2260
|
case 20:
|
2238
2261
|
if (isQuickPay) {
|
@@ -2240,15 +2263,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2240
2263
|
that.cancelState();
|
2241
2264
|
}
|
2242
2265
|
|
2243
|
-
|
2266
|
+
_context10.next = 23;
|
2244
2267
|
return _promise2.default.reject();
|
2245
2268
|
|
2246
2269
|
case 23:
|
2247
2270
|
case 'end':
|
2248
|
-
return
|
2271
|
+
return _context10.stop();
|
2249
2272
|
}
|
2250
2273
|
}
|
2251
|
-
},
|
2274
|
+
}, _callee10, _this3);
|
2252
2275
|
}));
|
2253
2276
|
|
2254
2277
|
return function commit(_x5) {
|
@@ -2260,10 +2283,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2260
2283
|
|
2261
2284
|
case 30:
|
2262
2285
|
case 'end':
|
2263
|
-
return
|
2286
|
+
return _context12.stop();
|
2264
2287
|
}
|
2265
2288
|
}
|
2266
|
-
},
|
2289
|
+
}, _callee12, _this3);
|
2267
2290
|
}));
|
2268
2291
|
|
2269
2292
|
return function (_x4) {
|
@@ -2271,91 +2294,91 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2271
2294
|
};
|
2272
2295
|
}();
|
2273
2296
|
|
2274
|
-
_this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function
|
2297
|
+
_this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15() {
|
2275
2298
|
var handleUserInputs = function () {
|
2276
|
-
var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function
|
2299
|
+
var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(promises) {
|
2277
2300
|
var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
|
2278
2301
|
|
2279
|
-
return _regenerator2.default.wrap(function
|
2302
|
+
return _regenerator2.default.wrap(function _callee14$(_context14) {
|
2280
2303
|
while (1) {
|
2281
|
-
switch (
|
2304
|
+
switch (_context14.prev = _context14.next) {
|
2282
2305
|
case 0:
|
2283
2306
|
results = [];
|
2284
|
-
|
2307
|
+
_context14.prev = 1;
|
2285
2308
|
_iteratorNormalCompletion2 = true;
|
2286
2309
|
_didIteratorError2 = false;
|
2287
2310
|
_iteratorError2 = undefined;
|
2288
|
-
|
2311
|
+
_context14.prev = 5;
|
2289
2312
|
_iterator2 = (0, _getIterator3.default)(promises);
|
2290
2313
|
|
2291
2314
|
case 7:
|
2292
2315
|
if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
|
2293
|
-
|
2316
|
+
_context14.next = 16;
|
2294
2317
|
break;
|
2295
2318
|
}
|
2296
2319
|
|
2297
2320
|
p = _step2.value;
|
2298
|
-
|
2321
|
+
_context14.next = 11;
|
2299
2322
|
return p;
|
2300
2323
|
|
2301
2324
|
case 11:
|
2302
|
-
_result2 =
|
2325
|
+
_result2 = _context14.sent;
|
2303
2326
|
|
2304
2327
|
results.push(_result2);
|
2305
2328
|
|
2306
2329
|
case 13:
|
2307
2330
|
_iteratorNormalCompletion2 = true;
|
2308
|
-
|
2331
|
+
_context14.next = 7;
|
2309
2332
|
break;
|
2310
2333
|
|
2311
2334
|
case 16:
|
2312
|
-
|
2335
|
+
_context14.next = 22;
|
2313
2336
|
break;
|
2314
2337
|
|
2315
2338
|
case 18:
|
2316
|
-
|
2317
|
-
|
2339
|
+
_context14.prev = 18;
|
2340
|
+
_context14.t0 = _context14['catch'](5);
|
2318
2341
|
_didIteratorError2 = true;
|
2319
|
-
_iteratorError2 =
|
2342
|
+
_iteratorError2 = _context14.t0;
|
2320
2343
|
|
2321
2344
|
case 22:
|
2322
|
-
|
2323
|
-
|
2345
|
+
_context14.prev = 22;
|
2346
|
+
_context14.prev = 23;
|
2324
2347
|
|
2325
2348
|
if (!_iteratorNormalCompletion2 && _iterator2.return) {
|
2326
2349
|
_iterator2.return();
|
2327
2350
|
}
|
2328
2351
|
|
2329
2352
|
case 25:
|
2330
|
-
|
2353
|
+
_context14.prev = 25;
|
2331
2354
|
|
2332
2355
|
if (!_didIteratorError2) {
|
2333
|
-
|
2356
|
+
_context14.next = 28;
|
2334
2357
|
break;
|
2335
2358
|
}
|
2336
2359
|
|
2337
2360
|
throw _iteratorError2;
|
2338
2361
|
|
2339
2362
|
case 28:
|
2340
|
-
return
|
2363
|
+
return _context14.finish(25);
|
2341
2364
|
|
2342
2365
|
case 29:
|
2343
|
-
return
|
2366
|
+
return _context14.finish(22);
|
2344
2367
|
|
2345
2368
|
case 30:
|
2346
|
-
|
2369
|
+
_context14.next = 32;
|
2347
2370
|
return commit(results);
|
2348
2371
|
|
2349
2372
|
case 32:
|
2350
|
-
|
2373
|
+
_context14.next = 37;
|
2351
2374
|
break;
|
2352
2375
|
|
2353
2376
|
case 34:
|
2354
|
-
|
2355
|
-
|
2377
|
+
_context14.prev = 34;
|
2378
|
+
_context14.t1 = _context14['catch'](1);
|
2356
2379
|
|
2357
|
-
if (
|
2358
|
-
_message2.default.error(
|
2380
|
+
if (_context14.t1 != "cancelpwd") {
|
2381
|
+
_message2.default.error(_context14.t1);
|
2359
2382
|
setTimeout(function () {
|
2360
2383
|
that.handleCzk();
|
2361
2384
|
}, 500);
|
@@ -2363,10 +2386,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2363
2386
|
|
2364
2387
|
case 37:
|
2365
2388
|
case 'end':
|
2366
|
-
return
|
2389
|
+
return _context14.stop();
|
2367
2390
|
}
|
2368
2391
|
}
|
2369
|
-
},
|
2392
|
+
}, _callee14, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
|
2370
2393
|
}));
|
2371
2394
|
|
2372
2395
|
return function handleUserInputs(_x8) {
|
@@ -2376,9 +2399,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2376
2399
|
|
2377
2400
|
var that, curmode, promises, _enumController$getEn22, PayStyle, commit;
|
2378
2401
|
|
2379
|
-
return _regenerator2.default.wrap(function
|
2402
|
+
return _regenerator2.default.wrap(function _callee15$(_context15) {
|
2380
2403
|
while (1) {
|
2381
|
-
switch (
|
2404
|
+
switch (_context15.prev = _context15.next) {
|
2382
2405
|
case 0:
|
2383
2406
|
that = _this2;
|
2384
2407
|
curmode = _this2.store.paymode.currentMode;
|
@@ -2397,33 +2420,33 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2397
2420
|
}
|
2398
2421
|
|
2399
2422
|
commit = function () {
|
2400
|
-
var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function
|
2423
|
+
var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(values) {
|
2401
2424
|
var result;
|
2402
|
-
return _regenerator2.default.wrap(function
|
2425
|
+
return _regenerator2.default.wrap(function _callee13$(_context13) {
|
2403
2426
|
while (1) {
|
2404
|
-
switch (
|
2427
|
+
switch (_context13.prev = _context13.next) {
|
2405
2428
|
case 0:
|
2406
2429
|
if (!(values.length > 0)) {
|
2407
|
-
|
2430
|
+
_context13.next = 6;
|
2408
2431
|
break;
|
2409
2432
|
}
|
2410
2433
|
|
2411
|
-
|
2434
|
+
_context13.next = 3;
|
2412
2435
|
return that.store.validePwd(values[0]);
|
2413
2436
|
|
2414
2437
|
case 3:
|
2415
|
-
|
2416
|
-
|
2438
|
+
_context13.t0 = _context13.sent;
|
2439
|
+
_context13.next = 7;
|
2417
2440
|
break;
|
2418
2441
|
|
2419
2442
|
case 6:
|
2420
|
-
|
2443
|
+
_context13.t0 = "";
|
2421
2444
|
|
2422
2445
|
case 7:
|
2423
|
-
result =
|
2446
|
+
result = _context13.t0;
|
2424
2447
|
|
2425
2448
|
if (!(result == "")) {
|
2426
|
-
|
2449
|
+
_context13.next = 13;
|
2427
2450
|
break;
|
2428
2451
|
}
|
2429
2452
|
|
@@ -2431,19 +2454,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2431
2454
|
//返回
|
2432
2455
|
that.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
|
2433
2456
|
_promise2.default.resolve();
|
2434
|
-
|
2457
|
+
_context13.next = 15;
|
2435
2458
|
break;
|
2436
2459
|
|
2437
2460
|
case 13:
|
2438
|
-
|
2461
|
+
_context13.next = 15;
|
2439
2462
|
return _promise2.default.reject(result);
|
2440
2463
|
|
2441
2464
|
case 15:
|
2442
2465
|
case 'end':
|
2443
|
-
return
|
2466
|
+
return _context13.stop();
|
2444
2467
|
}
|
2445
2468
|
}
|
2446
|
-
},
|
2469
|
+
}, _callee13, _this3);
|
2447
2470
|
}));
|
2448
2471
|
|
2449
2472
|
return function commit(_x7) {
|
@@ -2455,10 +2478,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2455
2478
|
|
2456
2479
|
case 6:
|
2457
2480
|
case 'end':
|
2458
|
-
return
|
2481
|
+
return _context15.stop();
|
2459
2482
|
}
|
2460
2483
|
}
|
2461
|
-
},
|
2484
|
+
}, _callee15, _this3);
|
2462
2485
|
}));
|
2463
2486
|
|
2464
2487
|
_this2.fKeyboardOnOk = function (paymethodeId) {
|
@@ -2498,15 +2521,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2498
2521
|
};
|
2499
2522
|
|
2500
2523
|
_this2.inputPwd = function () {
|
2501
|
-
var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function
|
2524
|
+
var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(paymode) {
|
2502
2525
|
var that, confirmPwd;
|
2503
|
-
return _regenerator2.default.wrap(function
|
2526
|
+
return _regenerator2.default.wrap(function _callee16$(_context16) {
|
2504
2527
|
while (1) {
|
2505
|
-
switch (
|
2528
|
+
switch (_context16.prev = _context16.next) {
|
2506
2529
|
case 0:
|
2507
2530
|
that = _this2;
|
2508
2531
|
confirmPwd = _this2.state.confirmPwd;
|
2509
|
-
return
|
2532
|
+
return _context16.abrupt('return', new _promise2.default(function (resolve, reject) {
|
2510
2533
|
var modal = (0, _asyncModal2.default)({
|
2511
2534
|
onPressEnter: function onPressEnter() {
|
2512
2535
|
_keyboard2.default.close();
|
@@ -2641,10 +2664,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2641
2664
|
|
2642
2665
|
case 3:
|
2643
2666
|
case 'end':
|
2644
|
-
return
|
2667
|
+
return _context16.stop();
|
2645
2668
|
}
|
2646
2669
|
}
|
2647
|
-
},
|
2670
|
+
}, _callee16, _this3);
|
2648
2671
|
}));
|
2649
2672
|
|
2650
2673
|
return function (_x9) {
|
@@ -2653,12 +2676,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2653
2676
|
}();
|
2654
2677
|
|
2655
2678
|
_this2.btnDebounced = function () {
|
2656
|
-
var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function
|
2657
|
-
var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, _enumController$getEn23, PayStyle, _this2$
|
2679
|
+
var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(type, bquick) {
|
2680
|
+
var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, productStore, checkResult, _enumController$getEn23, PayStyle, _this2$store7, paymode, brefund, boriginReturn, newStyle, status;
|
2658
2681
|
|
2659
|
-
return _regenerator2.default.wrap(function
|
2682
|
+
return _regenerator2.default.wrap(function _callee17$(_context17) {
|
2660
2683
|
while (1) {
|
2661
|
-
switch (
|
2684
|
+
switch (_context17.prev = _context17.next) {
|
2662
2685
|
case 0:
|
2663
2686
|
IdbusiType = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.IdbusiType;
|
2664
2687
|
CustomerPhone = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.CustomerPhone;
|
@@ -2667,7 +2690,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2667
2690
|
//预订时,若没录入买家手机号,或配送方式为快递时,弹框买家信息确认框
|
2668
2691
|
|
2669
2692
|
if (!(IdbusiType == 38)) {
|
2670
|
-
|
2693
|
+
_context17.next = 14;
|
2671
2694
|
break;
|
2672
2695
|
}
|
2673
2696
|
|
@@ -2678,11 +2701,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2678
2701
|
});
|
2679
2702
|
|
2680
2703
|
if (!(isEnableSerialNumber && resultObj && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE'))) {
|
2681
|
-
|
2704
|
+
_context17.next = 9;
|
2682
2705
|
break;
|
2683
2706
|
}
|
2684
2707
|
|
2685
|
-
return
|
2708
|
+
return _context17.abrupt('return', _message2.default.error('启用了序列号管理和批号/有效期管理的商品,不支持快递和同城配送'));
|
2686
2709
|
|
2687
2710
|
case 9:
|
2688
2711
|
|
@@ -2691,31 +2714,48 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2691
2714
|
}
|
2692
2715
|
|
2693
2716
|
if (!(!CustomerPhone && !_this2.context.viewModel.data.Member.Mobilephone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
|
2694
|
-
|
2717
|
+
_context17.next = 14;
|
2695
2718
|
break;
|
2696
2719
|
}
|
2697
2720
|
|
2698
2721
|
title = (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && Address ? '收货地址确认' : '收货人';
|
2699
|
-
|
2722
|
+
_context17.next = 14;
|
2700
2723
|
return _this2.props.openBuyerModal(title);
|
2701
2724
|
|
2702
2725
|
case 14:
|
2703
2726
|
|
2727
|
+
// 极速模式错误校验
|
2728
|
+
|
2729
|
+
productStore = _mutantsMicrofx.stores.productStore;
|
2730
|
+
_context17.next = 17;
|
2731
|
+
return productStore.checkShouldSettlement();
|
2732
|
+
|
2733
|
+
case 17:
|
2734
|
+
checkResult = _context17.sent;
|
2735
|
+
|
2736
|
+
if (checkResult) {
|
2737
|
+
_context17.next = 20;
|
2738
|
+
break;
|
2739
|
+
}
|
2740
|
+
|
2741
|
+
return _context17.abrupt('return', false);
|
2742
|
+
|
2743
|
+
case 20:
|
2744
|
+
|
2704
2745
|
_this2.setState({
|
2705
|
-
bquick: bquick
|
2706
|
-
isInputMember: true
|
2746
|
+
bquick: bquick
|
2707
2747
|
});
|
2708
2748
|
_enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn23.PayStyle;
|
2709
|
-
_this2$
|
2749
|
+
_this2$store7 = _this2.store, paymode = _this2$store7.paymode, brefund = _this2$store7.brefund, boriginReturn = _this2$store7.boriginReturn, newStyle = _this2$store7.newStyle;
|
2710
2750
|
|
2711
2751
|
if (!(bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type))) {
|
2712
|
-
|
2752
|
+
_context17.next = 25;
|
2713
2753
|
break;
|
2714
2754
|
}
|
2715
2755
|
|
2716
|
-
return
|
2756
|
+
return _context17.abrupt('return', false);
|
2717
2757
|
|
2718
|
-
case
|
2758
|
+
case 25:
|
2719
2759
|
status = false;
|
2720
2760
|
|
2721
2761
|
paymode.thePaymodes.forEach(function (v) {
|
@@ -2728,13 +2768,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2728
2768
|
});
|
2729
2769
|
|
2730
2770
|
if (!_this2.btndebounced) {
|
2731
|
-
|
2771
|
+
_context17.next = 30;
|
2732
2772
|
break;
|
2733
2773
|
}
|
2734
2774
|
|
2735
|
-
return
|
2775
|
+
return _context17.abrupt('return');
|
2736
2776
|
|
2737
|
-
case
|
2777
|
+
case 30:
|
2738
2778
|
_this2.btndebounced = (0, _debounce3.default)(function () {
|
2739
2779
|
if (bquick) {
|
2740
2780
|
_this2.quickSettle(type);
|
@@ -2751,12 +2791,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2751
2791
|
_this2.btndebounced = null;
|
2752
2792
|
}, 2000);
|
2753
2793
|
|
2754
|
-
case
|
2794
|
+
case 33:
|
2755
2795
|
case 'end':
|
2756
|
-
return
|
2796
|
+
return _context17.stop();
|
2757
2797
|
}
|
2758
2798
|
}
|
2759
|
-
},
|
2799
|
+
}, _callee17, _this3);
|
2760
2800
|
}));
|
2761
2801
|
|
2762
2802
|
return function (_x10, _x11) {
|
@@ -3189,9 +3229,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3189
3229
|
};
|
3190
3230
|
|
3191
3231
|
_this2.checkCurrentModeHaveMutex = function (type) {
|
3192
|
-
var _this2$
|
3193
|
-
paymode = _this2$
|
3194
|
-
newStyle = _this2$
|
3232
|
+
var _this2$store8 = _this2.store,
|
3233
|
+
paymode = _this2$store8.paymode,
|
3234
|
+
newStyle = _this2$store8.newStyle;
|
3195
3235
|
|
3196
3236
|
var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
|
3197
3237
|
PayStyle = _enumController$getEn28.PayStyle;
|
@@ -3392,6 +3432,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3392
3432
|
_this2.setTimer = null;
|
3393
3433
|
_this2.keypressStime = null;
|
3394
3434
|
_this2.store = !(props.type == 1) ? _mutantsMicrofx.stores.settlementVoucherStore : _mutantsMicrofx.stores.settlementMemberStore;
|
3435
|
+
_this2.voucherRunningFast = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('vocherRunningFast') == '1';
|
3395
3436
|
return _this2;
|
3396
3437
|
}
|
3397
3438
|
|
@@ -3488,16 +3529,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3488
3529
|
}
|
3489
3530
|
}
|
3490
3531
|
|
3491
|
-
//IC卡关闭
|
3492
|
-
|
3493
|
-
}, {
|
3494
|
-
key: 'closeRfCard',
|
3495
|
-
value: function closeRfCard() {
|
3496
|
-
if (this.hasElectron === true && this.iCCardServer === 1) {
|
3497
|
-
_mutantsMicrofx.nativeMs.setIpcRendererMethod('CloseRfCard');
|
3498
|
-
}
|
3499
|
-
}
|
3500
|
-
|
3501
3532
|
//czk
|
3502
3533
|
|
3503
3534
|
|
@@ -3531,6 +3562,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3531
3562
|
* @param {*} symbol 从当前currenIndex开始 还是从当前currenIndex截止
|
3532
3563
|
*/
|
3533
3564
|
|
3565
|
+
// 极速模式下是否开启了支付有礼功能
|
3566
|
+
|
3534
3567
|
// 处理客显显示功能
|
3535
3568
|
|
3536
3569
|
|
@@ -4007,7 +4040,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4007
4040
|
onClose: this.handleCancel,
|
4008
4041
|
visible: this.state.visible,
|
4009
4042
|
destroyOnClose: true,
|
4010
|
-
className: 'settlement-wraper',
|
4043
|
+
className: 'settlement-wraper ' + (this.voucherRunningFast ? 'no-zoom' : null),
|
4011
4044
|
style: { 'zIndex': 1006 }
|
4012
4045
|
},
|
4013
4046
|
_react2.default.createElement(
|
@@ -4278,7 +4311,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4278
4311
|
onClose: this.handleCancel,
|
4279
4312
|
visible: this.state.visible,
|
4280
4313
|
destroyOnClose: true,
|
4281
|
-
className: 'settlement-wraper',
|
4314
|
+
className: 'settlement-wraper ' + (this.voucherRunningFast ? 'no-zoom' : ''),
|
4282
4315
|
style: { 'zIndex': 1006 }
|
4283
4316
|
},
|
4284
4317
|
_react2.default.createElement(
|
@@ -4588,7 +4621,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4588
4621
|
_react2.default.createElement(
|
4589
4622
|
_modal2.default,
|
4590
4623
|
{
|
4591
|
-
wrapClassName: 'czk ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
4624
|
+
wrapClassName: 'czk ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
4592
4625
|
width: '400px',
|
4593
4626
|
visible: this.state.czkVisible,
|
4594
4627
|
maskClosable: false,
|
@@ -4700,22 +4733,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4700
4733
|
return _this8.czkInput = input;
|
4701
4734
|
},
|
4702
4735
|
onKeyDown: function () {
|
4703
|
-
var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function
|
4736
|
+
var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee18(e) {
|
4704
4737
|
var time, _paymode;
|
4705
4738
|
|
4706
|
-
return _regenerator2.default.wrap(function
|
4739
|
+
return _regenerator2.default.wrap(function _callee18$(_context18) {
|
4707
4740
|
while (1) {
|
4708
|
-
switch (
|
4741
|
+
switch (_context18.prev = _context18.next) {
|
4709
4742
|
case 0:
|
4710
4743
|
if (!(e.keyCode == 13)) {
|
4711
|
-
|
4744
|
+
_context18.next = 14;
|
4712
4745
|
break;
|
4713
4746
|
}
|
4714
4747
|
|
4715
4748
|
time = Date.parse(new Date());
|
4716
4749
|
|
4717
4750
|
if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
|
4718
|
-
|
4751
|
+
_context18.next = 7;
|
4719
4752
|
break;
|
4720
4753
|
}
|
4721
4754
|
|
@@ -4724,11 +4757,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4724
4757
|
_this8.setState({
|
4725
4758
|
czkValue: null
|
4726
4759
|
});
|
4727
|
-
return
|
4760
|
+
return _context18.abrupt('return');
|
4728
4761
|
|
4729
4762
|
case 7:
|
4730
4763
|
_this8.keypressStime = null;
|
4731
|
-
|
4764
|
+
_context18.next = 10;
|
4732
4765
|
return _this8.loadCzk(e.target.value);
|
4733
4766
|
|
4734
4767
|
case 10:
|
@@ -4739,7 +4772,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4739
4772
|
czkvalue: null
|
4740
4773
|
});
|
4741
4774
|
}
|
4742
|
-
|
4775
|
+
_context18.next = 15;
|
4743
4776
|
break;
|
4744
4777
|
|
4745
4778
|
case 14:
|
@@ -4749,10 +4782,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4749
4782
|
|
4750
4783
|
case 15:
|
4751
4784
|
case 'end':
|
4752
|
-
return
|
4785
|
+
return _context18.stop();
|
4753
4786
|
}
|
4754
4787
|
}
|
4755
|
-
},
|
4788
|
+
}, _callee18, _this8);
|
4756
4789
|
}));
|
4757
4790
|
|
4758
4791
|
return function (_x13) {
|
@@ -4866,7 +4899,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4866
4899
|
_react2.default.createElement(
|
4867
4900
|
_modal2.default,
|
4868
4901
|
{
|
4869
|
-
wrapClassName: _index.hotKey.hotKeyBindClass('5', 'moreCzkModal') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
4902
|
+
wrapClassName: _index.hotKey.hotKeyBindClass('5', 'moreCzkModal') + ' ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
4870
4903
|
width: '400px',
|
4871
4904
|
visible: this.state.moreCzkVisible,
|
4872
4905
|
maskClosable: false,
|
@@ -4908,7 +4941,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4908
4941
|
_react2.default.createElement(
|
4909
4942
|
_modal2.default,
|
4910
4943
|
(0, _defineProperty3.default)({
|
4911
|
-
wrapClassName: 'djq ' + (this.isHorizontalPad ? 'extraHeight' : '') + ' passwordContainer',
|
4944
|
+
wrapClassName: 'djq ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : '') + ' passwordContainer',
|
4912
4945
|
width: '400px',
|
4913
4946
|
visible: this.state.showSetPwdModal,
|
4914
4947
|
backdropClosable: false,
|
@@ -5005,7 +5038,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
5005
5038
|
_react2.default.createElement(
|
5006
5039
|
_modal2.default,
|
5007
5040
|
{
|
5008
|
-
wrapClassName: 'djq ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
5041
|
+
wrapClassName: 'djq ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
5009
5042
|
width: '810px',
|
5010
5043
|
visible: this.state.djqVisible,
|
5011
5044
|
maskClosable: false,
|
@@ -5329,7 +5362,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
5329
5362
|
_react2.default.createElement(
|
5330
5363
|
_modal2.default,
|
5331
5364
|
{
|
5332
|
-
wrapClassName: 'czk ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
5365
|
+
wrapClassName: 'czk ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
5333
5366
|
width: '420px',
|
5334
5367
|
visible: this.state.jfdxVisible,
|
5335
5368
|
maskClosable: false,
|