tplus-components-touch 3.23.2 → 3.24.1
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/settlementStore.js +18 -22
- package/dist/components/settlement/settlementStore.js.map +1 -1
- 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 +3 -3
|
@@ -217,18 +217,20 @@ var SettlementStore = (_class = function () {
|
|
|
217
217
|
detailDTO.isManualFreeGift = item.IsPresent;
|
|
218
218
|
detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
|
|
219
219
|
detailDTO.IsManualChangePrice = item.IsManualChangePrice;
|
|
220
|
-
if
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
detailDTO.netAmountWithTax = Math.Multiply(item.MemberPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
|
|
220
|
+
// if(detailDTO.IsManualChangePrice)//如果是手工改价
|
|
221
|
+
// {
|
|
222
|
+
// detailDTO.listPrice = item.TaxPrice;
|
|
223
|
+
// detailDTO.netAmountWithTax = item.TaxAmount;
|
|
224
|
+
// }
|
|
225
|
+
// else
|
|
226
|
+
// {
|
|
227
|
+
var bookingQuantity = 0;
|
|
228
|
+
if (item.BookingQuantity) {
|
|
229
|
+
bookingQuantity = item.BookingQuantity;
|
|
231
230
|
}
|
|
231
|
+
detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
|
|
232
|
+
detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
|
|
233
|
+
//}
|
|
232
234
|
detailDTO.taxRate = item.TaxRate;
|
|
233
235
|
detailDTO.quantity = item.Quantity;
|
|
234
236
|
|
|
@@ -1677,18 +1679,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1677
1679
|
detailDTO.isManualFreeGift = item.IsPresent;
|
|
1678
1680
|
detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
|
|
1679
1681
|
detailDTO.IsManualChangePrice = item.IsManualChangePrice;
|
|
1680
|
-
|
|
1681
|
-
|
|
1682
|
-
|
|
1683
|
-
detailDTO.netAmountWithTax = item.TaxAmount;
|
|
1684
|
-
} else {
|
|
1685
|
-
var bookingQuantity = 0;
|
|
1686
|
-
if (item.BookingQuantity) {
|
|
1687
|
-
bookingQuantity = item.BookingQuantity;
|
|
1688
|
-
}
|
|
1689
|
-
detailDTO.listPrice = item.MemberPrice;
|
|
1690
|
-
detailDTO.netAmountWithTax = Math.Multiply(item.MemberPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
|
|
1682
|
+
var bookingQuantity = 0;
|
|
1683
|
+
if (item.BookingQuantity) {
|
|
1684
|
+
bookingQuantity = item.BookingQuantity;
|
|
1691
1685
|
}
|
|
1686
|
+
detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
|
|
1687
|
+
detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
|
|
1692
1688
|
detailDTO.taxRate = item.TaxRate;
|
|
1693
1689
|
detailDTO.quantity = item.Quantity;
|
|
1694
1690
|
|