kts-component-invoice-operate 3.2.35 → 3.2.37

package/dist/index.esm.js

@@ -1695,10 +1695,12 @@ var validateFields = function validateFields(form) {
 function getGoodsSearch(goodsList, search, isTaxIncluded) {
   if (!search) return goodsList;
   return goodsList.filter(function (e) {
-    var _e$itemName$indexOf, _e$itemName, _e$itemModelName$inde, _e$itemModelName, _e$lineAmountIncludeT, _e$lineAmountExcludeT;
+    var _e$itemName$indexOf, _e$itemName, _e$itemCode$indexOf, _e$itemCode, _e$itemModelName$inde, _e$itemModelName, _e$lineAmountIncludeT, _e$lineAmountExcludeT;
 
     if (((_e$itemName$indexOf = (_e$itemName = e.itemName) === null || _e$itemName === void 0 ? void 0 : _e$itemName.indexOf(search)) !== null && _e$itemName$indexOf !== void 0 ? _e$itemName$indexOf : -1) >= 0) {
       return true;
+    } else if (((_e$itemCode$indexOf = (_e$itemCode = e.itemCode) === null || _e$itemCode === void 0 ? void 0 : _e$itemCode.indexOf(search)) !== null && _e$itemCode$indexOf !== void 0 ? _e$itemCode$indexOf : -1) >= 0) {
+      return true;
     } else if (((_e$itemModelName$inde = (_e$itemModelName = e.itemModelName) === null || _e$itemModelName === void 0 ? void 0 : _e$itemModelName.indexOf(search)) !== null && _e$itemModelName$inde !== void 0 ? _e$itemModelName$inde : -1) >= 0) {
       return true;
     } else if ("".concat(isTaxIncluded ? (_e$lineAmountIncludeT = e.lineAmountIncludeTax) === null || _e$lineAmountIncludeT === void 0 ? void 0 : _e$lineAmountIncludeT.toFixed(2) : (_e$lineAmountExcludeT = e.lineAmountExcludeTax) === null || _e$lineAmountExcludeT === void 0 ? void 0 : _e$lineAmountExcludeT.toFixed(2)).indexOf(search) >= 0) {
@@ -1796,21 +1798,21 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 40;
+            _context.next = 41;
             break;
 
-          case 36:
-            _context.prev = 36;
+          case 37:
+            _context.prev = 37;
             _context.t0 = _context["catch"](5);
             debugger;
             showError(_context.t0);
 
-          case 40:
+          case 41:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 36]]);
+    }, _callee, null, [[5, 37]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -1983,7 +1985,9 @@ function _fillingInformationGood() {
             goods = goodsList[findMaxIndex(goodsList.map(function (e) {
               return e.lineAmountIncludeTax || 0;
             }))];
-            return _context7.abrupt("return", _objectSpread2({}, goods));
+            return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, goods), {}, {
+              lineAttribute: LineAttributeType$1.正常
+            }));
 
           case 3:
           case "end":
