kts-component-invoice-operate 3.2.174 → 3.2.176

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

@@ -1,6 +1,6 @@
 # 数电
 
-## 简单用法
+<!-- ## 简单用法
 <code src="./_test/easiest/index.tsx"></code>
 
 ## 只读模式
@@ -32,3 +32,9 @@
 
 ## 不动产经营租赁服务
 <code src="./_test/realEstateInfo/index.tsx"></code>
+
+## 建筑服务
+<code src="./_test/architecture/index.tsx"></code> -->
+
+## 货物运输服务
+<code src="./_test/freight/index.tsx"></code>

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

@@ -0,0 +1,10 @@
+
+/** 商品表格补充配置 */
+
+import { ValidationRule } from "kts-components-antd-x3/lib/form";
+
+export default interface IColumnsReplenish {
+
+    /** 补充的规则 */
+    rules: ValidationRule[];
+}

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

@@ -0,0 +1,33 @@
+export default interface IGood {
+  /** 数据索引 */
+  $index: string;
+  /** 序号 */
+  sortNumber?: number;
+  /** 运输工具种类列表 */
+  vehicleList?: any[] | null;
+
+  /** 运输工具种类 */
+  vehicle?: string;
+
+  type:string;
+
+  licensePlate:string;
+
+  itemName:string;
+
+  /** 运输工具牌号 */
+  vehicleNo?: string;
+
+  /** 起运地 */
+  origin?: string[];
+
+  /** 到达地 */
+  destination?: string[];
+
+  /** 运输货物名称 */
+  goodName?: string;
+
+  /** 地区 */
+  area?: string[];
+
+}

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

@@ -0,0 +1,81 @@
+import { ColumnProps } from 'kts-components-antd-x3/lib/Table/interface';
+import { PaginationConfig } from 'kts-components-antd-x3/lib/Table';
+import { message } from 'kts-components-antd-x3';
+import React from 'react';
+
+export interface IGetGoodsListOption {
+  /** 分页数据 */
+  pagination: PaginationConfig;
+}
+
+export default class ImportGoods<ColumnType = any> {
+  /** 表头 */
+  columns: ColumnProps<ColumnType>[] = [
+    {
+      title: '商品分类',
+      dataIndex: 'itemType',
+      key: 'itemType',
+    },
+    {
+      title: '商品编码',
+      dataIndex: 'itemNo',
+      key: 'itemNo',
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'itemName',
+      key: 'itemName',
+    },
+    {
+      title: '规格型号',
+      dataIndex: 'itemModelName',
+      key: 'itemModelName',
+    },
+    {
+      title: '计量单位',
+      dataIndex: 'unit',
+      key: 'unit',
+    },
+    {
+      title: '税率',
+      dataIndex: 'taxRate',
+      key: 'taxRate',
+      render: text => text || text === 0 ? `${text}%` : ''
+    },
+    {
+      title: '单价(含税)',
+      dataIndex: 'priceIncludeTax',
+      key: 'priceIncludeTax',
+    },
+    {
+      title: '税收分类编码',
+      dataIndex: 'taxClassificationCode',
+      key: 'taxClassificationCode',
+    },
+  ];
+
+  /** 货物列表 */
+  dataSource: ColumnType[] = [];
+
+  /** 分页数据 */
+  pagination: PaginationConfig = {};
+
+  /** 是否显示导入 */
+  isVisibleDrawer = false;
+
+  /** 顶部扩展 */
+  topExpand?: React.ReactNode;
+
+  /** 导入时校验函数 */
+  verifyFn: (record: any) => Promise<boolean> = async record => {
+    if (!record.taxClassificationCode) {
+      message.error({ content: '请维护该商品的税收分类编码！', key: '请维护该商品的税收分类编码！' })
+      return false;
+    }
+    if (record.productStatus === 0) {
+      message.error({ content: '当前货物为禁用', key: '当前货物为禁用' })
+      return false;
+    }
+    return true;
+  };
+}

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

@@ -0,0 +1,40 @@
+import IGood from './IGood';
+import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
+
+export default class FreightListState {
+
+  /** 产品最大数 */
+  goodMax?: number;
+
+  /** 正在编辑的货物 */
+  editGood?: IGood;
+
+  /** 是否可以添加行 */
+  isAddRow = true;
+
+  /** 是否可以删除行 */
+  isRemRow = true;
+
+  /** 货物字典 */
+  goodsMap = new Map<string, IGood>();
+
+  /** 被编辑行的form对象 */
+  form?: WrappedFormUtils;
+
+  /** 运输工具种类列表 */
+  vehicleTypeList: any[] = [];
+
+  /** 货物列表 */
+  goodsList: IGood[] = [];
+
+  /** 列表选中的货物索引列表 */
+  selectedGoodIndex: string[] = [];
+
+  /** 地区 */
+  area: any[] = [];
+
+  addressFieldNames: IFieldNames = { label: 'label', value: 'value', children: 'children' }
+}
+interface IFieldNames {
+  label: string; value: string; children: string
+}

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

