kts-component-invoice-operate 2.0.18 → 2.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "2.0.18",
+  "version": "2.0.20",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/Invoice/InvoiceController/fns/addGoodDiscount.ts

@@ -109,6 +109,7 @@ export default async (state: InvoiceControllerState, options?: IOptions) => {
       taxClassificationCode: good.taxClassificationCode,
       taxRate: good.taxRate,
       itemName:good.itemName,
+      itemNameSelf:good.itemNameSelf,
       discountGroup,
       lineAmountIncludeTax,
       lineAmountExcludeTax,

package/src/Invoice/ui/EndowCodeDrawer/index.tsx

@@ -459,11 +459,11 @@ const components = {
 
 /** 提取简称 */
 const getShorthand = (value?: string) => {
-  if (!value) return undefined;
+  if (!value) return ' ';
   const arr = value.match(/\*[^*]+\*/);
   if (arr) {
     return arr[0].split('*')[1];
   } else {
-    return undefined;
+    return ' ';
   }
 };

package/src/Invoice/ui/GoodsList/hook/useColumns/index.tsx

@@ -473,7 +473,7 @@ export default (form: WrappedFormUtils) => {
         title: '操作',
         dataIndex: 'operating',
         key: 'operating',
-        width: 50,
+        width: 120,
         align: 'center',
         render: (_value: string, record: IGood) => <RowMenu key={record.lineAttribute} goods={record} />,
       },

package/src/Invoice/ui/GoodsList/hook/useColumns/ui/RowMenu/hook/useEndowCode/index.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
-import { Menu, message, Typography } from 'kts-components-antd-x3';
+import { Button } from 'kts-components-antd-x3';
 import Invoice from '../../../../../../../../';
-import { IGood, LineAttributeType } from '../../../../../../../../InvoiceController';
+import { IGood } from '../../../../../../../../InvoiceController';
 import { endowCode } from '../../../../autoFillFn';
 
-const { Text } = Typography;
+// const { Text } = Typography;
 
 export default (goods: IGood) => {
 
@@ -14,9 +14,15 @@ export default (goods: IGood) => {
         endowCode(controller, goods);
     }, [controller, goods]);
 
+    // return React.useMemo(() => {
+    //     return (
+    //         <Menu.Item key="endowCode" onClick={onClick} ><Text strong>赋码</Text></Menu.Item>
+    //     );
+    // }, [goods.lineAttribute, onClick])
+
     return React.useMemo(() => {
         return (
-            <Menu.Item key="endowCode" onClick={onClick} ><Text strong>赋码</Text></Menu.Item>
+            <Button key="endowCode" type="link" onClick={onClick} >赋码</Button>
         );
     }, [goods.lineAttribute, onClick])
 };

package/src/Invoice/ui/GoodsList/hook/useColumns/ui/RowMenu/index.tsx

@@ -13,10 +13,10 @@ export default (props: { goods: IGood }) => {
 
   const controller = Invoice.useInvoiceController();
 
-  const model = controller.useMemo(s=>s.model, [])
+  const model = controller.useMemo(s => s.model, [])
 
   /** 是否能添加折扣行 */
-  const isAddDiscount = controller.useMemo(s=>s.goodsListState.isAddDiscount, [])
+  const isAddDiscount = controller.useMemo(s => s.goodsListState.isAddDiscount, [])
 
   const goodsMenuExpand = controller.useMemo(s => s.goodsListState.goodsMenuExpand, []);
 
@@ -27,11 +27,11 @@ export default (props: { goods: IGood }) => {
 
   const itemList = React.useMemo(() => {
     const arr: any[] = [];
-    
-    model !=='prefab' && isAddDiscount !== false && addDiscount && arr.push(addDiscount);  // 添加折扣行
-    arr.push(addComparison);                                                               // 添加商品对照
-    endowCode && arr.push(endowCode);                                                      // 赋码
-    model !=='prefab' && delItem && arr.push(delItem);                                     // 删除
+
+    model !== 'prefab' && isAddDiscount !== false && addDiscount && arr.push(addDiscount);  // 添加折扣行
+    arr.push(addComparison);                                                                // 添加商品对照
+    // endowCode && arr.push(endowCode);                                                    // 赋码
+    model !== 'prefab' && delItem && arr.push(delItem);                                     // 删除
 
     if (!goodsMenuExpand || goodsMenuExpand.length === 0) return arr;
 
@@ -52,10 +52,13 @@ export default (props: { goods: IGood }) => {
   }
 
   return (
-    <Dropdown overlay={<Menu>{itemList}</Menu>} trigger={['click']}>
-      <Button className="kts-invoice-operate-goods-list-columns-row-menu ant-btn-icon-only" type="link">
-        <Icon component={SpotSvg} />
-      </Button>
-    </Dropdown>
+    <span>
+      {endowCode}
+      <Dropdown overlay={<Menu>{itemList}</Menu>} trigger={['click']}>
+        <Button className="kts-invoice-operate-goods-list-columns-row-menu ant-btn-icon-only" type="link">
+          <Icon component={SpotSvg} />
+        </Button>
+      </Dropdown>
+    </span>
   );
 };