kts-component-invoice-operate 3.2.53 → 3.2.55
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/.dumi/theme/builtins/API.tsx +66 -66
- package/.editorconfig +16 -16
- package/.fatherrc.ts +4 -4
- package/.prettierignore +7 -7
- package/.prettierrc +11 -11
- package/.umirc.ts +8 -8
- package/README.md +5 -5
- package/dist/index.esm.js +7905 -5681
- package/dist/index.js +7905 -5681
- package/docs/index.md +5 -5
- package/docs-dist/static/arrowDown.a1cbf0d8.svg +2 -2
- package/docs-dist/static/arrowUp.4c482054.svg +2 -2
- package/docs-dist/static/fork.5431267d.svg +11 -11
- package/docs-dist/static/plus.44013ce3.svg +11 -11
- package/docs-dist/static/plus.4fd1af30.svg +11 -11
- package/index.html +12 -12
- package/package.json +60 -60
- package/src/Invoice/Invoice-digtal/_test/disabled/index.tsx +38 -38
- package/src/Invoice/Invoice-digtal/_test/easiest/index.tsx +16 -16
- package/src/Invoice/Invoice-digtal/_test/header/index.tsx +84 -84
- package/src/Invoice/Invoice-digtal/_test/importGoods/index.tsx +470 -470
- package/src/Invoice/Invoice-digtal/_test/importStakeholder/index.tsx +17 -17
- package/src/Invoice/Invoice-digtal/_test/lineCredit/index.tsx +20 -20
- package/src/Invoice/Invoice-digtal/_test/prefab/index.tsx +150 -150
- package/src/Invoice/Invoice-digtal/_test/readOnly/index.tsx +41 -41
- package/src/Invoice/Invoice-digtal/_test/stakeholder/index.tsx +12 -12
- package/src/Invoice/Invoice-digtal/_test/typeSelection/index.tsx +29 -29
- package/src/Invoice/Invoice-digtal/index.md +30 -30
- package/src/Invoice/InvoiceController/InvoiceControllerForm/index.ts +94 -94
- package/src/Invoice/InvoiceController/InvoiceControllerState/AutoComplete/index.ts +17 -17
- package/src/Invoice/InvoiceController/InvoiceControllerState/BuyerState/index.tsx +88 -88
- package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/Drag/index.ts +12 -12
- package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/EndowCode/index.tsx +93 -93
- package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/IColumnsReplenish/index.ts +10 -10
- package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/IGood/index.ts +75 -75
- package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/ImportGoods/index.ts +80 -80
- package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType/index.ts +5 -5
- package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/ProductComparison/index.ts +9 -9
- package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/index.ts +107 -107
- package/src/Invoice/InvoiceController/InvoiceControllerState/Stakeholder/index.ts +10 -10
- package/src/Invoice/InvoiceController/InvoiceControllerState/index.ts +60 -60
- package/src/Invoice/InvoiceController/fns/addGood.ts +11 -11
- package/src/Invoice/InvoiceController/fns/addGoodDiscount.ts +125 -125
- package/src/Invoice/InvoiceController/fns/addGoodDiscountV2.ts +84 -84
- package/src/Invoice/InvoiceController/fns/delGood.ts +41 -41
- package/src/Invoice/InvoiceController/fns/getGoodsSearch.ts +26 -26
- package/src/Invoice/InvoiceController/fns/importGoodsDrawer.ts +79 -68
- package/src/Invoice/InvoiceController/fns/mergeDetails.ts +163 -163
- package/src/Invoice/InvoiceController/fns/mergeDiscount.ts +28 -28
- package/src/Invoice/InvoiceController/fns/saveEditGood.ts +24 -24
- package/src/Invoice/InvoiceController/fns/setEditGood.ts +16 -16
- package/src/Invoice/InvoiceController/fns/setGoods.ts +10 -10
- package/src/Invoice/InvoiceController/fns/updateInvoiceNo.ts +8 -8
- package/src/Invoice/InvoiceController/index.ts +77 -77
- package/src/Invoice/_test/buyerNameSearch/index.tsx +41 -41
- package/src/Invoice/_test/deduction/index.tsx +935 -935
- package/src/Invoice/_test/draft/index.tsx +40 -40
- package/src/Invoice/_test/easiest/index.tsx +5 -5
- package/src/Invoice/_test/endowCode/index.tsx +1099 -1099
- package/src/Invoice/_test/goodsMenuExpand/index.tsx +32 -32
- package/src/Invoice/_test/importBuyer/index.tsx +74 -74
- package/src/Invoice/_test/importGoods/index.tsx +515 -515
- package/src/Invoice/_test/invoiceType/index.tsx +59 -59
- package/src/Invoice/_test/isInvoiceNo/index.tsx +12 -12
- package/src/Invoice/_test/replaceHead/index.tsx +22 -22
- package/src/Invoice/_test/retrieveData/index.tsx +22 -22
- package/src/Invoice/_test/seller/index.tsx +28 -28
- package/src/Invoice/_test/setDataSource/index.tsx +73 -73
- package/src/Invoice/_test/unit/index.tsx +19 -19
- package/src/Invoice/index.less +29 -29
- package/src/Invoice/index.md +53 -53
- package/src/Invoice/index.tsx +165 -165
- package/src/Invoice/tools/calculate/index.ts +112 -112
- package/src/Invoice/tools/coolingFn/index.ts +17 -17
- package/src/Invoice/tools/evaluate/index.ts +7 -7
- package/src/Invoice/tools/idGenerator/index.ts +2 -2
- package/src/Invoice/tools/itemName/index.ts +55 -55
- package/src/Invoice/tools/lazyFn/index.ts +19 -19
- package/src/Invoice/tools/mounting/index.ts +13 -13
- package/src/Invoice/tools/strringFn/index.ts +40 -40
- package/src/Invoice/tools/useToGenerateId/index.ts +8 -8
- package/src/Invoice/ui/default/AddComparisonDrawer/index.tsx +149 -149
- package/src/Invoice/ui/default/Buyer/index.less +219 -219
- package/src/Invoice/ui/default/Buyer/index.tsx +114 -114
- package/src/Invoice/ui/default/Buyer/ui/BuyerNameInput/index.tsx +166 -166
- package/src/Invoice/ui/default/Buyer/ui/ImportBuyerButton/index.tsx +21 -21
- package/src/Invoice/ui/default/EndowCodeDrawer/index.less +8 -8
- package/src/Invoice/ui/default/EndowCodeDrawer/index.tsx +431 -431
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/autoFillFn/index.ts +533 -533
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/index.tsx +664 -664
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/Drag/index.less +20 -20
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/Drag/index.tsx +202 -202
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/ItemCodeInput/index.less +18 -18
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/ItemCodeInput/index.tsx +48 -48
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/ItemNameInput/index.less +17 -17
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/ItemNameInput/index.tsx +130 -130
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowEditButton/index.tsx +30 -30
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/_useAddComparison/index.tsx +43 -43
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useAddDiscount/index.tsx +76 -76
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useDelItem/index.tsx +41 -41
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useEndowCode/index.tsx +34 -34
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/index.less +13 -13
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/index.tsx +98 -98
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowSaveButton/index.tsx +14 -14
- package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/TitleText/index.tsx +20 -20
- package/src/Invoice/ui/default/GoodsList/hook/useDeduction/index.tsx +24 -24
- package/src/Invoice/ui/default/GoodsList/hook/useOnRow/index.tsx +39 -39
- package/src/Invoice/ui/default/GoodsList/hook/useRowSelection/index.tsx +111 -111
- package/src/Invoice/ui/default/GoodsList/hook/useWindowClick/index.tsx +23 -23
- package/src/Invoice/ui/default/GoodsList/index.less +177 -177
- package/src/Invoice/ui/default/GoodsList/index.tsx +191 -191
- package/src/Invoice/ui/default/GoodsList/ui/AddRowButton/index.tsx +65 -65
- package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.less +21 -21
- package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.tsx +244 -244
- package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useCommodityComparisonButton/index.tsx +75 -75
- package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useDelRowButton/index.tsx +69 -69
- package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useEndowCodeButton/index.tsx +58 -58
- package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useMergeDetails/index.tsx +37 -37
- package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useMergeDiscount/index.tsx +36 -36
- package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/index.tsx +37 -37
- package/src/Invoice/ui/default/GoodsList/ui/DescribeSwitch/index.tsx +36 -36
- package/src/Invoice/ui/default/GoodsList/ui/Search/index.less +10 -10
- package/src/Invoice/ui/default/GoodsList/ui/Search/index.tsx +52 -52
- package/src/Invoice/ui/default/GoodsList/ui/Statistics/index.less +18 -18
- package/src/Invoice/ui/default/GoodsList/ui/Statistics/index.tsx +109 -109
- package/src/Invoice/ui/default/GoodsList/ui/TableRow/index.less +13 -13
- package/src/Invoice/ui/default/GoodsList/ui/TableRow/index.tsx +46 -46
- package/src/Invoice/ui/default/GoodsList/ui/TableVirtual/index.less +38 -38
- package/src/Invoice/ui/default/GoodsList/ui/TableVirtual/index.tsx +108 -108
- package/src/Invoice/ui/default/GoodsList/ui/TableVirtual.o/index.less +44 -44
- package/src/Invoice/ui/default/GoodsList/ui/TableVirtual.o/index.tsx +96 -96
- package/src/Invoice/ui/default/GoodsList/ui/TaxIncludedSwitch/index.tsx +30 -30
- package/src/Invoice/ui/default/ImportBuyerDrawer/index.tsx +75 -75
- package/src/Invoice/ui/default/ImportGoodsDrawer/index.tsx +193 -193
- package/src/Invoice/ui/default/InvoiceHeader/index.less +68 -68
- package/src/Invoice/ui/default/InvoiceHeader/index.tsx +246 -246
- package/src/Invoice/ui/default/Seller/index.less +113 -113
- package/src/Invoice/ui/default/Seller/index.tsx +98 -98
- package/src/Invoice/ui/default/Sign/index.less +14 -14
- package/src/Invoice/ui/default/Sign/index.tsx +71 -71
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/autoFillFn/index.ts +519 -519
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/index.tsx +648 -648
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/svg/plus.svg +11 -11
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/Drag/index.less +20 -20
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/Drag/index.tsx +186 -186
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/ItemNameInput/index.less +9 -9
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/ItemNameInput/index.tsx +50 -50
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/RowEditButton/index.tsx +30 -30
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/RowMenu/hook/_useAddComparison/index.tsx +43 -43
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/RowMenu/hook/useAddDiscount/index.tsx +76 -76
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/RowMenu/hook/useDelItem/index.tsx +41 -41
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/RowMenu/hook/useEndowCode/index.tsx +34 -34
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/RowMenu/index.less +13 -13
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/RowMenu/index.tsx +98 -98
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/RowSaveButton/index.tsx +14 -14
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/TitleText/index.tsx +20 -20
- package/src/Invoice/ui/digtal/GoodsList/hook/useOnRow/index.tsx +39 -39
- package/src/Invoice/ui/digtal/GoodsList/hook/useRowSelection/index.tsx +121 -121
- package/src/Invoice/ui/digtal/GoodsList/hook/useWindowClick/index.tsx +23 -23
- package/src/Invoice/ui/digtal/GoodsList/index.less +56 -56
- package/src/Invoice/ui/digtal/GoodsList/index.tsx +180 -180
- package/src/Invoice/ui/digtal/GoodsList/ui/AddRowButton/index.tsx +65 -65
- package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.tsx +341 -341
- package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/svg/add.svg +11 -11
- package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useCommodityComparisonButton/index.tsx +75 -75
- package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useDelRowButton/index.tsx +50 -50
- package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useEmptyRefill/index.tsx +35 -35
- package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useEndowCodeButton/index.tsx +82 -82
- package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useReselectInvoiceType/index.tsx +57 -57
- package/src/Invoice/ui/digtal/GoodsList/ui/DescribeSwitch/index.tsx +36 -36
- package/src/Invoice/ui/digtal/GoodsList/ui/Search/index.less +11 -11
- package/src/Invoice/ui/digtal/GoodsList/ui/Search/index.tsx +50 -50
- package/src/Invoice/ui/digtal/GoodsList/ui/Statistics/index.less +53 -53
- package/src/Invoice/ui/digtal/GoodsList/ui/Statistics/index.tsx +99 -99
- package/src/Invoice/ui/digtal/GoodsList/ui/Statistics/svg/fork.svg +11 -11
- package/src/Invoice/ui/digtal/GoodsList/ui/TableRow/index.less +13 -13
- package/src/Invoice/ui/digtal/GoodsList/ui/TableRow/index.tsx +40 -40
- package/src/Invoice/ui/digtal/GoodsList/ui/TableVirtual/index.less +38 -38
- package/src/Invoice/ui/digtal/GoodsList/ui/TableVirtual/index.tsx +108 -108
- package/src/Invoice/ui/digtal/GoodsList/ui/TableVirtual.o/index.less +44 -44
- package/src/Invoice/ui/digtal/GoodsList/ui/TableVirtual.o/index.tsx +96 -96
- package/src/Invoice/ui/digtal/GoodsList/ui/TaxIncludedSwitch/index.tsx +30 -30
- package/src/Invoice/ui/digtal/InvoiceHeader/index.less +57 -57
- package/src/Invoice/ui/digtal/InvoiceHeader/index.tsx +77 -77
- package/src/Invoice/ui/digtal/Sign/index.less +48 -48
- package/src/Invoice/ui/digtal/Sign/index.tsx +89 -89
- package/src/Invoice/ui/digtal/Stakeholder/index.less +75 -75
- package/src/Invoice/ui/digtal/Stakeholder/index.tsx +388 -388
- package/src/Invoice/ui/digtal/Stakeholder/svg/arrowDown.svg +2 -2
- package/src/Invoice/ui/digtal/Stakeholder/svg/arrowUp.svg +2 -2
- package/src/Invoice/ui/digtal/Stakeholder/svg/plus.svg +11 -11
- package/src/InvoiceTypeModal/_test/easiest/index.tsx +31 -31
- package/src/InvoiceTypeModal/index.less +7 -7
- package/src/InvoiceTypeModal/index.md +5 -5
- package/src/InvoiceTypeModal/index.tsx +153 -153
- package/src/index.ts +9 -9
- package/tsconfig.json +31 -31
- package/typings.d.ts +3 -3
- package/yarn.e.lock +14331 -14331
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
import IGood from "../InvoiceControllerState/GoodsListState/IGood";
|
|
3
|
-
|
|
4
|
-
/**
|
|
5
|
-
* 计算搜索商品
|
|
6
|
-
* @param goodsList 被搜索列表
|
|
7
|
-
* @param search 搜索条件
|
|
8
|
-
* @param isTaxIncluded 是否含税
|
|
9
|
-
* @returns
|
|
10
|
-
*/
|
|
11
|
-
export default function getGoodsSearch(goodsList: IGood[], search: string, isTaxIncluded: boolean) {
|
|
12
|
-
if (!search) return goodsList;
|
|
13
|
-
return goodsList.filter(e => {
|
|
14
|
-
if ((e.itemName?.indexOf(search) ?? -1) >= 0) {
|
|
15
|
-
return true;
|
|
16
|
-
} else if ((e.itemCode?.indexOf(search) ?? -1) >= 0) {
|
|
17
|
-
return true
|
|
18
|
-
} else if ((e.itemModelName?.indexOf(search) ?? -1) >= 0) {
|
|
19
|
-
return true
|
|
20
|
-
} else if (`${isTaxIncluded ? e.lineAmountIncludeTax?.toFixed(2) : e.lineAmountExcludeTax?.toFixed(2)}`.indexOf(search) >= 0) {
|
|
21
|
-
return true
|
|
22
|
-
} else {
|
|
23
|
-
return false;
|
|
24
|
-
}
|
|
25
|
-
})
|
|
26
|
-
}
|
|
1
|
+
|
|
2
|
+
import IGood from "../InvoiceControllerState/GoodsListState/IGood";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* 计算搜索商品
|
|
6
|
+
* @param goodsList 被搜索列表
|
|
7
|
+
* @param search 搜索条件
|
|
8
|
+
* @param isTaxIncluded 是否含税
|
|
9
|
+
* @returns
|
|
10
|
+
*/
|
|
11
|
+
export default function getGoodsSearch(goodsList: IGood[], search: string, isTaxIncluded: boolean) {
|
|
12
|
+
if (!search) return goodsList;
|
|
13
|
+
return goodsList.filter(e => {
|
|
14
|
+
if ((e.itemName?.indexOf(search) ?? -1) >= 0) {
|
|
15
|
+
return true;
|
|
16
|
+
} else if ((e.itemCode?.indexOf(search) ?? -1) >= 0) {
|
|
17
|
+
return true
|
|
18
|
+
} else if ((e.itemModelName?.indexOf(search) ?? -1) >= 0) {
|
|
19
|
+
return true
|
|
20
|
+
} else if (`${isTaxIncluded ? e.lineAmountIncludeTax?.toFixed(2) : e.lineAmountExcludeTax?.toFixed(2)}`.indexOf(search) >= 0) {
|
|
21
|
+
return true
|
|
22
|
+
} else {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
})
|
|
26
|
+
}
|
|
@@ -1,68 +1,79 @@
|
|
|
1
|
-
import { dutyFree, format15, updateUnitPriceExcludingTax, updateUnitPriceTax } from '../../ui/default/GoodsList/hook/useColumns/autoFillFn';
|
|
2
|
-
import { InvoiceControllerState, IGood } from '../';
|
|
3
|
-
import evaluate from '../../tools/evaluate';
|
|
4
|
-
import { countAmountIncludeTax } from '../../tools/calculate';
|
|
5
|
-
|
|
6
|
-
/**
|
|
7
|
-
* 删除一个货物
|
|
8
|
-
*/
|
|
9
|
-
export default async (s: InvoiceControllerState, record: any, controller:any) => {
|
|
10
|
-
Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
|
|
11
|
-
|
|
12
|
-
// 没用 被编辑的货物 和 form 就退出
|
|
13
|
-
if (!s.goodsListState.editGood || !s.goodsListState.form) return;
|
|
14
|
-
|
|
15
|
-
// 导入时清空之前输入的值,使用导入的单价和税率(参考税局系统)
|
|
16
|
-
record.quantity = undefined;
|
|
17
|
-
record.lineAmountExcludeTax = undefined;
|
|
18
|
-
record.lineAmountIncludeTax = undefined;
|
|
19
|
-
|
|
20
|
-
// 中间数据
|
|
21
|
-
const between = {
|
|
22
|
-
|
|
23
|
-
between.
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
if (editGood.
|
|
40
|
-
editGood.
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
1
|
+
import { dutyFree, format15, updateUnitPriceExcludingTax, updateUnitPriceTax } from '../../ui/default/GoodsList/hook/useColumns/autoFillFn';
|
|
2
|
+
import { InvoiceControllerState, IGood } from '../';
|
|
3
|
+
import evaluate from '../../tools/evaluate';
|
|
4
|
+
import { countAmountIncludeTax } from '../../tools/calculate';
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* 删除一个货物
|
|
8
|
+
*/
|
|
9
|
+
export default async (s: InvoiceControllerState, record: any, controller:any) => {
|
|
10
|
+
Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
|
|
11
|
+
|
|
12
|
+
// 没用 被编辑的货物 和 form 就退出
|
|
13
|
+
if (!s.goodsListState.editGood || !s.goodsListState.form) return;
|
|
14
|
+
|
|
15
|
+
// 导入时清空之前输入的值,使用导入的单价和税率(参考税局系统)
|
|
16
|
+
record.quantity = undefined;
|
|
17
|
+
record.lineAmountExcludeTax = undefined;
|
|
18
|
+
record.lineAmountIncludeTax = undefined;
|
|
19
|
+
|
|
20
|
+
// 中间数据
|
|
21
|
+
const between: any = {...record };
|
|
22
|
+
|
|
23
|
+
between.itemCode = record.itemCode;
|
|
24
|
+
between.shorthand = record.shorthand;
|
|
25
|
+
between.itemName = record.itemName;
|
|
26
|
+
between.itemNameOther = record.itemName;
|
|
27
|
+
between.itemModelName = record.itemModelName;
|
|
28
|
+
between.unit = record.unit;
|
|
29
|
+
between.quantity = record.quantity;
|
|
30
|
+
between.priceIncludeTax = record.priceIncludeTax;
|
|
31
|
+
between.lineAmountIncludeTax = record.lineAmountIncludeTax;
|
|
32
|
+
between.lineAmountExcludeTax = record.lineAmountExcludeTax;
|
|
33
|
+
between.taxRate = record.taxRate;
|
|
34
|
+
between.taxAmount = record.taxAmount;
|
|
35
|
+
|
|
36
|
+
// 设置编辑货物
|
|
37
|
+
const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
|
|
38
|
+
|
|
39
|
+
if (editGood.taxRate) {
|
|
40
|
+
editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
if (`${editGood.priceIncludeTax}` === '0') {
|
|
44
|
+
editGood.priceIncludeTax = undefined;
|
|
45
|
+
editGood.priceExcludeTax = undefined;
|
|
46
|
+
} else {
|
|
47
|
+
editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits) as number;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
if (editGood.quantity && editGood.priceIncludeTax) {
|
|
51
|
+
editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax, s.calculatingDigits);
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
// 导入FORM里
|
|
55
|
+
if (s.goodsListState.isMyShow) {
|
|
56
|
+
s.goodsListState.form.setFieldsValue({
|
|
57
|
+
...editGood,
|
|
58
|
+
itemName: editGood.itemNameSelf,
|
|
59
|
+
itemModelName: editGood.itemModelNameSelf,
|
|
60
|
+
});
|
|
61
|
+
} else {
|
|
62
|
+
s.goodsListState.form.setFieldsValue({
|
|
63
|
+
...editGood,
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
s.goodsListState.importGoods.isVisibleDrawer = false;
|
|
68
|
+
s.goodsListState.isTaxIncluded
|
|
69
|
+
? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
|
|
70
|
+
: await updateUnitPriceTax(controller, s.goodsListState.form, record)
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/** 货物单价,不含税 */
|
|
74
|
+
const getPriceExcludeTax = (s: IGood, record: any, calculatingDigits?: number) => {
|
|
75
|
+
if ((!s.taxRate && s.taxRate !== 0) || (!record.priceIncludeTax && record.priceIncludeTax !== 0)) return;
|
|
76
|
+
|
|
77
|
+
// 单价(含税)/(1+税率) = 单价(不含税)
|
|
78
|
+
return format15(evaluate(`${record.priceIncludeTax} / (1+${s.taxRate}/100)`), calculatingDigits);
|
|
79
|
+
};
|
|
@@ -1,164 +1,164 @@
|
|
|
1
|
-
|
|
2
|
-
import { message } from 'kts-xui';
|
|
3
|
-
import { chain, bignumber } from 'mathjs';
|
|
4
|
-
import idGenerator from '../../tools/idGenerator';
|
|
5
|
-
import { IGood, InvoiceControllerState, LineAttributeType } from '..';
|
|
6
|
-
import { format15 } from '../../tools/calculate';
|
|
7
|
-
|
|
8
|
-
export default async function mergeDetails(state: InvoiceControllerState) {
|
|
9
|
-
if (state.goodsListState.editGood) return;
|
|
10
|
-
|
|
11
|
-
// const goodsList = state.goodsListState.selectedGoodIndex.map(e => state.goodsListState.goodsMap.get(e)).filter(e => !!e) as IGood[];
|
|
12
|
-
const goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0)
|
|
13
|
-
if (goodsList.length < 2) return;
|
|
14
|
-
|
|
15
|
-
try {
|
|
16
|
-
// 创建合并后的商品对象
|
|
17
|
-
let sum: IGood = { $index: idGenerator(), lineAttribute: LineAttributeType.正常 }
|
|
18
|
-
|
|
19
|
-
// 存在税率不一样的明细,不能合并
|
|
20
|
-
await checkTaxTate(goodsList);
|
|
21
|
-
|
|
22
|
-
// 填充行明细信息
|
|
23
|
-
sum = await fillingInformationGood(goodsList, sum);
|
|
24
|
-
|
|
25
|
-
// 合并数量
|
|
26
|
-
sum.quantity = await mergeQuantity(goodsList);
|
|
27
|
-
|
|
28
|
-
// 合并金额(不含税)
|
|
29
|
-
sum.lineAmountExcludeTax = await mergeLineAmountExcludeTax(goodsList);
|
|
30
|
-
|
|
31
|
-
// 合并金额(含税)
|
|
32
|
-
sum.lineAmountIncludeTax = await mergeLineAmountIncludeTax(goodsList);
|
|
33
|
-
|
|
34
|
-
// 计算单价(不含税)
|
|
35
|
-
sum.priceExcludeTax = await calculatePriceExcludeTax(sum, state.calculatingDigits);
|
|
36
|
-
|
|
37
|
-
// 计算单价(含税)
|
|
38
|
-
sum.priceIncludeTax = await calculatePriceIncludeTax(sum, state.calculatingDigits);
|
|
39
|
-
|
|
40
|
-
// 计算税额
|
|
41
|
-
sum.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber()
|
|
42
|
-
|
|
43
|
-
// 校验数据 是否数量和金额是否同号
|
|
44
|
-
await checkSameNumber(sum);
|
|
45
|
-
|
|
46
|
-
const p = state.goodsListState.goodsList.indexOf(goodsList[0]);
|
|
47
|
-
state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0);
|
|
48
|
-
state.goodsListState.goodsList.splice(p, 0, sum);
|
|
49
|
-
state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => e.lineAmountExcludeTax !== 0);
|
|
50
|
-
state.goodsListState.goodsMap = new Map();
|
|
51
|
-
state.goodsListState.goodsList.forEach(e => { state.goodsListState.goodsMap.set(e.$index, e) });
|
|
52
|
-
state.goodsListState.selectedGoodIndex = [];
|
|
53
|
-
} catch (error: any) {
|
|
54
|
-
showError(error)
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
/** 计算单价(含税) */
|
|
59
|
-
async function calculatePriceIncludeTax(sum: IGood, calculatingDigits?: number) {
|
|
60
|
-
if (!sum.quantity) return undefined;
|
|
61
|
-
const value = chain(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber()
|
|
62
|
-
return format15(value, calculatingDigits) || undefined;
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
/** 计算单价(不含税) */
|
|
66
|
-
async function calculatePriceExcludeTax(sum: IGood, calculatingDigits?: number) {
|
|
67
|
-
if (!sum.quantity) return undefined;
|
|
68
|
-
const value = format15(chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber());
|
|
69
|
-
return format15(value, calculatingDigits) || undefined;;
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
/** 合并金额(含税) */
|
|
73
|
-
async function mergeLineAmountIncludeTax(goodsList: IGood[]) {
|
|
74
|
-
let sum = chain(bignumber(0));
|
|
75
|
-
goodsList.forEach(e => {
|
|
76
|
-
sum = sum.add(bignumber(e.lineAmountIncludeTax || 0))
|
|
77
|
-
})
|
|
78
|
-
return sum.done().toNumber();
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
/** 合并金额(不含税) */
|
|
82
|
-
async function mergeLineAmountExcludeTax(goodsList: IGood[]) {
|
|
83
|
-
let sum = chain(bignumber(0));
|
|
84
|
-
goodsList.forEach(e => {
|
|
85
|
-
sum = sum.add(bignumber(e.lineAmountExcludeTax || 0))
|
|
86
|
-
})
|
|
87
|
-
return sum.done().toNumber();
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
/** 合并数量 */
|
|
91
|
-
async function mergeQuantity(goodsList: IGood[]) {
|
|
92
|
-
let sum = chain(bignumber(0));
|
|
93
|
-
goodsList.forEach(e => {
|
|
94
|
-
sum = sum.add(bignumber(e.quantity || 0))
|
|
95
|
-
})
|
|
96
|
-
return sum.done().toNumber() || undefined;
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
/** 填充行明细信息 */
|
|
100
|
-
async function fillingInformationGood(goodsList: IGood[], sum: IGood) {
|
|
101
|
-
sum = { ...sum };
|
|
102
|
-
|
|
103
|
-
const goods = goodsList[findMaxIndex(goodsList.map(e => e.lineAmountIncludeTax || 0))]
|
|
104
|
-
|
|
105
|
-
return { ...goods, lineAttribute: LineAttributeType.正常 };
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
/** 存在税率不一样的明细,不能合并 */
|
|
109
|
-
async function checkTaxTate(goodsList: IGood[]) {
|
|
110
|
-
const tax = goodsList[0].taxRate;
|
|
111
|
-
for (let i = 1; i < goodsList.length; i++) {
|
|
112
|
-
if (tax !== goodsList[i].taxRate) {
|
|
113
|
-
throw new Error('存在税率不一样的明细,不能合并');
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
/** 校验数据 是否数量和金额是否同号 */
|
|
119
|
-
async function checkSameNumber(good: IGood) {
|
|
120
|
-
if (!good.quantity) return;
|
|
121
|
-
|
|
122
|
-
if (!good.lineAmountExcludeTax && good.lineAmountExcludeTax !== 0) {
|
|
123
|
-
const content = '金额不能为空';
|
|
124
|
-
message.error({ content, key: content });
|
|
125
|
-
throw new Error(content);
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
if (
|
|
129
|
-
good.quantity >= 0 && good.lineAmountExcludeTax >= 0 ||
|
|
130
|
-
good.lineAmountExcludeTax === 0 ||
|
|
131
|
-
good.quantity < 0 && good.lineAmountExcludeTax < 0
|
|
132
|
-
) {
|
|
133
|
-
return;
|
|
134
|
-
} else {
|
|
135
|
-
const content = '合并失败,合并后“数量”和“金额”必须同时为正数或同时为负数。';
|
|
136
|
-
message.error({ content, key: content });
|
|
137
|
-
throw new Error(content);
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
|
|
141
|
-
/** 显示错误信息 */
|
|
142
|
-
function showError(error: Error) {
|
|
143
|
-
console.log(error);
|
|
144
|
-
message.error({ content: error.message, key: error.message });
|
|
145
|
-
}
|
|
146
|
-
|
|
147
|
-
/** 查询最大数据的索引 */
|
|
148
|
-
function findMaxIndex(arr: number[]): number {
|
|
149
|
-
if (arr.length === 0) {
|
|
150
|
-
throw new Error("数组为空");
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
let maxIndex = 0;
|
|
154
|
-
let maxValue = arr[0];
|
|
155
|
-
|
|
156
|
-
for (let i = arr.length - 1; i >= 0; i--) {
|
|
157
|
-
if (arr[i] > maxValue) {
|
|
158
|
-
maxValue = arr[i];
|
|
159
|
-
maxIndex = i;
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
|
|
163
|
-
return maxIndex;
|
|
1
|
+
|
|
2
|
+
import { message } from 'kts-xui';
|
|
3
|
+
import { chain, bignumber } from 'mathjs';
|
|
4
|
+
import idGenerator from '../../tools/idGenerator';
|
|
5
|
+
import { IGood, InvoiceControllerState, LineAttributeType } from '..';
|
|
6
|
+
import { format15 } from '../../tools/calculate';
|
|
7
|
+
|
|
8
|
+
export default async function mergeDetails(state: InvoiceControllerState) {
|
|
9
|
+
if (state.goodsListState.editGood) return;
|
|
10
|
+
|
|
11
|
+
// const goodsList = state.goodsListState.selectedGoodIndex.map(e => state.goodsListState.goodsMap.get(e)).filter(e => !!e) as IGood[];
|
|
12
|
+
const goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0)
|
|
13
|
+
if (goodsList.length < 2) return;
|
|
14
|
+
|
|
15
|
+
try {
|
|
16
|
+
// 创建合并后的商品对象
|
|
17
|
+
let sum: IGood = { $index: idGenerator(), lineAttribute: LineAttributeType.正常 }
|
|
18
|
+
|
|
19
|
+
// 存在税率不一样的明细,不能合并
|
|
20
|
+
await checkTaxTate(goodsList);
|
|
21
|
+
|
|
22
|
+
// 填充行明细信息
|
|
23
|
+
sum = await fillingInformationGood(goodsList, sum);
|
|
24
|
+
|
|
25
|
+
// 合并数量
|
|
26
|
+
sum.quantity = await mergeQuantity(goodsList);
|
|
27
|
+
|
|
28
|
+
// 合并金额(不含税)
|
|
29
|
+
sum.lineAmountExcludeTax = await mergeLineAmountExcludeTax(goodsList);
|
|
30
|
+
|
|
31
|
+
// 合并金额(含税)
|
|
32
|
+
sum.lineAmountIncludeTax = await mergeLineAmountIncludeTax(goodsList);
|
|
33
|
+
|
|
34
|
+
// 计算单价(不含税)
|
|
35
|
+
sum.priceExcludeTax = await calculatePriceExcludeTax(sum, state.calculatingDigits);
|
|
36
|
+
|
|
37
|
+
// 计算单价(含税)
|
|
38
|
+
sum.priceIncludeTax = await calculatePriceIncludeTax(sum, state.calculatingDigits);
|
|
39
|
+
|
|
40
|
+
// 计算税额
|
|
41
|
+
sum.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber()
|
|
42
|
+
|
|
43
|
+
// 校验数据 是否数量和金额是否同号
|
|
44
|
+
await checkSameNumber(sum);
|
|
45
|
+
|
|
46
|
+
const p = state.goodsListState.goodsList.indexOf(goodsList[0]);
|
|
47
|
+
state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0);
|
|
48
|
+
state.goodsListState.goodsList.splice(p, 0, sum);
|
|
49
|
+
state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => e.lineAmountExcludeTax !== 0);
|
|
50
|
+
state.goodsListState.goodsMap = new Map();
|
|
51
|
+
state.goodsListState.goodsList.forEach(e => { state.goodsListState.goodsMap.set(e.$index, e) });
|
|
52
|
+
state.goodsListState.selectedGoodIndex = [];
|
|
53
|
+
} catch (error: any) {
|
|
54
|
+
showError(error)
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/** 计算单价(含税) */
|
|
59
|
+
async function calculatePriceIncludeTax(sum: IGood, calculatingDigits?: number) {
|
|
60
|
+
if (!sum.quantity) return undefined;
|
|
61
|
+
const value = chain(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber()
|
|
62
|
+
return format15(value, calculatingDigits) || undefined;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/** 计算单价(不含税) */
|
|
66
|
+
async function calculatePriceExcludeTax(sum: IGood, calculatingDigits?: number) {
|
|
67
|
+
if (!sum.quantity) return undefined;
|
|
68
|
+
const value = format15(chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber());
|
|
69
|
+
return format15(value, calculatingDigits) || undefined;;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/** 合并金额(含税) */
|
|
73
|
+
async function mergeLineAmountIncludeTax(goodsList: IGood[]) {
|
|
74
|
+
let sum = chain(bignumber(0));
|
|
75
|
+
goodsList.forEach(e => {
|
|
76
|
+
sum = sum.add(bignumber(e.lineAmountIncludeTax || 0))
|
|
77
|
+
})
|
|
78
|
+
return sum.done().toNumber();
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/** 合并金额(不含税) */
|
|
82
|
+
async function mergeLineAmountExcludeTax(goodsList: IGood[]) {
|
|
83
|
+
let sum = chain(bignumber(0));
|
|
84
|
+
goodsList.forEach(e => {
|
|
85
|
+
sum = sum.add(bignumber(e.lineAmountExcludeTax || 0))
|
|
86
|
+
})
|
|
87
|
+
return sum.done().toNumber();
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/** 合并数量 */
|
|
91
|
+
async function mergeQuantity(goodsList: IGood[]) {
|
|
92
|
+
let sum = chain(bignumber(0));
|
|
93
|
+
goodsList.forEach(e => {
|
|
94
|
+
sum = sum.add(bignumber(e.quantity || 0))
|
|
95
|
+
})
|
|
96
|
+
return sum.done().toNumber() || undefined;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/** 填充行明细信息 */
|
|
100
|
+
async function fillingInformationGood(goodsList: IGood[], sum: IGood) {
|
|
101
|
+
sum = { ...sum };
|
|
102
|
+
|
|
103
|
+
const goods = goodsList[findMaxIndex(goodsList.map(e => e.lineAmountIncludeTax || 0))]
|
|
104
|
+
|
|
105
|
+
return { ...goods, lineAttribute: LineAttributeType.正常 };
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
/** 存在税率不一样的明细,不能合并 */
|
|
109
|
+
async function checkTaxTate(goodsList: IGood[]) {
|
|
110
|
+
const tax = goodsList[0].taxRate;
|
|
111
|
+
for (let i = 1; i < goodsList.length; i++) {
|
|
112
|
+
if (tax !== goodsList[i].taxRate) {
|
|
113
|
+
throw new Error('存在税率不一样的明细,不能合并');
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/** 校验数据 是否数量和金额是否同号 */
|
|
119
|
+
async function checkSameNumber(good: IGood) {
|
|
120
|
+
if (!good.quantity) return;
|
|
121
|
+
|
|
122
|
+
if (!good.lineAmountExcludeTax && good.lineAmountExcludeTax !== 0) {
|
|
123
|
+
const content = '金额不能为空';
|
|
124
|
+
message.error({ content, key: content });
|
|
125
|
+
throw new Error(content);
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
if (
|
|
129
|
+
good.quantity >= 0 && good.lineAmountExcludeTax >= 0 ||
|
|
130
|
+
good.lineAmountExcludeTax === 0 ||
|
|
131
|
+
good.quantity < 0 && good.lineAmountExcludeTax < 0
|
|
132
|
+
) {
|
|
133
|
+
return;
|
|
134
|
+
} else {
|
|
135
|
+
const content = '合并失败,合并后“数量”和“金额”必须同时为正数或同时为负数。';
|
|
136
|
+
message.error({ content, key: content });
|
|
137
|
+
throw new Error(content);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
/** 显示错误信息 */
|
|
142
|
+
function showError(error: Error) {
|
|
143
|
+
console.log(error);
|
|
144
|
+
message.error({ content: error.message, key: error.message });
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
/** 查询最大数据的索引 */
|
|
148
|
+
function findMaxIndex(arr: number[]): number {
|
|
149
|
+
if (arr.length === 0) {
|
|
150
|
+
throw new Error("数组为空");
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
let maxIndex = 0;
|
|
154
|
+
let maxValue = arr[0];
|
|
155
|
+
|
|
156
|
+
for (let i = arr.length - 1; i >= 0; i--) {
|
|
157
|
+
if (arr[i] > maxValue) {
|
|
158
|
+
maxValue = arr[i];
|
|
159
|
+
maxIndex = i;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
return maxIndex;
|
|
164
164
|
}
|
|
@@ -1,29 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
import { IGood, InvoiceControllerState, LineAttributeType } from '..';
|
|
4
|
-
import { chain, bignumber } from 'mathjs';
|
|
5
|
-
import idGenerator from '../../tools/idGenerator';
|
|
6
|
-
|
|
7
|
-
export default async function mergeDiscount(state: InvoiceControllerState) {
|
|
8
|
-
if (state.goodsListState.goodsList.length <= 1 || state.goodsListState.editGood) return;
|
|
9
|
-
|
|
10
|
-
const goodsList = state.goodsListState.goodsList.slice();
|
|
11
|
-
for (let i = 0; i < goodsList.length; i++) {
|
|
12
|
-
const good = goodsList[i];
|
|
13
|
-
if (good.lineAttribute * 1 === LineAttributeType.被折扣行) {
|
|
14
|
-
const sum: IGood = { ...good, $index: idGenerator(), lineAttribute: LineAttributeType.正常, discountGroup: undefined };
|
|
15
|
-
const zk = goodsList[i + 1];
|
|
16
|
-
|
|
17
|
-
sum.lineAmountExcludeTax = chain(bignumber(good.lineAmountExcludeTax)).subtract(bignumber(Math.abs(zk.lineAmountExcludeTax || 0))).done().toNumber();
|
|
18
|
-
sum.lineAmountIncludeTax = chain(bignumber(good.lineAmountIncludeTax)).subtract(bignumber(Math.abs(zk.lineAmountIncludeTax || 0))).done().toNumber();
|
|
19
|
-
sum.quantity = good.quantity;
|
|
20
|
-
if (sum.quantity) {
|
|
21
|
-
sum.priceExcludeTax = chain(bignumber(good.lineAmountExcludeTax)).divide(bignumber(good.quantity)).done().toNumber();
|
|
22
|
-
sum.priceIncludeTax = chain(bignumber(good.lineAmountIncludeTax)).divide(bignumber(good.quantity)).done().toNumber();
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
goodsList.splice(i, 2, sum);
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
state.goodsListState.goodsList = goodsList;
|
|
1
|
+
|
|
2
|
+
|
|
3
|
+
import { IGood, InvoiceControllerState, LineAttributeType } from '..';
|
|
4
|
+
import { chain, bignumber } from 'mathjs';
|
|
5
|
+
import idGenerator from '../../tools/idGenerator';
|
|
6
|
+
|
|
7
|
+
export default async function mergeDiscount(state: InvoiceControllerState) {
|
|
8
|
+
if (state.goodsListState.goodsList.length <= 1 || state.goodsListState.editGood) return;
|
|
9
|
+
|
|
10
|
+
const goodsList = state.goodsListState.goodsList.slice();
|
|
11
|
+
for (let i = 0; i < goodsList.length; i++) {
|
|
12
|
+
const good = goodsList[i];
|
|
13
|
+
if (good.lineAttribute * 1 === LineAttributeType.被折扣行) {
|
|
14
|
+
const sum: IGood = { ...good, $index: idGenerator(), lineAttribute: LineAttributeType.正常, discountGroup: undefined };
|
|
15
|
+
const zk = goodsList[i + 1];
|
|
16
|
+
|
|
17
|
+
sum.lineAmountExcludeTax = chain(bignumber(good.lineAmountExcludeTax)).subtract(bignumber(Math.abs(zk.lineAmountExcludeTax || 0))).done().toNumber();
|
|
18
|
+
sum.lineAmountIncludeTax = chain(bignumber(good.lineAmountIncludeTax)).subtract(bignumber(Math.abs(zk.lineAmountIncludeTax || 0))).done().toNumber();
|
|
19
|
+
sum.quantity = good.quantity;
|
|
20
|
+
if (sum.quantity) {
|
|
21
|
+
sum.priceExcludeTax = chain(bignumber(good.lineAmountExcludeTax)).divide(bignumber(good.quantity)).done().toNumber();
|
|
22
|
+
sum.priceIncludeTax = chain(bignumber(good.lineAmountIncludeTax)).divide(bignumber(good.quantity)).done().toNumber();
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
goodsList.splice(i, 2, sum);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
state.goodsListState.goodsList = goodsList;
|
|
29
29
|
}
|
|
@@ -1,24 +1,24 @@
|
|
|
1
|
-
import { InvoiceControllerState } from '../';
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* 保存正在编辑的货物
|
|
5
|
-
*/
|
|
6
|
-
export default async (state: InvoiceControllerState) => {
|
|
7
|
-
|
|
8
|
-
const editGood = state.goodsListState.editGood;
|
|
9
|
-
const form = state.goodsListState.form;
|
|
10
|
-
|
|
11
|
-
if (!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField) return;
|
|
12
|
-
if ((await validateFields(form)).err) return;
|
|
13
|
-
|
|
14
|
-
state.goodsListState.goodsList = state.goodsListState.goodsList.map((e) =>
|
|
15
|
-
e.$index === editGood.$index ? { ...e, ...editGood } : e,
|
|
16
|
-
);
|
|
17
|
-
state.goodsListState.editGood = undefined;
|
|
18
|
-
};
|
|
19
|
-
|
|
20
|
-
const validateFields = (form: any) => new Promise((resolve: (v: { err: any; values: any }) => void) => {
|
|
21
|
-
form.validateFields(async (err: any, values: any) => {
|
|
22
|
-
resolve({ err, values });
|
|
23
|
-
});
|
|
24
|
-
});
|
|
1
|
+
import { InvoiceControllerState } from '../';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* 保存正在编辑的货物
|
|
5
|
+
*/
|
|
6
|
+
export default async (state: InvoiceControllerState) => {
|
|
7
|
+
|
|
8
|
+
const editGood = state.goodsListState.editGood;
|
|
9
|
+
const form = state.goodsListState.form;
|
|
10
|
+
|
|
11
|
+
if (!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField) return;
|
|
12
|
+
if ((await validateFields(form)).err) return;
|
|
13
|
+
|
|
14
|
+
state.goodsListState.goodsList = state.goodsListState.goodsList.map((e) =>
|
|
15
|
+
e.$index === editGood.$index ? { ...e, ...editGood } : e,
|
|
16
|
+
);
|
|
17
|
+
state.goodsListState.editGood = undefined;
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
const validateFields = (form: any) => new Promise((resolve: (v: { err: any; values: any }) => void) => {
|
|
21
|
+
form.validateFields(async (err: any, values: any) => {
|
|
22
|
+
resolve({ err, values });
|
|
23
|
+
});
|
|
24
|
+
});
|