kts-component-invoice-operate 3.2.191 → 3.2.193

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

@@ -294,7 +294,7 @@ export default (form: WrappedFormUtils) => {
                 })(
                   <MyInput
                     style={{ textAlign: 'right' }}
-                    maxLength={16}
+                    maxLength={25}
                     loading={isCipher(changeField, "quantity")}
                     onChange={async () => {
                       setChangeField('quantity');
@@ -338,7 +338,7 @@ export default (form: WrappedFormUtils) => {
                 })(
                   <MyInput
                     style={{ textAlign: 'right' }}
-                    maxLength={16}
+                    maxLength={25}
                     loading={isCipher(changeField, 'priceIncludeTax')}
                     onChange={() => {
                       setChangeField('priceIncludeTax');
@@ -382,7 +382,7 @@ export default (form: WrappedFormUtils) => {
                 })(
                   <MyInput
                     style={{ textAlign: 'right' }}
-                    maxLength={16}
+                    maxLength={25}
                     loading={isCipher(changeField, 'priceExcludeTax')}
                     onChange={() => {
                       setChangeField('priceExcludeTax');

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

@@ -342,6 +342,40 @@ export const onChangeTaxRate = lazyFn(
   1000,
 );
 
+/** 税额 */
+export const onChangeTaxAmount = lazyFn(
+  (controller: InvoiceController, form: WrappedFormUtils, record: IGood) => {
+
+    /** 金额（不含税） */
+    let lineAmountExcludeTax;
+
+    form.validateFields(async (err, values) => {
+      err = err || {};
+
+      const record = controller.state.goodsListState.editGood;
+
+      // 校验是否有含税金额
+      if (err.lineAmountIncludeTax && (!record?.lineAmountIncludeTax && record?.lineAmountIncludeTax !== 0)) {
+        await clearCalculatingField(controller);
+        return;
+      }
+
+      // 计数不含税金额
+      lineAmountExcludeTax = countAmountExcludeTax(record?.lineAmountIncludeTax || 0, values.taxAmount);
+      form.setFieldsValue({ lineAmountExcludeTax });
+
+      const priceExcludeTax: any = countPrice(lineAmountExcludeTax || '', record?.quantity || '', controller.state.calculatingDigits);
+      
+      await controller.setEditGood({ lineAmountExcludeTax, taxAmount: values.taxAmount, priceExcludeTax });
+      form.setFieldsValue({ priceExcludeTax });
+
+      // 清楚 计算中启动字段
+      await clearCalculatingField(controller);
+    })
+  },
+  1000,
+)
+
 /** 小规模纳税人 1% 和 3% 自动赋码免税 */
 export function dutyFree(controller: InvoiceController, taxRate: number, form: WrappedFormUtils<any>, record: IGood) {
 
@@ -558,7 +592,7 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
         key: '你正在编辑一个货物',
       });
 
-      return ;
+      return;
     }
 
     s.goodsListState.isTaxIncluded = isTaxIncluded;
@@ -632,7 +666,7 @@ export const onChangeSwitchTax = async (controller: InvoiceController, isTaxIncl
           s.goodsListState.goodsList = newGoodsList;
         }
       }
-    } catch(e) {
+    } catch (e) {
       console.error('切换税率重新计算出错', e, s.goodsListState)
     }
   })

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

@@ -18,6 +18,7 @@ import {
   onChangeLineAmountExcludeTax,
   onChangeTaxRate,
   onChangeItemName,
+  onChangeTaxAmount,
 } from './autoFillFn';
 import Drag from './ui/Drag';
 import { nonScientificNotation } from '../../../../../tools/calculate';
@@ -50,6 +51,9 @@ export default (form: WrappedFormUtils) => {
   /** 禁用字段 */
   const disableds = controller.useMemo((e) => e.stakeholder.disableds || [], []);
 
+  /** 启用字段 */
+  const enables = controller.useMemo(s => s.stakeholder.enables || [], []);
+
   /** 搜索条件 */
   const searchValue = controller.useMemo((e) => e.goodsListState.searchValue, []);
 
@@ -71,6 +75,8 @@ export default (form: WrappedFormUtils) => {
   /** 计算中启动字段 */
   const setChangeField = React.useCallback((value: string) => controller.run(async s => { s.calculatingField = value }), []);
 
+  const isEnables = React.useCallback(field => enables.indexOf(field) >= 0, [enables])
+
   const onNumberValueChange = React.useCallback((e) => {
     const value = e?.target?.value;
     if (value) {
@@ -256,7 +262,7 @@ export default (form: WrappedFormUtils) => {
                 })(
                   <MyInput
                     style={{ textAlign: 'right' }}
-                    maxLength={16}
+                    maxLength={25}
                     loading={isCipher(changeField, "quantity")}
                     onChange={async () => {
                       setChangeField('quantity');
@@ -300,7 +306,7 @@ export default (form: WrappedFormUtils) => {
                 })(
                   <MyInput
                     style={{ textAlign: 'right' }}
-                    maxLength={16}
+                    maxLength={25}
                     loading={isCipher(changeField, 'priceIncludeTax')}
                     onChange={() => {
                       setChangeField('priceIncludeTax');
@@ -344,7 +350,7 @@ export default (form: WrappedFormUtils) => {
                 })(
                   <MyInput
                     style={{ textAlign: 'right' }}
-                    maxLength={16}
+                    maxLength={25}
                     loading={isCipher(changeField, 'priceExcludeTax')}
                     onChange={() => {
                       setChangeField('priceExcludeTax');
@@ -505,21 +511,28 @@ export default (form: WrappedFormUtils) => {
           if (editGood?.$index === record.$index && !disableds.includes('taxAmount')) {
             return getFieldDecorator('taxAmount', {
               initialValue: editGood.taxAmount,
-              rules: getReplenishRules('taxAmount'),
-            })(<MyDiv loading={isCipher(changeField, 'taxAmount')} />);
+              rules: [
+                ...getReplenishRules('taxAmount'),
+                { required: true, message: '税额不能为空' },
+                { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '税额必须为数字' },
+              ],
+            })(
+              isEnables('taxAmount')
+                ? <MyInput
+                  style={{ textAlign: 'right' }}
+                  loading={isCipher(changeField, 'taxAmount')}
+                  onChange={() => {
+                    setChangeField('taxAmount');
+                    onChangeTaxAmount(controller, form, record);
+                  }}
+                />
+                : <MyDiv loading={isCipher(changeField, 'taxAmount')} />
+            );
           } else {
             return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : parseFloat(value).toFixed(2)}</span>;
           }
         },
       },
-      // {
-      //   title: '操作',
-      //   key: 'operating',
-      //   align: 'right',
-      //   width: 130,
-      //   fixed: 'right',
-      //   render: (_value: string, record: IGood) => <RowMenu key={record.lineAttribute} goods={record} />,
-      // },
     ]
       // 含税不含税
       .filter((e) => {