kts-component-invoice-operate 3.2.20 → 3.2.21

package/dist/index.esm.js

@@ -10216,12 +10216,100 @@ function ItemNameInput(props) {
     };
   }(), [autoComplete.onItemNameSearch]);
   var onChangeAutoComplete = React.useCallback(function (itemName) {
-    var _controller$state$goo;
-
-    var good = options.filter(function (e) {
+    // const good = options.filter(e=>e.itemName === itemName)[0];
+    // good && controller.state.goodsListState.form?.setFieldsValue(removeNullUndefined(good));
+    var record = options.filter(function (e) {
       return e.itemName === itemName;
     })[0];
-    good && ((_controller$state$goo = controller.state.goodsListState.form) === null || _controller$state$goo === void 0 ? void 0 : _controller$state$goo.setFieldsValue(removeNullUndefined(good)));
+    debugger;
+    if (!record) return;
+    controller.run( /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+        var between, editGood;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.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)) {
+                  _context2.next = 3;
+                  break;
+                }
+
+                return _context2.abrupt("return");
+
+              case 3:
+                // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
+                record.quantity = undefined;
+                record.lineAmountExcludeTax = undefined;
+                record.lineAmountIncludeTax = undefined; // 中间数据
+
+                between = _objectSpread2({}, record);
+                between.itemName = record.itemName;
+                between.itemNameOther = record.itemName; // 设置编辑货物
+
+                editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between);
+
+                if (editGood.taxRate) {
+                  editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood);
+                }
+
+                if ("".concat(editGood.priceIncludeTax) === '0') {
+                  editGood.priceIncludeTax = undefined;
+                  editGood.priceExcludeTax = undefined;
+                } else {
+                  editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits);
+                }
+
+                if (editGood.quantity && editGood.priceIncludeTax) {
+                  editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax, s.calculatingDigits);
+                } // 导入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.importGoods.isVisibleDrawer = false;
+
+                if (!s.goodsListState.isTaxIncluded) {
+                  _context2.next = 20;
+                  break;
+                }
+
+                _context2.next = 18;
+                return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
+
+              case 18:
+                _context2.next = 22;
+                break;
+
+              case 20:
+                _context2.next = 22;
+                return updateUnitPriceTax(controller, s.goodsListState.form, record);
+
+              case 22:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }));
+
+      return function (_x2) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
   }, [options, controller]);
   return React.createElement("div", {
     className: 'kts-invoice-operate-goods-list-itemName-input'
@@ -10246,19 +10334,23 @@ function ItemNameInput(props) {
     value: props.value,
     onChange: onChange
   })));
-}
+} // function removeNullUndefined(obj: Record<string, any>): Record<string, any> {
+//     const filteredObj: Record<string, any> = {};
+//     for (const key in obj) {
+//         if (obj[key] !== null && obj[key] !== undefined) {
+//             filteredObj[key] = obj[key];
+//         }
+//     }
+//     return filteredObj;
+// }
 
