kts-component-invoice-operate 3.1.13 → 3.1.14

package/dist/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/IGood/index.d.ts

@@ -42,6 +42,8 @@ export default interface IGood {
     taxAmount?: number;
     /** 税收分类编码 */
     taxClassificationCode?: string;
+    /** 商品和服务分类简称 */
+    shorthand?: string;
     /** 是否享受优惠政策 */
     favouredPolicyMark?: number;
     /** 优惠政策类型 */

package/dist/Invoice/tools/itemName/index.d.ts

@@ -12,3 +12,5 @@ export declare const getItemName: (value: ISN) => string;
 export declare const setFull: (name?: string, full?: string) => string | undefined;
 /** 设置简称 */
 export declare const setShorthand: (name?: string, shorthand?: string) => string | undefined;
+/** 组合全称加简称 */
+export declare const getItemNameWithShorthand: (value: ISN) => string;

package/dist/Invoice/ui/GoodsList/hook/useColumns/ui/ItemNameInput/index.d.ts

@@ -3,4 +3,5 @@ import './index.less';
 export default function ItemNameInput(props: {
     onChange?: (e: ChangeEvent<HTMLInputElement>) => void;
     value?: string;
+    shorthand?: string;
 }): JSX.Element;

package/dist/index.esm.js

@@ -2327,39 +2327,6 @@ var evaluate = (function (expr) {
   return parseFloat(math.evaluate(expr).toFixed(fractionDigits));
 });
 
-/** 拆分全称加简称 */
-var getSN = function getSN(value) {
-  if (!value) return undefined;
-  var arr = value.match(/\*[^*]+\*/);
-  if (arr && arr[0]) {
-    return {
-      shorthand: arr[0].split('*')[1],
-      full: value.replace(arr[0], '')
-    };
-  } else {
-    return {
-      shorthand: undefined,
-      full: value
-    };
-  }
-};
-/** 组合全称加简称 */
-var getItemName = function getItemName(value) {
-  if (value.shorthand) {
-    return "*".concat(value.shorthand, "*").concat(value.full);
-  } else {
-    return value.full;
-  }
-};
-/** 设置简称 */
-var setShorthand = function setShorthand(name, shorthand) {
-  if (!name) return undefined;
-  var sn = getSN(name);
-  if (!sn) return undefined;
-  sn.shorthand = shorthand || '';
-  return getItemName(sn);
-};
-
 //! moment.js
 //! version : 2.29.4
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
@@ -8863,50 +8830,48 @@ var onChangeItemName = /*#__PURE__*/function () {
         case 0:
           controller.run( /*#__PURE__*/function () {
             var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(s) {
-              var _getSN$shorthand, _getSN;
-              var value, shorthand;
+              var value;
               return _regeneratorRuntime().wrap(function _callee14$(_context14) {
                 while (1) switch (_context14.prev = _context14.next) {
                   case 0:
                     value = form.getFieldsValue().itemName;
-                    shorthand = (_getSN$shorthand = (_getSN = getSN(value)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand) !== null && _getSN$shorthand !== void 0 ? _getSN$shorthand : '';
                     if (!s.goodsListState.isMyShow) {
-                      _context14.next = 11;
+                      _context14.next = 10;
                       break;
                     }
-                    _context14.next = 5;
+                    _context14.next = 4;
                     return controller.setEditGood({
                       itemNameSelf: value
                     });
-                  case 5:
+                  case 4:
                     _context14.t0 = record.itemName;
                     if (!_context14.t0) {
-                      _context14.next = 9;
+                      _context14.next = 8;
                       break;
                     }
-                    _context14.next = 9;
+                    _context14.next = 8;
                     return controller.setEditGood({
-                      itemName: setShorthand(record.itemName, shorthand)
+                      itemName: record.itemName
                     });
-                  case 9:
-                    _context14.next = 17;
+                  case 8:
+                    _context14.next = 16;
                     break;
-                  case 11:
-                    _context14.next = 13;
+                  case 10:
+                    _context14.next = 12;
                     return controller.setEditGood({
                       itemName: value
                     });
-                  case 13:
+                  case 12:
                     _context14.t1 = record.itemNameSelf;
                     if (!_context14.t1) {
-                      _context14.next = 17;
+                      _context14.next = 16;
                       break;
                     }
-                    _context14.next = 17;
+                    _context14.next = 16;
                     return controller.setEditGood({
-                      itemNameSelf: setShorthand(record.itemNameSelf, shorthand)
+                      itemNameSelf: record.itemNameSelf
                     });
-                  case 17:
+                  case 16:
                   case "end":
                     return _context14.stop();
                 }
@@ -9063,40 +9028,50 @@ var css_248z$6 = ".kts-invoice-operate-goods-list-itemName-input {\n  display: f
 styleInject(css_248z$6);
 
 function ItemNameInput(props) {
-  var _getShorthand = getShorthand(props.value),
-    shorthand = _getShorthand.shorthand,
-    fullName = _getShorthand.fullName;
   var onChange = React.useCallback(function (e) {
     var event = _objectSpread2({}, e);
-    event.target.value = shorthand ? "*".concat(shorthand, "*").concat(e.target.value) : e.target.value;
     props.onChange && props.onChange(event);
   }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: 'kts-invoice-operate-goods-list-itemName-input'
-  }, shorthand && /*#__PURE__*/React.createElement("span", {
+  }, props.shorthand && /*#__PURE__*/React.createElement("span", {
     style: {
       alignSelf: 'center',
       fontSize: 12
     }
-  }, "*", shorthand, "*"), /*#__PURE__*/React.createElement(Input, {
+  }, "*", props.shorthand, "*"), /*#__PURE__*/React.createElement(Input, {
     style: {
       height: '100%',
       border: 'none'
     },
-    value: fullName,
+    value: props.value,
     onChange: onChange
   }));
 }
-/** 提取简称 */
-var getShorthand = function getShorthand(value) {
-  if (!value) return {};
+
+/** 拆分全称加简称 */
+var getSN = function getSN(value) {
+  if (!value) return undefined;
   var arr = value.match(/\*[^*]+\*/);
-  var shorthand = arr ? arr[0].split('*')[1] : '';
-  var fullName = shorthand ? value.replace("*".concat(shorthand, "*"), '') : value;
-  return {
-    shorthand: shorthand,
-    fullName: fullName
-  };
+  if (arr && arr[0]) {
+    return {
+      shorthand: arr[0].split('*')[1],
+      full: value.replace(arr[0], '')
+    };
+  } else {
+    return {
+      shorthand: undefined,
+      full: value
+    };
+  }
+};
+/** 组合全称加简称 */
+var getItemNameWithShorthand = function getItemNameWithShorthand(value) {
+  if (value.shorthand) {
+    return "*".concat(value.shorthand, "*").concat(value.full);
+  } else {
+    return value.full;
+  }
 };
 
 var useColumns = (function (form) {
@@ -9238,6 +9213,7 @@ var useColumns = (function (form) {
               }()
             }])
           })( /*#__PURE__*/React.createElement(ItemNameInput, {
+            shorthand: editGood.shorthand,
             onChange: function onChange() {
               onChangeItemName(controller, form, record);
             }
@@ -9267,8 +9243,14 @@ var useColumns = (function (form) {
           })))));
         } else {
           return /*#__PURE__*/React.createElement(MyItemNameDiv, {
-            valueT: formatSearch(record.itemNameSelf, searchValue),
-            valueF: formatSearch(record.itemName, searchValue),
+            valueT: formatSearch(getItemNameWithShorthand({
+              shorthand: record.shorthand,
+              full: record.itemNameSelf || ''
+            }), searchValue),
+            valueF: formatSearch(getItemNameWithShorthand({
+              shorthand: record.shorthand,
+              full: record.itemName || ''
+            }), searchValue),
             isMyShow: isMyShow
           });
         }
@@ -11889,7 +11871,7 @@ var DrawerBody$2 = function DrawerBody() {
                     }
                     // 中间数据
                     between = _objectSpread2({}, record);
-                    between.itemName = getItemName$1(record, s.goodsListState.editGood);
+                    between.itemName = getItemName(record, s.goodsListState.editGood);
                     between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood);
                     // 设置编辑货物
                     editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between);
@@ -11944,27 +11926,26 @@ var getPriceExcludeTax = function getPriceExcludeTax(s, record, calculatingDigit
   return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")), calculatingDigits);
 };
 // 获取我方名称
-var getItemName$1 = function getItemName(record, editGood) {
-  var _getSN;
-  var shorthand;
-  shorthand = record.shorthand;
-  if (shorthand) {
-    return "*".concat(shorthand, "*").concat(record.itemName);
-  }
-  shorthand = (_getSN = getSN(editGood.itemName)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand;
-  if (shorthand) {
-    return "*".concat(shorthand, "*").concat(record.itemNameSelf);
-  }
+var getItemName = function getItemName(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.itemName;
 };
 // 获取他方名称
 var getItemNameOther = function getItemNameOther(record, editGood) {
-  if (!editGood.itemName) return editGood.itemName;
-  var shorthand;
-  shorthand = record.shorthand;
-  if (shorthand) {
-    return "*".concat(shorthand, "*").concat(record.itemNameSelf);
-  }
+  // if (!editGood.itemName) return editGood.itemName;
+  // let shorthand;
+  // shorthand = record.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemNameSelf}`;
+  // }
   return record.itemName;
 };
 
@@ -12414,8 +12395,7 @@ var DrawerBody$3 = function DrawerBody(props) {
               }); // 赋码
               endowCodeGood.forEach(function (good) {
                 if (!good) return;
-                good.itemName = setShorthand(good.itemName, values.shorthand);
-                good.itemNameSelf = setShorthand(good.itemNameSelf, values.shorthand);
+                good.shorthand = values.shorthand;
                 good.taxClassificationCode = values.taxClassificationCode;
                 good.taxRate = values.taxRate;
                 good.taxFreeType = values.taxFreeType;
@@ -12508,7 +12488,7 @@ var DrawerBody$3 = function DrawerBody(props) {
     name: "shorthand",
     type: "string",
     readOnly: true,
-    default: getShorthand$1(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.itemName),
+    default: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.shorthand,
     title: "\u5546\u54C1\u548C\u670D\u52A1\u5206\u7C7B\u7B80\u79F0"
   }), /*#__PURE__*/React.createElement(SchemaMarkupField, {
     name: "taxRate",
@@ -12600,16 +12580,6 @@ var components = {
   string: Input$1,
   number: NumberPicker
 };
-/** 提取简称 */
-var getShorthand$1 = function getShorthand(value) {
-  if (!value) return ' ';
-  var arr = value.match(/\*[^*]+\*/);
-  if (arr) {
-    return arr[0].split('*')[1];
-  } else {
-    return ' ';
-  }
-};
 
 function AddComparisonDrawer() {
   var _Form$useForm = Form$1.useForm(),

package/dist/index.js

@@ -2337,39 +2337,6 @@ var evaluate = (function (expr) {
   return parseFloat(math.evaluate(expr).toFixed(fractionDigits));
 });
 
-/** 拆分全称加简称 */
-var getSN = function getSN(value) {
-  if (!value) return undefined;
-  var arr = value.match(/\*[^*]+\*/);
-  if (arr && arr[0]) {
-    return {
-      shorthand: arr[0].split('*')[1],
-      full: value.replace(arr[0], '')
-    };
-  } else {
-    return {
-      shorthand: undefined,
-      full: value
-    };
-  }
-};
-/** 组合全称加简称 */
-var getItemName = function getItemName(value) {
-  if (value.shorthand) {
-    return "*".concat(value.shorthand, "*").concat(value.full);
-  } else {
-    return value.full;
-  }
-};
-/** 设置简称 */
-var setShorthand = function setShorthand(name, shorthand) {
-  if (!name) return undefined;
-  var sn = getSN(name);
-  if (!sn) return undefined;
-  sn.shorthand = shorthand || '';
-  return getItemName(sn);
-};
-
 //! moment.js
 //! version : 2.29.4
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
@@ -8873,50 +8840,48 @@ var onChangeItemName = /*#__PURE__*/function () {
         case 0:
           controller.run( /*#__PURE__*/function () {
             var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(s) {
-              var _getSN$shorthand, _getSN;
-              var value, shorthand;
+              var value;
               return _regeneratorRuntime().wrap(function _callee14$(_context14) {
                 while (1) switch (_context14.prev = _context14.next) {
                   case 0:
                     value = form.getFieldsValue().itemName;
-                    shorthand = (_getSN$shorthand = (_getSN = getSN(value)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand) !== null && _getSN$shorthand !== void 0 ? _getSN$shorthand : '';
                     if (!s.goodsListState.isMyShow) {
-                      _context14.next = 11;
+                      _context14.next = 10;
                       break;
                     }
-                    _context14.next = 5;
+                    _context14.next = 4;
                     return controller.setEditGood({
                       itemNameSelf: value
                     });
-                  case 5:
+                  case 4:
                     _context14.t0 = record.itemName;
                     if (!_context14.t0) {
-                      _context14.next = 9;
+                      _context14.next = 8;
                       break;
                     }
-                    _context14.next = 9;
+                    _context14.next = 8;
                     return controller.setEditGood({
-                      itemName: setShorthand(record.itemName, shorthand)
+                      itemName: record.itemName
                     });
-                  case 9:
-                    _context14.next = 17;
+                  case 8:
+                    _context14.next = 16;
                     break;
-                  case 11:
-                    _context14.next = 13;
+                  case 10:
+                    _context14.next = 12;
                     return controller.setEditGood({
                       itemName: value
                     });
-                  case 13:
+                  case 12:
                     _context14.t1 = record.itemNameSelf;
                     if (!_context14.t1) {
-                      _context14.next = 17;
+                      _context14.next = 16;
                       break;
                     }
-                    _context14.next = 17;
+                    _context14.next = 16;
                     return controller.setEditGood({
-                      itemNameSelf: setShorthand(record.itemNameSelf, shorthand)
+                      itemNameSelf: record.itemNameSelf
                     });
-                  case 17:
+                  case 16:
                   case "end":
                     return _context14.stop();
                 }
@@ -9073,40 +9038,50 @@ var css_248z$6 = ".kts-invoice-operate-goods-list-itemName-input {\n  display: f
 styleInject(css_248z$6);
 
 function ItemNameInput(props) {
-  var _getShorthand = getShorthand(props.value),
-    shorthand = _getShorthand.shorthand,
-    fullName = _getShorthand.fullName;
   var onChange = React__default['default'].useCallback(function (e) {
     var event = _objectSpread2({}, e);
-    event.target.value = shorthand ? "*".concat(shorthand, "*").concat(e.target.value) : e.target.value;
     props.onChange && props.onChange(event);
   }, []);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'kts-invoice-operate-goods-list-itemName-input'
-  }, shorthand && /*#__PURE__*/React__default['default'].createElement("span", {
+  }, props.shorthand && /*#__PURE__*/React__default['default'].createElement("span", {
     style: {
       alignSelf: 'center',
       fontSize: 12
     }
-  }, "*", shorthand, "*"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Input, {
+  }, "*", props.shorthand, "*"), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Input, {
     style: {
       height: '100%',
       border: 'none'
     },
-    value: fullName,
+    value: props.value,
     onChange: onChange
   }));
 }
-/** 提取简称 */
-var getShorthand = function getShorthand(value) {
-  if (!value) return {};
+
+/** 拆分全称加简称 */
+var getSN = function getSN(value) {
+  if (!value) return undefined;
   var arr = value.match(/\*[^*]+\*/);
-  var shorthand = arr ? arr[0].split('*')[1] : '';
-  var fullName = shorthand ? value.replace("*".concat(shorthand, "*"), '') : value;
-  return {
-    shorthand: shorthand,
-    fullName: fullName
-  };
+  if (arr && arr[0]) {
+    return {
+      shorthand: arr[0].split('*')[1],
+      full: value.replace(arr[0], '')
+    };
+  } else {
+    return {
+      shorthand: undefined,
+      full: value
+    };
+  }
+};
+/** 组合全称加简称 */
+var getItemNameWithShorthand = function getItemNameWithShorthand(value) {
+  if (value.shorthand) {
+    return "*".concat(value.shorthand, "*").concat(value.full);
+  } else {
+    return value.full;
+  }
 };
 
 var useColumns = (function (form) {
@@ -9248,6 +9223,7 @@ var useColumns = (function (form) {
               }()
             }])
           })( /*#__PURE__*/React__default['default'].createElement(ItemNameInput, {
+            shorthand: editGood.shorthand,
             onChange: function onChange() {
               onChangeItemName(controller, form, record);
             }
@@ -9277,8 +9253,14 @@ var useColumns = (function (form) {
           })))));
         } else {
           return /*#__PURE__*/React__default['default'].createElement(MyItemNameDiv, {
-            valueT: formatSearch(record.itemNameSelf, searchValue),
-            valueF: formatSearch(record.itemName, searchValue),
+            valueT: formatSearch(getItemNameWithShorthand({
+              shorthand: record.shorthand,
+              full: record.itemNameSelf || ''
+            }), searchValue),
+            valueF: formatSearch(getItemNameWithShorthand({
+              shorthand: record.shorthand,
+              full: record.itemName || ''
+            }), searchValue),
             isMyShow: isMyShow
           });
         }
@@ -11899,7 +11881,7 @@ var DrawerBody$2 = function DrawerBody() {
                     }
                     // 中间数据
                     between = _objectSpread2({}, record);
-                    between.itemName = getItemName$1(record, s.goodsListState.editGood);
+                    between.itemName = getItemName(record, s.goodsListState.editGood);
                     between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood);
                     // 设置编辑货物
                     editGood = s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), between);
@@ -11954,27 +11936,26 @@ var getPriceExcludeTax = function getPriceExcludeTax(s, record, calculatingDigit
   return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")), calculatingDigits);
 };
 // 获取我方名称
-var getItemName$1 = function getItemName(record, editGood) {
-  var _getSN;
-  var shorthand;
-  shorthand = record.shorthand;
-  if (shorthand) {
-    return "*".concat(shorthand, "*").concat(record.itemName);
-  }
-  shorthand = (_getSN = getSN(editGood.itemName)) === null || _getSN === void 0 ? void 0 : _getSN.shorthand;
-  if (shorthand) {
-    return "*".concat(shorthand, "*").concat(record.itemNameSelf);
-  }
+var getItemName = function getItemName(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.itemName;
 };
 // 获取他方名称
 var getItemNameOther = function getItemNameOther(record, editGood) {
-  if (!editGood.itemName) return editGood.itemName;
-  var shorthand;
-  shorthand = record.shorthand;
-  if (shorthand) {
-    return "*".concat(shorthand, "*").concat(record.itemNameSelf);
-  }
+  // if (!editGood.itemName) return editGood.itemName;
+  // let shorthand;
+  // shorthand = record.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemNameSelf}`;
+  // }
   return record.itemName;
 };
 
@@ -12424,8 +12405,7 @@ var DrawerBody$3 = function DrawerBody(props) {
               }); // 赋码
               endowCodeGood.forEach(function (good) {
                 if (!good) return;
-                good.itemName = setShorthand(good.itemName, values.shorthand);
-                good.itemNameSelf = setShorthand(good.itemNameSelf, values.shorthand);
+                good.shorthand = values.shorthand;
                 good.taxClassificationCode = values.taxClassificationCode;
                 good.taxRate = values.taxRate;
                 good.taxFreeType = values.taxFreeType;
@@ -12518,7 +12498,7 @@ var DrawerBody$3 = function DrawerBody(props) {
     name: "shorthand",
     type: "string",
     readOnly: true,
-    default: getShorthand$1(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.itemName),
+    default: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.shorthand,
     title: "\u5546\u54C1\u548C\u670D\u52A1\u5206\u7C7B\u7B80\u79F0"
   }), /*#__PURE__*/React__default['default'].createElement(antd.SchemaMarkupField, {
     name: "taxRate",
@@ -12610,16 +12590,6 @@ var components = {
   string: antdComponents.Input,
   number: antdComponents.NumberPicker
 };
-/** 提取简称 */
-var getShorthand$1 = function getShorthand(value) {
-  if (!value) return ' ';
-  var arr = value.match(/\*[^*]+\*/);
-  if (arr) {
-    return arr[0].split('*')[1];
-  } else {
-    return ' ';
-  }
-};
 
 function AddComparisonDrawer() {
   var _Form$useForm = ktsXui.Form.useForm(),

package/package.json

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

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/IGood/index.ts

@@ -64,6 +64,9 @@ export default interface IGood {
   /** 税收分类编码 */
   taxClassificationCode?: string;
 
+  /** 商品和服务分类简称 */
+  shorthand?: string;
+
   /** 是否享受优惠政策 */
   favouredPolicyMark?: number;
 

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

@@ -44,4 +44,13 @@ export const setShorthand = (name?:string, shorthand?:string) => {
     if(!sn) return undefined;
     sn.shorthand = shorthand || '';
     return getItemName(sn);
+}
+
+/** 组合全称加简称 */
+export const getItemNameWithShorthand = (value: ISN) => {
+    if (value.shorthand) {
+        return `*${value.shorthand}*${value.full}`;
+    } else {
+        return value.full;
+    }
 }

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

@@ -8,7 +8,6 @@ import { LineAttributeType } from '../../InvoiceController';
 import IGood from '../../InvoiceController/InvoiceControllerState/GoodsListState/IGood';
 import { countTaxAmount } from '../../tools/calculate';
 import { bytesLnegth, cutStr } from '../../tools/strringFn';
-import { setShorthand } from '../../tools/itemName';
 import {
   SchemaForm,
   FormButtonGroup,
@@ -302,9 +301,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
       endowCodeGood.forEach(good => {
         if (!good) return;
 
-        good.itemName = setShorthand(good.itemName, values.shorthand);
-        good.itemNameSelf = setShorthand(good.itemNameSelf, values.shorthand);
-        
+        good.shorthand = values.shorthand;
         good.taxClassificationCode = values.taxClassificationCode;
         good.taxRate = values.taxRate;
         good.taxFreeType = values.taxFreeType;
@@ -368,7 +365,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
           name="shorthand"
           type="string"
           readOnly
-          default={getShorthand(defaultValue?.itemName)}
+          default={defaultValue?.shorthand}
           title="商品和服务分类简称"
         />
         <Field
@@ -432,14 +429,3 @@ const components = {
   string: Input,
   number: NumberPicker,
 };
-
-/** 提取简称 */
-const getShorthand = (value?: string) => {
-  if (!value) return ' ';
-  const arr = value.match(/\*[^*]+\*/);
-  if (arr) {
-    return arr[0].split('*')[1];
-  } else {
-    return ' ';
-  }
-};

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

@@ -7,7 +7,6 @@
 import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
 import InvoiceController, { IGood, LineAttributeType } from '../../../../../InvoiceController';
 import evaluate from '../../../../../tools/evaluate';
-import { getSN, setShorthand } from '../../../../../tools/itemName';
 import { message } from 'kts-components-antd-x3'
 import { format2, format15, countTaxAmount, countAmountExcludeTax, countPrice } from '../../../../../tools/calculate';
 import moment from 'moment';
@@ -501,14 +500,13 @@ export const endowCode = async (controller: InvoiceController, goods: IGood) =>
 export const onChangeItemName = async (controller: InvoiceController, form: WrappedFormUtils<any>, record: IGood) => {
   controller.run(async s => {
     const value = form.getFieldsValue().itemName;
-    const shorthand = getSN(value)?.shorthand ?? '';
 
     if (s.goodsListState.isMyShow) {
       await controller.setEditGood({ itemNameSelf: value });
-      record.itemName && await controller.setEditGood({ itemName: setShorthand(record.itemName, shorthand) });
+      record.itemName && await controller.setEditGood({ itemName: record.itemName });
     } else {
       await controller.setEditGood({ itemName: value });
-      record.itemNameSelf && await controller.setEditGood({ itemNameSelf: setShorthand(record.itemNameSelf, shorthand) });
+      record.itemNameSelf && await controller.setEditGood({ itemNameSelf: record.itemNameSelf });
     }
   })
 }

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

@@ -16,6 +16,7 @@ import {
   onChangeTaxRate,
   onChangeItemName,
 } from './autoFillFn';
+import { getItemNameWithShorthand } from '../../../../tools/itemName';
 
 export default (form: WrappedFormUtils) => {
   const { getFieldDecorator, getFieldValue } = form;
@@ -106,6 +107,7 @@ export default (form: WrappedFormUtils) => {
                     ]
                   })(
                     <ItemNameInput
+                      shorthand={editGood.shorthand}
                       onChange={() => {
                         onChangeItemName(controller, form, record);
                       }}
@@ -128,8 +130,8 @@ export default (form: WrappedFormUtils) => {
           } else {
             return (
               <MyItemNameDiv
-                valueT={formatSearch(record.itemNameSelf, searchValue)}
-                valueF={formatSearch(record.itemName, searchValue)}
+                valueT={formatSearch(getItemNameWithShorthand({shorthand: record.shorthand, full: record.itemNameSelf || ''}), searchValue)}
+                valueF={formatSearch(getItemNameWithShorthand({shorthand: record.shorthand, full: record.itemName || ''}), searchValue)}
                 isMyShow={isMyShow}
               />
             )

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

@@ -3,32 +3,17 @@ import { Input } from 'kts-components-antd-x3';
 import React, { ChangeEvent } from 'react';
 import './index.less';
 
-export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLInputElement>) => void, value?: string }) {
-
-    const { shorthand, fullName } = getShorthand(props.value);
+export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLInputElement>) => void, value?: string, shorthand?: string }) {
 
     const onChange = React.useCallback((e: ChangeEvent<HTMLInputElement>) => {
         const event = { ...e };
-        event.target.value = shorthand ? `*${shorthand}*${e.target.value}` : e.target.value
         props.onChange && props.onChange(event);
     }, [])
 
     return (
         <div className='kts-invoice-operate-goods-list-itemName-input'>
-            {shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{shorthand}*</span>}
-            <Input style={{ height: '100%', border: 'none' }} value={fullName} onChange={onChange} />
+            {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
+            <Input style={{ height: '100%', border: 'none' }} value={props.value} onChange={onChange} />
         </div>
     )
 }
-
-/** 提取简称 */
-const getShorthand = (value?: string) => {
-    if (!value) return {};
-    const arr = value.match(/\*[^*]+\*/);
-
-    const shorthand = arr ? arr[0].split('*')[1] : '';
-    const fullName = shorthand ? value.replace(`*${shorthand}*`, '') : value;
-
-    return { shorthand, fullName }
-};
-

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

@@ -3,7 +3,6 @@ import { Drawer, Table } from 'kts-components-antd-x3';
 import Invoice from '../../';
 import { updateUnitPriceExcludingTax, updateUnitPriceTax, dutyFree, format15 } from '../GoodsList/hook/useColumns/autoFillFn';
 import { countAmountIncludeTax } from '../../tools/calculate'
-import { getSN } from '../../tools/itemName'
 import { IGood } from '../../InvoiceController';
 import evaluate from '../../tools/evaluate';
 
@@ -115,7 +114,6 @@ const DrawerBody = () => {
               }
 
               s.goodsListState.importGoods.isVisibleDrawer = false;
-
               s.goodsListState.isTaxIncluded
                 ? updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
                 : updateUnitPriceTax(controller, s.goodsListState.form, record)
@@ -145,31 +143,31 @@ const getPriceExcludeTax = (s: IGood, record: any, calculatingDigits?: number) =
 // 获取我方名称
 const getItemName = (record: any, editGood: IGood) => {
 
-  let shorthand;
+  // let shorthand;
 
-  shorthand = record.shorthand;
-  if (shorthand) {
-    return `*${shorthand}*${record.itemName}`;
-  }
+  // shorthand = record.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemName}`;
+  // }
 
-  shorthand = getSN(editGood.itemName)?.shorthand;
-  if (shorthand) {
-    return `*${shorthand}*${record.itemNameSelf}`;
-  }
+  // shorthand = getSN(editGood.itemName)?.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemNameSelf}`;
+  // }
 
   return record.itemName;
 }
 
 // 获取他方名称
 const getItemNameOther = (record: any, editGood: IGood) => {
-  if (!editGood.itemName) return editGood.itemName;
+  // if (!editGood.itemName) return editGood.itemName;
 
-  let shorthand;
+  // let shorthand;
 
-  shorthand = record.shorthand;
-  if (shorthand) {
-    return `*${shorthand}*${record.itemNameSelf}`;
-  }
+  // shorthand = record.shorthand;
+  // if (shorthand) {
+  //   return `*${shorthand}*${record.itemNameSelf}`;
+  // }
 
   return record.itemName;
 }