kts-component-invoice-operate 3.2.70 → 3.2.72

package/dist/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/index.d.ts

@@ -72,6 +72,8 @@ export default class GoodsListState {
     isMergeDiscount: boolean;
     /** 是否可以销售折让 */
     isSalesDiscount: boolean;
+    /** 是否可以销售赠品 */
+    isSalesGifts: boolean;
     /** 正在 添加商品对照 的货物 */
     addComparisonIndex?: string;
     /** 商品拖拽数据 */

package/dist/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useSalesGifts/index.d.ts

@@ -2,5 +2,5 @@
 /** 销售赠品 */
 export default function useSalesGifts(): {
     /** 按钮 */
-    button: JSX.Element;
+    button: JSX.Element | undefined;
 };

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 as Popover$1, 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, Popover, Dropdown as Dropdown$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, Popover, Dropdown as Dropdown$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';
@@ -1089,6 +1089,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.isMergeDetails = false;
   this.isMergeDiscount = false;
   this.isSalesDiscount = false;
+  this.isSalesGifts = false;
   this.addComparisonIndex = void 0;
   this.drag = new Drag();
 });
@@ -14965,6 +14966,12 @@ function useSalesDiscount() {
 
 function useSalesGifts() {
   var controller = Invoice.useInvoiceController();
+  var isSalesGifts = controller.useMemo(function (s) {
+    return s.goodsListState.isSalesGifts;
+  }, []);
+  var selectedGoodIndex = controller.useMemo(function (s) {
+    return s.goodsListState.selectedGoodIndex;
+  }, []);
   var goodsList = controller.useMemo(function (s) {
     return s.goodsListState.goodsList;
   }, []);
@@ -14973,7 +14980,7 @@ function useSalesGifts() {
       return e.lineAttribute === LineAttributeType$1.赠品行;
     });
   }, [goodsList]);
-  var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var onClickAuto = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _iterator, _step, g;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -15027,12 +15034,105 @@ function useSalesGifts() {
       }
     }, _callee, null, [[1, 12, 15, 18]]);
   })), [controller, giveaways]);
+  var onClickManual = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _controller$state$goo, goodsMap, selectedGoodIndex, giveaways, content, _iterator2, _step2, g;
+
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _controller$state$goo = controller.state.goodsListState, goodsMap = _controller$state$goo.goodsMap, selectedGoodIndex = _controller$state$goo.selectedGoodIndex;
+            giveaways = selectedGoodIndex.map(function (e) {
+              return goodsMap.get(e);
+            }).filter(function (e) {
+              return !!e;
+            });
+
+            if (!(giveaways.some(function (e) {
+              return e.lineAttribute === LineAttributeType$1.正常 || e.lineAttribute === LineAttributeType$1.赠品行;
+            }) === false)) {
+              _context2.next = 5;
+              break;
+            }
+
+            content = '只能选择‘赠品行’和‘正常行’';
+            return _context2.abrupt("return", message.error({
+              content: content,
+              key: content
+            }));
+
+          case 5:
+            _iterator2 = _createForOfIteratorHelper(giveaways);
+            _context2.prev = 6;
+
+            _iterator2.s();
+
+          case 8:
+            if ((_step2 = _iterator2.n()).done) {
+              _context2.next = 14;
+              break;
+            }
+
+            g = _step2.value;
+            _context2.next = 12;
+            return controller.addGoodDiscountV2([{
+              $index: g.$index,
+              discolineAmountunt: g.lineAmountIncludeTax || 0
+            }]);
+
+          case 12:
+            _context2.next = 8;
+            break;
+
+          case 14:
+            _context2.next = 19;
+            break;
+
+          case 16:
+            _context2.prev = 16;
+            _context2.t0 = _context2["catch"](6);
+
+            _iterator2.e(_context2.t0);
+
+          case 19:
+            _context2.prev = 19;
+
+            _iterator2.f();
+
+            return _context2.finish(19);
+
+          case 22:
+            controller.state.goodsListState.selectedGoodIndex = [];
+
+          case 23:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2, null, [[6, 16, 19, 22]]);
+  })), [controller]);
+  var items = React.useMemo(function () {
+    return [{
+      key: '0',
+      label: '自动转换',
+      disabled: giveaways.length <= 0,
+      onClick: onClickAuto
+    }, {
+      key: '1',
+      label: '手动转换',
+      disabled: selectedGoodIndex.length <= 0,
+      onClick: onClickManual
+    }];
+  }, [selectedGoodIndex, onClickManual, onClickAuto]);
   var button = React.useMemo(function () {
-    if (giveaways.length <= 0) return React.createElement(React.Fragment, null);
-    return React.createElement(Button, {
-      onClick: onClick
-    }, "\u9500\u552E\u8D60\u54C1");
-  }, [giveaways, onClick]);
+    if (!isSalesGifts) return;
+    return React.createElement(Dropdown$1, {
+      menu: {
+        items: items
+      },
+      trigger: ['click']
+    }, React.createElement(Button, null, "\u9500\u552E\u8D60\u54C1"));
+  }, [items, isSalesGifts]);
   return {
     /** 按钮 */
     button: button
@@ -16195,6 +16295,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
@@ -16210,7 +16317,8 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
       type: 'link',
       style: {
         padding: 0,
-        width: 20
+        width: 20,
+        height: '100%'
       },
       icon: React.createElement(Icon, {
         component: SvgPlus
@@ -16377,6 +16485,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;

package/dist/index.js

@@ -1099,6 +1099,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.isMergeDetails = false;
   this.isMergeDiscount = false;
   this.isSalesDiscount = false;
+  this.isSalesGifts = false;
   this.addComparisonIndex = void 0;
   this.drag = new Drag();
 });
@@ -14975,6 +14976,12 @@ function useSalesDiscount() {
 
 function useSalesGifts() {
   var controller = Invoice.useInvoiceController();
+  var isSalesGifts = controller.useMemo(function (s) {
+    return s.goodsListState.isSalesGifts;
+  }, []);
+  var selectedGoodIndex = controller.useMemo(function (s) {
+    return s.goodsListState.selectedGoodIndex;
+  }, []);
   var goodsList = controller.useMemo(function (s) {
     return s.goodsListState.goodsList;
   }, []);
@@ -14983,7 +14990,7 @@ function useSalesGifts() {
       return e.lineAttribute === LineAttributeType$1.赠品行;
     });
   }, [goodsList]);
