kts-component-invoice-operate 3.2.31 → 3.2.33

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import GreyReactBox, { decorator } from 'grey-react-box';
 import { chain as chain$1, bignumber, create, all } from 'mathjs';
 import { message, Form, Input, Icon as Icon$1, Tag as Tag$1, Select, Button, Tooltip, Switch as Switch$1, Typography, Menu, Dropdown, AutoComplete as AutoComplete$2, Spin, Checkbox, Drawer, Descriptions, Empty, Divider, Popover, Table as Table$1, Tree, Modal as Modal$1, Row as Row$1, Col as Col$1 } from 'kts-components-antd-x3';
 import { v4 } from 'uuid';
-import { message as message$1, TableManual, Switch, AutoComplete as AutoComplete$1, Row, Col, Button as Button$1, Tooltip as Tooltip$1, Input as Input$1, Select as Select$1, Spin as Spin$1, Menu as Menu$1, Form as Form$1, Drawer as Drawer$1, Space, Radio, InputNumber, Popconfirm, Modal } from 'kts-xui';
+import { message as message$1, TableManual, Switch, AutoComplete as AutoComplete$1, Row, Col, Button as Button$1, Tooltip as Tooltip$1, Checkbox as Checkbox$1, Input as Input$1, Select as Select$1, Spin as Spin$1, Menu as Menu$1, Form as Form$1, Drawer as Drawer$1, Space, Radio, InputNumber, Popconfirm, Modal } from 'kts-xui';
 import classnames from 'classnames';
 import { Table } from 'kts-components-antd-x4-v4';
 import { render } from 'react-dom';
@@ -10619,7 +10619,7 @@ function ItemNameInput(props) {
     }
   }, "*", props.shorthand, "*"), React.createElement(AutoComplete$1, {
     onSearch: onSearch,
-    defaultValue: props.value,
+    value: props.value,
     options: options.map(function (e) {
       return {
         value: e.itemName
@@ -10631,7 +10631,6 @@ function ItemNameInput(props) {
       height: '100%',
       border: 'none'
     },
-    value: props.value,
     onChange: onChange
   })));
 } // function removeNullUndefined(obj: Record<string, any>): Record<string, any> {
@@ -15625,6 +15624,13 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
     gutter: [16, 0]
   }, React.createElement(Col, {
     span: 24
+  }, React.createElement(Form.Item, {
+    label: "\u8D2D\u4E70\u65B9\u4FE1\u606F",
+    colon: false
+  }, getFieldDecorator('naturalPersonFlag', {})(React.createElement(NaturalPersonFlag, {
+    readOnly: isReadOnly('naturalPersonFlag')
+  })))), React.createElement(Col, {
+    span: 24
   }, React.createElement(Form.Item, {
     label: "\u540D\u79F0",
     colon: false
@@ -15807,6 +15813,27 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
   })))))))));
 });
 
+function NaturalPersonFlag(props) {
+  var _React$useState3 = React.useState(props.value || 0),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      value = _React$useState4[0],
+      setValue = _React$useState4[1];
+
+  var onChange = React.useCallback(function (e) {
+    if (props.readOnly) return;
+    setValue(e.target.checked ? 1 : 0);
+    props.onChange && props.onChange(e.target.checked ? 1 : 0);
+  }, [props.onChange, props.readOnly]);
+  React.useEffect(function () {
+    setValue(props.value || 0);
+  }, [props.value]);
+  return React.createElement(Checkbox$1, {
+    disabled: props.readOnly,
+    checked: value === 1,
+    onChange: onChange
+  }, "\u662F\u5426\u5F00\u7968\u7ED9\u81EA\u7136\u4EBA");
+}
+
 function BuyerNameInput$1(props) {
   var fieldName = props.fieldName,
       form = props.myform;
@@ -15815,10 +15842,10 @@ function BuyerNameInput$1(props) {
     return s.autoComplete;
   }, []);
 
