kts-component-invoice-operate 3.2.250 → 3.2.252

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

@@ -3,10 +3,12 @@ import React from "react";
 import { decorator } from 'grey-react-box';
 import { Form } from 'kts-components-antd-x3';
 import { FormComponentProps } from 'kts-components-antd-x3/lib/form';
+import Icon from '@ant-design/icons';
 import Invoice from '../../..';
 import './index.less';
-import { Cascader, Col, Input, Row, Select } from "kts-components-antd-x4";
+import { Cascader, Col, Input, Row, Select, Button } from "kts-components-antd-x4";
 import moment from "moment";
+import { ReactComponent as I001 } from './svg/plus.svg'
 
 
 export interface RealEstateInfoProps {
@@ -19,6 +21,12 @@ export interface RealEstateInfoProps {
      * 建筑服务地址数据字段名
      */
     fieldNames?: any;
+
+    /** 获取"跨区域涉税事项报验管理编号" */
+    getCrossRegionTaxReportNo?: () => Promise<any>;
+
+    /** 是否显示 【 获取"跨区域涉税事项报验管理编号"】按钮 */
+    showGetCrossRegionTaxReportNoButton?: boolean;
 }
 
 /** 特殊信息-建筑服务 */
@@ -38,6 +46,15 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
     // 注册 form
     controller.useForm('serviceDataDtoInfo', form);
 
+    // 监听 crossCitiesSign 字段值变化
+    const [crossCitiesSign, setCrossCitiesSign] = React.useState(form.getFieldValue('crossCitiesSign'));
+
+    // 同步表单初始值和外部更新
+    React.useEffect(() => {
+        const currentValue = form.getFieldValue('crossCitiesSign');
+        setCrossCitiesSign(currentValue);
+    }, [form]);
+
     return (
         <div className="kts-invoice-operate-real-estate-info-digtal">
             <div className='real-estate-info-digtal-label' >特定信息-建筑服务</div>
@@ -45,7 +62,7 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
                 <Col span={6} >
                     <Form.Item label='土地增值税项目编号' >
                         {getFieldDecorator('landNumber', {
-                             rules: [
+                            rules: [
                                 { max: 16, message: '最多16个字符' },
                             ]
                         })(
@@ -55,7 +72,7 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
                         )}
                     </Form.Item>
                 </Col>
-               
+
 
                 <Col span={6} >
                     <Form.Item label='建筑服务发生地' >
@@ -102,19 +119,53 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
                         })(
                             readOnly
                                 ? <MyNY />
-                                : <Select placeholder='请选择' style={{ width: '100%' }} >
+                                : <Select
+                                    placeholder='请选择'
+                                    style={{ width: '100%' }}
+                                    onChange={(value) => {
+                                        setCrossCitiesSign(value)
+                                        if (value === 'N') {
+                                            form.setFieldsValue({
+                                                crossRegionTaxReportNo: '',
+                                                constructAddress: [],
+                                                constructDetailAddress: '',
+                                                constructName: '',
+                                            });
+                                        }
+                                    }}
+                                >
                                     <Select.Option value='Y'>是</Select.Option>
                                     <Select.Option value='N'>否</Select.Option>
                                 </Select>
                         )}
                     </Form.Item>
                 </Col>
+
+                <Col span={6} >
+                    <Form.Item label='跨区域涉税事项报验管理编号' >
+                        {getFieldDecorator('crossRegionTaxReportNo', {
+                            rules: readOnly ? [] : [{ required: crossCitiesSign === 'Y', message: '请输入跨区域涉税事项报验管理编号' }]
+                        })(
+                            readOnly
+                                ? <MyDiv />
+                                : <Input readOnly autoComplete='off'
+                                    addonAfter={props.showGetCrossRegionTaxReportNoButton && <Button style={{ height: 0, padding: 0, width: "auto" }} type="link" icon={<Icon component={I001} />} disabled={readOnly || crossCitiesSign !== 'Y'}
+                                        onClick={async () => {
+                                            const values = await props.getCrossRegionTaxReportNo?.();
+                                            form.setFieldsValue(values);
+                                        }}
+                                    />}
+                                />
+                        )}
+                    </Form.Item>
+                </Col>
+
                 <Col span={6} >
                     <Form.Item label='建筑项目名称' >