@@ -1,4 +1,5 @@
 import GoodsListState from './GoodsListState';
+import FreightListState from './FreightListState';
 import BuyerState from './BuyerState';
 import Stakeholder from './Stakeholder';
 import { IInvoiceTypeModalProps } from '../../../InvoiceTypeModal';
@@ -62,4 +63,9 @@ export default class InvoiceControllerState {
    * 商品税收分类编码窗口
    * */
   taxClassificationProps?: TaxClassificationProps;
+
+  /**
+   * 货物运输列表
+   */
+  freightListState = new FreightListState();
 }

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

@@ -0,0 +1,11 @@
+import { InvoiceControllerState } from '..';
+import idGenerator from '../../tools/idGenerator';
+
+/**
+ * 添加的编辑货物运输
+ */
+export default async (state: InvoiceControllerState, options?: any) => {
+  options.$index = idGenerator();
+  state.freightListState.goodsList = [...state.freightListState.goodsList, options];
+  return options;
+};

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

@@ -0,0 +1,38 @@
+import { InvoiceControllerState } from '..';
+
+/**
+ * 删除一个货物运输
+ */
+export default async (state: InvoiceControllerState, $index?: string) => {
+  if (!$index) return;
+  // 查下要删除的货物
+  const goods = state.freightListState.goodsList.filter((e) => e.$index === $index)[0];
+  if (!goods) return;
+
+  // 如果正在编辑 就取消编辑
+  if (state.freightListState.editGood && state.freightListState.editGood.$index === $index) {
+    state.freightListState.editGood = undefined;
+  }
+  const goodsList = state.freightListState.goodsList;
+  const goodsMap = state.freightListState.goodsMap;
+
+  goodsMap.delete($index);
+
+  for (let i = 0; i < goodsList.length; i++) {
+
+    if (goodsList[i].$index === $index) {
+      // const good = goodsList[i];
+
+      // if (good.lineAttribute === LineAttributeType.折扣行 && goodsList[i - 1] && goodsList[i - 1].lineAttribute === LineAttributeType.被折扣行) {
+      //   goodsList[i - 1].lineAttribute = LineAttributeType.正常;
+      // }
+
+      goodsList.splice(i, 1);
+
+      break;
+    }
+  }
+  
+  state.freightListState.goodsList = [...goodsList];
+  state.freightListState.goodsMap = new Map(goodsMap);
+};

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

@@ -0,0 +1,24 @@
+import { InvoiceControllerState } from '..';
+
+/**
+ * 保存正在编辑的货物
+ */
+export default async (state: InvoiceControllerState) => {
+  
+  const editGood = state.freightListState.editGood;
+  const form = state.freightListState.form;
+  
+  if (!editGood || !form ) return;
+  if ((await validateFields(form)).err) return;
+
+  state.freightListState.goodsList = state.freightListState.goodsList.map((e) =>
+    e.$index === editGood.$index ? { ...e, ...editGood } : e,
+  );
+  state.freightListState.editGood = undefined;
+};
+
+const validateFields = (form: any) => new Promise((resolve: (v: { err: any; values: any }) => void) => {
+  form.validateFields(async (err: any, values: any) => {
+    resolve({ err, values });
+  });
+});

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

@@ -0,0 +1,16 @@
+import { InvoiceControllerState, IGood2 } from '..';
+
+/**
+ * 设置当前的编辑货物运输
+ */
+export default async (state: InvoiceControllerState, newEditGood?: any) => {
+  if (newEditGood) {
+    const editGood = state.freightListState.editGood as IGood2;
+    state.freightListState = {
+      ...state.freightListState,
+      editGood: { ...editGood, ...newEditGood },
+    };
+  } else {
+    state.freightListState = { ...state.freightListState, editGood: undefined };
+  }
+};

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

@@ -0,0 +1,11 @@
+
+import { InvoiceControllerState, IGood } from '..';
+
+/**
+ * 设置单个货物属性
+ */
+export default async (state: InvoiceControllerState, options?: IGood) => {
+    if (!options || !options.$index) return;
+    const goodsList = state.freightListState.goodsList.map(e => e.$index === options.$index ? { ...e, ...options } : e);
+    state.freightListState = { ...state.freightListState, goodsList };
+};

package/src/Invoice/InvoiceController/index.ts

@@ -4,12 +4,17 @@ import { IGetBuyerListOption } from './InvoiceControllerState/BuyerState';
 import { IGetGoodsListOption } from './InvoiceControllerState/GoodsListState/ImportGoods';
 // import updateInvoiceNo from './fns/updateInvoiceNo';
 import setEditGood from './fns/setEditGood';