@@ -9999,6 +10003,9 @@ function Search() {
   var readOnly = controller.useMemo(function (s) {
     return !!s.goodsListState.editGood;
   }, []);
+  var columnshide = controller.useMemo(function (s) {
+    return s.goodsListState.columnshide;
+  }, []);
   /** 是否含税 */
 
   var isTaxIncluded = controller.useMemo(function (s) {
@@ -10062,7 +10069,7 @@ function Search() {
     readOnly: readOnly,
     value: value,
     className: "kts-invoice-operate-goods-list-search",
-    placeholder: "\u8BF7\u60A8\u8F93\u5165\u9879\u76EE\u540D\u79F0\u3001\u89C4\u683C\u578B\u53F7\u3001\u91D1\u989D(".concat(isTaxIncluded ? '含税' : '不含税', ")\u641C\u7D22"),
+    placeholder: "\u8BF7\u60A8\u8F93\u5165".concat(columnshide.includes('itemCode') ? '' : '商品编码、', "\u9879\u76EE\u540D\u79F0\u3001\u89C4\u683C\u578B\u53F7\u3001\u91D1\u989D(").concat(isTaxIncluded ? '含税' : '不含税', ")\u641C\u7D22"),
     prefix: React.createElement(Icon$1, {
       component: SvgMagnifier,
       style: {
@@ -12384,7 +12391,11 @@ var useColumns = (function (form) {
       render: function render(_, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
           return React.createElement(Form.Item, null, getFieldDecorator('itemCode', {
-            initialValue: editGood.itemCode
+            initialValue: editGood.itemCode,
+            rules: [].concat(_toConsumableArray(getReplenishRules('itemCode')), [{
+              pattern: /^.{1,19}$/,
+              message: '商品编码长度不能超过19位'
+            }])
           })(React.createElement(ItemCodeInput, {
             record: record,
             onChange: function () {
@@ -12416,7 +12427,11 @@ var useColumns = (function (form) {
             }()
           })));
         } else {
-          return record.itemCode;
+          return React.createElement("span", {
+            style: {
+              padding: '0 10px'
+            }
+          }, record.itemCode);
         }
       }
     }, {
@@ -21214,6 +21229,7 @@ var DrawerBody$2 = function DrawerBody() {
 
                       between = _objectSpread2({}, record);
                       between.itemName = getItemName(record, s.goodsListState.editGood);
+                      between.itemCode = getItemCode(record, s.goodsListState.editGood);
                       between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood); // 设置编辑货物
 
                       editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between);
@@ -21249,22 +21265,22 @@ var DrawerBody$2 = function DrawerBody() {
                       s.goodsListState.importGoods.isVisibleDrawer = false;
 
                       if (!s.goodsListState.isTaxIncluded) {
-                        _context2.next = 25;
+                        _context2.next = 26;
                         break;
                       }
 
-                      _context2.next = 23;
+                      _context2.next = 24;
                       return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
 
-                    case 23:
-                      _context2.next = 27;
+                    case 24:
+                      _context2.next = 28;
                       break;
 
-                    case 25:
-                      _context2.next = 27;
+                    case 26:
+                      _context2.next = 28;
                       return updateUnitPriceTax(controller, s.goodsListState.form, record);
 
-                    case 27:
+                    case 28:
                     case "end":
                       return _context2.stop();
                   }
@@ -21320,6 +21336,20 @@ var getItemNameOther = function getItemNameOther(record, editGood) {
   //   return `*${shorthand}*${record.itemNameSelf}`;
   // }
   return record.itemName;
+}; // 获取商品编号
+
+
+var getItemCode = function getItemCode(record, editGood) {
+  // let shorthand;
+  // shorthand = record.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemName}`;
+  // }
+  // shorthand = getSN(editGood.itemName)?.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemNameSelf}`;
+  // }
+  return record.productCode;
 };
 
 var css_248z$q = ".kts-invoice-operate-goods-endow-code-button-list {\n  display: flex;\n  flex-direction: column;\n}\n.kts-invoice-operate-goods-endow-code-button-list > button {\n  margin-bottom: 10px;\n}\n";

package/dist/index.js

@@ -1705,10 +1705,12 @@ var validateFields = function validateFields(form) {
 function getGoodsSearch(goodsList, search, isTaxIncluded) {
   if (!search) return goodsList;
   return goodsList.filter(function (e) {
-    var _e$itemName$indexOf, _e$itemName, _e$itemModelName$inde, _e$itemModelName, _e$lineAmountIncludeT, _e$lineAmountExcludeT;
+    var _e$itemName$indexOf, _e$itemName, _e$itemCode$indexOf, _e$itemCode, _e$itemModelName$inde, _e$itemModelName, _e$lineAmountIncludeT, _e$lineAmountExcludeT;
 
     if (((_e$itemName$indexOf = (_e$itemName = e.itemName) === null || _e$itemName === void 0 ? void 0 : _e$itemName.indexOf(search)) !== null && _e$itemName$indexOf !== void 0 ? _e$itemName$indexOf : -1) >= 0) {
       return true;
+    } else if (((_e$itemCode$indexOf = (_e$itemCode = e.itemCode) === null || _e$itemCode === void 0 ? void 0 : _e$itemCode.indexOf(search)) !== null && _e$itemCode$indexOf !== void 0 ? _e$itemCode$indexOf : -1) >= 0) {
+      return true;
     } else if (((_e$itemModelName$inde = (_e$itemModelName = e.itemModelName) === null || _e$itemModelName === void 0 ? void 0 : _e$itemModelName.indexOf(search)) !== null && _e$itemModelName$inde !== void 0 ? _e$itemModelName$inde : -1) >= 0) {
       return true;
     } else if ("".concat(isTaxIncluded ? (_e$lineAmountIncludeT = e.lineAmountIncludeTax) === null || _e$lineAmountIncludeT === void 0 ? void 0 : _e$lineAmountIncludeT.toFixed(2) : (_e$lineAmountExcludeT = e.lineAmountExcludeTax) === null || _e$lineAmountExcludeT === void 0 ? void 0 : _e$lineAmountExcludeT.toFixed(2)).indexOf(search) >= 0) {
@@ -1806,21 +1808,21 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 40;
+            _context.next = 41;
             break;
 
-          case 36:
-            _context.prev = 36;
+          case 37:
+            _context.prev = 37;
             _context.t0 = _context["catch"](5);
             debugger;
             showError(_context.t0);
 
-          case 40:
+          case 41:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 36]]);
+    }, _callee, null, [[5, 37]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -1993,7 +1995,9 @@ function _fillingInformationGood() {
             goods = goodsList[findMaxIndex(goodsList.map(function (e) {
               return e.lineAmountIncludeTax || 0;
             }))];
-            return _context7.abrupt("return", _objectSpread2({}, goods));
+            return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, goods), {}, {
+              lineAttribute: LineAttributeType$1.正常
+            }));
 
           case 3:
           case "end":
@@ -10009,6 +10013,9 @@ function Search() {
   var readOnly = controller.useMemo(function (s) {
     return !!s.goodsListState.editGood;
   }, []);
+  var columnshide = controller.useMemo(function (s) {
+    return s.goodsListState.columnshide;
+  }, []);
   /** 是否含税 */
 
   var isTaxIncluded = controller.useMemo(function (s) {
@@ -10072,7 +10079,7 @@ function Search() {
     readOnly: readOnly,
     value: value,
     className: "kts-invoice-operate-goods-list-search",
-    placeholder: "\u8BF7\u60A8\u8F93\u5165\u9879\u76EE\u540D\u79F0\u3001\u89C4\u683C\u578B\u53F7\u3001\u91D1\u989D(".concat(isTaxIncluded ? '含税' : '不含税', ")\u641C\u7D22"),
+    placeholder: "\u8BF7\u60A8\u8F93\u5165".concat(columnshide.includes('itemCode') ? '' : '商品编码、', "\u9879\u76EE\u540D\u79F0\u3001\u89C4\u683C\u578B\u53F7\u3001\u91D1\u989D(").concat(isTaxIncluded ? '含税' : '不含税', ")\u641C\u7D22"),
     prefix: React__default['default'].createElement(ktsComponentsAntdX3.Icon, {
       component: SvgMagnifier,
       style: {
@@ -12394,7 +12401,11 @@ var useColumns = (function (form) {
       render: function render(_, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
           return React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, null, getFieldDecorator('itemCode', {
-            initialValue: editGood.itemCode
+            initialValue: editGood.itemCode,
+            rules: [].concat(_toConsumableArray(getReplenishRules('itemCode')), [{
+              pattern: /^.{1,19}$/,
+              message: '商品编码长度不能超过19位'
+            }])
           })(React__default['default'].createElement(ItemCodeInput, {
             record: record,
             onChange: function () {
@@ -12426,7 +12437,11 @@ var useColumns = (function (form) {
             }()
           })));
         } else {
-          return record.itemCode;
+          return React__default['default'].createElement("span", {
+            style: {
+              padding: '0 10px'
+            }
+          }, record.itemCode);
         }
       }
     }, {
@@ -21224,6 +21239,7 @@ var DrawerBody$2 = function DrawerBody() {
 
                       between = _objectSpread2({}, record);
                       between.itemName = getItemName(record, s.goodsListState.editGood);
+                      between.itemCode = getItemCode(record, s.goodsListState.editGood);
                       between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood); // 设置编辑货物
 
                       editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between);
@@ -21259,22 +21275,22 @@ var DrawerBody$2 = function DrawerBody() {
                       s.goodsListState.importGoods.isVisibleDrawer = false;
 
                       if (!s.goodsListState.isTaxIncluded) {
-                        _context2.next = 25;
+                        _context2.next = 26;
                         break;
                       }
 
-                      _context2.next = 23;
+                      _context2.next = 24;
                       return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
 
-                    case 23:
-                      _context2.next = 27;
+                    case 24:
+                      _context2.next = 28;
                       break;
 
-                    case 25:
-                      _context2.next = 27;
+                    case 26:
+                      _context2.next = 28;
                       return updateUnitPriceTax(controller, s.goodsListState.form, record);
 
-                    case 27:
+                    case 28:
                     case "end":
                       return _context2.stop();
                   }
@@ -21330,6 +21346,20 @@ var getItemNameOther = function getItemNameOther(record, editGood) {
   //   return `*${shorthand}*${record.itemNameSelf}`;
   // }
   return record.itemName;
+}; // 获取商品编号
+
+
+var getItemCode = function getItemCode(record, editGood) {
+  // let shorthand;
+  // shorthand = record.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemName}`;
+  // }
+  // shorthand = getSN(editGood.itemName)?.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemNameSelf}`;
+  // }
+  return record.productCode;
 };
 
 var css_248z$q = ".kts-invoice-operate-goods-endow-code-button-list {\n  display: flex;\n  flex-direction: column;\n}\n.kts-invoice-operate-goods-endow-code-button-list > button {\n  margin-bottom: 10px;\n}\n";

package/package.json

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

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

@@ -6,13 +6,15 @@ import IGood from "../InvoiceControllerState/GoodsListState/IGood";
  * @param goodsList 被搜索列表
  * @param search 搜索条件
  * @param isTaxIncluded 是否含税
- * @returns 
+ * @returns
  */
 export default function getGoodsSearch(goodsList: IGood[], search: string, isTaxIncluded: boolean) {
     if (!search) return goodsList;
     return goodsList.filter(e => {
         if ((e.itemName?.indexOf(search) ?? -1) >= 0) {
             return true;
+        } else if ((e.itemCode?.indexOf(search) ?? -1) >= 0) {
+          return true
         } else if ((e.itemModelName?.indexOf(search) ?? -1) >= 0) {
             return true
         } else if (`${isTaxIncluded ? e.lineAmountIncludeTax?.toFixed(2) : e.lineAmountExcludeTax?.toFixed(2)}`.indexOf(search) >= 0) {
@@ -21,4 +23,4 @@ export default function getGoodsSearch(goodsList: IGood[], search: string, isTax
             return false;
         }
     })
-}
+}

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

@@ -38,7 +38,7 @@ export default async function mergeDetails(state: InvoiceControllerState) {
         // 计算税额
         sum.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber()
 
-        const p = state.goodsListState.goodsList.indexOf(goodsList[0]);
+        const p = state.goodsListState.goodsList.indexOf(goodsList[0]);9
         state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0);
         state.goodsListState.goodsList.splice(p, 0, sum);
         state.goodsListState.goodsMap = new Map();
@@ -95,7 +95,7 @@ async function fillingInformationGood(goodsList: IGood[], sum: IGood) {
 
     const goods = goodsList[findMaxIndex(goodsList.map(e => e.lineAmountIncludeTax || 0))]
 
-    return { ...goods };
+    return { ...goods, lineAttribute: LineAttributeType.正常 };
 }
 
 /** 存在税率不一样的明细，不能合并 */

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

@@ -107,6 +107,10 @@ export default (form: WrappedFormUtils) => {
               <Form.Item>
                 {getFieldDecorator('itemCode', {
                   initialValue: editGood.itemCode,
+                  rules: [
+                    ...getReplenishRules('itemCode'),
+                    { pattern: /^.{1,19}$/, message: '商品编码长度不能超过19位' },
+                  ]
                 })(
                   <ItemCodeInput
                     record={record}
@@ -119,7 +123,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             )
           } else {
-            return record.itemCode
+            return <span style={{ padding: '0 10px' }}>{record.itemCode}</span>
           }
         }
       },

package/src/Invoice/ui/default/GoodsList/ui/Search/index.tsx

@@ -13,6 +13,8 @@ export default function Search() {
 
     const readOnly = controller.useMemo(s => !!s.goodsListState.editGood, [])
 
+    const columnshide = controller.useMemo(s => s.goodsListState.columnshide, [])
+
     /** 是否含税 */
     const isTaxIncluded = controller.useMemo(s => s.goodsListState.isTaxIncluded, [])
 
@@ -40,7 +42,7 @@ export default function Search() {
             readOnly={readOnly}
             value={value}
             className="kts-invoice-operate-goods-list-search"
-            placeholder={`请您输入项目名称、规格型号、金额(${isTaxIncluded ? '含税' : '不含税'})搜索`}
+            placeholder={`请您输入${columnshide.includes('itemCode') ? '' : '商品编码、'}项目名称、规格型号、金额(${isTaxIncluded ? '含税' : '不含税'})搜索`}
             prefix={<Icon component={MagnifierSvg} style={{ color: "#b8b8b8" }} />}
             onChange={e => { setValue(e.target.value); }}
             onClick={onClick}

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

@@ -79,6 +79,7 @@ const DrawerBody = () => {
               // 中间数据
               const between = { ...record };
               between.itemName = getItemName(record, s.goodsListState.editGood);
+              between.itemCode = getItemCode(record, s.goodsListState.editGood);
               between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood);
 
               // 设置编辑货物
@@ -171,4 +172,22 @@ const getItemNameOther = (record: any, editGood: IGood) => {
   //   return `*${shorthand}*${record.itemNameSelf}`;
   // }
   return record.itemName;
-}
+}
+
+// 获取商品编号
+const getItemCode = (record: any, editGood: IGood) => {
+
+  // let shorthand;
+
+  // shorthand = record.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemName}`;
+  // }
+
+  // shorthand = getSN(editGood.itemName)?.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemNameSelf}`;
+  // }
+
+  return record.productCode;
+}