-                        {getFieldDecorator('constructName', { rules: readOnly ? [] : [
+                        {getFieldDecorator('constructName', {
+                            rules: readOnly ? [] : [
                                 { required: true, message: '请输入建筑项目名称' },
                                 { max: 200, message: '建筑项目名称最多200个字符' },
-                                
                             ]
                         })(
                             readOnly
@@ -123,7 +174,6 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
                         )}
                     </Form.Item>
                 </Col>
-
             </Row>
         </div>
     )

package/src/Invoice/ui/digtal/Architecture/svg/plus.svg

@@ -0,0 +1 @@
+<svg t="1767497722334" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16431" width="200" height="200"><path d="M644.879 886.426c0-71.304-56.367-129.106-125.887-129.106-69.511 0-125.898 57.802-125.898 129.106 0 71.323 56.388 129.124 125.898 129.124 69.52 0 125.887-57.803 125.887-129.124z m0-387.336c0-71.303-56.367-129.124-125.887-129.124-69.511 0-125.898 57.822-125.898 129.124 0 71.303 56.388 129.106 125.898 129.106 69.52 0 125.887-57.803 125.887-129.106z m0-361.515c0-71.324-56.367-129.125-125.887-129.125-69.511 0-125.898 57.801-125.898 129.125 0 71.304 56.388 129.105 125.898 129.105 69.52-0.001 125.887-57.802 125.887-129.105z" p-id="16432"></path></svg>

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

@@ -11,6 +11,7 @@ import { message } from 'kts-components-antd-x3'
 import { format2, format15, countTaxAmount, countAmountExcludeTax, countPrice } from '../../../../../../tools/calculate';
 import moment from 'moment';
 import { equal } from 'mathjs';
+import { chain, bignumber } from 'mathjs';
 
 export { format2, format15 } from '../../../../../../tools/calculate';
 
@@ -361,13 +362,18 @@ export const onChangeTaxAmount = lazyFn(
       }
 
       // 计数不含税金额
-      lineAmountExcludeTax = countAmountExcludeTax(record?.lineAmountIncludeTax || 0, values.taxAmount);
-      form.setFieldsValue({ lineAmountExcludeTax });
-
-      const priceExcludeTax: any = countPrice(lineAmountExcludeTax || '', record?.quantity || '', controller.state.calculatingDigits);
+      // 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 });
+
+      // 计算含税金额
+      const lineAmountIncludeTax = chain(bignumber(record?.lineAmountExcludeTax || 0)).add(bignumber(values.taxAmount || 0)).done().toNumber();
+      form.setFieldsValue({ lineAmountIncludeTax });
 
-      await controller.setEditGood({ lineAmountExcludeTax, taxAmount: values.taxAmount, priceExcludeTax });
-      form.setFieldsValue({ priceExcludeTax });
+      await controller.setEditGood({ taxAmount: values.taxAmount, lineAmountIncludeTax });
 
       // 清楚 计算中启动字段
       await clearCalculatingField(controller);
@@ -481,7 +487,8 @@ export const updateUnitPriceTax = async (controller: InvoiceController, form: Wr
         }
 
         // 税额 = 金额(含税)-金额(不含税)
-        const taxAmount = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
+        // const taxAmount = evaluate(`${lineAmountIncludeTax} - ${lineAmountExcludeTax}`);
+        const taxAmount = format2(evaluate(`${lineAmountExcludeTax} * ${values.taxRate}/100`));
         form.setFieldsValue({ taxAmount });
         await controller.setEditGood({ taxAmount });
       } else {

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

@@ -473,7 +473,7 @@ export default (form: WrappedFormUtils) => {
         key: 'taxRate',
         align: 'right',
         width: 70,
-        render: (value: string|number, record: IGood) => {
+        render: (value: string | number, record: IGood) => {
           if (editGood?.$index === record.$index && !disableds.includes('taxRate') && !(model === 'prefab' && calculateType === '3')) {
             return (
               <Form.Item>
@@ -533,28 +533,27 @@ export default (form: WrappedFormUtils) => {
                     { required: isValidateGood, message: '税额不能为空' },
                     {
                       validator: (rule, value, callback) => {
-                        //含税金额
+                        //含税金额(lineAmountExcludeTax)
                         const lineAmountIncludeTax = editGood?.lineAmountIncludeTax || 0;
                         //不含税金额
                         // const lineAmountExcludeTax = lineAmountIncludeTax-value;
-                        const lineAmountExcludeTax = chain(bignumber(lineAmountIncludeTax || 0)).subtract(bignumber(value || 0));
+                        const lineAmountExcludeTax = editGood?.lineAmountExcludeTax || 0;
                         const taxRate = editGood?.taxRate;
-                        if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
+                        console.log('taxRate ===>', taxRate);
+                        if (lineAmountExcludeTax &&  (taxRate || taxRate === 0) && lineAmountIncludeTax) {
                           // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
-                          const total = lineAmountExcludeTax.multiply(bignumber(taxRate || 0)).divide(bignumber(100));
+                          const total = chain(bignumber(lineAmountExcludeTax)).multiply(bignumber(taxRate || 0)).divide(bignumber(100));
                           // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
-                          if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
+                          if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.06) {
                             callback();
                           } else {
-                            callback('税额填写错误，请重新输入')
-                          }
+                            callback('第' + (record.serialNo) + '行税额校验不通过!')
+                          } 
                         } else {
                           callback();
                         }
-
                       }
                     },
-
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '税额必须为数字' },
                   ],
                 })(
@@ -581,7 +580,6 @@ export default (form: WrappedFormUtils) => {
         dataIndex: 'remarks',
         key: 'remarks',
         width: 150,
-
       },
     ]
       // 含税不含税

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

@@ -13,27 +13,7 @@ export default () => {
   /** 是否不含税） */
   const isTaxIncluded = controller.useMemo(s => s.goodsListState.isTaxIncluded, []);
 
-  /** 金额（含税） */
-  const lineAmountIncludeTax = controller.useMemo((s) => {
-    if (typeof s.goodsListState.amountIncludeTax === 'number') {
-      return s.goodsListState.amountIncludeTax
-    }
-
-    let sum = chain(bignumber(0));
-    const editGood = s.goodsListState.editGood; // 正在编辑的货物
-    const err = s.goodsListState.form?.getFieldsError() ?? {};
-
-    s.goodsListState.goodsList.forEach((e) => {
-      if (e.$index === editGood?.$index) {
-        if (!err.lineAmountIncludeTax) {
-          sum = sum.add(bignumber(editGood.lineAmountIncludeTax || 0));
-        }
-      } else {
-        sum = sum.add(bignumber(e.lineAmountIncludeTax || 0));
-      }
-    });
-    return sum.done().toNumber();
-  }, []);
+  
 
   /** 金额（不含税） */
   const lineAmountExcludeTax = controller.useMemo((s) => {
@@ -75,6 +55,28 @@ export default () => {
     return sum.done().toNumber();
   }, []);
 
+  /** 金额（含税） */
+  const lineAmountIncludeTax = controller.useMemo((s) => {
+    if (typeof s.goodsListState.amountIncludeTax === 'number') {
+      return s.goodsListState.amountIncludeTax
+    }
+
+    let sum = chain(bignumber(0));
+    const editGood = s.goodsListState.editGood; // 正在编辑的货物
+    const err = s.goodsListState.form?.getFieldsError() ?? {};
+
+    s.goodsListState.goodsList.forEach((e) => {
+      if (e.$index === editGood?.$index) {
+        if (!err.lineAmountIncludeTax) {
+          sum = sum.add(bignumber(editGood.lineAmountIncludeTax || 0));
+        }
+      } else {
+        sum = sum.add(bignumber(e.lineAmountIncludeTax || 0));
+      }
+    });
+    return sum.done().toNumber();
+  }, []);
+
   return (
     <div className='kts-invoice-operate-goods-list-statistics-digtal' >
       <div className='statistics-digtal-total' >
@@ -87,11 +89,11 @@ export default () => {
         <div>价税合计（大写）</div>
         <div style={{ paddingLeft: 30 }} >
           <Icon style={{fontSize: 16}} component={ForkSvg} />
-          <span style={{ fontWeight: 'bold', marginLeft: 4 }} >{Money.toStringChinese(lineAmountIncludeTax)}</span>
+          <span style={{ fontWeight: 'bold', marginLeft: 4 }} >{Money.toStringChinese(lineAmountExcludeTax+taxAmount)}</span>
         </div>
         <div style={{ flex: 1 }} />
         <div style={{ width: 90, color: '#9F613E' }} >（小写）</div>
-        <div style={{ minWidth: 119, maxWidth: 300 }} >¥{parseFloat(lineAmountIncludeTax).toFixed(2)}</div>
+        <div style={{ minWidth: 119, maxWidth: 300 }} >¥{parseFloat(lineAmountExcludeTax+taxAmount).toFixed(2)}</div>
       </div>
     </div >
   );