kts-component-invoice-operate 3.2.220-chinaship → 3.2.221-chinaship

package/package.json

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

package/src/Invoice/Invoice-digtal/_test/realEstateInfo/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(), []);
@@ -11,12 +11,27 @@ export default () => {
         controller.run(async s => {
         })
     }, [])
-
+    const onSave = async () => {
+        const formValues = await controller.validateFields();
+        console.log(formValues)
+    }
     return (
-        <Invoice
-            invoiceType='digtal'
-            controller={controller}
-            specialInfor={<Invoice.RealEstateInfo />}
-        />
+        <>
+            <Button onClick={onSave}>输出表单内容</Button>
+            <Invoice
+                invoiceType='digtal'
+                controller={controller}
+                specialInfor={<Invoice.RealEstateInfo realEstateAddressOptions={[
+                    {
+                        "code": "11",
+                        "name": "北京市"
+                    }] || []}
+                    realEstateAddressFieldNames={{
+                        label: 'name',
+                        value: 'name',
+                        children: 'children'
+                    }} />}
+            />
+        </>
     )
 };

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

@@ -1,7 +1,7 @@
 # 数电
 
-## 简单用法
-<code src="./_test/easiest/index.tsx"></code>
+<!-- ## 简单用法
+<code src="./_test/easiest/index.tsx"></code> -->
 
 <!-- ## 建筑服务
 <code src="./_test/architecture/index.tsx"></code> -->
@@ -33,8 +33,7 @@
 ## 查看当前可用授信额度
 <code src="./_test/lineCredit/index.tsx"></code>
 
-## 不动产经营租赁服务
-<code src="./_test/realEstateInfo/index.tsx"></code>
+
 
 -->
 

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

@@ -68,4 +68,6 @@ export default class InvoiceControllerState {
    * 货物运输列表
    */
   freightListState = new FreightListState();
+
+  addGoodsCheck?: any;
 }

package/src/Invoice/_test/deduction/index.tsx

@@ -1,12 +1,18 @@
 import React from 'react';
-import { Input } from 'kts-components-antd-x3';
+import { Input, message } from 'kts-components-antd-x3';
 import Invoice from '../../';
 import 'antd/dist/antd.css';
 
 export default () => {
 
     const controller = React.useMemo(() => new MyController1(), [])
+    React.useEffect(() => {
+        controller.run(async s => {
+            s.addGoodsCheck=checkGood;
+           
 
+        })
+    }, [])
     const [deduction, setDeduction] = React.useState<number | undefined>(0);
 
     const [goodMax, setgoodMax] = React.useState(0);
@@ -29,17 +35,33 @@ export default () => {
             </span>
         )
     }, [])
