tplus-components-touch 3.22.8 → 3.22.9
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/settlement.js +82 -45
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlement.less +4 -4
- package/dist/components/settlement/settlementStore.js +18 -3
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/package.json +1 -1
|
@@ -224,7 +224,7 @@
|
|
|
224
224
|
}
|
|
225
225
|
span:last-child{
|
|
226
226
|
font-size: 18px;
|
|
227
|
-
color:
|
|
227
|
+
color: white;
|
|
228
228
|
text-align: right;
|
|
229
229
|
line-height: 14px;
|
|
230
230
|
}
|
|
@@ -424,7 +424,7 @@
|
|
|
424
424
|
.amount{
|
|
425
425
|
padding-top:27px;
|
|
426
426
|
span:first-child{
|
|
427
|
-
font-size:
|
|
427
|
+
font-size: 20px;
|
|
428
428
|
color: #FFFFFF;
|
|
429
429
|
line-height: 36px;
|
|
430
430
|
}
|
|
@@ -504,8 +504,8 @@
|
|
|
504
504
|
}
|
|
505
505
|
.noxuanzhong1 {
|
|
506
506
|
position: absolute;
|
|
507
|
-
top:
|
|
508
|
-
right:
|
|
507
|
+
top: 12px;
|
|
508
|
+
right: 12px;
|
|
509
509
|
border: 1px solid #979797;
|
|
510
510
|
border-radius: 0.83px;
|
|
511
511
|
width: 18px;
|
|
@@ -1646,6 +1646,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1646
1646
|
if (!q1.checked) {
|
|
1647
1647
|
this.checkList.forEach(function (ele, i) {
|
|
1648
1648
|
if (ele.id === q1.id) {
|
|
1649
|
+
// this.checkList.forEach((ele1) => {
|
|
1650
|
+
// if(ele.discountPct > 0) {
|
|
1651
|
+
// this.currentMode.receivable = this.currentMode.receivable + ele.amount / (1 - discountPct);
|
|
1652
|
+
// } else {
|
|
1653
|
+
// this.currentMode.receivable = this.currentMode.receivable + ele.amount;
|
|
1654
|
+
// }
|
|
1655
|
+
// })
|
|
1656
|
+
// if(ele.discountPct > 0) {
|
|
1657
|
+
// this.currentMode.receivable = 100;
|
|
1658
|
+
// } else {
|
|
1659
|
+
// this.currentMode.receivable = this.currentMode.receivable + ele.amount;
|
|
1660
|
+
// }
|
|
1649
1661
|
_this14.checkList.splice(i, 1);
|
|
1650
1662
|
}
|
|
1651
1663
|
});
|
|
@@ -1655,11 +1667,14 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1655
1667
|
}
|
|
1656
1668
|
this.checkList.push(q1);
|
|
1657
1669
|
}
|
|
1670
|
+
|
|
1671
|
+
var copy1 = (0, _cloneDeep2.default)(this.receivable);
|
|
1658
1672
|
this.checkList.forEach(function (ele, i) {
|
|
1659
1673
|
if (ele.discountPct > 0) {
|
|
1660
|
-
|
|
1661
|
-
|
|
1662
|
-
|
|
1674
|
+
ele.amount = (1 - ele.discountPct) * copy1;
|
|
1675
|
+
copy1 -= ele.amount;
|
|
1676
|
+
} else {
|
|
1677
|
+
copy1 -= ele.amount;
|
|
1663
1678
|
}
|
|
1664
1679
|
sum = Math.Add(sum, ele.amount);
|
|
1665
1680
|
});
|