kts-component-invoice-operate 3.2.70 → 3.2.71-1

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/InvoiceController/InvoiceControllerState/Stakeholder/index.d.ts

@@ -3,6 +3,8 @@ import { ValidationRule } from "kts-components-antd-x3/lib/form";
 export default class Stakeholder {
     /** 禁用字段 */
     disableds?: string[];
+    /** 启用字段 */
+    enables?: string[];
     /** 字段字段规则 */
     rulesMap?: {
         [key: string]: ValidationRule[] | undefined;

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

@@ -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();
 });
@@ -1151,6 +1152,7 @@ var Stakeholder = /*#__PURE__*/_createClass(function Stakeholder() {
   _classCallCheck(this, Stakeholder);
 
   this.disableds = void 0;
+  this.enables = void 0;
   this.rulesMap = void 0;
 });
 
@@ -14965,6 +14967,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 +14981,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 +15035,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
@@ -16543,15 +16644,25 @@ var SignDigtal = decorator(Form.create())(function (props) {
   var model = controller.useMemo(function (s) {
     return s.model;
   }, []);
+  /** 禁用字段 */
+
   var disableds = controller.useMemo(function (s) {
     return s.stakeholder.disableds || [];
   }, []);
+  /** 启用字段 */
+
+  var enables = controller.useMemo(function (s) {
+    return s.stakeholder.enables || [];
+  }, []);
   var readOnly = React.useMemo(function () {
     return model === 'readOnly';
   }, [model]);
   var isReadOnly = React.useCallback(function (field) {
     return disableds.indexOf(field) >= 0;
-  }, [disableds]); // 注册 form
+  }, [disableds]);
+  var isEnables = React.useCallback(function (field) {
+    return enables.indexOf(field) >= 0;
+  }, [enables]); // 注册 form
 
   controller.useForm('sign', form);
 
@@ -16562,7 +16673,12 @@ var SignDigtal = decorator(Form.create())(function (props) {
       className: 'sign-digtal-readOnly-cont'
     }, React.createElement("div", null, React.createElement("span", null, "\u5907"), React.createElement("span", null, "\u6CE8")), React.createElement("div", null, getFieldDecorator('remarks', {
       initialValue: props.defaultRemark
-    })(React.createElement(MyDiv$1, null)))), React.createElement(Form, {
+    })(isEnables('remarks') ? React.createElement(Input$1.TextArea, {
+      placeholder: "\u8BF7\u8F93\u5165",
+      style: {
+        height: '100%'
+      }
+    }) : React.createElement(MyDiv$1, null)))), React.createElement(Form, {
       layout: 'inline',
       className: 'digtal-readOnly-form'
     }, React.createElement(Form.Item, {

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();
 });
@@ -1161,6 +1162,7 @@ var Stakeholder = /*#__PURE__*/_createClass(function Stakeholder() {
   _classCallCheck(this, Stakeholder);
 
   this.disableds = void 0;
+  this.enables = void 0;
   this.rulesMap = void 0;
 });
 
@@ -14975,6 +14977,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 +14991,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 +15045,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
@@ -16553,15 +16654,25 @@ var SignDigtal = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(funct
   var model = controller.useMemo(function (s) {
     return s.model;
   }, []);
+  /** 禁用字段 */
+
   var disableds = controller.useMemo(function (s) {
     return s.stakeholder.disableds || [];
   }, []);
+  /** 启用字段 */
+
+  var enables = controller.useMemo(function (s) {
+    return s.stakeholder.enables || [];
+  }, []);
   var readOnly = React__default['default'].useMemo(function () {
     return model === 'readOnly';
   }, [model]);
   var isReadOnly = React__default['default'].useCallback(function (field) {
     return disableds.indexOf(field) >= 0;
-  }, [disableds]); // 注册 form
+  }, [disableds]);
+  var isEnables = React__default['default'].useCallback(function (field) {
+    return enables.indexOf(field) >= 0;
+  }, [enables]); // 注册 form
 
   controller.useForm('sign', form);
 
@@ -16572,7 +16683,12 @@ var SignDigtal = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(funct
       className: 'sign-digtal-readOnly-cont'
     }, React__default['default'].createElement("div", null, React__default['default'].createElement("span", null, "\u5907"), React__default['default'].createElement("span", null, "\u6CE8")), React__default['default'].createElement("div", null, getFieldDecorator('remarks', {
       initialValue: props.defaultRemark
-    })(React__default['default'].createElement(MyDiv$1, null)))), React__default['default'].createElement(ktsComponentsAntdX3.Form, {
+    })(isEnables('remarks') ? React__default['default'].createElement(ktsXui.Input.TextArea, {
+      placeholder: "\u8BF7\u8F93\u5165",
+      style: {
+        height: '100%'
+      }
+    }) : React__default['default'].createElement(MyDiv$1, null)))), React__default['default'].createElement(ktsComponentsAntdX3.Form, {
       layout: 'inline',
       className: 'digtal-readOnly-form'
     }, React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {

package/package.json

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

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

@@ -9,10 +9,11 @@ export default () => {
     React.useEffect(() => {
         (async () => {
             await controller.run(async s => { s.model = 'readOnly' }); // 设置只读
+            await controller.run(async s => { s.stakeholder.enables = ['remarks'] });
             await controller.formList.get('invoiceHeader')?.setFieldsValue({
                 no: '2029292029201920291029',
                 invoicingDate: '2023年7月6日',
-                tag:'成品油',
+                tag: '成品油',
             })
             await controller.formList.get('stakeholder')?.setFieldsValue({
                 buyerName: '国能供应链内蒙古有限公司',
@@ -30,8 +31,8 @@ export default () => {
                 sellerAccount: '9550880218186900195',
             })
             await controller.formList.get('sign')?.setFieldsValue({
-                remark: '备注',
-                issuer: '张自豪',
+                remarks: '备注',
+                drawer: '张自豪',
             })
         })()
     }, [controller])

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/InvoiceController/InvoiceControllerState/Stakeholder/index.ts

@@ -6,6 +6,9 @@ export default class Stakeholder {
     /** 禁用字段 */
     disableds?: string[];
 
+    /** 启用字段 */
+    enables?: string[];
+
     /** 字段字段规则 */
     rulesMap?: { [key: string]: ValidationRule[] | undefined }
 }

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/Sign/index.tsx

@@ -27,12 +27,18 @@ export default decorator<IBuyerProps, IBuyerProps & FormComponentProps>(Form.cre
 
     const model = controller.useMemo(s => s.model, []);
 
+    /** 禁用字段 */
     const disableds = controller.useMemo(s => s.stakeholder.disableds || [], []);
 
+    /** 启用字段 */
+    const enables = controller.useMemo(s => s.stakeholder.enables || [], []);
+
     const readOnly = React.useMemo(() => model === 'readOnly', [model]);
 
     const isReadOnly = React.useCallback(field => disableds.indexOf(field) >= 0, [disableds])
 
+    const isEnables = React.useCallback(field => enables.indexOf(field) >= 0, [enables])
+
     // 注册 form
     controller.useForm('sign', form);
 
@@ -47,7 +53,11 @@ export default decorator<IBuyerProps, IBuyerProps & FormComponentProps>(Form.cre
                     <div>
                         {getFieldDecorator('remarks', {
                             initialValue: props.defaultRemark
-                        })(<MyDiv />)}
+                        })(
+                            isEnables('remarks')
+                                ? <Input.TextArea placeholder='请输入' style={{ height: '100%' }} />
+                                : <MyDiv />
+                        )}
                     </div>
                 </div>
                 <Form layout='inline' className='digtal-readOnly-form' >