@kmkf-fe-packages/basic-components 2.3.17 → 2.3.19-beta.10

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import every from 'lodash/every';
 import maxBy from 'lodash/maxBy';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
@@ -9132,6 +9132,10 @@ var processErpTradeId = function processErpTradeId(getValue) {
       EXCHANGE_TRADE_ID: {
         key: 'tradeItemList',
         defaultValue: []
+      },
+      SWAP_OUT_TRADE_ID: {
+        key: 'tradeItemList',
+        defaultValue: []
       }
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
@@ -9499,6 +9503,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       RETURN_GOODS_TRADE_ID: processErpTradeId,
       BS_DELIVERY_NO: processErpTradeId,
       REISSUE_TRADE_ID: processErpTradeId,
+      SWAP_OUT_TRADE_ID: processErpTradeId,
       ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
       EXCHANGE_TRADE_ID: processErpTradeId,
       WLN_GOODS: processWlnGoods(templateColumns),
@@ -15121,6 +15126,13 @@ var wdtColumns = [{
   title: '辅助单位',
   width: 150,
   render: renderTextEllipsis
+}, {
+  dataIndex: 'skuType',
+  title: '是否组合装',
+  width: 150,
+  render: function render(type) {
+    return type === 'suite' ? '组合装' : '非组合装';
+  }
 }];
 
 var bse3Columns = [{
@@ -15963,7 +15975,7 @@ var transformFormData = function transformFormData(formData) {
     if (formData[key]) {
       var _formData$key, _formData$key2, _formData$key3, _formData$key4;
       var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
-      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : 'like';
+      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'eq' : 'like';
       conditionList.push({
         leftValue: key,
         compareSymbol: compareSymbol,
@@ -16109,35 +16121,56 @@ var GoodList = function GoodList(props, ref) {
         };
       })
     }
+  }, {
+    label: '是否组合装',
+    name: 'skuType',
+    dataIndex: 'skuType',
+    type: 'select',
+    formItemProps: {
+      mode: 'multiple',
+      filterOption: function filterOption(input, option) {
+        return option.label.includes(input);
+      },
+      options: [{
+        label: '组合装',
+        value: 'suite'
+      }, {
+        label: '非组合装',
+        value: ''
+      }]
+    }
   }];
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
     onSelect: function onSelect(record, selected) {
+      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.specNo;
+          return t !== uniqueKey;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.specNo !== record.specNo;
+          return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.specNo;
-        }))));
+        var changeKeys = changeRows.map(function (t) {
+          return "".concat(t.goodNo, "-").concat(t.specNo);
+        });
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
-        setSelectIds(difference(selectIds, changeRows.map(function (t) {
-          return t.specNo;
-        })));
+        var _changeKeys = changeRows.map(function (t) {
+          return "".concat(t.goodNo, "-").concat(t.specNo);
+        });
+        setSelectIds(difference(selectIds, _changeKeys));
         var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.specNo !== othVal.specNo;
+          return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
         });
         setSelect(list);
       }
