tplus-components-touch 3.22.19 → 3.23.4
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/settlement/prototypeTable/style.less +1 -1
- package/dist/components/settlement/settlementStore.js +10 -3
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/ticon/iconfont/demo.css +539 -539
- package/dist/components/ticon/iconfont/demo_index.html +5202 -5202
- package/dist/components/ticon/iconfont/iconfont.css +887 -887
- package/dist/components/ticon/iconfont/iconfont.json +1535 -1535
- package/package.json +35 -35
|
@@ -109,6 +109,10 @@ var _moment = require('moment');
|
|
|
109
109
|
|
|
110
110
|
var _moment2 = _interopRequireDefault(_moment);
|
|
111
111
|
|
|
112
|
+
var _reduce2 = require('lodash/reduce');
|
|
113
|
+
|
|
114
|
+
var _reduce3 = _interopRequireDefault(_reduce2);
|
|
115
|
+
|
|
112
116
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
113
117
|
|
|
114
118
|
function _initDefineProp(target, property, descriptor, context) {
|
|
@@ -659,6 +663,9 @@ var SettlementStore = (_class = function () {
|
|
|
659
663
|
_this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
|
|
660
664
|
_this7.updateEvent();
|
|
661
665
|
var message = '';
|
|
666
|
+
var sum = (0, _reduce3.default)(_this7.paymode.thePaymodes, function (total, cur) {
|
|
667
|
+
return total + cur.value;
|
|
668
|
+
}, 0);
|
|
662
669
|
if (global.CheckMemberStorageProcessorBlock) {
|
|
663
670
|
message = CheckMemberStorageProcessorBlock.execute(m);
|
|
664
671
|
}
|
|
@@ -666,7 +673,7 @@ var SettlementStore = (_class = function () {
|
|
|
666
673
|
_this7.paymode.currentMode.errinfo = message;
|
|
667
674
|
} else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
|
|
668
675
|
_this7.paymode.currentMode.errinfo = "余额不足";
|
|
669
|
-
} else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
|
|
676
|
+
} else if (_this7.paymode.amount > 0 && parseFloat(_this7.paymode.amount) !== sum && _this7.paymode.currentMode.value == 0) {
|
|
670
677
|
_this7.paymode.currentMode.errinfo = "实收金额必须录入";
|
|
671
678
|
} else {
|
|
672
679
|
// 查询成功后将焦点移入下一个输入框
|
|
@@ -1844,13 +1851,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1844
1851
|
var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
|
|
1845
1852
|
PayStyle = _enumController$getEn17.PayStyle;
|
|
1846
1853
|
|
|
1847
|
-
this.
|
|
1854
|
+
this.thePaymodes && this.thePaymodes.forEach(function (mode) {
|
|
1848
1855
|
if (mode.paymentType === PayStyle.hyczk) {
|
|
1849
1856
|
sum -= mode.value;
|
|
1850
1857
|
}
|
|
1851
1858
|
});
|
|
1852
1859
|
|
|
1853
|
-
if (this.amount > 0 && (v === '' || v === '0.00')) {
|
|
1860
|
+
if (this.amount > 0 && (v === '' || v === '0.00') && sum !== 0) {
|
|
1854
1861
|
this.currentMode.errinfo = "实收金额必须录入";
|
|
1855
1862
|
} else if (Math.abs(parseFloat(v)) > Math.abs(sum)) {
|
|
1856
1863
|
this.currentMode.errinfo = "实收不应大于应收";
|