kts-component-invoice-operate 1.0.89 → 1.0.93

package/dist/index.esm.js

@@ -2417,7 +2417,7 @@ function quantityPriceIncludeTax(quantity, priceIncludeTax) {
   if (!priceIncludeTax && priceIncludeTax !== 0) return undefined;
   quantity = format15(quantity);
   priceIncludeTax = format15(priceIncludeTax);
-  return evaluate("".concat(priceIncludeTax, " * ").concat(quantity));
+  return parseFloat(evaluate("".concat(priceIncludeTax, " * ").concat(quantity)).toFixed(2));
 }
 
 /** 延迟函数 */
@@ -2437,18 +2437,24 @@ var lazyFn$1 = function lazyFn(fn) {
     }, delayed);
   };
 };
-/** 提示错误 */
 
+var promptErrV = {};
+/** 提示错误 */
 
 var promptErr = function promptErr(err) {
   if (!err) return false;
   if (err.errors[0].message === 'lineAmountIncludeTax need to revalidate') return true;
   if (err.errors[0].message === 'priceIncludeTax need to revalidate') return true;
-  message.error({
-    key: err.errors[0].message,
-    content: err.errors[0].message,
-    duration: 2
-  });
+
+  if (new Date().getTime() - promptErrV.t > 2000 || err.errors[0].message !== promptErrV.m) {
+    promptErrV.t = new Date().getTime();
+    promptErrV.m = err.errors[0].message;
+    message.error({
+      content: err.errors[0].message,
+      duration: 2
+    });
+  }
+
   return true;
 };
 /** 数量改变了 */
@@ -3355,7 +3361,6 @@ var RowMenu = (function (props) {
   var endowCode = useEndowCode(props.goods);
   var itemList = React.useMemo(function () {
     var arr = [];
-    console.log('model ===>', model, controller);
     model !== 'prefab' && addDiscount && arr.push(addDiscount); // 添加折扣行
 
     endowCode && arr.push(endowCode); // 赋码
@@ -3784,7 +3789,7 @@ var useColumns = (function (form) {
                       switch (_context5.prev = _context5.next) {
                         case 0:
                           if ("".concat(value).split('.')[0].length > 9) {
-                            callback('金额整数部分不能大于9位');
+                            callback('金额整数部分不能大于9位，小数点后最多2位');
                           }
 
                         case 1:
@@ -3846,7 +3851,7 @@ var useColumns = (function (form) {
                       switch (_context6.prev = _context6.next) {
                         case 0:
                           if ("".concat(value).split('.')[0].length > 9) {
-                            callback('金额整数部分不能大于9位');
+                            callback('金额整数部分不能大于9位，小数点后最多2位');
                           }
 
                         case 1:
@@ -5111,71 +5116,51 @@ var DrawerBody$2 = function DrawerBody() {
               return regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
-                    case 0:
-                      if (!s.goodsListState.editGood) {
-                        _context2.next = 2;
-                        break;
-                      }
-
-                      return _context2.abrupt("return");
-
-                    case 2:
-                      s.goodsListState.editGood = editGood;
-
-                    case 3:
-                    case "end":
-                      return _context2.stop();
-                  }
-                }
-              }, _callee2);
-            }));
-
-            return function (_x2) {
-              return _ref2.apply(this, arguments);
-            };
-          }(), /*#__PURE__*/function () {
-            var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(s) {
-              return regeneratorRuntime.wrap(function _callee3$(_context3) {
-                while (1) {
-                  switch (_context3.prev = _context3.next) {
                     case 0:
                       Object.keys(record).filter(function (e) {
                         return !record[e] && record[e] !== 0;
                       }).forEach(function (e) {
                         delete record[e];
                       });
-                      _context3.next = 3;
+                      _context2.next = 3;
                       return s.goodsListState.importGoods.verifyFn(record);
 
                     case 3:
-                      _context3.t0 = _context3.sent;
+                      _context2.t0 = _context2.sent;
 
-                      if (!(_context3.t0 === false)) {
-                        _context3.next = 6;
+                      if (!(_context2.t0 === false)) {
+                        _context2.next = 6;
                         break;
                       }
 
-                      return _context3.abrupt("return");
+                      return _context2.abrupt("return");
 
                     case 6:
                       if (!(!s.goodsListState.editGood || !s.goodsListState.form)) {
-                        _context3.next = 8;
+                        _context2.next = 8;
                         break;
                       }
 
-                      return _context3.abrupt("return");
+                      return _context2.abrupt("return");
 
                     case 8:
+                      if (s.goodsListState.editGood.lineAmountExcludeTax || s.goodsListState.editGood.lineAmountIncludeTax) {
+                        record.priceExcludeTax = s.goodsListState.editGood.priceExcludeTax;
+                        record.priceIncludeTax = s.goodsListState.editGood.priceIncludeTax;
+                        record.lineAmountExcludeTax = s.goodsListState.editGood.lineAmountExcludeTax;
+                        record.lineAmountIncludeTax = s.goodsListState.editGood.lineAmountIncludeTax;
+                      }
+
                       s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), record);
 
                       if (s.goodsListState.editGood) {
-                        _context3.next = 11;
+                        _context2.next = 12;
                         break;
                       }
 
-                      return _context3.abrupt("return");
+                      return _context2.abrupt("return");
 
-                    case 11:
+                    case 12:
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
                         s.goodsListState.editGood.priceIncludeTax = undefined;
                         s.goodsListState.editGood.priceExcludeTax = undefined;
@@ -5183,22 +5168,22 @@ var DrawerBody$2 = function DrawerBody() {
                         s.goodsListState.editGood.priceExcludeTax = getPriceExcludeTax(s.goodsListState.editGood, record);
                       }
 
-                      s.goodsListState.editGood.lineAmountIncludeTax = quantityPriceIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
+                      if (s.goodsListState.editGood.quantity && s.goodsListState.editGood.priceIncludeTax) s.goodsListState.editGood.lineAmountIncludeTax = quantityPriceIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
                       s.goodsListState.editGood.itemName = getItemName(record);
                       s.goodsListState.form.setFieldsValue(s.goodsListState.editGood);
                       s.goodsListState.importGoods.isVisibleDrawer = false;
                       s.goodsListState.isTaxIncluded ? updateUnitPriceExcludingTax(controller, s.goodsListState.form) : updateUnitPriceTax(controller, s.goodsListState.form);
 
-                    case 17:
+                    case 18:
                     case "end":
-                      return _context3.stop();
+                      return _context2.stop();
                   }
                 }
-              }, _callee3);
+              }, _callee2);
             }));
 
