kts-component-invoice-operate 3.2.84 → 3.2.85

package/dist/index.esm.js

@@ -9773,6 +9773,8 @@ var Statistics = (function () {
 
     var err = (_s$goodsListState$for = (_s$goodsListState$for2 = s.goodsListState.form) === null || _s$goodsListState$for2 === void 0 ? void 0 : _s$goodsListState$for2.getFieldsError()) !== null && _s$goodsListState$for !== void 0 ? _s$goodsListState$for : {};
     s.goodsListState.goodsList.forEach(function (e) {
+      if (e.lineAttribute === LineAttributeType$1.赠品行) return;
+
       if (e.$index === (editGood === null || editGood === void 0 ? void 0 : editGood.$index)) {
         if (!err.lineAmountIncludeTax) {
           sum = sum.add(bignumber(editGood.lineAmountIncludeTax || 0));
@@ -9797,6 +9799,8 @@ var Statistics = (function () {
 
     var err = (_s$goodsListState$for3 = (_s$goodsListState$for4 = s.goodsListState.form) === null || _s$goodsListState$for4 === void 0 ? void 0 : _s$goodsListState$for4.getFieldsError()) !== null && _s$goodsListState$for3 !== void 0 ? _s$goodsListState$for3 : {};
     s.goodsListState.goodsList.forEach(function (e) {
+      if (e.lineAttribute === LineAttributeType$1.赠品行) return;
+
       if (e.$index === (editGood === null || editGood === void 0 ? void 0 : editGood.$index)) {
         if (!err.lineAmountExcludeTax) {
           sum = sum.add(bignumber(editGood.lineAmountExcludeTax || 0));
@@ -9818,6 +9822,8 @@ var Statistics = (function () {
     var editGood = s.goodsListState.editGood; // 正在编辑的货物
 
     s.goodsListState.goodsList.forEach(function (e) {
+      if (e.lineAttribute === LineAttributeType$1.赠品行) return;
+
       if (e.$index === (editGood === null || editGood === void 0 ? void 0 : editGood.$index)) {
         sum = sum.add(bignumber(editGood.taxAmount || 0));
       } else {
@@ -10536,24 +10542,15 @@ var useEndowCode = (function (goods) {
     }, _callee);
   })), [controller, goods]);
 
-  if (goods.lineAttribute === LineAttributeType$1.折让行) {
+  if ([LineAttributeType$1.正常, LineAttributeType$1.被折扣行, LineAttributeType$1.折扣行].indexOf(goods.lineAttribute) >= 0) {
+    return {
+      key: 'endowCode',
+      title: '赋码',
+      onClick: onClick
+    };
+  } else {
     return undefined;
   }
-
-  return {
-    key: 'endowCode',
-    title: '赋码',
-    onClick: onClick
-  }; // return React.useMemo(() => {
-  //     return (
-  //         <Menu.Item key="endowCode" onClick={onClick} ><Text strong>赋码</Text></Menu.Item>
-  //     );
-  // }, [goods.lineAttribute, onClick])
-  // return React.useMemo(() => {
-  //     return (
-  //         <Button key="endowCode" type="link" onClick={onClick} >赋码</Button>
-  //     );
-  // }, [goods.lineAttribute, onClick])
 });
 
 var css_248z$6 = ".ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:focus,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu {\n  font-size: 16px;\n  color: #000;\n  text-align: center;\n  padding: 0;\n}\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu.ktsAnt3x-dropdown-open {\n  background: #ebebeb;\n  border-radius: 9999px;\n}\n";
@@ -14704,11 +14701,11 @@ function useMergeDetails() {
   var items = React.useMemo(function () {
     return [{
       key: '0',
-      label: '自动合并',
+      label: '处理全部行',
       onClick: onClickAuto
     }, {
       key: '1',
-      label: '手动合并',
+      label: '处理选中行',
       disabled: selectedGoodIndex.length <= 1,
       onClick: onClickManual
     }];
@@ -15149,12 +15146,12 @@ function useSalesGifts() {
   var items = React.useMemo(function () {
     return [{
       key: '0',
-      label: '自动转换',
+      label: '处理全部行',
       disabled: giveaways.length <= 0,
       onClick: onClickAuto
     }, {
       key: '1',
-      label: '手动转换',
+      label: '处理选中行',
       disabled: selectedGoodIndex.length <= 0,
       onClick: onClickManual
     }];

package/dist/index.js

@@ -9783,6 +9783,8 @@ var Statistics = (function () {
 
     var err = (_s$goodsListState$for = (_s$goodsListState$for2 = s.goodsListState.form) === null || _s$goodsListState$for2 === void 0 ? void 0 : _s$goodsListState$for2.getFieldsError()) !== null && _s$goodsListState$for !== void 0 ? _s$goodsListState$for : {};
     s.goodsListState.goodsList.forEach(function (e) {
+      if (e.lineAttribute === LineAttributeType$1.赠品行) return;
+
       if (e.$index === (editGood === null || editGood === void 0 ? void 0 : editGood.$index)) {
         if (!err.lineAmountIncludeTax) {
           sum = sum.add(mathjs.bignumber(editGood.lineAmountIncludeTax || 0));
@@ -9807,6 +9809,8 @@ var Statistics = (function () {
 
     var err = (_s$goodsListState$for3 = (_s$goodsListState$for4 = s.goodsListState.form) === null || _s$goodsListState$for4 === void 0 ? void 0 : _s$goodsListState$for4.getFieldsError()) !== null && _s$goodsListState$for3 !== void 0 ? _s$goodsListState$for3 : {};
     s.goodsListState.goodsList.forEach(function (e) {
+      if (e.lineAttribute === LineAttributeType$1.赠品行) return;
+
       if (e.$index === (editGood === null || editGood === void 0 ? void 0 : editGood.$index)) {
         if (!err.lineAmountExcludeTax) {
           sum = sum.add(mathjs.bignumber(editGood.lineAmountExcludeTax || 0));
@@ -9828,6 +9832,8 @@ var Statistics = (function () {
     var editGood = s.goodsListState.editGood; // 正在编辑的货物
 
     s.goodsListState.goodsList.forEach(function (e) {
+      if (e.lineAttribute === LineAttributeType$1.赠品行) return;
+
       if (e.$index === (editGood === null || editGood === void 0 ? void 0 : editGood.$index)) {
         sum = sum.add(mathjs.bignumber(editGood.taxAmount || 0));
       } else {
@@ -10546,24 +10552,15 @@ var useEndowCode = (function (goods) {
     }, _callee);
   })), [controller, goods]);
 
-  if (goods.lineAttribute === LineAttributeType$1.折让行) {
+  if ([LineAttributeType$1.正常, LineAttributeType$1.被折扣行, LineAttributeType$1.折扣行].indexOf(goods.lineAttribute) >= 0) {
+    return {
+      key: 'endowCode',
+      title: '赋码',
+      onClick: onClick
+    };
+  } else {
     return undefined;
   }
-
-  return {
-    key: 'endowCode',
-    title: '赋码',
-    onClick: onClick
-  }; // return React.useMemo(() => {
-  //     return (
-  //         <Menu.Item key="endowCode" onClick={onClick} ><Text strong>赋码</Text></Menu.Item>
-  //     );
-  // }, [goods.lineAttribute, onClick])
-  // return React.useMemo(() => {
-  //     return (
-  //         <Button key="endowCode" type="link" onClick={onClick} >赋码</Button>
-  //     );
-  // }, [goods.lineAttribute, onClick])
 });
 
 var css_248z$6 = ".ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:focus,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu {\n  font-size: 16px;\n  color: #000;\n  text-align: center;\n  padding: 0;\n}\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,\n.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu.ktsAnt3x-dropdown-open {\n  background: #ebebeb;\n  border-radius: 9999px;\n}\n";
@@ -14714,11 +14711,11 @@ function useMergeDetails() {
   var items = React__default['default'].useMemo(function () {
     return [{
       key: '0',
-      label: '自动合并',
+      label: '处理全部行',
       onClick: onClickAuto
     }, {
       key: '1',
-      label: '手动合并',
+      label: '处理选中行',
       disabled: selectedGoodIndex.length <= 1,
       onClick: onClickManual
     }];
@@ -15159,12 +15156,12 @@ function useSalesGifts() {
   var items = React__default['default'].useMemo(function () {
     return [{
       key: '0',
-      label: '自动转换',
+      label: '处理全部行',
       disabled: giveaways.length <= 0,
       onClick: onClickAuto
     }, {
       key: '1',
-      label: '手动转换',
+      label: '处理选中行',
       disabled: selectedGoodIndex.length <= 0,
       onClick: onClickManual
     }];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.84",
+  "version": "3.2.85",
   "scripts": {
     "dev": "dumi dev",
     "start": "dumi dev",

package/src/Invoice/_test/endowCode/index.tsx

@@ -259,7 +259,32 @@ const lines: any[] = [
       "referenceLines": null,
       "version": 0,
       taxAmount:1
-  }
+  },
+  {
+    "serialNumber": "1714491422279110656",
+    "lineNumber": 3,
+    "taxCode": "3070401000000000000",
+    "taxName": "信息技术服务",
+    "specification": null,
+    "itemName": "技术服务费",
+    "itemCode": null,
+    "unit": "套",
+    "quantity": 1,
+    "taxRate": 0.06,
+    "priceExcludeTax": 2,
+    "priceIncludeTax": 2.12,
+    "amountTax": 0.12,
+    "lineAmountExcludeTax": 5,
+    "lineAmountIncludeTax": 5.3,
+    "lineAttribute": LineAttributeType.赠品行,
+    "discountGroup": null,
+    "favouredPolicyMark": false,
+    "favouredPolicyName": null,
+    "zeroTaxRateFlag": null,
+    "referenceLines": null,
+    "version": 0,
+    taxAmount:1
+}
 ]
 
 const moke = [

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

@@ -1,8 +1,7 @@
 import React from 'react';
-// import { Button } from 'kts-components-antd-x3';
 import Invoice from '../../../../../../../../..';
-import { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
 import { endowCode } from '../../../../autoFillFn';
+import { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
 
 // const { Text } = Typography;
 
@@ -14,25 +13,13 @@ export default (goods: IGood) => {
         endowCode(controller, goods);
     }, [controller, goods]);
 
-    if (goods.lineAttribute === LineAttributeType.折让行) {
-        return undefined;
-    }
-
-    return {
-        key: 'endowCode',
-        title: '赋码',
-        onClick,
+    if ([LineAttributeType.正常, LineAttributeType.被折扣行, LineAttributeType.折扣行].indexOf(goods.lineAttribute) >= 0) {
+        return {
+            key: 'endowCode',
+            title: '赋码',
+            onClick,
+        }
+    } else {
+        return undefined
     }
-
-    // return React.useMemo(() => {
-    //     return (
-    //         <Menu.Item key="endowCode" onClick={onClick} ><Text strong>赋码</Text></Menu.Item>
-    //     );
-    // }, [goods.lineAttribute, onClick])
-
-    // return React.useMemo(() => {
-    //     return (
-    //         <Button key="endowCode" type="link" onClick={onClick} >赋码</Button>
-    //     );
-    // }, [goods.lineAttribute, onClick])
 };

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useMergeDetails/index.tsx

@@ -36,11 +36,11 @@ export default function useMergeDetails() {
         return [
             {
                 key: '0',
-                label: '自动合并',
+                label: '处理全部行',
                 onClick: onClickAuto,
             }, {
                 key: '1',
-                label: '手动合并',
+                label: '处理选中行',
                 disabled: selectedGoodIndex.length <= 1,
                 onClick: onClickManual,
             },

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useSalesGifts/index.tsx

@@ -46,12 +46,12 @@ export default function useSalesGifts() {
         return [
             {
                 key: '0',
-                label: '自动转换',
+                label: '处理全部行',
                 disabled: giveaways.length <= 0,
                 onClick: onClickAuto,
             }, {
                 key: '1',
-                label: '手动转换',
+                label: '处理选中行',
                 disabled: selectedGoodIndex.length <= 0,
                 onClick: onClickManual,
             },

package/src/Invoice/ui/default/GoodsList/ui/Statistics/index.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { } from 'kts-components-antd-x3';
 import { chain, bignumber } from 'mathjs';
+import { LineAttributeType } from '../../../../../../Invoice/InvoiceController';
 import Invoice from '../../../../..';
 import './index.less';
 
@@ -23,6 +24,7 @@ export default () => {
     const err = s.goodsListState.form?.getFieldsError() ?? {};
 
     s.goodsListState.goodsList.forEach((e) => {
+      if (e.lineAttribute === LineAttributeType.赠品行) return;
       if (e.$index === editGood?.$index) {
         if (!err.lineAmountIncludeTax) {
           sum = sum.add(bignumber(editGood.lineAmountIncludeTax || 0));
@@ -45,6 +47,7 @@ export default () => {
     const err = s.goodsListState.form?.getFieldsError() ?? {};
 
     s.goodsListState.goodsList.forEach((e) => {
+      if (e.lineAttribute === LineAttributeType.赠品行) return;
       if (e.$index === editGood?.$index) {
         if (!err.lineAmountExcludeTax) {
           sum = sum.add(bignumber(editGood.lineAmountExcludeTax || 0));
@@ -65,6 +68,7 @@ export default () => {
     let sum = chain(bignumber(0));
     const editGood = s.goodsListState.editGood; // 正在编辑的货物
     s.goodsListState.goodsList.forEach((e) => {
+      if (e.lineAttribute === LineAttributeType.赠品行) return;
       if (e.$index === editGood?.$index) {
         sum = sum.add(bignumber(editGood.taxAmount || 0));
       } else {

package/src/Invoice/ui/default/Seller/index.tsx

@@ -34,7 +34,7 @@ const Main = decorator<ISellerProps, ISellerProps & FormComponentProps>(Form.cre
   const controller = Invoice.useInvoiceController();
 
   /** 控制器 */
-  const model = controller.useMemo(s => s.model, [])
+  const model = controller.useMemo(s => s.model, []);
 
   /** 注册 form 对象 */
   controller.useForm('seller', form);