kts-component-invoice-operate 3.2.106 → 3.2.107

package/dist/Invoice/InvoiceController/fns/itemBlur.d.ts

@@ -0,0 +1,6 @@
+import { InvoiceControllerState } from '../';
+/**
+ * 项目名称智能赋码
+ */
+declare const _default: (s: InvoiceControllerState, record: any, controller: any) => Promise<void>;
+export default _default;

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

@@ -32,6 +32,8 @@ export default class InvoiceController extends InvoiceControllerForm {
     addGoodDiscountV2: (option?: import("./fns/addGoodDiscountV2").IOptions[] | undefined) => Promise<any>;
     /** 导入商品 */
     importGoodsDrawer: (option?: any) => Promise<any>;
+    /** 项目名称智能赋码 */
+    itemNameBlur: (option?: any) => Promise<any>;
     /** 获取 商品 列表 */
     getGoodsList?: (option?: IGetGoodsListOption | undefined) => Promise<any>;
     /** 税收分类编码列表  */

package/dist/index.esm.js

@@ -9403,6 +9403,76 @@ var getPriceExcludeTax = function getPriceExcludeTax(s, record, calculatingDigit
   return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")), calculatingDigits);
 };
 
+/**
+ * 项目名称智能赋码
+ */
+
+var itemBlur = /*#__PURE__*/(function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s, record, controller) {
+    var between, editGood;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            Object.keys(record).filter(function (e) {
+              return !record[e] && record[e] !== 0;
+            }).forEach(function (e) {
+              delete record[e];
+            }); // 没用 被编辑的货物 和 form 就退出
+
+            if (!(!s.goodsListState.editGood || !s.goodsListState.form)) {
+              _context.next = 3;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 3:
+            // 中间数据
+            between = _objectSpread2({}, record);
+            between.taxClassificationCode = record.taxClassificationCode;
+            between.shorthand = record.shorthand; // 设置编辑货物
+
+            editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between); // 导入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));
+            }
+
+            if (!s.goodsListState.isTaxIncluded) {
+              _context.next = 13;
+              break;
+            }
+
+            _context.next = 11;
+            return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
+
+          case 11:
+            _context.next = 15;
+            break;
+
+          case 13:
+            _context.next = 15;
+            return updateUnitPriceTax(controller, s.goodsListState.form, record);
+
+          case 15:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function (_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
 var InvoiceController = /*#__PURE__*/function (_InvoiceControllerFor) {
   _inherits(InvoiceController, _InvoiceControllerFor);
 
@@ -9428,6 +9498,7 @@ var InvoiceController = /*#__PURE__*/function (_InvoiceControllerFor) {
     _this.addGoodDiscount = _this.pipeline(addGoodDiscount);
     _this.addGoodDiscountV2 = _this.pipeline(addGoodDiscountV2);
     _this.importGoodsDrawer = _this.pipeline(importGoodsDrawer);
+    _this.itemNameBlur = _this.pipeline(itemBlur);
     _this.getGoodsList = void 0;
     _this.getTaxCategoryCodeList = void 0;
     _this.getGoodsSearch = getGoodsSearch;
@@ -10923,11 +10994,11 @@ function ItemNameInput(props) {
               taxCategoryData = _context.sent;
 
               if (taxCategoryData && taxCategoryData[0]) {
-                params = _objectSpread2(_objectSpread2({}, props.editGood), {}, {
+                params = {
                   taxClassificationCode: taxCategoryData[0].taxCategoryCode,
                   shorthand: taxCategoryData[0].shorthand
-                });
-                controller.importGoodsDrawer(params);
+                };
+                controller.itemNameBlur(params);
               }
 
             case 7:
@@ -17814,11 +17885,11 @@ function ItemNameInput$1(props) {
               taxCategoryData = _context.sent;
 
               if (taxCategoryData && taxCategoryData[0]) {
-                params = _objectSpread2(_objectSpread2({}, props.editGood), {}, {
+                params = {
                   taxClassificationCode: taxCategoryData[0].taxCategoryCode,
                   shorthand: taxCategoryData[0].shorthand
-                });
-                controller.importGoodsDrawer(params);
+                };
+                controller.itemNameBlur(params);
               }
 
             case 7:

package/dist/index.js

@@ -9413,6 +9413,76 @@ var getPriceExcludeTax = function getPriceExcludeTax(s, record, calculatingDigit
   return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")), calculatingDigits);
 };
 
+/**
+ * 项目名称智能赋码
+ */
+
+var itemBlur = /*#__PURE__*/(function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s, record, controller) {
+    var between, editGood;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            Object.keys(record).filter(function (e) {
+              return !record[e] && record[e] !== 0;
+            }).forEach(function (e) {
+              delete record[e];
+            }); // 没用 被编辑的货物 和 form 就退出
+
+            if (!(!s.goodsListState.editGood || !s.goodsListState.form)) {
+              _context.next = 3;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 3:
+            // 中间数据
+            between = _objectSpread2({}, record);
+            between.taxClassificationCode = record.taxClassificationCode;
+            between.shorthand = record.shorthand; // 设置编辑货物
+
+            editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between); // 导入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));
+            }
+
+            if (!s.goodsListState.isTaxIncluded) {
+              _context.next = 13;
+              break;
+            }
+
+            _context.next = 11;
+            return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
+
+          case 11:
+            _context.next = 15;
+            break;
+
+          case 13:
+            _context.next = 15;
+            return updateUnitPriceTax(controller, s.goodsListState.form, record);
+
+          case 15:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function (_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+})();
+
 var InvoiceController = /*#__PURE__*/function (_InvoiceControllerFor) {
   _inherits(InvoiceController, _InvoiceControllerFor);
 
@@ -9438,6 +9508,7 @@ var InvoiceController = /*#__PURE__*/function (_InvoiceControllerFor) {
     _this.addGoodDiscount = _this.pipeline(addGoodDiscount);
     _this.addGoodDiscountV2 = _this.pipeline(addGoodDiscountV2);
     _this.importGoodsDrawer = _this.pipeline(importGoodsDrawer);
+    _this.itemNameBlur = _this.pipeline(itemBlur);
     _this.getGoodsList = void 0;
     _this.getTaxCategoryCodeList = void 0;
     _this.getGoodsSearch = getGoodsSearch;
@@ -10933,11 +11004,11 @@ function ItemNameInput(props) {
               taxCategoryData = _context.sent;
 
               if (taxCategoryData && taxCategoryData[0]) {
-                params = _objectSpread2(_objectSpread2({}, props.editGood), {}, {
+                params = {
                   taxClassificationCode: taxCategoryData[0].taxCategoryCode,
                   shorthand: taxCategoryData[0].shorthand
-                });
-                controller.importGoodsDrawer(params);
+                };
+                controller.itemNameBlur(params);
               }
 
             case 7:
@@ -17824,11 +17895,11 @@ function ItemNameInput$1(props) {
               taxCategoryData = _context.sent;
 
               if (taxCategoryData && taxCategoryData[0]) {
-                params = _objectSpread2(_objectSpread2({}, props.editGood), {}, {
+                params = {
                   taxClassificationCode: taxCategoryData[0].taxCategoryCode,
                   shorthand: taxCategoryData[0].shorthand
-                });
-                controller.importGoodsDrawer(params);
+                };
+                controller.itemNameBlur(params);
               }
 
             case 7:

package/package.json

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

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

@@ -0,0 +1,40 @@
+import { updateUnitPriceExcludingTax, updateUnitPriceTax } from '../../ui/default/GoodsList/hook/useColumns/autoFillFn';
+import { InvoiceControllerState, IGood } from '../';
+
+/**
+ * 项目名称智能赋码
+ */
+export default async (s: InvoiceControllerState, record: any, controller:any) => {
+    Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
+
+    // 没用 被编辑的货物 和 form 就退出
+    if (!s.goodsListState.editGood || !s.goodsListState.form) return;
+
+    // 中间数据
+    const between: any = {...record };
+
+    between.taxClassificationCode = record.taxClassificationCode;
+    between.shorthand = record.shorthand;
+
+    // 设置编辑货物
+    const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
+
+    // 导入FORM里
+    if (s.goodsListState.isMyShow) {
+        s.goodsListState.form.setFieldsValue({
+            ...editGood,
+            itemName: editGood.itemNameSelf,
+            itemModelName: editGood.itemModelNameSelf,
+        });
+    } else {
+        s.goodsListState.form.setFieldsValue({
+            ...editGood,
+        });
+    }
+
+    s.goodsListState.isTaxIncluded
+        ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
+        : await updateUnitPriceTax(controller, s.goodsListState.form, record)
+}
+
+

package/src/Invoice/InvoiceController/index.ts

@@ -14,6 +14,7 @@ import getGoodsSearch from './fns/getGoodsSearch';
 import mergeDetails from './fns/mergeDetails';
 import mergeDiscount from './fns/mergeDiscount';
 import importGoodsDrawer from './fns/importGoodsDrawer';
+import itemBlur from './fns/itemBlur';
 0
 export { default as InvoiceControllerState } from './InvoiceControllerState';
 export { default as IGood } from './InvoiceControllerState/GoodsListState/IGood';
@@ -66,6 +67,9 @@ export default class InvoiceController extends InvoiceControllerForm {
   /** 导入商品 */
   importGoodsDrawer = this.pipeline(importGoodsDrawer);
 
+  /** 项目名称智能赋码 */
+  itemNameBlur = this.pipeline(itemBlur);
+
   /** 获取 商品 列表 */
   getGoodsList?: (option?: IGetGoodsListOption | undefined) => Promise<any>;
 

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

@@ -30,11 +30,10 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
                     const taxCategoryData: any = await autoComplete.onItemNameBlur(searchText);
                     if (taxCategoryData && taxCategoryData[0]) {
                         const params = {
-                            ...props.editGood,
                             taxClassificationCode: taxCategoryData[0].taxCategoryCode,
                             shorthand: taxCategoryData[0].shorthand
                         }
-                        controller.importGoodsDrawer(params);
+                        controller.itemNameBlur(params);
                     }
                 }
                 setSelectLine(null);

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

@@ -32,11 +32,10 @@ export default function ItemNameInput(props: {
             const taxCategoryData: any = await autoComplete.onItemNameBlur(searchText);
             if (taxCategoryData && taxCategoryData[0]) {
               const params = {
-                ...props.editGood,
                 taxClassificationCode: taxCategoryData[0].taxCategoryCode,
                 shorthand: taxCategoryData[0].shorthand
               }
-              controller.importGoodsDrawer(params);
+              controller.itemNameBlur(params);
             }
           }
           setSelectLine(null);