-            return function (_x3) {
-              return _ref3.apply(this, arguments);
+            return function (_x2) {
+              return _ref2.apply(this, arguments);
             };
           }())();
         }

package/dist/index.js

@@ -2427,7 +2427,7 @@ function quantityPriceIncludeTax(quantity, priceIncludeTax) {
   if (!priceIncludeTax && priceIncludeTax !== 0) return undefined;
   quantity = format15(quantity);
   priceIncludeTax = format15(priceIncludeTax);
-  return evaluate("".concat(priceIncludeTax, " * ").concat(quantity));
+  return parseFloat(evaluate("".concat(priceIncludeTax, " * ").concat(quantity)).toFixed(2));
 }
 
 /** 延迟函数 */
@@ -2447,18 +2447,24 @@ var lazyFn$1 = function lazyFn(fn) {
     }, delayed);
   };
 };
-/** 提示错误 */
 
+var promptErrV = {};
+/** 提示错误 */
 
 var promptErr = function promptErr(err) {
   if (!err) return false;
   if (err.errors[0].message === 'lineAmountIncludeTax need to revalidate') return true;
   if (err.errors[0].message === 'priceIncludeTax need to revalidate') return true;
-  ktsComponentsAntdX3.message.error({
-    key: err.errors[0].message,
-    content: err.errors[0].message,
-    duration: 2
-  });
+
+  if (new Date().getTime() - promptErrV.t > 2000 || err.errors[0].message !== promptErrV.m) {
+    promptErrV.t = new Date().getTime();
+    promptErrV.m = err.errors[0].message;
+    ktsComponentsAntdX3.message.error({
+      content: err.errors[0].message,
+      duration: 2
+    });
+  }
+
   return true;
 };
 /** 数量改变了 */
