kts-component-invoice-operate 2.0.21 → 2.0.22
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/package.json
CHANGED
|
@@ -39,7 +39,7 @@ export default function AddComparisonDrawer() {
|
|
|
39
39
|
good.itemName = shorthand ? `*${shorthand}*${values.itemName}` : values.itemName;
|
|
40
40
|
good.itemNameSelf = shorthand ? `*${shorthand}*${values.itemNameSelf}` : values.itemNameSelf;
|
|
41
41
|
|
|
42
|
-
if (good.lineAttribute
|
|
42
|
+
if (good.lineAttribute !== LineAttributeType.折扣行) {
|
|
43
43
|
good.itemModelName = values.itemModelName;
|
|
44
44
|
good.itemModelNameSelf = values.itemModelNameSelf;
|
|
45
45
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Button, Menu, Dropdown, Icon } from 'kts-components-antd-x3';
|
|
3
|
-
import { IGood } from '../../../../../../InvoiceController';
|
|
3
|
+
import { IGood, LineAttributeType } from '../../../../../../InvoiceController';
|
|
4
4
|
import { ReactComponent as SpotSvg } from './spot.svg';
|
|
5
5
|
import useDelItem from './hook/useDelItem';
|
|
6
6
|
import useAddDiscount from './hook/useAddDiscount';
|
|
@@ -29,7 +29,7 @@ export default (props: { goods: IGood }) => {
|
|
|
29
29
|
const arr: any[] = [];
|
|
30
30
|
|
|
31
31
|
model !== 'prefab' && isAddDiscount !== false && addDiscount && arr.push(addDiscount); // 添加折扣行
|
|
32
|
-
arr.push(addComparison);
|
|
32
|
+
props.goods.lineAttribute !== LineAttributeType.折扣行 && arr.push(addComparison); // 添加商品对照
|
|
33
33
|
// endowCode && arr.push(endowCode); // 赋码
|
|
34
34
|
model !== 'prefab' && delItem && arr.push(delItem); // 删除
|
|
35
35
|
|