kts-component-invoice-operate 3.2.181-2 → 3.2.181-21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.181-2",
+  "version": "3.2.181-21",
   "scripts": {
     "dev": "dumi dev --max-old-space-size=6096",
     "start": "dumi dev",

package/src/Invoice/InvoiceController/InvoiceControllerState/BuyerState/index.tsx

@@ -28,6 +28,8 @@ export interface IBuyerInfo {
 
   /** 购买方开户行及账号 */
   buyerBank?: string;
+
+  customerCode?: string;
 }
 
 /** 自动填充 */
@@ -46,6 +48,11 @@ export default class BuyerState {
       dataIndex: 'buyerName',
       key: 'buyerName',
     },
+    {
+      title: '客户代码',
+      dataIndex: 'customerCode',
+      key: 'customerCode',
+    },
     {
       title: '纳税人识别号',
       dataIndex: 'buyerNo',

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/IGood/index.ts

@@ -84,4 +84,6 @@ export default interface IGood {
 
   /** 孩子 */
   children?: IGood[];
+
+  referenceLines?: any[];
 }

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/index.ts

@@ -32,7 +32,8 @@ export default class GoodsListState {
 
   /** 是否可以删除行 */
   isRemRow = true;
-
+  /** 批量删除 */
+  isBatchRemRow = true;
   /** 是否含税 */
   isTaxIncluded = true;
 

package/src/Invoice/InvoiceController/InvoiceControllerState/index.ts

@@ -14,7 +14,7 @@ export default class InvoiceControllerState {
    * readOnly 只读
    * */
   model: 'default' | 'prefab' | 'readOnly' = 'default';
-
+  
   /**
    * 企业类型
    * 01 一般纳税人

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

@@ -10,8 +10,7 @@ export default async (s: InvoiceControllerState, record: any, controller:any) =>
     Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
 
     // 没用 被编辑的货物 和 form 就退出
-    if (!s.goodsListState.editGood || !s.goodsListState.form) return;
-
+    if (!s.goodsListState.editGood || !s.goodsListState.form) return; 
     // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
     record.quantity = undefined;
     record.lineAmountExcludeTax = undefined;
@@ -31,7 +30,7 @@ export default async (s: InvoiceControllerState, record: any, controller:any) =>
     between.lineAmountIncludeTax = record.lineAmountIncludeTax;
     between.lineAmountExcludeTax = record.lineAmountExcludeTax;
     between.taxRate = record.taxRate;
-    between.taxAmount = record.taxAmount;
+    between.taxAmount = record.taxAmount; 
 
     // 设置编辑货物
     const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };

package/src/Invoice/tools/calculate/index.ts

@@ -20,7 +20,7 @@ export const format15 = (value: number | string, defaultFractionDigits: number =
     const fractionDigits = 15 - `${value || 0}`.indexOf('.');
     return nonScientificNotation(value, fractionDigits > defaultFractionDigits ? defaultFractionDigits : fractionDigits) as number | undefined | '';
 };
-
+ 
 
 /**
  * 金额(含税) = 数量 * 单价(含税) 

package/src/Invoice/ui/default/Buyer/ui/BuyerNameInput/index.tsx

@@ -86,7 +86,7 @@ export default (props: IBuyerNameInputProps) => {
     onBuyNameChange(e.target.value);
   }, [dataSource])
 
-  React.useEffect(() => {
+  React.useEffect(() => { 
     visible && onBuyNameChange(props.value)
   }, [visible, props.value])
 
@@ -134,7 +134,7 @@ function useDataSource() {
   const autoContainer = controller.useMemo(s => s.buyerState.autoContainer, []);
 
   const onBuyNameChange = React.useCallback(async (e?: string | undefined) => {
-    if (!autoContainer) return;
+    if (!autoContainer) return; 
     setLoading(true);
     setDataSource(await autoContainer.onBuyNameChange(e));
     setLoading(false);

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

@@ -476,8 +476,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
   const addProductionByTax = async (params: any) => { 
     if (controller.addProductionByTax) {
       controller.addProductionByTax(params)
-    };
-    // const goodsTaxRateList = await controller.getGoodsTaxRateList(good.taxClassificationCode);
+    }; 
   }
   // 确定
   const onSubmit = React.useCallback(values => {

package/src/Invoice/ui/default/GoodsList/hook/useColumns/autoFillFn/index.ts

@@ -49,6 +49,71 @@ const promptErr = (err: any) => {
 export const clearCalculatingField = async (controller: InvoiceController) => controller.run(async s => s.calculatingField = '');
 
 /** 数量改变了 */
+// export const onChangeQuantity = lazyFn(
+//   (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
+//     form.validateFields(async (err, values) => {
+//       err = err || {};
+
+//       if (!values.quantity && values.quantity !== 0) {
+//         await controller.setEditGood({ quantity: undefined });
+//         await clearCalculatingField(controller);
+//         return;
+//       }
+//       if (err.quantity) {
+//         await clearCalculatingField(controller);
+//         return
+//       };
+
+//       const calculatingDigits = controller.state.calculatingDigits;
+//       const quantity = format15(values.quantity, calculatingDigits);
+//       await controller.setEditGood({ quantity });
+//       form.setFieldsValue({ quantity });
+
+//       // 是否含税
+//       if (controller.state.goodsListState.isTaxIncluded) {
+//         // 含税
+//         if (!err.priceIncludeTax && values.priceIncludeTax) {
+//           // 可以找到 单价(含税)
+//           const priceIncludeTax = format15(values.priceIncludeTax, calculatingDigits);
+//           const lineAmountIncludeTax = format2(evaluate(`${priceIncludeTax} * ${quantity}`));
+//           form.setFieldsValue({ lineAmountIncludeTax });
+//           await controller.setEditGood({ lineAmountIncludeTax });
+//         } else if (!err.lineAmountIncludeTax && values.lineAmountIncludeTax) {
+//           // 可以找到 金额(含税)
+//           const lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
+//           const priceIncludeTax = format15(
+//             evaluate(`${lineAmountIncludeTax} / ${quantity}`),
+//             calculatingDigits);
+//           form.setFieldsValue({ priceIncludeTax });
+//           await controller.setEditGood({ priceIncludeTax });
+//         }
+
+//         // 更新不含税
+//         await updateUnitPriceExcludingTax(controller, form, record);
+//       } else {
+//         // 不含税
+//         if (!err.priceExcludeTax && values.priceExcludeTax) {
+//           const priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
+//           const lineAmountExcludeTax = format2(evaluate(`${quantity} * ${priceExcludeTax}`));
+//           form.setFieldsValue({ lineAmountExcludeTax });
+//           await controller.setEditGood({ lineAmountExcludeTax, quantity });
+//         } else if (!err.lineAmountExcludeTax && values.lineAmountExcludeTax) {
+//           const lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
+//           const priceExcludeTax = format15(evaluate(`${lineAmountExcludeTax} / ${quantity}`), calculatingDigits);
+//           form.setFieldsValue({ priceExcludeTax });
+//           await controller.setEditGood({ priceExcludeTax, quantity });
+//         }
+
+//         // 更新含税
+//         await updateUnitPriceTax(controller, form, record);
+//       }
+
+//       // 清楚 计算中启动字段
+//       await clearCalculatingField(controller);
+//     });
+//   },
+//   1000,
+// );
 export const onChangeQuantity = lazyFn(
   (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
     form.validateFields(async (err, values) => {
@@ -61,8 +126,8 @@ export const onChangeQuantity = lazyFn(
       }
       if (err.quantity) {
         await clearCalculatingField(controller);
-        return
-      };
+        return;
+      }
 
       const calculatingDigits = controller.state.calculatingDigits;
       const quantity = format15(values.quantity, calculatingDigits);
@@ -71,50 +136,41 @@ export const onChangeQuantity = lazyFn(
 
       // 是否含税
       if (controller.state.goodsListState.isTaxIncluded) {
-        // 含税
-        if (!err.priceIncludeTax && values.priceIncludeTax) {
-          // 可以找到 单价(含税)
-          const priceIncludeTax = format15(values.priceIncludeTax, calculatingDigits);
-          const lineAmountIncludeTax = format2(evaluate(`${priceIncludeTax} * ${quantity}`));
-          form.setFieldsValue({ lineAmountIncludeTax });
-          await controller.setEditGood({ lineAmountIncludeTax });
-        } else if (!err.lineAmountIncludeTax && values.lineAmountIncludeTax) {
-          // 可以找到 金额(含税)
+        // 含税：只根据金额反算单价
+        if (!err.lineAmountIncludeTax && values.lineAmountIncludeTax) {
           const lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
           const priceIncludeTax = format15(
             evaluate(`${lineAmountIncludeTax} / ${quantity}`),
-            calculatingDigits);
+            8
+          );
           form.setFieldsValue({ priceIncludeTax });
           await controller.setEditGood({ priceIncludeTax });
         }
 
-        // 更新不含税
+        // 更新不含税单价（反算）
         await updateUnitPriceExcludingTax(controller, form, record);
+
       } else {
-        // 不含税
-        if (!err.priceExcludeTax && values.priceExcludeTax) {
-          const priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
-          const lineAmountExcludeTax = format2(evaluate(`${quantity} * ${priceExcludeTax}`));
-          form.setFieldsValue({ lineAmountExcludeTax });
-          await controller.setEditGood({ lineAmountExcludeTax, quantity });
-        } else if (!err.lineAmountExcludeTax && values.lineAmountExcludeTax) {
+        // 不含税：只根据金额反算单价
+        if (!err.lineAmountExcludeTax && values.lineAmountExcludeTax) {
           const lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
-          const priceExcludeTax = format15(evaluate(`${lineAmountExcludeTax} / ${quantity}`), calculatingDigits);
+          const priceExcludeTax = format15(
+            evaluate(`${lineAmountExcludeTax} / ${quantity}`),
+            8
+          );
           form.setFieldsValue({ priceExcludeTax });
-          await controller.setEditGood({ priceExcludeTax, quantity });
+          await controller.setEditGood({ priceExcludeTax });
         }
 
-        // 更新含税
+        // 更新含税单价（反算）
         await updateUnitPriceTax(controller, form, record);
       }
 
-      // 清楚 计算中启动字段
       await clearCalculatingField(controller);
     });
   },
   1000,
 );
-
 /** 单价(含税) */
 export const onChangePriceIncludeTax = lazyFn(
   (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
@@ -132,7 +188,7 @@ export const onChangePriceIncludeTax = lazyFn(
       }
 
       const calculatingDigits = controller.state.calculatingDigits;
-      const priceIncludeTax = format15(values.priceIncludeTax, calculatingDigits);
+      const priceIncludeTax = format15(values.priceIncludeTax, 8);
       await controller.setEditGood({ priceIncludeTax });
       form.setFieldsValue({ priceIncludeTax });
 
@@ -176,7 +232,7 @@ export const onChangePriceExcludeTax = lazyFn(
       }
 
       const calculatingDigits = controller.state.calculatingDigits;
-      const priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
+      const priceExcludeTax = format15(values.priceExcludeTax, 8);
       await controller.setEditGood({ priceExcludeTax });
       form.setFieldsValue({ priceExcludeTax });
 
@@ -228,11 +284,11 @@ export const onChangeLineAmountIncludeTax = lazyFn(
       // 是否有数量
       if (!err.quantity && values.quantity) {
         const quantity = format15(values.quantity, calculatingDigits);
-        const priceIncludeTax = format15(evaluate(`${lineAmountIncludeTax} / ${quantity}`), calculatingDigits);
+        const priceIncludeTax = format15(evaluate(`${lineAmountIncludeTax} / ${quantity}`), 8);
         form.setFieldsValue({ priceIncludeTax });
         await controller.setEditGood({ priceIncludeTax });
       } else if (!err.priceIncludeTax && (values.priceIncludeTax || values.priceIncludeTax === 0)) {
-        const priceIncludeTax = format15(values.priceIncludeTax, calculatingDigits);
+        const priceIncludeTax = format15(values.priceIncludeTax, 8);
         const quantity = format15(evaluate(`${lineAmountIncludeTax} / ${priceIncludeTax}`), calculatingDigits);
         form.setFieldsValue({ quantity });
         await controller.setEditGood({ quantity });
@@ -268,11 +324,11 @@ export const onChangeLineAmountExcludeTax = lazyFn(
       // 是否有数量
       if (!err.quantity && values.quantity) {
         const quantity = format15(values.quantity, calculatingDigits);
-        const priceExcludeTax = format15(evaluate(`${lineAmountExcludeTax} / ${quantity}`), calculatingDigits);
+        const priceExcludeTax = format15(evaluate(`${lineAmountExcludeTax} / ${quantity}`), 8);
         form.setFieldsValue({ priceExcludeTax });
         await controller.setEditGood({ priceExcludeTax });
       } else if (!err.priceExcludeTax && values.priceExcludeTax) {
-        const priceExcludeTax = format15(values.priceExcludeTax, calculatingDigits);
+        const priceExcludeTax = format15(values.priceExcludeTax, 8);
         const quantity = format15(evaluate(`${lineAmountExcludeTax} / ${priceExcludeTax}`), calculatingDigits);
         form.setFieldsValue({ quantity });
         await controller.setEditGood({ quantity });
@@ -435,7 +491,7 @@ export const updateUnitPriceTax = async (controller: InvoiceController, form: Wr
         // 单价(含税) = 金额（含税） / (數量)
         // 是否有数量
         if (!err.quantity && values.quantity) {
-          const priceIncludeTax = format15(evaluate(`${lineAmountIncludeTax} / ${values.quantity}`), calculatingDigits);
+          const priceIncludeTax = format15(evaluate(`${lineAmountIncludeTax} / ${values.quantity}`), 8);
           await controller.setEditGood({ priceIncludeTax });
         }
 
@@ -593,12 +649,12 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
               needRefresh = true;
             }
             const quantity: any = format15(sourceQuantity, calculatingDigits);
-            const priceIncludeTax: any = format15(sourcePriceIncludeTax, calculatingDigits);
+            const priceIncludeTax: any = format15(sourcePriceIncludeTax, 8);
 
             const lineAmountIncludeTax: any = format2(evaluate(`${priceIncludeTax} * ${quantity}`));
             const taxAmount: any = countTaxAmount(lineAmountIncludeTax, controller.state.goodsListState.deduction, taxRate as any);
             const lineAmountExcludeTax: any = countAmountExcludeTax(lineAmountIncludeTax, taxAmount);
-            const priceExcludeTax: any = countPrice(lineAmountExcludeTax, quantity, controller.state.calculatingDigits);
+            const priceExcludeTax: any = countPrice(lineAmountExcludeTax, quantity, 8);
 
             return {
               ...good,
@@ -618,11 +674,11 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
               needRefresh = true;
             }
             const quantity: any = format15(sourceQuantity, calculatingDigits);
-            const priceExcludeTax: any = format15(sourcePriceExcludeTax, calculatingDigits);
+            const priceExcludeTax: any = format15(sourcePriceExcludeTax, 8);
 
             const lineAmountExcludeTax: any = format2(evaluate(`${priceExcludeTax} * ${quantity}`));
             const lineAmountIncludeTax: any = format2(evaluate(`${lineAmountExcludeTax} * (1+(${taxRate}/100))`));
-            const priceIncludeTax: any = format15(evaluate(`${lineAmountIncludeTax} / ${quantity}`), calculatingDigits);
+            const priceIncludeTax: any = format15(evaluate(`${lineAmountIncludeTax} / ${quantity}`), 8);
             const taxAmount: any = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
 
             return {

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

@@ -320,18 +320,33 @@ export default (form: WrappedFormUtils) => {
             return (
               <Form.Item>
                 {getFieldDecorator('priceIncludeTax', {
-                  initialValue: nonScientificNotation(editGood.priceIncludeTax),
+                  initialValue: nonScientificNotation(editGood.priceIncludeTax, 8),
                   getValueFromEvent: onNumberValueChange,
                   rules: [
                     ...getReplenishRules('priceIncludeTax'),
-                    { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '单价必须为数字' },
+                    // { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '单价必须为数字' },
+                    // { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额必须为数字' },
+                    {
+                      pattern: /^[+-]?(0|([1-9]\d*))(\.\d{1,8})?$/,
+                      message: '单价必须为数字且最多保留8位小数'
+                    },
                     {
                       validator: async (_, value, callback) => {
                         await controller.wait();
-                        const isQuantity = !!getFieldValue('quantity') || getFieldValue('quantity') === 0;
-                        const isvalue = !!value || value === 0;
-                        if (isvalue || isQuantity === isvalue) return;
-                        callback('请输入单价');
+                        // const isQuantity = !!getFieldValue('quantity') || getFieldValue('quantity') === 0;
+                        // const isvalue = !!value || value === 0;
+                        // if (isvalue || isQuantity === isvalue) return;
+                        // callback('请输入单价');
+                        const quantity = getFieldValue('quantity');
+                        const isQuantityValid = quantity !== undefined && quantity !== null && quantity !== '';
+                        const isValueValid = value !== undefined && value !== null && value !== '';
+
+                        // if (isValueValid && isQuantityValid) return;
+                        // 允许两者都为空
+                        if (!isValueValid && !isQuantityValid) return;
+
+                        if (!isValueValid) return callback('金额不能为空');
+                        if (!isQuantityValid) return callback('数量不能为空');
                       }
                     }
                   ],
@@ -349,7 +364,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{nonScientificNotation(value)}</span>;
+            return <span style={{ padding: '0 10px' }}>{nonScientificNotation(value, 8)}</span>;
           }
         },
       },
@@ -364,18 +379,32 @@ export default (form: WrappedFormUtils) => {
             return (
               <Form.Item>
                 {getFieldDecorator('priceExcludeTax', {
-                  initialValue: nonScientificNotation(editGood.priceExcludeTax),
+                  initialValue: nonScientificNotation(editGood.priceExcludeTax, 8),
                   getValueFromEvent: onNumberValueChange,
                   rules: [
                     ...getReplenishRules('priceExcludeTax'),
-                    { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '单价必须为数字' },
+                    // { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '单价必须为数字' },
+                    {
+                      pattern: /^[+-]?(0|([1-9]\d*))(\.\d{1,8})?$/,
+                      message: '单价必须为数字且最多保留8位小数'
+                    },
                     {
                       validator: async (_, value, callback) => {
                         await controller.wait();
-                        const isQuantity = !!getFieldValue('quantity') || getFieldValue('quantity') === 0;
-                        const isvalue = !!value || value === 0;
-                        if (isvalue || isQuantity === isvalue) return;
-                        callback('请输入单价');
+                        // const isQuantity = !!getFieldValue('quantity') || getFieldValue('quantity') === 0;
+                        // const isvalue = !!value || value === 0;
+                        // if (isvalue || isQuantity === isvalue) return;
+                        // callback('请输入单价');
+                        const quantity = getFieldValue('quantity');
+                        const isQuantityValid = quantity !== undefined && quantity !== null && quantity !== '';
+                        const isValueValid = value !== undefined && value !== null && value !== '';
+
+                        // if (isValueValid && isQuantityValid) return;
+                        // 允许两者都为空
+                        if (!isValueValid && !isQuantityValid) return;
+
+                        if (!isValueValid) return callback('金额不能为空');
+                        if (!isQuantityValid) return callback('数量不能为空');
                       }
                     }
                   ],
@@ -393,7 +422,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{nonScientificNotation(value)}</span>;
+            return <span style={{ padding: '0 10px' }}>{nonScientificNotation(value, 8)}</span>;
           }
         },
       },

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

@@ -16,7 +16,10 @@ export default (goods: IGood) => {
     const onClick = React.useCallback(() => {
         controller.delGood(goods.$index);
     }, [controller, goods.$index]);
-
+    
+    if (goods.lineAttribute === LineAttributeType.正常 && goods?.referenceLines && goods?.referenceLines?.length > 0 ) {
+        return undefined;
+    }
     if (goods.lineAttribute === LineAttributeType.被折扣行) {
         return undefined;
     }

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

@@ -25,7 +25,7 @@ import Invoice from '../../..';
 import './index.less';
 
 import useEndowCodeButton from './ui/BulkMenu/hooks/useEndowCodeButton';
-import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton';
+import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton'; 
 import useAddDiscountRowButton from './ui/BulkMenu/hooks/useAddDiscountRowButton';
 import useMergeDetails from './ui/BulkMenu/hooks/useMergeDetails';
 import useMergeDiscount from './ui/BulkMenu/hooks/useMergeDiscount';
@@ -49,7 +49,7 @@ export interface IGoodsListProps {
   isSwitchTax?: boolean;
 }
 
-export default class GoodsList extends React.Component<IGoodsListProps>{
+export default class GoodsList extends React.Component<IGoodsListProps> {
   render() {
     return <Main {...this.props} />
   }
@@ -85,8 +85,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   const delRowButton = useDelRowButton();
 
   /** 添加折扣行 */
-  const addDiscountRowButton = useAddDiscountRowButton();
-
+  const addDiscountRowButton = useAddDiscountRowButton(); 
   /** 全单合并明细 */
   const mergeDetails = useMergeDetails()
 
@@ -147,7 +146,8 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
 
           {/* 批量删除 */}
           {delRowButton.button}
-
+          {/* 加载折扣 */}
+          {addDiscountRowButton.button}
           {/* 全单合并明细 */}
           {mergeDetails.button}
 
@@ -155,7 +155,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
           {mergeDiscount.button}
 
           {/* 添加折扣行 */}
-          {addDiscountRowButton.drawer}
+          {/* {addDiscountRowButton.drawer} */}
 
           {/* 销售折让 */}
           {salesDiscount.button}