@@ -3365,7 +3371,6 @@ var RowMenu = (function (props) {
   var endowCode = useEndowCode(props.goods);
   var itemList = React__default['default'].useMemo(function () {
     var arr = [];
-    console.log('model ===>', model, controller);
     model !== 'prefab' && addDiscount && arr.push(addDiscount); // 添加折扣行
 
     endowCode && arr.push(endowCode); // 赋码
@@ -3794,7 +3799,7 @@ var useColumns = (function (form) {
                       switch (_context5.prev = _context5.next) {
                         case 0:
                           if ("".concat(value).split('.')[0].length > 9) {
-                            callback('金额整数部分不能大于9位');
+                            callback('金额整数部分不能大于9位，小数点后最多2位');
                           }
 
                         case 1:
@@ -3856,7 +3861,7 @@ var useColumns = (function (form) {
                       switch (_context6.prev = _context6.next) {
                         case 0:
                           if ("".concat(value).split('.')[0].length > 9) {
-                            callback('金额整数部分不能大于9位');
+                            callback('金额整数部分不能大于9位，小数点后最多2位');
                           }
 
                         case 1:
@@ -5121,71 +5126,51 @@ var DrawerBody$2 = function DrawerBody() {
               return regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
-                    case 0:
-                      if (!s.goodsListState.editGood) {
-                        _context2.next = 2;
-                        break;
-                      }
-
-                      return _context2.abrupt("return");
-
-                    case 2:
-                      s.goodsListState.editGood = editGood;
-
-                    case 3:
-                    case "end":
-                      return _context2.stop();
-                  }
-                }
-              }, _callee2);
-            }));
-
-            return function (_x2) {
-              return _ref2.apply(this, arguments);
-            };
-          }(), /*#__PURE__*/function () {
-            var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(s) {
-              return regeneratorRuntime.wrap(function _callee3$(_context3) {
-                while (1) {
-                  switch (_context3.prev = _context3.next) {
                     case 0:
                       Object.keys(record).filter(function (e) {
                         return !record[e] && record[e] !== 0;
                       }).forEach(function (e) {
                         delete record[e];
                       });
-                      _context3.next = 3;
+                      _context2.next = 3;
                       return s.goodsListState.importGoods.verifyFn(record);
 
                     case 3:
-                      _context3.t0 = _context3.sent;
+                      _context2.t0 = _context2.sent;
 
-                      if (!(_context3.t0 === false)) {
-                        _context3.next = 6;
+                      if (!(_context2.t0 === false)) {
+                        _context2.next = 6;
                         break;
                       }
 
-                      return _context3.abrupt("return");
+                      return _context2.abrupt("return");
 
                     case 6:
                       if (!(!s.goodsListState.editGood || !s.goodsListState.form)) {
-                        _context3.next = 8;
+                        _context2.next = 8;
                         break;
                       }
 
-                      return _context3.abrupt("return");
+                      return _context2.abrupt("return");
 
                     case 8:
+                      if (s.goodsListState.editGood.lineAmountExcludeTax || s.goodsListState.editGood.lineAmountIncludeTax) {
+                        record.priceExcludeTax = s.goodsListState.editGood.priceExcludeTax;
+                        record.priceIncludeTax = s.goodsListState.editGood.priceIncludeTax;
+                        record.lineAmountExcludeTax = s.goodsListState.editGood.lineAmountExcludeTax;
+                        record.lineAmountIncludeTax = s.goodsListState.editGood.lineAmountIncludeTax;
+                      }
+
                       s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), record);
 
                       if (s.goodsListState.editGood) {
-                        _context3.next = 11;
+                        _context2.next = 12;
                         break;
                       }
 
-                      return _context3.abrupt("return");
+                      return _context2.abrupt("return");
 
-                    case 11:
+                    case 12:
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
                         s.goodsListState.editGood.priceIncludeTax = undefined;
                         s.goodsListState.editGood.priceExcludeTax = undefined;
@@ -5193,22 +5178,22 @@ var DrawerBody$2 = function DrawerBody() {
                         s.goodsListState.editGood.priceExcludeTax = getPriceExcludeTax(s.goodsListState.editGood, record);
                       }
 
-                      s.goodsListState.editGood.lineAmountIncludeTax = quantityPriceIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
+                      if (s.goodsListState.editGood.quantity && s.goodsListState.editGood.priceIncludeTax) s.goodsListState.editGood.lineAmountIncludeTax = quantityPriceIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
                       s.goodsListState.editGood.itemName = getItemName(record);
                       s.goodsListState.form.setFieldsValue(s.goodsListState.editGood);
                       s.goodsListState.importGoods.isVisibleDrawer = false;
                       s.goodsListState.isTaxIncluded ? updateUnitPriceExcludingTax(controller, s.goodsListState.form) : updateUnitPriceTax(controller, s.goodsListState.form);
 
-                    case 17:
+                    case 18:
                     case "end":
-                      return _context3.stop();
+                      return _context2.stop();
                   }
                 }
-              }, _callee3);
+              }, _callee2);
             }));
 