@@ -16145,11 +16178,12 @@ var GoodList = function GoodList(props, ref) {
   };
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
+      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.specNo;
+        return t !== uniqueKey;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.specNo !== record.specNo;
+        return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
       }));
     };
     var showColumns = [{
@@ -16173,7 +16207,9 @@ var GoodList = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React.createElement(Table, {
       columns: showColumns,
-      rowKey: 'specNo',
+      rowKey: function rowKey(record) {
+        return "".concat(record.goodNo, "-").concat(record.specNo);
+      },
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -16203,7 +16239,9 @@ var GoodList = function GoodList(props, ref) {
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
     className: "GoodModalColumns",
     rowSelection: rowSelection,
-    rowKey: "specNo",
+    rowKey: function rowKey(record) {
+      return "".concat(record.goodNo, "-").concat(record.specNo);
+    },
     columns: columns,
     scroll: {
       x: '100%',
@@ -21813,6 +21851,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -21941,6 +21984,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22109,6 +22157,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22290,6 +22343,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -24013,6 +24071,7 @@ var processKmGoods$1 = function processKmGoods(_ref8) {
       itemSysId: item.goodId,
       sysItemId: item.goodId,
       sysPicPath: item.goodPicUrl,
+      sysItemOuterId: item.goodNo,
       payment: null,
       price: item.retailPrice,
       type: (kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
@@ -25835,6 +25894,34 @@ var index$2 = (function (props) {
     showHeader = _props$showHeader === void 0 ? [] : _props$showHeader;
   var onceRef = useRef(false);
   var valueRef = useRef(null);
+  // 字段筛选状态 - 用户选择要筛选的字段（单选）
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    filterField = _useState2[0],
+    setFilterField = _useState2[1];
+  // 筛选关键词 - 输入框内容，用于模糊匹配选中字段列的值
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    filterKeyword = _useState4[0],
+    setFilterKeyword = _useState4[1];
+  // 初始化筛选字段（仅在 type 变化时初始化）
+  useEffect(function () {
+    var allColumns = columnsMap[type] || [];
+    if (showHeader && showHeader.length > 0) {
+      var _validItems$;
+      // showHeader 是对象数组，提取第一个 dataIndex
+      var validItems = showHeader.filter(function (item) {
+        return item.show !== false;
+      });
+      var defaultField = ((_validItems$ = validItems[0]) === null || _validItems$ === void 0 ? void 0 : _validItems$.dataIndex) || '';
+      setFilterField(defaultField);
+    } else {
+      var _allColumns$;
+      // 如果 showHeader 为空，使用第一个列
+      var firstField = ((_allColumns$ = allColumns[0]) === null || _allColumns$ === void 0 ? void 0 : _allColumns$.dataIndex) || '';
+      setFilterField(firstField);
+    }
+  }, [type]);
   useEffect(function () {
     var _value$orders, _value$showOrderInfo;
     valueRef.current = value;
@@ -25862,12 +25949,100 @@ var index$2 = (function (props) {
     }
   }, [value, type]);
   var columns = useMemo(function () {
+    // 通过 getSystemShowHead 处理 showHeader 配置
     var baseInfoColumns = getSystemShowHead({
       columns: columnsMap[type] || [],
       showHeader: showHeader
     });
     return baseInfoColumns || [];
   }, [type, showHeader]);
+  // 构建字段渲染值映射表（原始值 -> 显示值），用于筛选时同时匹配原始值和显示值
+  var fieldRenderMap = useMemo(function () {
+    var map = {};
+    // JKY_SYSTEM_ORDER 需要处理的字段
+    if (type === 'JKY_SYSTEM_ORDER') {
+      // isDelete: 1 -> "是", 0 -> "否"
+      map['isDelete'] = {
+        '1': '是',
+        '0': '否'
+      };
+      // tradeFrom - 订单来源映射
+      map['tradeFrom'] = _objectSpread2({}, JKY_ORDER_FROM_MAP);
+      // tradeType - 订单类型映射
+      map['tradeType'] = _objectSpread2({}, JKY_ORDER_TYPE_MAP);
+      // tradeStatus - 销售单状态映射
+      map['tradeStatus'] = _objectSpread2({}, JKY_ORDER_STATUS_MAP);
+    }
+    // BS_E3_SYSTEM_ORDER 需要处理的字段
+    if (type === 'BS_E3_SYSTEM_ORDER') {
+      // orderStatus - 订单状态映射
+      map['orderStatus'] = _objectSpread2({}, BS_E3_ORDER_STATUS_MAP);
+      // 布尔类型字段映射
+      var booleanMap = _objectSpread2({}, BS_E3_BOOLEAN_STATUS_MAP);
+      ['isSplit', 'isSplitNew', 'isCombine', 'isCombineNew', 'isCopy', 'isExchangeOrder'].forEach(function (field) {
+        map[field] = booleanMap;
+      });
+    }
+    // KM_SYSTEM_ORDER 需要处理的字段
+    if (type === 'KM_SYSTEM_ORDER') {
+      // billType - 订单类型映射（0: "普通订单", 1: "货到付款", ...）
+      map['billType'] = _objectSpread2({}, KM_ORDER_TYPE_MAP);
+      // sysStatus - 订单系统状态映射
+      map['sysStatus'] = _objectSpread2({}, KM_ORDER_STATUS);
+    }
+    // JY_SYSTEM_ORDER 需要处理的字段
+    if (type === 'JY_SYSTEM_ORDER') {
+      // tradeType - 订单类型映射
+      map['tradeType'] = _objectSpread2({}, JY_ORDER_TYPE_MAP);
+      // tradeStatus - 订单状态映射
+      map['tradeStatus'] = _objectSpread2({}, JY_ORDER_STATUS_MAP);
+    }
+    // GY_SYSTEM_ORDER 需要处理的字段
+    if (type === 'GY_SYSTEM_ORDER') {
+      // deliveryStateName - 发货状态映射 (0: "未发货", 2: "全部发货")
+      map['deliveryStateName'] = _objectSpread2({}, GY_DELIVERY_STATE_MAPPING);
+    }
+    return map;
+  }, [type]);
+  // 过滤后的表格数据 - 根据选中字段和关键词模糊匹配（不区分大小写）
+  var filteredData = useMemo(function () {
+    if (!filterField || !filterKeyword) {
+      return (value === null || value === void 0 ? void 0 : value.orders) || [];
+    }
+    var keywordLower = filterKeyword.toLowerCase();
+    var renderMap = fieldRenderMap[filterField];
+    return ((value === null || value === void 0 ? void 0 : value.orders) || []).filter(function (item) {
+      var fieldValue = item[filterField];
+      if (fieldValue == null) return false;
+      var fieldValueStr = String(fieldValue);
+      var fieldValueLower = fieldValueStr.toLowerCase();
+      // 直接匹配原始值
+      if (fieldValueLower.includes(keywordLower)) return true;
+      // 匹配渲染后的值
+      if (renderMap) {
+        // KM_SYSTEM_ORDER 的 billType 是逗号分隔的多个类型（如 "2,3,0"）
+        var isKmBillType = filterField === 'billType' && fieldValueStr.includes(',');
+        if (isKmBillType) {
+          // 拆分为单个类型代码，分别映射后拼接
+          var typeCodes = fieldValueStr.split(',');
+          var displayValues = typeCodes.map(function (code) {
+            return renderMap[code.trim()];
+          }).filter(Boolean);
+          var displayValueStr = displayValues.join(',');
+          if (displayValueStr.toLowerCase().includes(keywordLower)) {
+            return true;
+          }
+        } else {
+          // 单个值的字段
+          var displayValue = renderMap[fieldValueStr];
+          if (displayValue && displayValue.toLowerCase().includes(keywordLower)) {
+            return true;
+          }
+        }
+      }
+      return false;
+    });
+  }, [value === null || value === void 0 ? void 0 : value.orders, filterField, filterKeyword, fieldRenderMap]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -26160,25 +26335,39 @@ var index$2 = (function (props) {
       };
     }
   };
-  // useEffect(() => {
-  //   const dom = document.querySelector(
-  //     `.${type}_SYSTEM_ORDER_COMPONENT .ant-table-content`,
-  //   );
-  //   //解决列表出现横向滚动条时选择数据造成行内闪烁问题
-  //   if (
-  //     (value?.selectIds || []).length > 0 &&
-  //     dom &&
-  //     dom.scrollWidth > dom.clientWidth &&
-  //     dom.scrollLeft === 0
-  //   ) {
-  //     console.log(dom.scrollWidth > dom.clientWidth, dom.scrollLeft === 0);
-  //     dom.scrollLeft = 1;
-  //   }
-  // }, [JSON.stringify(value?.selectIds || [])]);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(type, "_SYSTEM_ORDER_COMPONENT")
-  }, /*#__PURE__*/React.createElement(Table, {
-    dataSource: (value === null || value === void 0 ? void 0 : value.orders) || [],
+  }, /*#__PURE__*/React.createElement(Space, {
+    style: {
+      marginBottom: 8
+    }
+  }, /*#__PURE__*/React.createElement(Select, {
+    style: {
+      width: 150
+    },
+    placeholder: "\u9009\u62E9\u5B57\u6BB5",
+    value: filterField,
+    onChange: setFilterField,
+    allowClear: true,
+    showSearch: true,
+    optionFilterProp: "children"
+  }, (columnsMap[type] || []).map(function (col) {
+    return /*#__PURE__*/React.createElement(Select.Option, {
+      key: col.dataIndex,
+      value: col.dataIndex
+    }, col.title);
+  })), /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8F93\u5165\u5173\u952E\u8BCD\u6A21\u7CCA\u5339\u914D",
+    style: {
+      width: 200
+    },
+    value: filterKeyword,
+    onChange: function onChange(e) {
+      return setFilterKeyword(e.target.value);
+    },
+    allowClear: true
+  })), /*#__PURE__*/React.createElement(Table, {
+    dataSource: filteredData,
     columns: columns,
     rowSelection: rowSelection,
     rowKey: rowKeyMap[type] || 'billNo',
@@ -28128,7 +28317,9 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order[componentMap$4[compType].oIdKey] === systemOrderNo;
     });
-    var goodDetails = jstMergeIdenticalGoods((order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$4[compType].goodDetailsKey]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.length) ? (_componentMap$compTyp7 = componentMap$4[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.updateGoodsHandle([order], true) : []);
+    var goodDetails = jstMergeIdenticalGoods((order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$4[compType].goodDetailsKey]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.length) ? (_componentMap$compTyp7 = componentMap$4[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.updateGoodsHandle([order], {
+      canEdit: true
+    }) : []);
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     return mode ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[componentMap$4[compType].outerOiIdKey] === orderNo;
@@ -28762,7 +28953,9 @@ var PublicReissue = function PublicReissue(props) {
     });
     var orderRest = undefined;
     if (['JST_REISSUE_GOODS', 'JST_RETURN_GOODS'].includes(type)) {
-      orderRest = true;
+      orderRest = {
+        canEdit: true
+      };
     } else if (['KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
       orderRest = {
         orderBackGoodsLevel: props.orderBackGoodsLevel,

package/dist/index.js

@@ -9147,6 +9147,10 @@ var processErpTradeId = function processErpTradeId(getValue) {
       EXCHANGE_TRADE_ID: {
         key: 'tradeItemList',
         defaultValue: []
+      },
+      SWAP_OUT_TRADE_ID: {
+        key: 'tradeItemList',
+        defaultValue: []
       }
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
@@ -9514,6 +9518,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       RETURN_GOODS_TRADE_ID: processErpTradeId,
       BS_DELIVERY_NO: processErpTradeId,
       REISSUE_TRADE_ID: processErpTradeId,
+      SWAP_OUT_TRADE_ID: processErpTradeId,
       ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
       EXCHANGE_TRADE_ID: processErpTradeId,
       WLN_GOODS: processWlnGoods(templateColumns),
@@ -15136,6 +15141,13 @@ var wdtColumns = [{
   title: '辅助单位',
   width: 150,
   render: renderTextEllipsis
+}, {
+  dataIndex: 'skuType',
+  title: '是否组合装',
+  width: 150,
+  render: function render(type) {
+    return type === 'suite' ? '组合装' : '非组合装';
+  }
 }];
 
 var bse3Columns = [{
@@ -15978,7 +15990,7 @@ var transformFormData = function transformFormData(formData) {
     if (formData[key]) {
       var _formData$key, _formData$key2, _formData$key3, _formData$key4;
       var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
-      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : 'like';
+      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'eq' : 'like';
       conditionList.push({
         leftValue: key,
         compareSymbol: compareSymbol,
@@ -16124,35 +16136,56 @@ var GoodList = function GoodList(props, ref) {
         };
       })
     }
+  }, {
+    label: '是否组合装',
+    name: 'skuType',
+    dataIndex: 'skuType',
+    type: 'select',
+    formItemProps: {
+      mode: 'multiple',
+      filterOption: function filterOption(input, option) {
+        return option.label.includes(input);
+      },
+      options: [{
+        label: '组合装',
+        value: 'suite'
+      }, {
+        label: '非组合装',
+        value: ''
+      }]
+    }
   }];
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
     onSelect: function onSelect(record, selected) {
+      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.specNo;
+          return t !== uniqueKey;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.specNo !== record.specNo;
+          return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.specNo;
-        }))));
+        var changeKeys = changeRows.map(function (t) {
+          return "".concat(t.goodNo, "-").concat(t.specNo);
+        });
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
-        setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
-          return t.specNo;
-        })));
+        var _changeKeys = changeRows.map(function (t) {
+          return "".concat(t.goodNo, "-").concat(t.specNo);
+        });
+        setSelectIds(lodash.difference(selectIds, _changeKeys));
         var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.specNo !== othVal.specNo;
+          return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
         });
         setSelect(list);
       }
@@ -16160,11 +16193,12 @@ var GoodList = function GoodList(props, ref) {
   };
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
+      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.specNo;
+        return t !== uniqueKey;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.specNo !== record.specNo;
+        return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
       }));
     };
     var showColumns = [{
@@ -16188,7 +16222,9 @@ var GoodList = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
       columns: showColumns,
-      rowKey: 'specNo',
+      rowKey: function rowKey(record) {
+        return "".concat(record.goodNo, "-").concat(record.specNo);
+      },
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -16218,7 +16254,9 @@ var GoodList = function GoodList(props, ref) {
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({
     className: "GoodModalColumns",
     rowSelection: rowSelection,
-    rowKey: "specNo",
+    rowKey: function rowKey(record) {
+      return "".concat(record.goodNo, "-").concat(record.specNo);
+    },
     columns: columns,
     scroll: {
       x: '100%',
@@ -21828,6 +21866,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -21956,6 +21999,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22124,6 +22172,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22305,6 +22358,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -24028,6 +24086,7 @@ var processKmGoods$1 = function processKmGoods(_ref8) {
       itemSysId: item.goodId,
       sysItemId: item.goodId,
       sysPicPath: item.goodPicUrl,
+      sysItemOuterId: item.goodNo,
       payment: null,
       price: item.retailPrice,
       type: (kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
@@ -25850,6 +25909,34 @@ var index$2 = (function (props) {
     showHeader = _props$showHeader === void 0 ? [] : _props$showHeader;
   var onceRef = React.useRef(false);
   var valueRef = React.useRef(null);
+  // 字段筛选状态 - 用户选择要筛选的字段（单选）
+  var _useState = React.useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    filterField = _useState2[0],
+    setFilterField = _useState2[1];
+  // 筛选关键词 - 输入框内容，用于模糊匹配选中字段列的值
+  var _useState3 = React.useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    filterKeyword = _useState4[0],
+    setFilterKeyword = _useState4[1];
+  // 初始化筛选字段（仅在 type 变化时初始化）
+  React.useEffect(function () {
+    var allColumns = columnsMap[type] || [];
+    if (showHeader && showHeader.length > 0) {
+      var _validItems$;
+      // showHeader 是对象数组，提取第一个 dataIndex
+      var validItems = showHeader.filter(function (item) {
+        return item.show !== false;
+      });
+      var defaultField = ((_validItems$ = validItems[0]) === null || _validItems$ === void 0 ? void 0 : _validItems$.dataIndex) || '';
+      setFilterField(defaultField);
+    } else {
+      var _allColumns$;
+      // 如果 showHeader 为空，使用第一个列
+      var firstField = ((_allColumns$ = allColumns[0]) === null || _allColumns$ === void 0 ? void 0 : _allColumns$.dataIndex) || '';
+      setFilterField(firstField);
+    }
+  }, [type]);
   React.useEffect(function () {
     var _value$orders, _value$showOrderInfo;
     valueRef.current = value;
@@ -25877,12 +25964,100 @@ var index$2 = (function (props) {
     }
   }, [value, type]);
   var columns = React.useMemo(function () {
+    // 通过 getSystemShowHead 处理 showHeader 配置
     var baseInfoColumns = kmkfUtils.getSystemShowHead({
       columns: columnsMap[type] || [],
       showHeader: showHeader
     });
     return baseInfoColumns || [];
   }, [type, showHeader]);
+  // 构建字段渲染值映射表（原始值 -> 显示值），用于筛选时同时匹配原始值和显示值
+  var fieldRenderMap = React.useMemo(function () {
+    var map = {};
+    // JKY_SYSTEM_ORDER 需要处理的字段
+    if (type === 'JKY_SYSTEM_ORDER') {
+      // isDelete: 1 -> "是", 0 -> "否"
+      map['isDelete'] = {
+        '1': '是',
+        '0': '否'
+      };
+      // tradeFrom - 订单来源映射
+      map['tradeFrom'] = _objectSpread2({}, kmkfUtils.JKY_ORDER_FROM_MAP);
+      // tradeType - 订单类型映射
+      map['tradeType'] = _objectSpread2({}, kmkfUtils.JKY_ORDER_TYPE_MAP);
+      // tradeStatus - 销售单状态映射
+      map['tradeStatus'] = _objectSpread2({}, kmkfUtils.JKY_ORDER_STATUS_MAP);
+    }
+    // BS_E3_SYSTEM_ORDER 需要处理的字段
+    if (type === 'BS_E3_SYSTEM_ORDER') {
+      // orderStatus - 订单状态映射
+      map['orderStatus'] = _objectSpread2({}, kmkfUtils.BS_E3_ORDER_STATUS_MAP);
+      // 布尔类型字段映射
+      var booleanMap = _objectSpread2({}, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP);
+      ['isSplit', 'isSplitNew', 'isCombine', 'isCombineNew', 'isCopy', 'isExchangeOrder'].forEach(function (field) {
+        map[field] = booleanMap;
+      });
+    }
+    // KM_SYSTEM_ORDER 需要处理的字段
+    if (type === 'KM_SYSTEM_ORDER') {
+      // billType - 订单类型映射（0: "普通订单", 1: "货到付款", ...）
+      map['billType'] = _objectSpread2({}, kmkfUtils.KM_ORDER_TYPE_MAP);
+      // sysStatus - 订单系统状态映射
+      map['sysStatus'] = _objectSpread2({}, kmkfUtils.KM_ORDER_STATUS);
+    }
+    // JY_SYSTEM_ORDER 需要处理的字段
+    if (type === 'JY_SYSTEM_ORDER') {
+      // tradeType - 订单类型映射
+      map['tradeType'] = _objectSpread2({}, kmkfUtils.JY_ORDER_TYPE_MAP);
+      // tradeStatus - 订单状态映射
+      map['tradeStatus'] = _objectSpread2({}, kmkfUtils.JY_ORDER_STATUS_MAP);
+    }
+    // GY_SYSTEM_ORDER 需要处理的字段
+    if (type === 'GY_SYSTEM_ORDER') {
+      // deliveryStateName - 发货状态映射 (0: "未发货", 2: "全部发货")
+      map['deliveryStateName'] = _objectSpread2({}, kmkfUtils.GY_DELIVERY_STATE_MAPPING);
+    }
+    return map;
+  }, [type]);
+  // 过滤后的表格数据 - 根据选中字段和关键词模糊匹配（不区分大小写）
+  var filteredData = React.useMemo(function () {
+    if (!filterField || !filterKeyword) {
+      return (value === null || value === void 0 ? void 0 : value.orders) || [];
+    }
+    var keywordLower = filterKeyword.toLowerCase();
+    var renderMap = fieldRenderMap[filterField];
+    return ((value === null || value === void 0 ? void 0 : value.orders) || []).filter(function (item) {
+      var fieldValue = item[filterField];
+      if (fieldValue == null) return false;
+      var fieldValueStr = String(fieldValue);
+      var fieldValueLower = fieldValueStr.toLowerCase();
+      // 直接匹配原始值
+      if (fieldValueLower.includes(keywordLower)) return true;
+      // 匹配渲染后的值
+      if (renderMap) {
+        // KM_SYSTEM_ORDER 的 billType 是逗号分隔的多个类型（如 "2,3,0"）
+        var isKmBillType = filterField === 'billType' && fieldValueStr.includes(',');
+        if (isKmBillType) {
+          // 拆分为单个类型代码，分别映射后拼接
+          var typeCodes = fieldValueStr.split(',');
+          var displayValues = typeCodes.map(function (code) {
+            return renderMap[code.trim()];
+          }).filter(Boolean);
+          var displayValueStr = displayValues.join(',');
+          if (displayValueStr.toLowerCase().includes(keywordLower)) {
+            return true;
+          }
+        } else {
+          // 单个值的字段
+          var displayValue = renderMap[fieldValueStr];
+          if (displayValue && displayValue.toLowerCase().includes(keywordLower)) {
+            return true;
+          }
+        }
+      }
+      return false;
+    });
+  }, [value === null || value === void 0 ? void 0 : value.orders, filterField, filterKeyword, fieldRenderMap]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -26175,25 +26350,39 @@ var index$2 = (function (props) {
       };
     }
   };
-  // useEffect(() => {
-  //   const dom = document.querySelector(
-  //     `.${type}_SYSTEM_ORDER_COMPONENT .ant-table-content`,
-  //   );
-  //   //解决列表出现横向滚动条时选择数据造成行内闪烁问题
-  //   if (
-  //     (value?.selectIds || []).length > 0 &&
-  //     dom &&
-  //     dom.scrollWidth > dom.clientWidth &&
-  //     dom.scrollLeft === 0
-  //   ) {
-  //     console.log(dom.scrollWidth > dom.clientWidth, dom.scrollLeft === 0);
-  //     dom.scrollLeft = 1;
-  //   }
-  // }, [JSON.stringify(value?.selectIds || [])]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "".concat(type, "_SYSTEM_ORDER_COMPONENT")
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
-    dataSource: (value === null || value === void 0 ? void 0 : value.orders) || [],
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Space, {
+    style: {
+      marginBottom: 8
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+    style: {
+      width: 150
+    },
+    placeholder: "\u9009\u62E9\u5B57\u6BB5",
+    value: filterField,
+    onChange: setFilterField,
+    allowClear: true,
+    showSearch: true,
+    optionFilterProp: "children"
+  }, (columnsMap[type] || []).map(function (col) {
+    return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
+      key: col.dataIndex,
+      value: col.dataIndex
+    }, col.title);
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    placeholder: "\u8F93\u5165\u5173\u952E\u8BCD\u6A21\u7CCA\u5339\u914D",
+    style: {
+      width: 200
+    },
+    value: filterKeyword,
+    onChange: function onChange(e) {
+      return setFilterKeyword(e.target.value);
+    },
+    allowClear: true
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
+    dataSource: filteredData,
     columns: columns,
     rowSelection: rowSelection,
     rowKey: rowKeyMap[type] || 'billNo',
@@ -28143,7 +28332,9 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order[componentMap$4[compType].oIdKey] === systemOrderNo;
     });
-    var goodDetails = kmkfUtils.jstMergeIdenticalGoods((order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$4[compType].goodDetailsKey]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.length) ? (_componentMap$compTyp7 = componentMap$4[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.updateGoodsHandle([order], true) : []);
+    var goodDetails = kmkfUtils.jstMergeIdenticalGoods((order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$4[compType].goodDetailsKey]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.length) ? (_componentMap$compTyp7 = componentMap$4[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.updateGoodsHandle([order], {
+      canEdit: true
+    }) : []);
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     return mode ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[componentMap$4[compType].outerOiIdKey] === orderNo;
@@ -28777,7 +28968,9 @@ var PublicReissue = function PublicReissue(props) {
     });
     var orderRest = undefined;
     if (['JST_REISSUE_GOODS', 'JST_RETURN_GOODS'].includes(type)) {
-      orderRest = true;
+      orderRest = {
+        canEdit: true
+      };
     } else if (['KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
       orderRest = {
         orderBackGoodsLevel: props.orderBackGoodsLevel,

package/dist/src/bs/SystemOrder/index.d.ts

@@ -10,7 +10,7 @@ interface BsSystemOrderProps {
         title: string;
         dataIndex: string;
         show?: boolean;
-    }[] | string[];
+    }[];
     type: string;
     disabled: boolean;
     onChange: (val: any) => void;

package/dist/src/bs/component/model/Columns/Erp/wdt.d.ts

@@ -17,5 +17,11 @@ declare const _default: ({
     width: number;
     render: (price: string | number) => string;
     ellipsis?: undefined;
+} | {
+    dataIndex: string;
+    title: string;
+    width: number;
+    render: (type: string) => "组合装" | "非组合装";
+    ellipsis?: undefined;
 })[];
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.3.17",
+  "version": "2.3.19-beta.10",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.3.17",
+    "@kmkf-fe-packages/kmkf-utils": "2.3.19-beta.10",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c327614be64b92883ad0682852195d47d3f95d34"
+  "gitHead": "5fffc84705cc6bfe5eea24d2605907aadd2e71ea"
 }