-  var onClick = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var onClickAuto = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _iterator, _step, g;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -15037,12 +15044,105 @@ function useSalesGifts() {
       }
     }, _callee, null, [[1, 12, 15, 18]]);
   })), [controller, giveaways]);
+  var onClickManual = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _controller$state$goo, goodsMap, selectedGoodIndex, giveaways, content, _iterator2, _step2, g;
+
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _controller$state$goo = controller.state.goodsListState, goodsMap = _controller$state$goo.goodsMap, selectedGoodIndex = _controller$state$goo.selectedGoodIndex;
+            giveaways = selectedGoodIndex.map(function (e) {
+              return goodsMap.get(e);
+            }).filter(function (e) {
+              return !!e;
+            });
+
+            if (!(giveaways.some(function (e) {
+              return e.lineAttribute === LineAttributeType$1.正常 || e.lineAttribute === LineAttributeType$1.赠品行;
+            }) === false)) {
+              _context2.next = 5;
+              break;
+            }
+
+            content = '只能选择‘赠品行’和‘正常行’';
+            return _context2.abrupt("return", ktsComponentsAntdX3.message.error({
+              content: content,
+              key: content
+            }));
+
+          case 5:
+            _iterator2 = _createForOfIteratorHelper(giveaways);
+            _context2.prev = 6;
+
+            _iterator2.s();
+
+          case 8:
+            if ((_step2 = _iterator2.n()).done) {
+              _context2.next = 14;
+              break;
+            }
+
+            g = _step2.value;
+            _context2.next = 12;
+            return controller.addGoodDiscountV2([{
+              $index: g.$index,
+              discolineAmountunt: g.lineAmountIncludeTax || 0
+            }]);
+
+          case 12:
+            _context2.next = 8;
+            break;
+
+          case 14:
+            _context2.next = 19;
+            break;
+
+          case 16:
+            _context2.prev = 16;
+            _context2.t0 = _context2["catch"](6);
+
+            _iterator2.e(_context2.t0);
+
+          case 19:
+            _context2.prev = 19;
+
+            _iterator2.f();
+
+            return _context2.finish(19);
+
+          case 22:
+            controller.state.goodsListState.selectedGoodIndex = [];
+
+          case 23:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2, null, [[6, 16, 19, 22]]);
+  })), [controller]);
+  var items = React__default['default'].useMemo(function () {
+    return [{
+      key: '0',
+      label: '自动转换',
+      disabled: giveaways.length <= 0,
+      onClick: onClickAuto
+    }, {
+      key: '1',
+      label: '手动转换',
+      disabled: selectedGoodIndex.length <= 0,
+      onClick: onClickManual
+    }];
+  }, [selectedGoodIndex, onClickManual, onClickAuto]);
   var button = React__default['default'].useMemo(function () {
-    if (giveaways.length <= 0) return React__default['default'].createElement(React__default['default'].Fragment, null);
-    return React__default['default'].createElement(ktsComponentsAntdX3.Button, {
-      onClick: onClick
-    }, "\u9500\u552E\u8D60\u54C1");
-  }, [giveaways, onClick]);
+    if (!isSalesGifts) return;
+    return React__default['default'].createElement(ktsXui.Dropdown, {
+      menu: {
+        items: items
+      },
+      trigger: ['click']
+    }, React__default['default'].createElement(ktsComponentsAntdX3.Button, null, "\u9500\u552E\u8D60\u54C1"));
+  }, [items, isSalesGifts]);
   return {
     /** 按钮 */
     button: button
@@ -16205,6 +16305,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
@@ -16220,7 +16327,8 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
       type: 'link',
       style: {
         padding: 0,
-        width: 20
+        width: 20,
+        height: '100%'
       },
       icon: React__default['default'].createElement(Icon, {
         component: SvgPlus
@@ -16387,6 +16495,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.70",
+  "version": "3.2.72",
   "scripts": {
     "dev": "dumi dev",
     "start": "dumi dev",

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

@@ -102,6 +102,9 @@ export default class GoodsListState {
   /** 是否可以销售折让 */
   isSalesDiscount = false;
 
+  /** 是否可以销售赠品 */
+  isSalesGifts = false;
+
   /** 正在 添加商品对照 的货物 */
   addComparisonIndex?: string;
 

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useSalesGifts/index.tsx

@@ -3,32 +3,71 @@ import React from "react"
 import { Button, message } from "kts-components-antd-x3"
 import { chain, bignumber } from 'mathjs';
 import Invoice from '../../../../../../..'
-import { LineAttributeType } from "../../../../../../../InvoiceController";
+import { IGood, LineAttributeType } from "../../../../../../../InvoiceController";
+import { Dropdown, MenuProps } from "kts-xui";
 
 /** 销售赠品 */
 export default function useSalesGifts() {
 
     const controller = Invoice.useInvoiceController();
 
+    const isSalesGifts = controller.useMemo(s => s.goodsListState.isSalesGifts, []);
+
+    const selectedGoodIndex = controller.useMemo(s => s.goodsListState.selectedGoodIndex, []);
+
     const goodsList = controller.useMemo(s => s.goodsListState.goodsList, [])
 
     const giveaways = React.useMemo(() => goodsList.filter(e => e.lineAttribute === LineAttributeType.赠品行), [goodsList])
 
-    const onClick = React.useCallback(async () => {
+    const onClickAuto = React.useCallback(async () => {
         for (let g of giveaways) {
             g.lineAttribute = LineAttributeType.正常;
             await controller.addGoodDiscountV2([{ $index: g.$index, discolineAmountunt: g.lineAmountIncludeTax || 0 }]);
         }
     }, [controller, giveaways])
 
+    const onClickManual = React.useCallback(async () => {
+        const { goodsMap, selectedGoodIndex } = controller.state.goodsListState;
+        const giveaways = selectedGoodIndex.map(e => goodsMap.get(e) as IGood).filter(e => !!e);
+
+        if (giveaways.some(e => e.lineAttribute === LineAttributeType.正常 || e.lineAttribute === LineAttributeType.赠品行) === false) {
+            const content = '只能选择‘赠品行’和‘正常行’';
+            return message.error({ content, key: content });
+        }
+
+        for (let g of giveaways) {
+            await controller.addGoodDiscountV2([{ $index: g.$index, discolineAmountunt: g.lineAmountIncludeTax || 0 }]);
+        }
+
+        controller.state.goodsListState.selectedGoodIndex = [];
+    }, [controller])
+
+    const items: MenuProps['items'] = React.useMemo(() => {
+        return [
+            {
+                key: '0',
+                label: '自动转换',
+                disabled: giveaways.length <= 0,
+                onClick: onClickAuto,
+            }, {
+                key: '1',
+                label: '手动转换',
+                disabled: selectedGoodIndex.length <= 0,
+                onClick: onClickManual,
+            },
+        ];
+    }, [selectedGoodIndex, onClickManual, onClickAuto])
+
     const button = React.useMemo(() => {
-        if (giveaways.length <= 0) return <></>;
+        if (!isSalesGifts) return;
         return (
-            <Button onClick={onClick} >
-                销售赠品
-            </Button>
+            <Dropdown menu={{ items }} trigger={['click']} >
+                <Button>
+                    销售赠品
+                </Button>
+            </Dropdown>
         )
-    }, [giveaways, onClick])
+    }, [items, isSalesGifts])
 
     return {
         /** 按钮 */

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

@@ -114,14 +114,14 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
             <div>
                 <Form className="digtal-stakeholder-form" >
                     <Row gutter={[16, 0]}>
-                        {/* <Col span={24} >
+                        <Col span={24} >
                             <Form.Item label='购买方信息' colon={false}>
                                 {getFieldDecorator('naturalPersonFlag', {
                                 })(
                                     <NaturalPersonFlag readOnly={isReadOnly('naturalPersonFlag')} />
                                 )}
                             </Form.Item>
-                        </Col> */}
+                        </Col>
 
                         <Col span={24} >
                             <Form.Item label='名称' colon={false}>
@@ -138,7 +138,7 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                                             isShowImportButton === true &&
                                             <Button
                                                 type='link'
-                                                style={{ padding: 0, width: 20 }}
+                                                style={{ padding: 0, width: 20, height: '100%' }}
                                                 icon={<Icon component={PlusSvg} />}
                                                 onClick={() => { onClickImportButton && onClickImportButton(controller) }}
                                             />