-            return function (_x3) {
-              return _ref3.apply(this, arguments);
+            return function (_x2) {
+              return _ref2.apply(this, arguments);
             };
           }())();
         }

package/package.json

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

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

@@ -1,3 +1,4 @@
+import { Button } from 'kts-components-antd-x3/lib/radio';
 import React from 'react';
 import { Invoice } from '../../../';
 import { IGetBuyerListOption } from '../../../Invoice/InvoiceController/InvoiceControllerState/BuyerState';
@@ -13,7 +14,12 @@ export default () => {
     s.goodsListState.importGoods.dataSource = [];
   }), [])
 
-  return <Invoice controller={controller} />;
+  return (
+    <>
+      <Button onClick={async () => { console.log('===> 当前组件状态', await controller.validateFields()); }} >获取数据</Button>
+      <Invoice controller={controller} />
+    </>
+  );
 };
 
 // 重写 购买方 的数据源，实现 ‘获取 购买方 列表’ 方法
@@ -80,79 +86,239 @@ const getMok = async (current: number = 1) => {
       "buyGroupCode": null,
       "buyGroupId": null,
       "buyGroupName": null,
-      "categoryId": 634,
-      "categoryName": "果类",
-      "companyId": "907b9336-468a-4917-afcf-d86eb85a2d0e",
-      "createTime": "2020-12-18 11:34:35.0",
+      "categoryId": 2073,
+      "categoryName": "通用",
+      "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+      "createTime": "2021-09-10 15:45:43.0",
       "enjoyPreferentialPolicies": 0,
       "factoryCode": null,
       "factoryId": null,
       "factoryName": null,
-      "id": 322769,
+      "id": 146200,
+      "internalNumber": "发动机盖",
+      "isUalityInspection": null,
+      "name": "发动机ABC",
+      "preferentialPoliciesType": null,
+      "priceAmount": 50,
+      "procurementCycle": 0,
+      "shorthand": "发动机",
+      "specification": "abc",
+      "spuCode": "6000001738252675",
+      "status": 1,
+      "taxCategoryCode": "1090102040000000000",
+      "taxExemptionType": "",
+      "taxId": 11,
+      "taxRate": 13,
+      "unitId": 30,
+      "unitName": "件",
+      "itemType": "通用",
+      "itemNo": "6000001738252675",
+      "itemName": "发动机ABC",
+      "itemModelName": "abc",
+      "unit": "件",
+      "priceIncludeTax": 50,
+      "priceExcludeTax": 50,
+      "taxClassificationCode": "1090102040000000000"
+    },
+    {
+      "attributeVOList": null,
+      "brandName": "丹东一号",
+      "buyGroupCode": null,
+      "buyGroupId": null,
+      "buyGroupName": null,
+      "categoryId": 2073,
+      "categoryName": "通用",
+      "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+      "createTime": "2021-09-02 14:59:52.0",
+      "enjoyPreferentialPolicies": 0,
+      "factoryCode": null,
+      "factoryId": null,
+      "factoryName": null,
+      "id": 146199,
+      "internalNumber": null,
+      "isUalityInspection": null,
+      "name": "aaaa",
+      "preferentialPoliciesType": null,
+      "priceAmount": 0,
+      "procurementCycle": 0,
+      "shorthand": "活牲畜",
+      "specification": null,
+      "spuCode": "6000001311479375",
+      "status": 1,
+      "taxCategoryCode": "1010301010000000000",
+      "taxExemptionType": "1",
+      "taxId": 1,
+      "taxRate": 0,
+      "unitId": null,
+      "unitName": null,
+      "itemType": "通用",
+      "itemNo": "6000001311479375",
+      "itemName": "aaaa",
+      "itemModelName": null,
+      "unit": null,
+      "priceIncludeTax": 0,
+      "priceExcludeTax": 0,
+      "taxClassificationCode": "1010301010000000000"
+    },
+    {
+      "attributeVOList": null,
+      "brandName": "丹东一号",
+      "buyGroupCode": null,
+      "buyGroupId": null,
+      "buyGroupName": null,
+      "categoryId": 246,
+      "categoryName": "分类cc>1",
+      "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+      "createTime": "2020-12-28 18:23:55.0",
+      "enjoyPreferentialPolicies": 0,
+      "factoryCode": null,
+      "factoryId": null,
+      "factoryName": null,
+      "id": 146131,
       "internalNumber": null,
       "isUalityInspection": null,
-      "name": "栗子",
+      "name": "AAAA",
       "preferentialPoliciesType": null,
       "priceAmount": null,
       "procurementCycle": 0,
       "shorthand": null,
-      "specification": null,
-      "spuCode": "6000001393856113",
+      "specification": "1234EFF",
+      "spuCode": "6000002120658581",
       "status": 1,
       "taxCategoryCode": null,
       "taxExemptionType": null,
       "taxId": null,
       "taxRate": 0,
+      "unitId": 362,
+      "unitName": "年",
+      "itemType": "分类cc>1",
+      "itemNo": "6000002120658581",
+      "itemName": "AAAA",
+      "itemModelName": "1234EFF",
+      "unit": "年",
+      "priceIncludeTax": 0,
+      "priceExcludeTax": 0,
+      "taxClassificationCode": null
+    },
+    {
+      "attributeVOList": null,
+      "brandName": null,
+      "buyGroupCode": null,
+      "buyGroupId": null,
+      "buyGroupName": null,
+      "categoryId": 2073,
+      "categoryName": "通用",
+      "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+      "createTime": "2020-12-15 10:14:14.0",
+      "enjoyPreferentialPolicies": 0,
+      "factoryCode": null,
+      "factoryId": null,
+      "factoryName": null,
+      "id": 146129,
+      "internalNumber": null,
+      "isUalityInspection": null,
+      "name": "服务费",
+      "preferentialPoliciesType": null,
+      "priceAmount": null,
+      "procurementCycle": 0,
+      "shorthand": "软件",
+      "specification": null,
+      "spuCode": "6000001474077629",
+      "status": 1,
+      "taxCategoryCode": "1060301020100000000",
+      "taxExemptionType": null,
+      "taxId": null,
+      "taxRate": 0,
       "unitId": null,
       "unitName": null,
-      "itemType": "果类",
-      "itemNo": "6000001393856113",
-      "itemName": "栗子",
+      "itemType": "通用",
+      "itemNo": "6000001474077629",
+      "itemName": "服务费",
       "itemModelName": null,
       "unit": null,
       "priceIncludeTax": 0,
       "priceExcludeTax": 0,
-      "taxClassificationCode": null
+      "taxClassificationCode": "1060301020100000000"
     },
     {
       "attributeVOList": null,
-      "brandName": null,
+      "brandName": "丹东一号",
       "buyGroupCode": null,
       "buyGroupId": null,
       "buyGroupName": null,
-      "categoryId": 634,
-      "categoryName": "果类",
-      "companyId": "907b9336-468a-4917-afcf-d86eb85a2d0e",
-      "createTime": "2020-11-24 10:30:58.0",
+      "categoryId": 2073,
+      "categoryName": "通用",
+      "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+      "createTime": "2020-10-30 15:07:05.0",
       "enjoyPreferentialPolicies": 0,
       "factoryCode": null,
       "factoryId": null,
       "factoryName": null,
-      "id": 322768,
-      "internalNumber": "00009",
+      "id": 145809,
+      "internalNumber": "0987",
       "isUalityInspection": null,
-      "name": "苹果",
+      "name": "中科",
       "preferentialPoliciesType": null,
+      "priceAmount": 1000,
+      "procurementCycle": 0,
+      "shorthand": "糖料",
+      "specification": "12",
+      "spuCode": "6000001168374126",
+      "status": 1,
+      "taxCategoryCode": "1010107010000000000",
+      "taxExemptionType": "3",
+      "taxId": 1,
+      "taxRate": 0,
+      "unitId": 32,
+      "unitName": "把",
+      "itemType": "通用",
+      "itemNo": "6000001168374126",
+      "itemName": "中科",
+      "itemModelName": "12",
+      "unit": "把",
+      "priceIncludeTax": 1000,
+      "priceExcludeTax": 1000,
+      "taxClassificationCode": "1010107010000000000"
+    },
+    {
+      "attributeVOList": null,
+      "brandName": null,
+      "buyGroupCode": null,
+      "buyGroupId": null,
+      "buyGroupName": null,
+      "categoryId": 1862,
+      "categoryName": "通用",
+      "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+      "createTime": "2019-03-22 11:06:53.0",
+      "enjoyPreferentialPolicies": 0,
+      "factoryCode": null,
+      "factoryId": null,
+      "factoryName": null,
+      "id": 144321,
+      "internalNumber": "4302111",
+      "isUalityInspection": 0,
+      "name": "农用化肥2",
+      "preferentialPoliciesType": "",
       "priceAmount": 90,
       "procurementCycle": 0,
-      "shorthand": "供电",
-      "specification": "苹果一号",
-      "spuCode": "6000000040810519",
+      "shorthand": "肥料",
+      "specification": "HLHF-211",
+      "spuCode": "1000019000000056",
       "status": 1,
-      // "taxCategoryCode": "1100101020200000000",
-      "taxExemptionType": "",
-      "taxId": 5,
-      "taxRate": 3,
-      "unitId": 10,
-      "unitName": "箱",
-      "itemType": "果类",
-      "itemNo": "6000000040810519",
-      "itemName": "苹果",
-      "itemModelName": "苹果一号",
-      "unit": "箱",
+      "taxCategoryCode": "1000000000000000000",
+      "taxExemptionType": null,
+      "taxId": null,
+      "taxRate": 0,
+      "unitId": 11,
+      "unitName": "包",
+      "itemType": "通用",
+      "itemNo": "1000019000000056",
+      "itemName": "农用化肥2",
+      "itemModelName": "HLHF-211",
+      "unit": "包",
       "priceIncludeTax": 90,
       "priceExcludeTax": 90,
-      "taxClassificationCode": "1100101020200000000"
+      "taxClassificationCode": "1000000000000000000"
     },
     {
       "attributeVOList": null,
@@ -160,39 +326,159 @@ const getMok = async (current: number = 1) => {
       "buyGroupCode": null,
       "buyGroupId": null,
       "buyGroupName": null,
-      "categoryId": 624,
-      "categoryName": "技术服务",
-      "companyId": "907b9336-468a-4917-afcf-d86eb85a2d0e",
-      "createTime": "2020-09-28 16:55:34.0",
+      "categoryId": 1862,
+      "categoryName": "通用",
+      "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+      "createTime": "2019-03-22 11:06:52.0",
       "enjoyPreferentialPolicies": 0,
       "factoryCode": null,
       "factoryId": null,
       "factoryName": null,
-      "id": 6966,
-      "internalNumber": null,
-      "isUalityInspection": null,
-      "name": "技术服务费",
-      "preferentialPoliciesType": null,
-      "priceAmount": 105750,
-      "procurementCycle": 0,
-      "shorthand": "研发和技术服务",
-      "specification": "",
-      "spuCode": "6000001800976795",
+      "id": 144320,
+      "internalNumber": "4302111",
+      "isUalityInspection": 0,
+      "name": "园林轻化肥",
+      "preferentialPoliciesType": "",
+      "priceAmount": null,
+      "procurementCycle": null,
+      "shorthand": "肥料",
+      "specification": "HLHF-211",
+      "spuCode": "1000019000000055",
       "status": 1,
-      "taxCategoryCode": "3040101000000000000",
+      "taxCategoryCode": "233WD5FG00911",
       "taxExemptionType": null,
-      "taxId": 7,
-      "taxRate": 6,
-      "unitId": 0,
-      "unitName": null,
-      "itemType": "技术服务",
-      "itemNo": "6000001800976795",
-      "itemName": "技术服务费",
-      "itemModelName": "",
-      "unit": null,
-      "priceIncludeTax": 105750,
-      "priceExcludeTax": 105750,
-      "taxClassificationCode": "3040101000000000000"
+      "taxId": null,
+      "taxRate": 0,
+      "unitId": 11,
+      "unitName": "包",
+      "itemType": "通用",
+      "itemNo": "1000019000000055",
+      "itemName": "园林轻化肥",
+      "itemModelName": "HLHF-211",
+      "unit": "包",
+      "priceIncludeTax": 0,
+      "priceExcludeTax": 0,
+      "taxClassificationCode": "233WD5FG00911"
+    },
+    {
+      "attributeVOList": null,
+      "brandName": null,
+      "buyGroupCode": null,
+      "buyGroupId": null,
+      "buyGroupName": null,
+      "categoryId": 1862,
+      "categoryName": "通用",
+      "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+      "createTime": "2019-03-06 16:06:16.0",
+      "enjoyPreferentialPolicies": 0,
+      "factoryCode": null,
+      "factoryId": null,
+      "factoryName": null,
+      "id": 101211,
+      "internalNumber": "4302111",
+      "isUalityInspection": 0,
+      "name": "营养土壤",
+      "preferentialPoliciesType": "",
+      "priceAmount": null,
+      "procurementCycle": null,
+      "shorthand": "肥料",
+      "specification": "HLHF-211",
+      "spuCode": "1000019000000053",
+      "status": 1,
+      "taxCategoryCode": "233WD5FG00911",
+      "taxExemptionType": null,
+      "taxId": null,
+      "taxRate": 0,
+      "unitId": 11,
+      "unitName": "包",
+      "itemType": "通用",
+      "itemNo": "1000019000000053",
+      "itemName": "营养土壤",
+      "itemModelName": "HLHF-211",
+      "unit": "包",
+      "priceIncludeTax": 0,
+      "priceExcludeTax": 0,
+      "taxClassificationCode": "233WD5FG00911"
+    },
+    {
+      "attributeVOList": null,
+      "brandName": null,
+      "buyGroupCode": null,
+      "buyGroupId": null,
+      "buyGroupName": null,
+      "categoryId": 1862,
+      "categoryName": "通用",
+      "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+      "createTime": "2019-03-06 16:06:16.0",
+      "enjoyPreferentialPolicies": 0,
+      "factoryCode": null,
+      "factoryId": null,
+      "factoryName": null,
+      "id": 101212,
+      "internalNumber": "4302111",
+      "isUalityInspection": 0,
+      "name": "植物营养液",
+      "preferentialPoliciesType": "",
+      "priceAmount": null,
+      "procurementCycle": null,
+      "shorthand": "肥料",
+      "specification": "HLHF-211",
+      "spuCode": "1000019000000054",
+      "status": 1,
+      "taxCategoryCode": "233WD5FG00911",
+      "taxExemptionType": null,
+      "taxId": null,
+      "taxRate": 0,
+      "unitId": 11,
+      "unitName": "包",
+      "itemType": "通用",
+      "itemNo": "1000019000000054",
+      "itemName": "植物营养液",
+      "itemModelName": "HLHF-211",
+      "unit": "包",
+      "priceIncludeTax": 0,
+      "priceExcludeTax": 0,
+      "taxClassificationCode": "233WD5FG00911"
+    },
+    {
+      "attributeVOList": null,
+      "brandName": null,
+      "buyGroupCode": null,
+      "buyGroupId": null,
+      "buyGroupName": null,
+      "categoryId": 1862,
+      "categoryName": "通用",
+      "companyId": "41daec4c-baa2-451f-b756-e26067b8657c",
+      "createTime": "2019-03-05 18:15:59.0",
+      "enjoyPreferentialPolicies": 0,
+      "factoryCode": null,
+      "factoryId": null,
+      "factoryName": null,
+      "id": 101203,
+      "internalNumber": "4353245243",
+      "isUalityInspection": 0,
+      "name": "医用棉布纱布条",
+      "preferentialPoliciesType": "",
+      "priceAmount": null,
+      "procurementCycle": null,
+      "shorthand": "布料",
+      "specification": "ZC11D-006",
+      "spuCode": "6000000804084562",
+      "status": 1,
+      "taxCategoryCode": "1234567890123456789",
+      "taxExemptionType": null,
+      "taxId": 5,
+      "taxRate": 3,
+      "unitId": 3,
+      "unitName": "米",
+      "itemType": "通用",
+      "itemNo": "6000000804084562",
+      "itemName": "医用棉布纱布条",
+      "itemModelName": "ZC11D-006",
+      "unit": "米",
+      "priceIncludeTax": 0,
+      "priceExcludeTax": 0,
+      "taxClassificationCode": "1234567890123456789"
     }
   ]
 }

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