+    const checkGood = async () => {
+        await new Promise((resolve,) => {
+            setTimeout(() => {
+                const a = Math.random();
+                if (a > 0.5) {
+                    message.error('请先填写发票行信息，再添加新的行');
+                    return false;
+                } else {
+                    resolve(true)
+                    console.log(11112)
+                }
 
+            }, 1000)
+        })
+    }
     return (
         <Invoice
             controller={controller}
             goodsList={
                 <Invoice.GoodsList
-                    isSwitchTax={false}             // 是否可以切换(含税/不含税)状态
-                    isAddDiscount={false}           // 不能添加折扣行
-                    goodMax={goodMax}               // 控制能可以添加的货物函数
-                    deduction={deduction}           // 扣除额
-                    menuExpansion={menuExpansion}   // 扩展
+
+                    // addGoodsCheck={checkGood}
+                // isSwitchTax={false}             // 是否可以切换(含税/不含税)状态
+                // isAddDiscount={false}           // 不能添加折扣行
+                // goodMax={goodMax}               // 控制能可以添加的货物函数
+                // deduction={deduction}           // 扣除额
+                // menuExpansion={menuExpansion}   // 扩展
                 />
             }
         />

package/src/Invoice/index.md

@@ -7,12 +7,12 @@
 <code src="./_test/draft/index.tsx" title="类似的操作,请查看API" ></code>
 
 ## 设置购买方名称搜索 
-<code src="./_test/buyerNameSearch/index.tsx"></code>
+<code src="./_test/buyerNameSearch/index.tsx"></code> -->
 
 ## 设置扣除额（差额征税）
 <code src="./_test/deduction/index.tsx"></code>
 
-## 设置单位列表、税率列表
+<!-- ## 设置单位列表、税率列表
 <code src="./_test/unit/index.tsx" ></code>
 
 ## 发票头类型设置和购买方信息配置

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

@@ -47,6 +47,8 @@ export interface IGoodsListProps {
 
   /** 是否可以切换(含税/不含税)状态 */
   isSwitchTax?: boolean;
+
+  addGoodsCheck?:()=>void;
 }
 
 export default class GoodsList extends React.Component<IGoodsListProps>{
@@ -137,7 +139,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
       <div className="kts-invoice-operate-goods-list-able">
         <div className="kts-invoice-operate-goods-list-able-list">
           {/* 添加行 */}
-          <AddRowButton />
+          <AddRowButton addGoodsCheck={props.addGoodsCheck}/>
 
           {/* 批量菜单 */}
           {/* <BulkMenu /> */}

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

@@ -3,7 +3,7 @@ import Invoice from '../../../../..';
 import { Button, message } from 'kts-components-antd-x3';
 import InvoiceController, { LineAttributeType } from '../../../../../InvoiceController';
 
-export default () => {
+export default (props: any) => {
   const controller = Invoice.useInvoiceController();
 
   const model = controller.useMemo(s => s.model, []);
@@ -26,6 +26,12 @@ export default () => {
   const disabled = React.useMemo(() => typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue, [goodMax, goodsNum, searchValue])
 
   const onClick = React.useCallback(async () => {
+    await controller.run(async (s) => {
+      if (s.addGoodsCheck) {  
+        await s.addGoodsCheck();
+      }
+    });
+    console.log('continue')
     await addGood(controller);
     await rollBottom(controller, rootElement);
   }, [controller, rootElement]);
@@ -43,6 +49,7 @@ export default () => {
 
 /** 添加一个空货物 */
 async function addGood(controller: InvoiceController) {
+
   await controller.saveEditGood();
   await controller.wait();
   await controller.run(async (s) => {

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

@@ -40,7 +40,7 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
 
     return (
         <div className="kts-invoice-operate-real-estate-info-digtal">
-            <div className='real-estate-info-digtal-label' >特殊信息-建筑服务</div>
+            <div className='real-estate-info-digtal-label' >特定信息-建筑服务</div>
             <Row gutter={[17, 0]}>
                 <Col span={6} >
                     <Form.Item label='土地增值税项目编号' >

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

@@ -94,7 +94,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   //  controller.useForm('freightInfo', form);
   return (
     <div className="kts-invoice-operate-freight">
-      <div className='real-estate-info-digtal-label' >特殊信息-货物运输</div>
+      <div className='real-estate-info-digtal-label' >特定信息-货物运输</div>
       <div className="kts-invoice-operate-goods-list-digtal" onClick={(e) => { e.stopPropagation() }} >
         <div className="kts-invoice-operate-freight-list-able">
           {/* 添加行 */}

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

@@ -257,14 +257,14 @@ export default (form: WrappedFormUtils) => {
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '数量必须为数字' },
                     {
                       validator: async (_, value, callback) => {
-                       
+
                         if (isValidateGood) {
                           await controller.wait();
                           const isvalue = !!value || value === 0;
                           const isPrice = !!getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') || getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') === 0;
                           if (isvalue || isPrice === isvalue) return;
                           callback('请输入数量');
-                        }else{
+                        } else {
                           callback();
                         }
                       }
@@ -473,7 +473,7 @@ export default (form: WrappedFormUtils) => {
         key: 'taxRate',
         align: 'right',
         width: 70,
-        render: (value: string, record: IGood) => {
+        render: (value: string|number, record: IGood) => {
           if (editGood?.$index === record.$index && !disableds.includes('taxRate') && !(model === 'prefab' && calculateType === '3')) {
             return (
               <Form.Item>
@@ -508,7 +508,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            if (value || value === '0') {
+            if (value || value === '0' || value === 0) {
               return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '免税' : `${value}%`}</span>;
             } else {
               return ''

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

@@ -45,6 +45,13 @@ export default () => {
 
 /** 添加一个空货物 */
 async function addGood(controller: InvoiceController) {
+  await controller.formList.get('realEstateInfo')?.validateFields(async (err: any, values: any) => {
+
+    if (err) {
+      message.error('请先填写发票行信息，再添加新的行');
+      return;
+    }
+  });
   await controller.saveEditGood();
   await controller.wait();
   await controller.run(async (s) => {

package/src/Invoice/ui/digtal/RealEstateInfo/index.less

@@ -12,4 +12,11 @@
     .ktsAnt3x-row.ktsAnt3x-form-item {
         margin-bottom: 0;
     }
+    .ktsAntX-row{
+        border-bottom: 1px dashed #9F613E;
+        &:last-child {
+            border-bottom: none;
+          }
+    }
+
 }

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

@@ -1,5 +1,5 @@
 
-import React from "react";
+import React, { useEffect } from "react";
 import { decorator } from 'grey-react-box';
 import { Form } from 'kts-components-antd-x3';
 import { FormComponentProps } from 'kts-components-antd-x3/lib/form';
@@ -36,110 +36,160 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
 
     const readOnly = React.useMemo(() => model === 'readOnly', [model]);
 
+    const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
+    const indexRef = React.useRef<any>([]);
+    useEffect(() => {
+        const dd = goodsList?.reduce((acc: any, cur: any) => {
+            if (cur.lineAttribute !==1) {
+                acc.push(cur.$index)
+            }
+            return acc
+        }, [])
+        indexRef.current = dd;
+    }, [goodsList, indexRef])
     // 注册 form
+   
     controller.useForm('realEstateInfo', form);
-
+    const getList = () => {
+        const decrease = indexRef.current.length > goodsList.length
+        if (decrease) {
+            //已删行列表
+            const diff = indexRef.current.filter((item: any) => !goodsList.find(i => i.$index === item));
+
+            const formData: any[] = form.getFieldValue('realEstateDataDto');
+            if (Array.isArray(formData) && diff.length > 0) {
+
+                const newForm = formData?.filter(item => !diff.find((i: any) => i === item.$index));
+
+                form.setFieldsValue({
+                    realEstateDataDto: newForm
+                });
+            } else {
+                form.setFieldsValue({
+                    realEstateDataDto: undefined
+                });
+            }
+        }
+        console.log('goodsList',goodsList)
+        return goodsList.filter(item=>item.lineAttribute !== 1).map((item, index) => {
+            if (item.lineAttribute !== 1) {
+                return <Row gutter={[17, 0]} >
+                    <Col span={6} >
+                        <Form.Item style={{ display: 'none' }}>
+                            {getFieldDecorator(`realEstateDataDto[${index}].$index`, {
+                                initialValue: item.$index,
+                            })(
+                                <Input />
+                            )}
+                        </Form.Item>
+                        <Form.Item label='不动产地址'>
+                            {getFieldDecorator(`realEstateDataDto[${index}].realEstateAddress`, {
+                                rules: readOnly ? [] : [{ required: true, message: '请选择不动产地址' }]
+                            })(
+                                readOnly
+                                    ? (<MyArrString />)
+                                    : (<Cascader
+                                        style={{ width: '100%' }}
+                                        options={props.realEstateAddressOptions}
+                                        fieldNames={props.realEstateAddressFieldNames}
+                                        placeholder="请选择省市区县"
+                                    />)
+                            )}
+                        </Form.Item>
+                    </Col>
+                    <Col span={6} >
+                        <Form.Item label='详细地址' >
+                            {getFieldDecorator(`realEstateDataDto[${index}].realEstateDetailedAddress`, {
+                                rules: readOnly ? [] : [
+                                    { required: true, message: '请输入详细地址' },
+                                    { max: 120, message: '详细地址最多120个字符' },
+                                    {
+                                        validator: async (_, value, callback) => {
+                                            const pattern = /街|路|村|乡|镇|道|巷|号/;
+                                            if (pattern.test(value)) {
+                                                callback()
+                                            } else {
+                                                callback('地址必须包含“街”、“路”、“村”、“乡”、“镇”、“道”、“巷”、“号”等任意一个关键词')
+                                            }
+                                        }
+                                    }
+                                ]
+                            })(
+                                readOnly
+                                    ? <MyDiv />
+                                    : <Input autoComplete='off' placeholder="请输入详细地址" />
+                            )}
+                        </Form.Item>
+                    </Col>
+                    <Col span={6} >
+                        <Form.Item label='租赁期起止' >
+                            {getFieldDecorator(`realEstateDataDto[${index}].leaseTerm`, {
+                                rules: readOnly ? [] : [{ required: true, message: '请输入租赁期' }]
+                            })(
+                                readOnly
+                                    ? <MyArrMoment />
+                                    : <RangePicker style={{ width: '100%' }} />
+                            )}
+                        </Form.Item>
+                    </Col>
+                    <Col span={6} >
+                        <Form.Item label='跨地（市）标志' >
+                            {getFieldDecorator(`realEstateDataDto[${index}].crossCitiesSign`, {
+                                rules: readOnly ? [] : [
+                                    { required: true, message: '请选择跨地（市）标志' }
+                                ]
+                            })(
+                                readOnly
+                                    ? <MyNY />
+                                    : <Select placeholder='请选择' style={{ width: '100%' }} >
+                                        <Select.Option value='Y'>是</Select.Option>
+                                        <Select.Option value='N'>否</Select.Option>
+                                    </Select>
+                            )}
+                        </Form.Item>
+                    </Col>
+                    <Col span={6} >
+                        <Form.Item label='产权证书/不动产权证号' >
+                            {getFieldDecorator(`realEstateDataDto[${index}].realEstateNumber`, {
+                                rules: readOnly ? [] : [
+                                    { required: true, message: '请输入证书编号，若没有证书填写“无”' },
+                                    { max: 40, message: '证书编号最多40个字符' },
+                                ]
+                            })(
+                                readOnly
+                                    ? <MyDiv />
+                                    : <Input autoComplete='off' placeholder="请输入证书编号，若没有证书填写“无”" />
+                            )}
+                        </Form.Item>
+                    </Col>
+                    <Col span={6} >
+                        <Form.Item label='面积单位' >
+                            {getFieldDecorator(`realEstateDataDto[${index}].realEstateUnit`, {
+                                rules: readOnly ? [] : [{ required: true, message: '请选择面积单位' }]
+                            })(
+                                readOnly
+                                    ? <MyDiv />
+                                    : <Select placeholder='请选择' style={{ width: '100%' }} >
+                                        <Select.Option value="平方千米">平方千米</Select.Option>
+                                        <Select.Option value="平方米">平方米</Select.Option>
+                                        <Select.Option value="公顷">公顷</Select.Option>
+                                        <Select.Option value="亩">亩</Select.Option>
+                                        <Select.Option value="h㎡">h㎡</Select.Option>
+                                        <Select.Option value="k㎡">k㎡</Select.Option>
+                                        <Select.Option value="㎡">㎡</Select.Option>
+                                    </Select>
+                            )}
+                        </Form.Item>
+                    </Col>
+                </Row>
+            }
+        })
+    }
     return (
         <div className="kts-invoice-operate-real-estate-info-digtal">
-            <div className='real-estate-info-digtal-label' >特殊信息-不动产经营租赁服务</div>
-            <Row gutter={[17, 0]}>
-                <Col span={6} >
-                    <Form.Item label='不动产地址' >
-                        {getFieldDecorator('realEstateAddress', {
-                            rules: readOnly ? [] : [{ required: true, message: '请选择不动产地址' }]
-                        })(
-                            readOnly
-                                ? (<MyArrString />)
-                                : (<Cascader
-                                    style={{ width: '100%' }}
-                                    options={props.realEstateAddressOptions}
-                                    fieldNames={props.realEstateAddressFieldNames}
-                                    placeholder="请选择省市区县"
-                                />)
-                        )}
-                    </Form.Item>
-                </Col>
-                <Col span={6} >
-                    <Form.Item label='详细地址' >
-                        {getFieldDecorator('realEstateDetailedAddress', {
-                            rules: readOnly ? [] : [
-                                { required: true, message: '请输入详细地址' },
-                                { max: 120, message: '详细地址最多120个字符' },
-                                {
-                                    validator: (_, value) => {
-                                        const pattern = /街|路|村|乡|镇|道|巷|号/;
-                                        return pattern.test(value) ? Promise.resolve() : Promise.reject('地址必须包含“街”、“路”、“村”、“乡”、“镇”、“道”、“巷”、“号”等任意一个关键词');
-                                    }
-                                }
-                            ]
-                        })(
-                            readOnly
-                                ? <MyDiv />
-                                : <Input autoComplete='off' placeholder="请输入详细地址" />
-                        )}
-                    </Form.Item>
-                </Col>
-                <Col span={6} >
-                    <Form.Item label='租赁期起止' >
-                        {getFieldDecorator('leaseTerm', {
-                            rules: readOnly ? [] : [{ required: true, message: '请输入租赁期' }]
-                        })(
-                            readOnly
-                                ? <MyArrMoment />
-                                : <RangePicker style={{ width: '100%' }} />
-                        )}
-                    </Form.Item>
-                </Col>
-                <Col span={6} >
-                    <Form.Item label='跨地（市）标志' >
-                        {getFieldDecorator('crossCitiesSign', {
-                            rules: readOnly ? [] : [
-                                { required: true, message: '请选择跨地（市）标志' }
-                            ]
-                        })(
-                            readOnly
-                                ? <MyNY />
-                                : <Select placeholder='请选择' style={{ width: '100%' }} >
-                                    <Select.Option value='Y'>是</Select.Option>
-                                    <Select.Option value='N'>否</Select.Option>
-                                </Select>
-                        )}
-                    </Form.Item>
-                </Col>
-                <Col span={6} >
-                    <Form.Item label='产权证书/不动产权证号' >
-                        {getFieldDecorator('realEstateNumber', {
-                            rules: readOnly ? [] : [
-                                { required: true, message: '请输入证书编号，若没有证书填写“无”' },
-                                { max: 40, message: '证书编号最多40个字符' },
-                            ]
-                        })(
-                            readOnly
-                                ? <MyDiv />
-                                : <Input autoComplete='off' placeholder="请输入证书编号，若没有证书填写“无”" />
-                        )}
-                    </Form.Item>
-                </Col>
-                <Col span={6} >
-                    <Form.Item label='面积单位' >
-                        {getFieldDecorator('realEstateUnit', {
-                            rules: readOnly ? [] : [{ required: true, message: '请选择面积单位' }]
-                        })(
-                            readOnly
-                                ? <MyDiv />
-                                : <Select placeholder='请选择' style={{ width: '100%' }} >
-                                    <Select.Option value="平方千米">平方千米</Select.Option>
-                                    <Select.Option value="平方米">平方米</Select.Option>
-                                    <Select.Option value="公顷">公顷</Select.Option>
-                                    <Select.Option value="亩">亩</Select.Option>
-                                    <Select.Option value="h㎡">h㎡</Select.Option>
-                                    <Select.Option value="k㎡">k㎡</Select.Option>
-                                    <Select.Option value="㎡">㎡</Select.Option>
-                                </Select>
-                        )}
-                    </Form.Item>
-                </Col>
-            </Row>
+            <div className='real-estate-info-digtal-label' >特定信息-不动产经营租赁服务</div>
+            {getList()}
+
         </div>
     )
 })
@@ -172,7 +222,7 @@ class MyArrMoment extends React.Component<{ value?: moment.Moment[], style?: Rea
             <div style={this.props.style}>
                 <span>{moment.isMoment(value[0]) && value[0].format('YYYY-MM-DD')}</span>
                 <span style={{ color: '#9F603D', fontWeight: 600 }} > - </span>
-                <span>{moment.isMoment(value[1]) && value[0].format('YYYY-MM-DD')}</span>
+                <span>{moment.isMoment(value[1]) && value[1].format('YYYY-MM-DD')}</span>
             </div>
         )
     }