kts-component-invoice-operate 2.0.19 → 2.0.21
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/index.esm.js +7 -3
- package/dist/index.js +7 -3
- package/docs-dist/umi.js +1 -1
- package/package.json +1 -1
- package/src/Invoice/InvoiceController/fns/addGoodDiscount.ts +1 -0
- package/src/Invoice/ui/AddComparisonDrawer/index.tsx +5 -2
- package/src/Invoice/ui/GoodsList/hook/useColumns/ui/RowMenu/index.tsx +3 -5
package/package.json
CHANGED
|
@@ -109,6 +109,7 @@ export default async (state: InvoiceControllerState, options?: IOptions) => {
|
|
|
109
109
|
taxClassificationCode: good.taxClassificationCode,
|
|
110
110
|
taxRate: good.taxRate,
|
|
111
111
|
itemName:good.itemName,
|
|
112
|
+
itemNameSelf:good.itemNameSelf,
|
|
112
113
|
discountGroup,
|
|
113
114
|
lineAmountIncludeTax,
|
|
114
115
|
lineAmountExcludeTax,
|
|
@@ -38,8 +38,11 @@ export default function AddComparisonDrawer() {
|
|
|
38
38
|
good.itemCodeSelf = values.itemCodeSelf;
|
|
39
39
|
good.itemName = shorthand ? `*${shorthand}*${values.itemName}` : values.itemName;
|
|
40
40
|
good.itemNameSelf = shorthand ? `*${shorthand}*${values.itemNameSelf}` : values.itemNameSelf;
|
|
41
|
-
|
|
42
|
-
good.
|
|
41
|
+
|
|
42
|
+
if (good.lineAttribute === LineAttributeType.正常) {
|
|
43
|
+
good.itemModelName = values.itemModelName;
|
|
44
|
+
good.itemModelNameSelf = values.itemModelNameSelf;
|
|
45
|
+
}
|
|
43
46
|
}
|
|
44
47
|
|
|
45
48
|
setGood(good);
|
|
@@ -25,15 +25,13 @@ export default (props: { goods: IGood }) => {
|
|
|
25
25
|
const endowCode = useEndowCode(props.goods);
|
|
26
26
|
const addComparison = useAddComparison(props.goods);
|
|
27
27
|
|
|
28
|
-
|
|
29
|
-
|
|
30
28
|
const itemList = React.useMemo(() => {
|
|
31
29
|
const arr: any[] = [];
|
|
32
30
|
|
|
33
31
|
model !== 'prefab' && isAddDiscount !== false && addDiscount && arr.push(addDiscount); // 添加折扣行
|
|
34
|
-
arr.push(addComparison);
|
|
35
|
-
// endowCode && arr.push(endowCode);
|
|
36
|
-
model !== 'prefab' && delItem && arr.push(delItem);
|
|
32
|
+
arr.push(addComparison); // 添加商品对照
|
|
33
|
+
// endowCode && arr.push(endowCode); // 赋码
|
|
34
|
+
model !== 'prefab' && delItem && arr.push(delItem); // 删除
|
|
37
35
|
|
|
38
36
|
if (!goodsMenuExpand || goodsMenuExpand.length === 0) return arr;
|
|
39
37
|
|