@@ -14,12 +14,7 @@ const InvoiceHeader = () => {
   return (
     <div>
       新的表头
-      <Button
-        onClick={() => {
-          controller.updateInvoiceNo();
-        }}
-        type="link"
-      >
+      <Button type="link">
         更新
       </Button>
     </div>

package/src/Invoice/tools/calculate/index.ts

@@ -27,5 +27,5 @@ export function quantityPriceIncludeTax(quantity?: number | string, priceInclude
     quantity = format15(quantity);
     priceIncludeTax = format15(priceIncludeTax);
 
-    return evaluate(`${priceIncludeTax} * ${quantity}`);
+    return parseFloat(evaluate(`${priceIncludeTax} * ${quantity}`).toFixed(2));
 }

package/src/Invoice/ui/GoodsList/hook/useColumns/autoFillFn/index.ts

@@ -28,12 +28,20 @@ const lazyFn = (fn: Function, delayed: number = 200) => {
   };
 };
 
+let promptErrV: any = {}
+
 /** 提示错误 */
 const promptErr = (err: any) => {
   if (!err) return false;
   if (err.errors[0].message === 'lineAmountIncludeTax need to revalidate') return true;
   if (err.errors[0].message === 'priceIncludeTax need to revalidate') return true;
-  message.error({ key: err.errors[0].message, content: err.errors[0].message, duration: 2 });
+
+  if (new Date().getTime() - promptErrV.t > 2000 || err.errors[0].message !== promptErrV.m) {
+    promptErrV.t = new Date().getTime();
+    promptErrV.m = err.errors[0].message;
+    message.error({ content: err.errors[0].message, duration: 2 });
+  }
+
   return true;
 }
 

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

@@ -295,7 +295,7 @@ export default (form: WrappedFormUtils) => {
                     {
                       validator: async (_, value, callback) => {
                         if (`${value}`.split('.')[0].length > 9) {
-                          callback('金额整数部分不能大于9位');
+                          callback('金额整数部分不能大于9位，小数点后最多2位');
                         }
                       }
                     },
@@ -339,7 +339,7 @@ export default (form: WrappedFormUtils) => {
                     {
                       validator: async (_, value: string, callback) => {
                         if (`${value}`.split('.')[0].length > 9) {
-                          callback('金额整数部分不能大于9位');
+                          callback('金额整数部分不能大于9位，小数点后最多2位');
                         }
                       }
                     },

package/src/Invoice/ui/GoodsList/hook/useColumns/ui/RowMenu/index.tsx

@@ -22,8 +22,7 @@ export default (props: { goods: IGood }) => {
 
   const itemList = React.useMemo(() => {
     const arr: any[] = [];
-
-    console.log('model ===>', model, controller)
+    
     model !=='prefab' && addDiscount && arr.push(addDiscount);  // 添加折扣行
     endowCode && arr.push(endowCode);                           // 赋码
     model !=='prefab' && delItem && arr.push(delItem);          // 删除

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

@@ -71,10 +71,6 @@ const DrawerBody = () => {
         return {
           onClick: () => {
             controller.pipeline(
-              async s => {
-                if (s.goodsListState.editGood) return;
-                s.goodsListState.editGood = editGood;
-              },
               async s => {
                 Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
 
@@ -82,6 +78,13 @@ const DrawerBody = () => {
 
                 if (!s.goodsListState.editGood || !s.goodsListState.form) return;
 
+                if (s.goodsListState.editGood.lineAmountExcludeTax || s.goodsListState.editGood.lineAmountIncludeTax) {
+                  record.priceExcludeTax = s.goodsListState.editGood.priceExcludeTax;
+                  record.priceIncludeTax = s.goodsListState.editGood.priceIncludeTax;
+                  record.lineAmountExcludeTax = s.goodsListState.editGood.lineAmountExcludeTax;
+                  record.lineAmountIncludeTax = s.goodsListState.editGood.lineAmountIncludeTax;
+                }
+
                 s.goodsListState.editGood = { ...s.goodsListState.editGood, ...record };
                 if (!s.goodsListState.editGood) return;
 
@@ -92,7 +95,9 @@ const DrawerBody = () => {
                   s.goodsListState.editGood.priceExcludeTax = getPriceExcludeTax(s.goodsListState.editGood, record) as number;
                 }
 
-                s.goodsListState.editGood.lineAmountIncludeTax = quantityPriceIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
+                if (s.goodsListState.editGood.quantity && s.goodsListState.editGood.priceIncludeTax)
+                  s.goodsListState.editGood.lineAmountIncludeTax = quantityPriceIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
+                
                 s.goodsListState.editGood.itemName = getItemName(record);
 
                 s.goodsListState.form.setFieldsValue(s.goodsListState.editGood as any);