+import setEditFreight from './fns/setEditFreight';
 import setGoods from './fns/setGoods';
+import setFreight from './fns/setFreight';
 import delGood from './fns/delGood';
+import delFreight from './fns/delFreight';
 import addGoodDiscount from './fns/addGoodDiscount';
 import addGoodDiscountV2 from './fns/addGoodDiscountV2';
 import addGood from './fns/addGood';
+import addFreight from './fns/addFreight';
 import saveEditGood from './fns/saveEditGood';
+import saveEditFreight from './fns/saveEditFreight';
 import getGoodsSearch from './fns/getGoodsSearch';
 import mergeDetails from './fns/mergeDetails';
 import mergeDiscount from './fns/mergeDiscount';
@@ -19,7 +24,7 @@ import itemBlur from './fns/itemBlur';
 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 class InvoiceController extends InvoiceControllerForm {
   constructor(state = new InvoiceControllerState()) {
     super(state);
@@ -40,18 +45,32 @@ export default class InvoiceController extends InvoiceControllerForm {
   /** 设置单个货物属性 */
   setGoods = this.pipeline(setGoods);
 
+  /** 设置货物运输属性 */
+  setFreight = this.pipeline(setFreight);
+
+  setEditFreight = this.pipeline(setEditFreight);
+
   /** 设置当前的编辑货物 */
   setEditGood = this.pipeline(setEditGood);
 
   /** 保存正在编辑的货物 */
   saveEditGood = this.pipeline<any>(saveEditGood);
 
+  /** 保存正在编辑的货物运输 */
+  saveEditFreight = this.pipeline<any>(saveEditFreight);
+
   /** 删除一个货物 */
   delGood = this.pipeline(delGood);
 
+  /** 删除一个货物运输 */
+  delFreight = this.pipeline(delFreight);
+
   /** 添加一个货物 */
   addGood = this.pipeline(addGood);
 
+  /** 添加一个货物运输 */
+  addFreight = this.pipeline(addFreight);
+
   /** 全单合并明细 */
   mergeDetails = this.pipeline(mergeDetails);
 

package/src/Invoice/index.tsx

@@ -19,6 +19,8 @@ import StakeFarmerholder from './ui/digtal/StakeFarmerholder';
 import SignDigtal from './ui/digtal/Sign';
 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 ImportBuyerDrawer from './ui/default/ImportBuyerDrawer';
 import ImportGoodsDrawer from './ui/default/ImportGoodsDrawer';
@@ -86,7 +88,7 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
 
   /** 干系人(数电) */
   static readonly Stakeholder = Stakeholder;
-  
+
   /** 农产品干系人(数电) */
   static readonly StakeFarmerholder = StakeFarmerholder;
 
@@ -95,6 +97,11 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
 
   /** 特殊信息-不动产经营租赁服务(数电) */
   static readonly RealEstateInfo = RealEstateInfo;
+  
+  /** 特殊信息-建筑服务(数电) */
+  static readonly Architecture = Architecture;
+
+  static readonly FreightList = FreightList;
 
   /** 货物列表(数电) */
   static readonly GoodsListDigtal = GoodsListDigtal;

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

@@ -6,4 +6,6 @@ import InvoiceController from '../../InvoiceController'
 export default function useToGenerateId(controller: InvoiceController) {
     const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
     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])
 }

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

@@ -379,31 +379,30 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
       //     s.value = info.node.taxRate
       //   }
       // });
-      let node = info.node || info;
+      
       actions.setFieldState('taxClassificationCode', async s => {
-        if(node.taxCategoryCode) {
-          s.value = node.taxCategoryCode
+        if(info.taxCategoryCode) {
+          s.value = info.taxCategoryCode
         }
       });
 
       actions.setFieldState('shorthand', async (s) => {
-        if (node.shorthand){
-          s.value = node.shorthand
+        if (info.shorthand){
+          s.value = info.shorthand
         }
       }); 
       setOpen(false);
     }, [controller, actions]);
 
     const onSelect = React.useCallback((key: any, info: any) => { 
-      let node = info.node || info;
       if (controller.state.goodsListState.isUpdateGoodsTaxRateList) {
-        if (node.taxRateList?.length) {
-          setGoodsTaxRateList(node.taxRateList);
+        if (info.node.taxRateList?.length) {
+          setGoodsTaxRateList(info.node.taxRateList);
         }
         if (!readOnlyTaxRate) {
           actions.setFieldState('taxRate', async s => {
-            if (node.taxRateList && node.taxRateList?.length === 1) {
-              s.value = node.taxRateList[0]
+            if (info.node.taxRateList && info.node.taxRateList?.length === 1) {
+              s.value = info.node.taxRateList[0]
             } else {
               s.value = undefined
             }
@@ -454,7 +453,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
           info={info}
           onSelect={onSelect}
           onSubmit={onSubmit1}
-          onCancel={()=> {setOpen(false); setInfo({})}}
+          onCancel={()=> {setOpen(false)}}
           onSearch={onSearch}
           onLoad={onLoad}
         />

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

@@ -0,0 +1,15 @@
+.kts-invoice-operate-real-estate-info-digtal {
+    padding      : 20px;
+    border-bottom: 2px solid #9F613E;
+    border-left  : 2px solid #9F613E;
+    border-right : 2px solid #9F613E;
+
+    .real-estate-info-digtal-label {
+        color      : #9F613E;
+        font-weight: bold;
+    }
+
+    .ktsAnt3x-row.ktsAnt3x-form-item {
+        margin-bottom: 0;
+    }
+}

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

@@ -0,0 +1,166 @@
+
+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 Invoice from '../../..';
+import './index.less';
+import { Cascader, Col, Input, Row, Select } from "kts-components-antd-x4";
+import moment from "moment";
+
+
+export interface RealEstateInfoProps {
+    /**
+     * 建筑服务地址数据
+     */
+    addressOptions?: any[];
+
+    /**
+     * 建筑服务地址数据字段名
+     */
+    fieldNames?: any;
+}
+
+/** 特殊信息-建筑服务 */
+export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInfoProps>(Form.create())(props => {
+
+    /** 控制器 */
+    const controller = Invoice.useInvoiceController();
+
+    const { form } = props;
+
+    const { getFieldDecorator } = form;
+
+    const model = controller.useMemo(s => s.model, []);
+
+    const readOnly = React.useMemo(() => model === 'readOnly', [model]);
+
+    // 注册 form
+    controller.useForm('realEstateInfo', form);
+
+    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('landNumber', {
+                        })(
+                            readOnly
+                                ? <MyDiv />
+                                : <Input autoComplete='off' placeholder="请输入" />
+                        )}
+                    </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('constructAddress', {
+                            rules: readOnly ? [] : [{ required: true, message: '请选择省市区县' }]
+                        })(
+                            readOnly
+                                ? (<MyArrString />)
+                                : (<Cascader
+                                    style={{ width: '100%' }}
+                                    options={props.addressOptions}
+                                    fieldNames={props.fieldNames}
+                                    placeholder="请选择省市区县"
+                                />)
+                        )}
+                    </Form.Item>
+                </Col>
+                <Col span={6} >
+                    <Form.Item label='详细地址' >
+                        {getFieldDecorator('constructDetailAddress', {
+                            rules: readOnly ? [] : [
+                                { max: 200, message: '详细地址最多200个字符' },
+                            ]
+                        })(
+                            readOnly
+                                ? <MyDiv />
+                                : <Input autoComplete='off' placeholder="请输入详细地址" />
+                        )}
+                    </Form.Item>
+                </Col>
+                <Col span={6} >
+                    <Form.Item label='建筑项目名称' >
+                        {getFieldDecorator('constructName', { rules: readOnly ? [] : [
+                                { required: true, message: '请输入建筑项目名称' },
+                                { max: 200, message: '建筑项目名称最多200个字符' },
+                                
+                            ]
+                        })(
+                            readOnly
+                                ? <MyDiv />
+                                : <Input autoComplete='off' placeholder="请输入" />
+                        )}
+                    </Form.Item>
+                </Col>
+
+            </Row>
+        </div>
+    )
+})
+
+class MyDiv extends React.Component<{ value?: string, style?: React.CSSProperties }> {
+    render(): React.ReactNode {
+        return (
+            <div style={this.props.style}>{this.props.value}</div>
+        )
+    }
+}
+
+class MyArrString extends React.Component<{ value?: string[], style?: React.CSSProperties }> {
+    render(): React.ReactNode {
+        return (
+            <div style={this.props.style}>
+                {
+                    this.props.value?.filter(e => !!e)
+                        .join(',')
+                }
+            </div>
+        )
+    }
+}
+
+class MyArrMoment extends React.Component<{ value?: moment.Moment[], style?: React.CSSProperties }> {
+    render(): React.ReactNode {
+        const { value = [] } = this.props
+        return (
+            <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>
+            </div>
+        )
+    }
+}
+
+class MyNY extends React.Component<{ value?: 'Y' | 'N', style?: React.CSSProperties }> {
+    render(): React.ReactNode {
+        return (
+            <div style={this.props.style}>
+                {
+                    this.props.value === 'Y' ? '是' : '否'
+                }
+            </div>
+        )
+    }
+}
+