-function removeNullUndefined(obj) {
-  var filteredObj = {};
+/** 货物单价，不含税 */
 
-  for (var key in obj) {
-    if (obj[key] !== null && obj[key] !== undefined) {
-      filteredObj[key] = obj[key];
-    }
-  }
+var getPriceExcludeTax = function getPriceExcludeTax(s, record, calculatingDigits) {
+  if (!s.taxRate && s.taxRate !== 0 || !record.priceIncludeTax && record.priceIncludeTax !== 0) return; // 单价(含税)/(1+税率) = 单价(不含税)
 
-  return filteredObj;
-}
+  return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")), calculatingDigits);
+};
 
 /** 拆分全称加简称 */
 var getSN = function getSN(value) {
@@ -19650,7 +19742,7 @@ var DrawerBody$2 = function DrawerBody() {
                         editGood.priceIncludeTax = undefined;
                         editGood.priceExcludeTax = undefined;
                       } else {
-                        editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits);
+                        editGood.priceExcludeTax = getPriceExcludeTax$1(editGood, record, s.calculatingDigits);
                       }
 
                       if (editGood.quantity && editGood.priceIncludeTax) {
@@ -19712,7 +19804,7 @@ var DrawerBody$2 = function DrawerBody() {
 /** 货物单价，不含税 */
 
 
-var getPriceExcludeTax = function getPriceExcludeTax(s, record, calculatingDigits) {
+var getPriceExcludeTax$1 = function getPriceExcludeTax(s, record, calculatingDigits) {
   if (!s.taxRate && s.taxRate !== 0 || !record.priceIncludeTax && record.priceIncludeTax !== 0) return; // 单价(含税)/(1+税率) = 单价(不含税)
 
   return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")), calculatingDigits);

package/dist/index.js

@@ -10226,12 +10226,100 @@ function ItemNameInput(props) {
     };
   }(), [autoComplete.onItemNameSearch]);
   var onChangeAutoComplete = React__default['default'].useCallback(function (itemName) {
-    var _controller$state$goo;
-
-    var good = options.filter(function (e) {
+    // const good = options.filter(e=>e.itemName === itemName)[0];
+    // good && controller.state.goodsListState.form?.setFieldsValue(removeNullUndefined(good));
+    var record = options.filter(function (e) {
       return e.itemName === itemName;
     })[0];
-    good && ((_controller$state$goo = controller.state.goodsListState.form) === null || _controller$state$goo === void 0 ? void 0 : _controller$state$goo.setFieldsValue(removeNullUndefined(good)));
+    debugger;
+    if (!record) return;
+    controller.run( /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
+        var between, editGood;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.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)) {
+                  _context2.next = 3;
+                  break;
+                }
+
+                return _context2.abrupt("return");
+
+              case 3:
+                // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
+                record.quantity = undefined;
+                record.lineAmountExcludeTax = undefined;
+                record.lineAmountIncludeTax = undefined; // 中间数据
+
+                between = _objectSpread2({}, record);
+                between.itemName = record.itemName;
+                between.itemNameOther = record.itemName; // 设置编辑货物
+
+                editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between);
+
+                if (editGood.taxRate) {
+                  editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood);
+                }
+
+                if ("".concat(editGood.priceIncludeTax) === '0') {
+                  editGood.priceIncludeTax = undefined;
+                  editGood.priceExcludeTax = undefined;
+                } else {
+                  editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits);
+                }
+
+                if (editGood.quantity && editGood.priceIncludeTax) {
+                  editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax, s.calculatingDigits);
+                } // 导入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.importGoods.isVisibleDrawer = false;
+
+                if (!s.goodsListState.isTaxIncluded) {
+                  _context2.next = 20;
+                  break;
+                }
+
+                _context2.next = 18;
+                return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
+
+              case 18:
+                _context2.next = 22;
+                break;
+
+              case 20:
+                _context2.next = 22;
+                return updateUnitPriceTax(controller, s.goodsListState.form, record);
+
+              case 22:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }));
+
+      return function (_x2) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
   }, [options, controller]);
   return React__default['default'].createElement("div", {
     className: 'kts-invoice-operate-goods-list-itemName-input'
@@ -10256,19 +10344,23 @@ function ItemNameInput(props) {
     value: props.value,
     onChange: onChange
   })));
-}
+} // function removeNullUndefined(obj: Record<string, any>): Record<string, any> {
+//     const filteredObj: Record<string, any> = {};
+//     for (const key in obj) {
+//         if (obj[key] !== null && obj[key] !== undefined) {
+//             filteredObj[key] = obj[key];
+//         }
+//     }
+//     return filteredObj;
+// }
 