-  var _React$useState3 = React.useState([]),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      options = _React$useState4[0],
-      setOptions = _React$useState4[1];
+  var _React$useState5 = React.useState([]),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      options = _React$useState6[0],
+      setOptions = _React$useState6[1];
 
   var onChangeAutoComplete = React.useCallback(function (value) {
     var record = options.filter(function (e) {
@@ -21218,14 +21245,17 @@ var DrawerBody$2 = function DrawerBody() {
                       } // 导入FORM里
 
 
-                      if (s.goodsListState.isMyShow) {
-                        s.goodsListState.form.setFieldsValue(_objectSpread2(_objectSpread2({}, editGood), {}, {
-                          itemName: editGood.itemNameSelf,
-                          itemModelName: editGood.itemModelNameSelf
-                        }));
-                      } else {
-                        s.goodsListState.form.setFieldsValue(_objectSpread2({}, editGood));
-                      }
+                      s.goodsListState.form.setFieldsValue(_objectSpread2({}, editGood)); // if (s.goodsListState.isMyShow) {
+                      //   s.goodsListState.form.setFieldsValue({
+                      //     ...editGood,
+                      //     itemName: editGood.itemNameSelf,
+                      //     itemModelName: editGood.itemModelNameSelf,
+                      //   });
+                      // } else {
+                      //   s.goodsListState.form.setFieldsValue({
+                      //     ...editGood,
+                      //   });
+                      // }
 
                       s.goodsListState.importGoods.isVisibleDrawer = false;
 

package/dist/index.js

@@ -10629,7 +10629,7 @@ function ItemNameInput(props) {
     }
   }, "*", props.shorthand, "*"), React__default['default'].createElement(ktsXui.AutoComplete, {
     onSearch: onSearch,
-    defaultValue: props.value,
+    value: props.value,
     options: options.map(function (e) {
       return {
         value: e.itemName
@@ -10641,7 +10641,6 @@ function ItemNameInput(props) {
       height: '100%',
       border: 'none'
     },
-    value: props.value,
     onChange: onChange
   })));
 } // function removeNullUndefined(obj: Record<string, any>): Record<string, any> {
@@ -15635,6 +15634,13 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     gutter: [16, 0]
   }, React__default['default'].createElement(ktsXui.Col, {
     span: 24
+  }, React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u8D2D\u4E70\u65B9\u4FE1\u606F",
+    colon: false
+  }, getFieldDecorator('naturalPersonFlag', {})(React__default['default'].createElement(NaturalPersonFlag, {
+    readOnly: isReadOnly('naturalPersonFlag')
+  })))), React__default['default'].createElement(ktsXui.Col, {
+    span: 24
   }, React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
     label: "\u540D\u79F0",
     colon: false
@@ -15817,6 +15823,27 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
   })))))))));
 });
 
+function NaturalPersonFlag(props) {
+  var _React$useState3 = React__default['default'].useState(props.value || 0),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      value = _React$useState4[0],
+      setValue = _React$useState4[1];
+
+  var onChange = React__default['default'].useCallback(function (e) {
+    if (props.readOnly) return;
+    setValue(e.target.checked ? 1 : 0);
+    props.onChange && props.onChange(e.target.checked ? 1 : 0);
+  }, [props.onChange, props.readOnly]);
+  React__default['default'].useEffect(function () {
+    setValue(props.value || 0);
+  }, [props.value]);
+  return React__default['default'].createElement(ktsXui.Checkbox, {
+    disabled: props.readOnly,
+    checked: value === 1,
+    onChange: onChange
+  }, "\u662F\u5426\u5F00\u7968\u7ED9\u81EA\u7136\u4EBA");
+}
+
 function BuyerNameInput$1(props) {
   var fieldName = props.fieldName,
       form = props.myform;
@@ -15825,10 +15852,10 @@ function BuyerNameInput$1(props) {
     return s.autoComplete;
   }, []);
 
