kts-component-invoice-operate 3.2.239 → 3.2.241

package/package.json

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

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

@@ -2,12 +2,12 @@ import React from 'react';
 import Invoice from '../../..';
 import 'antd/dist/antd.css';
 import { Money } from '../../../tools/utils';
-import { Button } from 'kts-components-antd-x3';
+import { chain, bignumber } from 'mathjs';
 export default () => {
     const callback = (e: any) => {
         console.log(e.target.checked)
     }
-    const onTaxSwitchChange = (e: any) => {
+    const onTaxSwitchChange=(e:any)=>{
         console.log(e)
     }
     console.log(Money.toStringChinese(0))
@@ -125,14 +125,10 @@ export default () => {
     }
     React.useEffect(() => {
         controller.run(async s => {
-            // s.goodsListState.isRecalculateWhenSwitchTax = false;
-            // s.goodsListState.isValidateGood = false;
-            // s.goodsListState.isTaxIncluded = false;
-            s.stakeholder.disableds = Array.from(new Set([
-                'buyerName',
-                'buyerTaxId',
-                'naturalPersonFlag'
-            ]));
+            s.goodsListState.isRecalculateWhenSwitchTax = false;
+            s.goodsListState.isValidateGood=false;
+            s.goodsListState.isTaxIncluded = false;
+            
             // s.stakeholder.enables = ['taxAmount'];
             // s.priceIntegerDigit = 25;
             // s.calculatingDigits = 25;
@@ -143,46 +139,18 @@ export default () => {
             // s.goodsListState.goodsList = data?.detailList?.map(e => sToCi(e)) ?? [];
         })
     }, [controller])
-    const onSave = async () => {
-        const formValues = await controller.validateFields();
-        console.log(formValues)
-    }
     return (
-        // <Invoice
-        //     invoiceType='digtal'
-        //     controller={controller}
-        //     goodsList={<Invoice.GoodsListDigtal onTaxSwitchChange={onTaxSwitchChange} />}
-        //     stakeholder={<Invoice.Stakeholder leqi={true} invoiceMarkCallback={callback} />}
-        //     invoiceHeader={
-        //         <Invoice.InvoiceHeader
-        //             title='自定义'
-        //         />
-        //     }
-        // />
-        <>
-         <Button onClick={onSave}>输出表单内容</Button>
         <Invoice
             invoiceType='digtal'
             controller={controller}
             goodsList={<Invoice.GoodsListDigtal onTaxSwitchChange={onTaxSwitchChange} />}
-            // stakeholder={<Invoice.Stakeholder leqi={true} invoiceMarkCallback={callback} />}
+            stakeholder={<Invoice.Stakeholder leqi={true} invoiceMarkCallback={callback} />}
             invoiceHeader={
                 <Invoice.InvoiceHeader
-                    title='农产品'
-                />
-            }
-            stakeholder={
-                <Invoice.StakeFarmerholder
-                    isExpand={false}
-                    isVatNormal={true}
-                    isNaturalPerson={true}
-                    isShowImportButton={true}
-                    leqi={true}
+                    title='自定义'
                 />
             }
         />
-        </>
-
     )
 };
 function sToCi(data: any) {

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

@@ -2,7 +2,7 @@ import React from 'react';
 import Invoice from '../../..';
 import moment from 'moment';
 import 'antd/dist/antd.css';
-import { Button } from 'kts-components-antd-x3';
+
 export default () => {
 
     const controller = React.useMemo(() => new Invoice.InvoiceController(), []);
@@ -14553,29 +14553,23 @@ export default () => {
             controller.state.freightListState.goodsList = [{ $index: '222', type: 'RAILWAY', itemName: '咖啡机', licensePlate: '渝bkb190', origin: ['北京', '市辖区', '东城区'], destination: ['北京', '市辖区', '东城区'] }]
         })
     }, [])
-    const onSave = async () => {
-        const formValues = await controller.validateFields();
-        console.log(formValues)
-    }
+
     return (
-        <>
-            <Button onClick={onSave}>输出表单内容</Button>
-            <Invoice
-                invoiceType='digtal'
-                controller={controller}
-                specialInfor={<Invoice.FreightList
-                    vehicleTypeList={[
-                        { label: '铁路运输', value: 'RAILWAY' }
-                    ]}
-                    addressOptions={area}
-                    fieldNames={{
-                        label: 'name',
-                        value: 'name',
-                        children: 'children'
-                    }}
-                />
-                }
+        <Invoice
+            invoiceType='digtal'
+            controller={controller}
+            specialInfor={<Invoice.FreightList
+                vehicleTypeList={[
+                    { label: '铁路运输', value: 'RAILWAY' }
+                ]}
+                addressOptions={area}
+                fieldNames={{
+                    label: 'name',
+                    value: 'name',
+                    children: 'children'
+                }}
             />
-        </>
+            }
+        />
     )
 };

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