-function removeNullUndefined(obj) {
-  var filteredObj = {};
+/** 货物单价，不含税 */
 
-  for (var key in obj) {
-    if (obj[key] !== null && obj[key] !== undefined) {
-      filteredObj[key] = obj[key];
-    }
-  }
+var getPriceExcludeTax = function getPriceExcludeTax(s, record, calculatingDigits) {
+  if (!s.taxRate && s.taxRate !== 0 || !record.priceIncludeTax && record.priceIncludeTax !== 0) return; // 单价(含税)/(1+税率) = 单价(不含税)
 
-  return filteredObj;
-}
+  return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")), calculatingDigits);
+};
 
 /** 拆分全称加简称 */
 var getSN = function getSN(value) {
@@ -19660,7 +19752,7 @@ var DrawerBody$2 = function DrawerBody() {
                         editGood.priceIncludeTax = undefined;
                         editGood.priceExcludeTax = undefined;
                       } else {
-                        editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits);
+                        editGood.priceExcludeTax = getPriceExcludeTax$1(editGood, record, s.calculatingDigits);
                       }
 
                       if (editGood.quantity && editGood.priceIncludeTax) {
@@ -19722,7 +19814,7 @@ var DrawerBody$2 = function DrawerBody() {
 /** 货物单价，不含税 */
 
 
-var getPriceExcludeTax = function getPriceExcludeTax(s, record, calculatingDigits) {
+var getPriceExcludeTax$1 = function getPriceExcludeTax(s, record, calculatingDigits) {
   if (!s.taxRate && s.taxRate !== 0 || !record.priceIncludeTax && record.priceIncludeTax !== 0) return; // 单价(含税)/(1+税率) = 单价(不含税)
 
   return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")), calculatingDigits);

package/package.json

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

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

@@ -2,8 +2,11 @@
 import { Input } from 'kts-components-antd-x3';
 import React, { ChangeEvent } from 'react';
 import { AutoComplete } from 'kts-xui';
+import { countAmountIncludeTax } from '../../../../../../../tools/calculate'
 import { IGood, Invoice } from '../../../../../../../..';
 import './index.less';
+import { dutyFree, format15, updateUnitPriceExcludingTax, updateUnitPriceTax } from '../../autoFillFn';
+import evaluate from '../../../../../../../tools/evaluate';
 
 export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLInputElement>) => void, value?: string, shorthand?: string }) {
 
@@ -30,8 +33,64 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
     }, [autoComplete.onItemNameSearch])
 
     const onChangeAutoComplete = React.useCallback(itemName => {
-        const good = options.filter(e=>e.itemName === itemName)[0];
-        good && controller.state.goodsListState.form?.setFieldsValue(removeNullUndefined(good));
+        // const good = options.filter(e=>e.itemName === itemName)[0];
+        // good && controller.state.goodsListState.form?.setFieldsValue(removeNullUndefined(good));
+
+        const record = options.filter(e => e.itemName === itemName)[0] as any;
+        debugger;
+        if (!record) return;
+        controller.run(async s => {
+            Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
+
+            // 没用 被编辑的货物 和 form 就退出
+            if (!s.goodsListState.editGood || !s.goodsListState.form) return;
+
+            // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
+            record.quantity = undefined;
+            record.lineAmountExcludeTax = undefined;
+            record.lineAmountIncludeTax = undefined;
+
+            // 中间数据
+            const between = { ...record };
+            between.itemName = record.itemName;
+            between.itemNameOther = record.itemName;
+
+            // 设置编辑货物
+            const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
+
+            if (editGood.taxRate) {
+                editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
+            }
+
+            if (`${editGood.priceIncludeTax}` === '0') {
+                editGood.priceIncludeTax = undefined;
+                editGood.priceExcludeTax = undefined;
+            } else {
+                editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits) as number;
+            }
+
+            if (editGood.quantity && editGood.priceIncludeTax) {
+                editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax, s.calculatingDigits);
+            }
+
+            // 导入FORM里
+            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
+                ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
+                : await updateUnitPriceTax(controller, s.goodsListState.form, record)
+        })
     }, [options, controller])
 
     return (
@@ -45,14 +104,22 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
 }
 
 
-function removeNullUndefined(obj: Record<string, any>): Record<string, any> {
-    const filteredObj: Record<string, any> = {};
-  
-    for (const key in obj) {
-      if (obj[key] !== null && obj[key] !== undefined) {
-        filteredObj[key] = obj[key];
-      }
-    }
-  
-    return filteredObj;
-  }
+// function removeNullUndefined(obj: Record<string, any>): Record<string, any> {
+//     const filteredObj: Record<string, any> = {};
+
+//     for (const key in obj) {
+//         if (obj[key] !== null && obj[key] !== undefined) {
+//             filteredObj[key] = obj[key];
+//         }
+//     }
+
+//     return filteredObj;
+// }
+
+/** 货物单价，不含税 */
+const getPriceExcludeTax = (s: IGood, record: any, calculatingDigits?: number) => {
+    if ((!s.taxRate && s.taxRate !== 0) || (!record.priceIncludeTax && record.priceIncludeTax !== 0)) return;
+
+    // 单价(含税)/(1+税率) = 单价(不含税)
+    return format15(evaluate(`${record.priceIncludeTax} / (1+${s.taxRate}/100)`), calculatingDigits);
+};