-  var _React$useState3 = React__default['default'].useState([]),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      options = _React$useState4[0],
-      setOptions = _React$useState4[1];
+  var _React$useState5 = React__default['default'].useState([]),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      options = _React$useState6[0],
+      setOptions = _React$useState6[1];
 
   var onChangeAutoComplete = React__default['default'].useCallback(function (value) {
     var record = options.filter(function (e) {
@@ -21228,14 +21255,17 @@ var DrawerBody$2 = function DrawerBody() {
                       } // 导入FORM里
 
 
-                      if (s.goodsListState.isMyShow) {
-                        s.goodsListState.form.setFieldsValue(_objectSpread2(_objectSpread2({}, editGood), {}, {
-                          itemName: editGood.itemNameSelf,
-                          itemModelName: editGood.itemModelNameSelf
-                        }));
-                      } else {
-                        s.goodsListState.form.setFieldsValue(_objectSpread2({}, editGood));
-                      }
+                      s.goodsListState.form.setFieldsValue(_objectSpread2({}, editGood)); // if (s.goodsListState.isMyShow) {
+                      //   s.goodsListState.form.setFieldsValue({
+                      //     ...editGood,
+                      //     itemName: editGood.itemNameSelf,
+                      //     itemModelName: editGood.itemModelNameSelf,
+                      //   });
+                      // } else {
+                      //   s.goodsListState.form.setFieldsValue({
+                      //     ...editGood,
+                      //   });
+                      // }
 
                       s.goodsListState.importGoods.isVisibleDrawer = false;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.31",
+  "version": "3.2.33",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -53,7 +53,7 @@ export default () => {
       <Switch checkedChildren="预制" unCheckedChildren="默认" onChange={e => { e ? setController(controller2) : setController(controller1) }} ></Switch>
       <Button onClick={controller.pipeline(async s => { s.goodsListState.endowCode.getReadOnlyTaxRate = s.goodsListState.endowCode.readOnlyTaxRateMap.DRAFT })} >税率（草稿）</Button>
       <Button onClick={controller.pipeline(async s => { s.goodsListState.endowCode.getReadOnlyTaxRate = () => true })} >税率（预制）</Button>
-      <Invoice invoiceType='digtal' controller={controller} />
+      <Invoice controller={controller} />
     </div>
   );
 };

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

@@ -1,7 +1,7 @@
 
 import React from 'react';
 import { Button } from 'kts-components-antd-x3/lib/radio';
-import { Invoice, IGood } from '../../../..';
+import { Invoice, IGood } from '../../../../src';
 import { IGetBuyerListOption } from '../../../Invoice/InvoiceController/InvoiceControllerState/BuyerState';
 
 const InvoiceController = Invoice.InvoiceController

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

@@ -16,7 +16,7 @@ export default () => {
   return (
     <div>
       <Button onClick={onClick} style={{ marginBottom: 10 }}>获取数据</Button>
-      <Invoice controller={controller}/>
+      <Invoice invoiceType='digtal' controller={controller}/>
     </div>
   );
 };

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

@@ -99,8 +99,8 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
     return (
         <div className='kts-invoice-operate-goods-list-itemName-input'>
             {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
-            <AutoComplete onSearch={onSearch} defaultValue={props.value} options={options.map(e => ({ value: e.itemName }))} onChange={onChangeAutoComplete} >
-                <Input style={{ height: '100%', border: 'none' }} value={props.value} onChange={onChange} />
+            <AutoComplete onSearch={onSearch} value={props.value} options={options.map(e => ({ value: e.itemName }))} onChange={onChangeAutoComplete} >
+                <Input style={{ height: '100%', border: 'none' }} onChange={onChange} />
             </AutoComplete>
         </div>
     )

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

@@ -27,10 +27,12 @@ export default () => {
       onClose={onClose}
       visible={visible}
     >
-      {topExpand &&
+      {
+        topExpand &&
         <div style={{ marginBottom: 10 }}  >
           {topExpand}
-        </div>}
+        </div>
+      }
       <DrawerBody />
     </Drawer>
   );
@@ -98,17 +100,20 @@ const DrawerBody = () => {
               }
 
               // 导入FORM里
-              if (s.goodsListState.isMyShow) {
-                s.goodsListState.form.setFieldsValue({
-                  ...editGood,
-                  itemName: editGood.itemNameSelf,
-                  itemModelName: editGood.itemModelNameSelf,
-                });
-              } else {
-                s.goodsListState.form.setFieldsValue({
-                  ...editGood,
-                });
-              }
+              s.goodsListState.form.setFieldsValue({
+                ...editGood,
+              });
+              // if (s.goodsListState.isMyShow) {
+              //   s.goodsListState.form.setFieldsValue({
+              //     ...editGood,
+              //     itemName: editGood.itemNameSelf,
+              //     itemModelName: editGood.itemModelNameSelf,
+              //   });
+              // } else {
+              //   s.goodsListState.form.setFieldsValue({
+              //     ...editGood,
+              //   });
+              // }
 
               s.goodsListState.importGoods.isVisibleDrawer = false;
               s.goodsListState.isTaxIncluded
@@ -165,6 +170,5 @@ const getItemNameOther = (record: any, editGood: IGood) => {
   // if (shorthand) {
   //   return `*${shorthand}*${record.itemNameSelf}`;
   // }
-
   return record.itemName;
 }

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

@@ -1,9 +1,10 @@
 
-import React, { ChangeEvent } from 'react';
+import React from 'react';
 import Icon from '@ant-design/icons';
 import { decorator } from "grey-react-box";
 import { Form } from "kts-components-antd-x3";
-import { AutoComplete, Button, Col, Input, InputProps, Row, Tooltip } from 'kts-xui'
+import { AutoComplete, Button, Checkbox, Col, Input, InputProps, Row, Tooltip } from 'kts-xui'
+import { CheckboxChangeEvent } from 'kts-components-antd-x4/lib/checkbox';
 import { FormComponentProps } from "kts-components-antd-x3/lib/form";
 import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
 import { ReactComponent as ArrowUpSvg } from './svg/arrowUp.svg';
@@ -112,6 +113,15 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
             <div>
                 <Form className="digtal-stakeholder-form" >
                     <Row gutter={[16, 0]}>
+                        <Col span={24} >
+                            <Form.Item label='购买方信息' colon={false}>
+                                {getFieldDecorator('naturalPersonFlag', {
+                                })(
+                                    <NaturalPersonFlag readOnly={isReadOnly('naturalPersonFlag')} />
+                                )}
+                            </Form.Item>
+                        </Col>
+
                         <Col span={24} >
                             <Form.Item label='名称' colon={false}>
                                 {getFieldDecorator('buyerName', {
@@ -274,6 +284,34 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
     )
 })
 
+function NaturalPersonFlag(props: {
+    value?: 0 | 1,
+    onChange?: (e: 0 | 1) => void
+    readOnly?: boolean;
+}) {
+
+    const [value, setValue] = React.useState(props.value || 0);
+
+    const onChange = React.useCallback((e: CheckboxChangeEvent) => {
+        if (props.readOnly) return;
+        setValue(e.target.checked ? 1 : 0);
+        props.onChange && props.onChange(e.target.checked ? 1 : 0);
+    }, [props.onChange, props.readOnly])
+
+    React.useEffect(() => {
+        setValue(props.value || 0)
+    }, [props.value])
+
+    return (
+        <Checkbox
+            disabled={props.readOnly}
+            checked={value === 1}
+            onChange={onChange}
+        >
+            是否开票给自然人
+        </Checkbox>
+    )
+}
 
 function BuyerNameInput(props: InputProps & { fieldName: string; myform: WrappedFormUtils<any> }) {
 
@@ -337,7 +375,6 @@ class MyInput extends React.Component<InputProps>{
     }
 }
 
-
 class Discontinue {
 
     private static timer: any;
@@ -347,3 +384,4 @@ class Discontinue {
         Discontinue.timer = setTimeout(resolve, interval);
     })
 }
+