kts-component-invoice-operate 3.2.8 → 3.2.10

package/package.json

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

package/src/Invoice/Invoice-digtal/_test/easiest/index.tsx

@@ -2,4 +2,15 @@ import React from 'react';
 import Invoice from '../../..';
 import 'antd/dist/antd.css';
 
-export default () => <Invoice invoiceType='digtal' />;
+export default () => {
+    return (
+        <Invoice
+            invoiceType='digtal'
+            invoiceHeader={ 
+                <Invoice.InvoiceHeader
+                    title='自定义'
+                />
+            }
+        />
+    )
+};

package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.tsx

@@ -36,38 +36,49 @@ export default () => {
     await controller.wait();
     await controller.run(async s => {
 
+      // 不能给编辑状态的行增加折扣!
       let isOk = s.goodsListState.editGood && s.goodsListState.selectedGoodIndex.indexOf(s.goodsListState.editGood.$index) >= 0;
       if (isOk) {
         message.error({ content: '不能给编辑状态的行增加折扣!', key: '不能给编辑状态的行增加折扣!' });
         return;
       }
 
+      // 项目不连续，不允许添加折扣
       if (!isContinuityNum(s.goodsListState.selectedGoodIndex.map(e => s.goodsListState.goodsMap.get(e)?.serialNo || -2).sort((a, b) => a - b))) {
         message.error({ content: '项目不连续，不允许添加折扣', key: '项目不连续，不允许添加折扣' });
         return;
       }
 
+      // 不允许重复添加折扣
       isOk = s.goodsListState.selectedGoodIndex.some($index => s.goodsListState.goodsMap.get($index)?.lineAttribute !== LineAttributeType.正常)
       if (isOk) {
         message.error({ content: '不允许重复添加折扣', key: '不允许重复添加折扣' });
         return;
       }
 
+      // 存在不同税率，不允许同时添加折扣
+      if (areAllValuesEqual(s.goodsListState.selectedGoodIndex.map(e => s.goodsListState.goodsMap.get(e)?.taxRate)) === false) {
+        message.error({ content: '存在不同税率，不允许同时添加折扣', key: '存在不同税率，不允许同时添加折扣' });
+        return;
+      }
+
+      // 添加折扣时项目金额不能为空或零
       isOk = s.goodsListState.selectedGoodIndex.some($index => {
         const good = s.goodsListState.goodsMap.get($index);
-        return !good || (good.taxRate === 0 && s.goodsListState.endowCode.isTaxFreeTypeNeeded && !good.taxFreeType)
+        return `${good?.lineAmountIncludeTax}` === '0'
       })
       if (isOk) {
-        message.error({ content: '零税率需要设置免税类型，请在赋码中设置！', key: '零税率需要设置免税类型，请在赋码中设置！' });
+        message.error({ content: '添加折扣时项目金额不能为空或零', key: '添加折扣时项目金额不能为空或零' });
         return;
       }
 
+      // 零税率需要设置免税类型，请在赋码中设置！
       isOk = s.goodsListState.selectedGoodIndex.some($index => {
         const good = s.goodsListState.goodsMap.get($index);
-        return `${good?.lineAmountIncludeTax}` === '0'
+        return !good || (good.taxRate === 0 && s.goodsListState.endowCode.isTaxFreeTypeNeeded && !good.taxFreeType)
       })
       if (isOk) {
-        message.error({ content: '金额为0不能添加折扣行', key: '金额为0不能添加折扣行' });
+        message.error({ content: '零税率需要设置免税类型，请在赋码中设置！', key: '零税率需要设置免税类型，请在赋码中设置！' });
         return;
       }
 
@@ -318,3 +329,12 @@ function isContinuityNum(array: number[]) {
   return isContinuation;
 }
 
+/** 数组的值是否相等 */
+function areAllValuesEqual(arr: any[]) {
+  for (let i = 1; i < arr.length; i++) {
+    if (arr[i] !== arr[0]) {
+      return false;
+    }
+  }
+  return true;
+}

package/src/Invoice/ui/digtal/Sign/index.tsx

@@ -45,14 +45,14 @@ export default decorator<IBuyerProps, IBuyerProps & FormComponentProps>(Form.cre
                         <span>注</span>
                     </div>
                     <div>
-                        {getFieldDecorator('remark', {
+                        {getFieldDecorator('remarks', {
                             initialValue: props.defaultRemark
                         })(<MyDiv />)}
                     </div>
                 </div>
                 <Form layout='inline' className='digtal-readOnly-form' >
                     <Form.Item label='开票人' >
-                        {getFieldDecorator('issuer', {
+                        {getFieldDecorator('drawer', {
                             initialValue: props.defaultRemark
                         })(<MyDiv />)}
                     </Form.Item>

package/docs-dist/static/add.a70623b4.svg

@@ -1,12 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" fill="none">
-  <g clip-path="url(#clip0_715_372)">
-    <path d="M7.5 14.5312C3.61687 14.5312 0.46875 11.3831 0.46875 7.5C0.46875 3.61687 3.61687 0.46875 7.5 0.46875C11.3831 0.46875 14.5312 3.61687 14.5312 7.5C14.5312 11.3831 11.3831 14.5312 7.5 14.5312ZM7.5 13.5938C10.8656 13.5938 13.5938 10.8656 13.5938 7.5C13.5938 4.13438 10.8656 1.40625 7.5 1.40625C4.13438 1.40625 1.40625 4.13438 1.40625 7.5C1.40625 10.8656 4.13438 13.5938 7.5 13.5938Z" />
-    <path d="M3.75 7.96875C3.62568 7.96875 3.50645 7.91936 3.41854 7.83146C3.33064 7.74355 3.28125 7.62432 3.28125 7.5C3.28125 7.37568 3.33064 7.25645 3.41854 7.16854C3.50645 7.08064 3.62568 7.03125 3.75 7.03125H11.25C11.3743 7.03125 11.4935 7.08064 11.5815 7.16854C11.6694 7.25645 11.7188 7.37568 11.7188 7.5C11.7188 7.62432 11.6694 7.74355 11.5815 7.83146C11.4935 7.91936 11.3743 7.96875 11.25 7.96875H3.75Z" />
-    <path d="M7.03125 3.75C7.03125 3.62568 7.08064 3.50645 7.16854 3.41854C7.25645 3.33064 7.37568 3.28125 7.5 3.28125C7.62432 3.28125 7.74355 3.33064 7.83146 3.41854C7.91936 3.50645 7.96875 3.62568 7.96875 3.75V11.25C7.96875 11.3743 7.91936 11.4935 7.83146 11.5815C7.74355 11.6694 7.62432 11.7188 7.5 11.7188C7.37568 11.7188 7.25645 11.6694 7.16854 11.5815C7.08064 11.4935 7.03125 11.3743 7.03125 11.25V3.75Z" />
-  </g>
-  <defs>
-    <clipPath id="clip0_715_372">
-      <rect width="15" height="15" />
-    </clipPath>
-  </defs>
-</svg>