@@ -9,53 +9,6 @@ export default () => {
 
     React.useEffect(() => {
         controller.run(async s => {
-            controller.state.goodsListState.goodsList = [{
-                "taxRate": 3,
-                "lineAttribute": 0,
-                "$index": "88a5549b-ede2-488a-962b-26dc1d5e4e3a",
-                "serialNo": 1,
-                "itemName": "车辆停放服务",
-                "lineAmountIncludeTax": 6,
-                "taxAmount": 0.17,
-                "lineAmountExcludeTax": 5.83,
-                cd:3,
-            },{
-                "taxRate": 3,
-                "lineAttribute": 0,
-                "$index": "88a5549b-ede2-488a-962b-26dc1d5e4e31",
-                "serialNo": 1,
-                "itemName": "车辆停放服务",
-                "lineAmountIncludeTax": 6,
-                "taxAmount": 0.17,
-                "lineAmountExcludeTax": 5.83,
-                cd:2
-            }]
-            window.setTimeout(() => {
-                controller.formList.get('realEstateInfo')?.setFieldsValue({
-                    realEstateDataDto: [
-                        {
-                            "$index": "88a5549b-ede2-488a-962b-26dc1d5e4e3a",
-                            realEstateAddress: ['北京市', '北京市', '东城区'],
-                            realEstateDetailedAddress: '东城区东华门大街',
-                            leaseTerm: [moment('2023-07-06 10:43'), moment('2023-07-06 10:59')],
-                            crossCitiesSign: 'Y',
-                            realEstateNumber: '123456789',
-                            realEstateUnit: '平方米',
-                            cphList:['京b22132','渝a12345','渝a1x212'],
-                        },
-                        {
-                            "$index": "88a5549b-ede2-488a-962b-26dc1d5e4e31",
-                            realEstateAddress: ['北京市', '北京市', '东城区'],
-                            realEstateDetailedAddress: '东城区东华门大街',
-                            leaseTerm: [moment('2023-07-06 10:43'), moment('2023-07-06 10:59')],
-                            crossCitiesSign: 'Y',
-                            realEstateNumber: '123456789',
-                            realEstateUnit: '平方米',
-                            cphList:['渝b22132','陕a12345',],
-                        }
-                    ]
-                })
-            }, 1000)
         })
     }, [])
     const onSave = async () => {

package/src/Invoice/Invoice-digtal/index.md

@@ -1,11 +1,10 @@
 # 数电
 
-## 简单用法
-<code src="./_test/pay/index.tsx"></code>
-<!-- <code src="./_test/easiest/index.tsx"></code> -->
+<!-- ## 简单用法
+<code src="./_test/easiest/index.tsx"></code> -->
 
-<!-- ## 不动产经营租赁服务
-<code src="./_test/realEstateInfo/index.tsx"></code> -->
+## 不动产经营租赁服务
+<code src="./_test/realEstateInfo/index.tsx"></code>
 
 <!-- ## 建筑服务
 <code src="./_test/architecture/index.tsx"></code> -->
@@ -40,6 +39,6 @@
 
 
 -->
-<!-- 
-## 货物运输服务
+
+<!-- ## 货物运输服务
 <code src="./_test/freight/index.tsx"></code>  -->

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

@@ -58,17 +58,6 @@ export default class InvoiceControllerForm extends GreyReactBox<InvoiceControlle
 
     _values.set('freightList', this.state.freightListState.goodsList.slice());
 
-    //支付
-    if (this.state.payListState.form) {
-      try {
-        await this.state.payListState.form?.validateFields()
-      } catch (error: any) {
-        _errors.set('payList', error.errors);
-      }
-    }
-
-    _values.set('payList', this.state.payListState.goodsList.slice());
-
     // 金额（含税）
     _values.set('lineAmountIncludeTax', (() => {
       let sum = chain(bignumber(0));

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

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

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

@@ -1,6 +1,5 @@
 import GoodsListState from './GoodsListState';
 import FreightListState from './FreightListState';
-import PayListState from './PayListState';
 import BuyerState from './BuyerState';
 import Stakeholder from './Stakeholder';
 import { IInvoiceTypeModalProps } from '../../../InvoiceTypeModal';
@@ -69,8 +68,6 @@ export default class InvoiceControllerState {
    * 货物运输列表
    */
   freightListState = new FreightListState();
-  
-  payListState=new PayListState();
 
   addGoodsCheck?: any;
 }

package/src/Invoice/InvoiceController/index.ts

@@ -5,27 +5,16 @@ import { IGetGoodsListOption } from './InvoiceControllerState/GoodsListState/Imp
 // import updateInvoiceNo from './fns/updateInvoiceNo';
 import setEditGood from './fns/setEditGood';
 import setEditFreight from './fns/setEditFreight';
-import setEditPay from './fns/setEditPay';
-
 import setGoods from './fns/setGoods';
 import setFreight from './fns/setFreight';
-import setPay from './fns/setPay';
-
 import delGood from './fns/delGood';
 import delFreight from './fns/delFreight';
-import delPay from './fns/delPay';
-
 import addGoodDiscount from './fns/addGoodDiscount';
 import addGoodDiscountV2 from './fns/addGoodDiscountV2';
-
 import addGood from './fns/addGood';
 import addFreight from './fns/addFreight';
-import addPay from './fns/addPay';
-
 import saveEditGood from './fns/saveEditGood';
 import saveEditFreight from './fns/saveEditFreight';
-import saveEditPay from './fns/saveEditPay';
-
 import getGoodsSearch from './fns/getGoodsSearch';
 import mergeDetails from './fns/mergeDetails';
 import mergeDiscount from './fns/mergeDiscount';
@@ -36,7 +25,6 @@ export { default as InvoiceControllerState } from './InvoiceControllerState';
 export { default as IGood } from './InvoiceControllerState/GoodsListState/IGood';
 export { default as LineAttributeType } from './InvoiceControllerState/GoodsListState/LineAttributeType';
 export { default as IGood2 } from './InvoiceControllerState/FreightListState/IGood';
-export { default as IGood3 } from './InvoiceControllerState/PayListState/IGood';
 export default class InvoiceController extends InvoiceControllerForm {
   constructor(state = new InvoiceControllerState()) {
     super(state);
@@ -60,12 +48,8 @@ export default class InvoiceController extends InvoiceControllerForm {
   /** 设置货物运输属性 */
   setFreight = this.pipeline(setFreight);
 
-  setPay = this.pipeline(setPay);
-
   setEditFreight = this.pipeline(setEditFreight);
 
-  setEditPay = this.pipeline(setEditPay);
-
   /** 设置当前的编辑货物 */
   setEditGood = this.pipeline(setEditGood);
 
@@ -75,23 +59,18 @@ export default class InvoiceController extends InvoiceControllerForm {
   /** 保存正在编辑的货物运输 */
   saveEditFreight = this.pipeline<any>(saveEditFreight);
 
-  saveEditPay=this.pipeline<any>(saveEditPay);
   /** 删除一个货物 */
   delGood = this.pipeline(delGood);
 
   /** 删除一个货物运输 */
   delFreight = this.pipeline(delFreight);
 
-  delPay = this.pipeline(delPay);
-
   /** 添加一个货物 */
   addGood = this.pipeline(addGood);
 
   /** 添加一个货物运输 */
   addFreight = this.pipeline(addFreight);
 
-  addPay = this.pipeline(addPay);
-
   /** 全单合并明细 */
   mergeDetails = this.pipeline(mergeDetails);
 

package/src/Invoice/index.tsx

@@ -21,7 +21,6 @@ import GoodsListDigtal from './ui/digtal/GoodsList';
 import RealEstateInfo from './ui/digtal/RealEstateInfo';
 import Architecture from './ui/digtal/Architecture';
 import FreightList from './ui/digtal/FreightList';
-import PayList from './ui/digtal/PayList';
 
 import ImportBuyerDrawer from './ui/default/ImportBuyerDrawer';
 import ImportGoodsDrawer from './ui/default/ImportGoodsDrawer';
@@ -111,8 +110,6 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
 
   static readonly FreightList = FreightList;
 
-  static readonly PayList = PayList;
-
   /** 货物列表(数电) */
   static readonly GoodsListDigtal = GoodsListDigtal;
 

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

@@ -8,6 +8,4 @@ export default function useToGenerateId(controller: InvoiceController) {
     React.useEffect(() => {  goodsList.forEach((e, i) => { e.serialNo = i + 1 }) }, [goodsList])
     const freightList = controller.useMemo(s => s.freightListState.goodsList, []);
     React.useEffect(() => {  freightList.forEach((e, i) => { e.sortNumber = i + 1 }) }, [freightList])
-    const payList = controller.useMemo(s => s.payListState.goodsList, []);
-    React.useEffect(() => {  payList.forEach((e, i) => { e.sortNumber = i + 1 }) }, [payList])
 }

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

@@ -573,6 +573,13 @@ export default (form: WrappedFormUtils) => {
           }
         }
       },
+      {
+        title: '行备注',
+        dataIndex: 'remarks',
+        key: 'remarks',
+        width: 150,
+
+      },
       {
         title: '操作',
         key: 'operating',