@kmkf-fe-packages/basic-components 2.2.44-beta.7 → 2.2.44-beta.71

package/dist/index.js

@@ -7773,9 +7773,10 @@ var Province = function Province(props) {
     wdt: kmkfUtils.WdtAddressData.getInstance(),
     gy: kmkfUtils.GyAddressData.getInstance(),
     km: kmkfUtils.AddressData.getInstance(),
-    jst: kmkfUtils.JstAddressData.getInstance(),
-    jky: kmkfUtils.JkyAddressData.getInstance()
+    jst: kmkfUtils.JstAddressData.getInstance()
+    // jky: JkyAddressData.getInstance(),
   };
+
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
     options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
     style: {
@@ -8011,13 +8012,14 @@ function ApaasPosting(props) {
   });
 }
 
-var _excluded$b = ["value", "onChange", "platformType", "type"];
+var _excluded$b = ["value", "onChange", "platformType", "type", "placement"];
 function ApaasLogistics(props) {
   var value = props.value,
     onChange = props.onChange,
     platformType = props.platformType,
     _props$type = props.type,
     type = _props$type === void 0 ? 'select' : _props$type,
+    placement = props.placement,
     other = _objectWithoutProperties(props, _excluded$b);
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -8055,12 +8057,13 @@ function ApaasLogistics(props) {
   return type === 'input' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2(_objectSpread2({}, other), {}, {
     value: value,
     onChange: handleInputChange
-  })) : /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
+  })) : /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2({
     value: value,
     onChange: onChange,
     options: option,
-    virtual: true
-  }));
+    virtual: true,
+    placement: placement
+  }, other));
 }
 
 var _excluded$c = ["label", "name", "extra", "required", "rules", "initialValue"];
@@ -8144,6 +8147,11 @@ var systemOrderMap = {
     ids: 'wdtSystemSelectIds',
     order: 'wdtSystemShowOrder'
   },
+  JKY_SYSTEM_ORDER: {
+    no: 'jkySystemOrderNo',
+    ids: 'jkySystemSelectIds',
+    order: 'jkySystemShowOrder'
+  },
   BS_E3_SYSTEM_ORDER: {
     no: 'bsE3SystemOrderNo',
     ids: 'bsE3SystemSelectIds',
@@ -8621,7 +8629,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
       WAREHOUSING_STATUS: 'inStockStatusItemList',
       BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
       MSG_STATUS: 'msgStatusValues',
-      WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList'
+      WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
+      JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
   };
@@ -8715,6 +8724,33 @@ var processBsGoods = function processBsGoods(getValue) {
     return _defineProperty({}, nex.uniqueKey, _values);
   };
 };
+var processJkyGoods = function processJkyGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var _values = {
+        jkyGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jkyGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
+      };
+      var selectIds = [];
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      var jkySystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'JKY_SYSTEM_ORDER';
+      });
+      if (jkySystemOrder) {
+        selectIds = jsonParseSecurity(getValue("".concat(jkySystemOrder.uniqueKey, "_").concat(systemOrderMap[jkySystemOrder.workOrderComponentType].ids)), []);
+      }
+      _values.selectIds = selectIds;
+      _values.orderNo = orderNo;
+      return _defineProperty({}, nex.uniqueKey, _values);
+    };
+  };
+};
 var processWdtGoods = function processWdtGoods(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
@@ -9006,6 +9042,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
         ids: 'wdtSystemSelectIds',
         order: 'wdtSystemShowOrder'
       },
+      JKY_SYSTEM_ORDER: {
+        no: 'jkySystemOrderNo',
+        ids: 'jkySystemSelectIds',
+        order: 'jkySystemShowOrder'
+      },
       BS_E3_SYSTEM_ORDER: {
         no: 'bsE3SystemOrderNo',
         ids: 'bsE3SystemSelectIds',
@@ -9265,14 +9306,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref73;
-    return _ref73 = {}, _defineProperty(_ref73, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref73, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref73;
+    var _ref74;
+    return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref74;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref74;
-    return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref74;
+    var _ref75;
+    return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref75;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9376,6 +9417,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_WAREHOUSING_STATUS: processSceneStatus,
       MSG_STATUS: processSceneStatus,
       WDT_WAREHOUSING_STATUS: processSceneStatus,
+      JKY_WAREHOUSING_STATUS: processSceneStatus,
       BS_LOGISTICS: processErpLogistics,
       WLN_LOGISTICS: processErpLogistics,
       WDT_LOGISTICS: processErpLogistics,
@@ -9391,6 +9433,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_POSTING: processBsPosting,
       BS_GOODS: processBsGoods,
       WDT_GOODS: processWdtGoods(templateColumns),
+      JKY_GOODS: processJkyGoods(templateColumns),
       WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
       JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
       BS_E3_GOODS: processBsE3Goods(templateColumns),
@@ -9409,6 +9452,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       KM_SYSTEM_ORDER: processErpSystemOrder,
       WLN_SYSTEM_ORDER: processErpSystemOrder,
       WDT_SYSTEM_ORDER: processErpSystemOrder,
+      JKY_SYSTEM_ORDER: processErpSystemOrder,
       WDT_RETURN_BILL_NO: processErpSystemOrder,
       BS_E3_SYSTEM_ORDER: processErpSystemOrder,
       JST_SYSTEM_ORDER: processErpSystemOrder,
@@ -10005,12 +10049,21 @@ var EditSplitRenderMap = {
       updateHandle = _ref17.updateHandle,
       disabled = _ref17.disabled;
     return /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
+      getPopupContainer: function getPopupContainer() {
+        return document.getElementById('subform');
+      },
       value: val,
       allowClear: true,
+      showSearch: true,
       onChange: function onChange(e) {
         return updateHandle(e, index, t.key);
       },
-      disabled: t.isEdit || disabled
+      disabled: t.isEdit || disabled,
+      filterOption: function filterOption(input, option) {
+        return option.label.includes(input);
+      },
+      placement: "topLeft",
+      listHeight: 120
     });
   },
   //退货物流-物流公司
@@ -10021,12 +10074,21 @@ var EditSplitRenderMap = {
       updateHandle = _ref18.updateHandle,
       disabled = _ref18.disabled;
     return /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
+      getPopupContainer: function getPopupContainer() {
+        return document.getElementById('subform');
+      },
       value: val,
       allowClear: true,
+      showSearch: true,
       onChange: function onChange(e) {
         return updateHandle(e, index, t.key);
       },
-      disabled: t.isEdit || disabled
+      disabled: t.isEdit || disabled,
+      filterOption: function filterOption(input, option) {
+        return option.label.includes(input);
+      },
+      placement: "topLeft",
+      listHeight: 120
     });
   }
 };
@@ -10495,7 +10557,11 @@ var SubForm = function SubForm(props) {
     });
   }, [inputValue]);
   var handleOpenChange = function handleOpenChange(newOpen) {
-    setOpen(newOpen);
+    if (!['jbCFrJV4m7_trajectoryCompany', '0qFEv9GEyd_returnLogisticsCompany'].includes(selectKey)) {
+      setOpen(newOpen);
+    } else {
+      setOpen(false);
+    }
   };
   var onChangeInput = React.useCallback(lodash.debounce(function (val) {
     setInputValue(val);
@@ -10583,6 +10649,9 @@ var SubForm = function SubForm(props) {
     visible: open,
     onVisibleChange: handleOpenChange
   }, ['0qFEv9GEyd_returnLogisticsCompany', 'jbCFrJV4m7_trajectoryCompany'].includes(selectKey) ? /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
+    getPopupContainer: function getPopupContainer() {
+      return document.getElementById('subform');
+    },
     value: undefined,
     onChange: function onChange(val) {
       onChangeInput(val);
@@ -10595,7 +10664,9 @@ var SubForm = function SubForm(props) {
     },
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
-    }
+    },
+    placement: "topLeft",
+    listHeight: 120
   }) : /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u8F93\u5165\u5173\u952E\u8BCD\u67E5\u8BE2",
     allowClear: true,
@@ -12114,7 +12185,7 @@ var ChooseBaby = function ChooseBaby(props) {
   }));
 };
 
-var css_248z$7 = "#goods-wrap.goodsBox.single-row {\n  max-height: 800px;\n  overflow-y: auto;\n  padding-top: 4px;\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-pic,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs {\n  flex-grow: 1;\n  flex-shrink: 1;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .good-item-attr {\n  flex-grow: 1;\n  flex-shrink: 1;\n  max-width: 80px;\n  width: 20px;\n  flex-basis: 20px;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .ant-input {\n  flex-shrink: 1;\n  flex-grow: 1;\n  width: 20px;\n  flex-basis: 40px;\n}\n#goods-wrap .good-item.rich-item {\n  position: relative;\n  border: 1px solid #ccc;\n  display: flex;\n  flex-basis: 80px;\n  flex-wrap: nowrap;\n  margin: 0 10px 10px 0;\n  padding: 4px;\n}\n#goods-wrap .good-item.rich-item.with-pic {\n  flex-basis: 90px;\n}\n#goods-wrap .good-item.rich-item.with-attr {\n  flex-basis: 150px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 238px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic .goods-imgBox {\n  margin-right: 8px;\n}\n#goods-wrap .good-item.rich-item .good-item-attr {\n  margin-right: 6px;\n  width: 52px;\n  flex-basis: 52px;\n}\n#goods-wrap .good-item.rich-item .good-img {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border-radius: 4px;\n  border: 1px solid #f2f3f5;\n  margin: 0 10px 0 0;\n  text-align: center;\n  background-color: #f2f3f5;\n}\n#goods-wrap .good-item.rich-item .good-attrs {\n  display: flex;\n  flex-direction: column;\n  font-size: 12px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input {\n  font-size: 12px;\n  width: 80px;\n  height: 20px;\n  padding-left: 5px;\n  padding-right: 5px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input.id-textarea {\n  width: 80px;\n  resize: none;\n  height: 45px;\n}\n#goods-wrap .good-item.rich-item .good-attrs div {\n  display: flex;\n}\n#goods-wrap .good-item.rich-item .good-attrs div:not(:first-child) {\n  margin-top: 4px;\n}\n";
+var css_248z$7 = "#goods-wrap.goodsBox.single-row {\n  max-height: 800px;\n  overflow-y: auto;\n  padding-top: 4px;\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-pic,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr,\n#goods-wrap.goodsBox.single-row .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 100%;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs {\n  flex-grow: 1;\n  flex-shrink: 1;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .good-item-attr {\n  flex-grow: 1;\n  flex-shrink: 1;\n  max-width: 80px;\n  width: 20px;\n  flex-basis: 20px;\n}\n#goods-wrap.goodsBox.single-row .good-item.rich-item .good-attrs .ant-input {\n  flex-shrink: 1;\n  flex-grow: 1;\n  width: 20px;\n  flex-basis: 40px;\n}\n#goods-wrap .good-item.rich-item {\n  position: relative;\n  border: 1px solid #ccc;\n  display: flex;\n  flex-basis: 80px;\n  flex-wrap: nowrap;\n  margin: 0 10px 10px 0;\n  padding: 4px;\n}\n#goods-wrap .good-item.rich-item.with-pic {\n  flex-basis: 90px;\n}\n#goods-wrap .good-item.rich-item.with-attr {\n  flex-basis: 150px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic {\n  flex-basis: 238px;\n}\n#goods-wrap .good-item.rich-item.with-attr.with-pic .goods-imgBox {\n  margin-right: 8px;\n}\n#goods-wrap .good-item.rich-item .good-item-attr {\n  margin-right: 6px;\n  width: 52px;\n  flex-basis: 52px;\n}\n#goods-wrap .good-item.rich-item .good-img {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border-radius: 4px;\n  border: 1px solid #f2f3f5;\n  margin: 0 10px 0 0;\n  text-align: center;\n  background-color: #f2f3f5;\n}\n#goods-wrap .good-item.rich-item .good-attrs {\n  display: flex;\n  flex-direction: column;\n  font-size: 12px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input {\n  font-size: 12px;\n  width: 80px;\n  height: 20px;\n  padding-left: 5px;\n  padding-right: 5px;\n}\n#goods-wrap .good-item.rich-item .good-attrs .ant-input.id-textarea {\n  width: 80px;\n  resize: none;\n  height: 45px;\n}\n#goods-wrap .good-item.rich-item .good-attrs div {\n  display: flex;\n}\n#goods-wrap .good-item.rich-item .good-attrs div:not(:first-child) {\n  margin-top: 4px;\n}\n.goods-uploaded-state {\n  display: flex;\n}\n.goods-uploaded-state .clear-all {\n  float: right;\n  color: #1966ff;\n  cursor: pointer;\n  margin-left: 12px;\n}\n";
 styleInject(css_248z$7);
 
 var GoodItem = function GoodItem(props) {
@@ -12443,13 +12514,22 @@ var GoodItem = function GoodItem(props) {
   var hasAttr = React.useMemo(function () {
     return hasPic ? headerList.length > 1 : headerList.length > 0;
   }, [hasPic, headerList]);
+  var clearAll = function clearAll() {
+    onChange === null || onChange === void 0 ? void 0 : onChange({
+      shopId: shopId,
+      imgList: []
+    });
+  };
   return /*#__PURE__*/React__default['default'].createElement("div", null, imgList.length === 0 ? /*#__PURE__*/React__default['default'].createElement("p", {
     className: "goods-title"
   }, "\u6700\u591A\u6DFB\u52A0", maxLength, "\u4E2A\u5B9D\u8D1D") : /*#__PURE__*/React__default['default'].createElement("p", {
     className: "goods-uploaded-state"
   }, "\u5DF2\u6DFB\u52A0", /*#__PURE__*/React__default['default'].createElement("span", {
     className: "goods-uploaded-count"
-  }, imgList.length), "/", maxLength, "\u4E2A\u5B9D\u8D1D"), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, imgList.length), "/", maxLength, /*#__PURE__*/React__default['default'].createElement("span", {
+    className: 'clear-all',
+    onClick: clearAll
+  }, "\u6E05\u7A7A")), /*#__PURE__*/React__default['default'].createElement("div", {
     ref: boxRef,
     id: "goods-wrap",
     className: "goodsBox goodsBox-item-horizontal--box".concat(isSingleRow ? ' single-row' : '')
@@ -14946,6 +15026,13 @@ var wdtColumns = [{
   title: '辅助单位',
   width: 150,
   render: renderTextEllipsis
+}, {
+  dataIndex: 'skuType',
+  title: '是否组合装',
+  width: 150,
+  render: function render(type) {
+    return type === 'suite' ? '组合装' : '非组合装';
+  }
 }];
 
 var bse3Columns = [{
@@ -15336,34 +15423,75 @@ var jyColumns = [{
   }
 }];
 
+var getYesOrNo$2 = function getYesOrNo(val) {
+  if (!lodash.isBoolean(val)) return null;
+  return val ? '是' : '否';
+};
 var jkyColumns = [{
-  dataIndex: 'goodsNo',
-  title: "\u8D27\u54C1\u7F16\u53F7",
+  dataIndex: 'goodName',
+  title: "\u8D27\u54C1\u540D\u79F0",
   align: 'center',
   ellipsis: true,
   width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'goodsName',
-  title: "\u8D27\u54C1\u540D\u79F0",
+  dataIndex: 'goodNo',
+  title: "\u8D27\u54C1\u7F16\u53F7",
   align: 'center',
   ellipsis: true,
   width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'goodsId',
+  dataIndex: 'goodId',
   title: "\u8D27\u54C1ID",
   align: 'center',
   ellipsis: true,
   width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'barcode',
+  dataIndex: 'goodPicUrl',
+  title: "\u8D27\u54C1\u4E3B\u56FE",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React__default['default'].createElement("img", {
+      style: {
+        width: '30px',
+        height: '30px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u8D27\u54C1\u522B\u540D",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specBarcode',
   title: "\u8D27\u54C1\u6761\u7801",
   align: 'center',
   ellipsis: true,
   width: 150,
   render: renderTextEllipsis
+}, {
+  dataIndex: 'categoryName',
+  title: "\u8D27\u54C1\u7C7B\u522B",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'brandName',
+  title: "\u54C1\u724C",
+  align: 'center',
+  ellipsis: true,
+  width: 200,
+  render: renderTextEllipsis
 }, {
   dataIndex: 'specName',
   title: "\u89C4\u683C\u540D\u79F0",
@@ -15379,7 +15507,14 @@ var jkyColumns = [{
   width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'skuImgUrl',
+  dataIndex: 'specNo',
+  title: "\u89C4\u683C\u7F16\u7801",
+  align: 'center',
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specImgUrl',
   title: "\u89C4\u683C\u56FE\u7247",
   align: 'center',
   ellipsis: true,
@@ -15395,162 +15530,78 @@ var jkyColumns = [{
     });
   }
 }, {
-  dataIndex: 'sellCount',
-  title: "\u6570\u91CF",
-  width: 100,
-  render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, val);
-  }
-}, {
-  dataIndex: 'actualSendCount',
-  title: "\u5B9E\u53D1\u6570\u91CF",
-  width: 150,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'sellPrice',
-  title: "\u5355\u4EF7",
-  width: 150,
-  render: function render(val) {
-    return val || val === 0 ? Number(val).toFixed(2) : '';
-  }
-}, {
-  dataIndex: 'sellTotal',
-  title: "\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'discountTotal',
-  title: "\u62B5\u6263\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'shareFavourableFee',
-  title: "\u5206\u644A\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'shareFavourableAfterFee',
-  title: "\u5206\u644A\u540E\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'customerPrice',
-  title: "\u7EC8\u7AEF\u9500\u552E\u5355\u4EF7",
-  width: 150
-}, {
-  dataIndex: 'customerTotal',
-  title: "\u7EC8\u7AEF\u9500\u552E\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'divideSellTotal',
-  title: "\u5B9E\u4ED8\u91D1\u989D",
-  width: 150
-}, {
-  dataIndex: 'isGift',
-  title: "\u662F\u5426\u8D60\u54C1",
-  width: 150,
-  render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
-  }
-}, {
-  dataIndex: 'isFit',
-  title: "\u662F\u5426\u7EC4\u5408\u88C5",
-  width: 150,
-  render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
-  }
-}, {
-  dataIndex: 'isPresell',
-  title: "\u662F\u5426\u9884\u552E\u8D27\u54C1",
-  width: 150,
-  render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
-  }
-}, {
-  dataIndex: 'brandName',
-  title: "\u54C1\u724C",
+  dataIndex: 'colorName',
+  title: "\u989C\u8272\u540D\u79F0",
   align: 'center',
   ellipsis: true,
-  width: 200,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'cateName',
-  title: "\u8D27\u54C1\u7C7B\u522B",
+  dataIndex: 'colorCode',
+  title: "\u989C\u8272\u4EE3\u7801",
   align: 'center',
   ellipsis: true,
   width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'goodsTags',
-  title: "\u8D27\u54C1\u6807\u7B7E",
+  dataIndex: 'sizeName',
+  title: "\u5C3A\u7801\u540D\u79F0",
   align: 'center',
   ellipsis: true,
-  width: 250,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'goodsMemo',
-  title: "\u8D27\u54C1\u5907\u6CE8",
+  dataIndex: 'sizeCode',
+  title: "\u5C3A\u7801\u4EE3\u7801",
   align: 'center',
   ellipsis: true,
-  width: 250,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'tradeGoodsNo',
-  title: "\u4EA4\u6613\u8D27\u54C1\u7F16\u53F7",
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
   align: 'center',
   ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'tradeGoodsName',
-  title: "\u4EA4\u6613\u8D27\u54C1\u540D\u79F0",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'tradeGoodsSpec',
-  title: "\u4EA4\u6613\u89C4\u683C\u540D\u79F0",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'sourceSubtradeNo',
-  title: "\u7F51\u5E97\u5B50\u8BA2\u5355\u53F7",
-  ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
-}, {
-  dataIndex: 'platGoodsId',
-  title: "\u5E73\u53F0\u5546\u54C1ID",
-  ellipsis: true,
-  width: 250,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'subTradeId',
-  title: "\u5546\u54C1\u660E\u7EC6ID",
+  dataIndex: 'retailPrice',
+  title: "\u96F6\u552E\u4EF7",
+  align: 'center',
   ellipsis: true,
-  width: 250,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'batchNo',
-  title: "\u6279\u6B21\u53F7",
+  dataIndex: 'memberPrice',
+  title: "\u4F1A\u5458\u4EF7",
+  align: 'center',
   ellipsis: true,
-  width: 250,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'sendCount',
-  title: "\u6279\u6B21\u6570\u91CF",
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  align: 'center',
   ellipsis: true,
-  width: 250,
+  width: 150,
   render: renderTextEllipsis
 }, {
-  dataIndex: 'productDate',
-  title: "\u751F\u4EA7\u65E5\u671F",
+  dataIndex: 'isVirtual',
+  title: "\u662F\u5426\u865A\u62DF\u5546\u54C1",
+  align: 'center',
   ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
+  width: 150,
+  render: function render(val) {
+    return renderTextEllipsis(getYesOrNo$2(val));
+  }
 }, {
-  dataIndex: 'expireDate',
-  title: "\u5230\u671F\u65E5\u671F",
+  dataIndex: 'skuType',
+  title: "\u662F\u5426\u7EC4\u5408\u88C5",
   ellipsis: true,
-  width: 250,
-  render: renderTextEllipsis
+  width: 150,
+  render: function render(val) {
+    return renderTextEllipsis(getYesOrNo$2(val === 'combine'));
+  }
 }];
 
 var getColumnsMap = function getColumnsMap() {
@@ -15824,7 +15875,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,
@@ -15970,6 +16021,24 @@ 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,
@@ -18793,13 +18862,15 @@ var JyGoodsModal$1 = /*#__PURE__*/React.forwardRef(JyGoodsModal);
 var getTableData$6 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JY_ERP'
-    }, formData)
+      platform: 'JKY_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -18822,13 +18893,15 @@ var searchFormData$5 = [{
 }, {
   label: '规格编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
-  label: '商品名称',
+  label: '货品名称',
   name: 'goodName'
 }, {
-  label: '商品编码',
-  name: 'goodNo'
+  label: '货品编码',
+  name: 'goodNo',
+  type: 'optionalInput'
 }];
 var GoodList$6 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -18898,8 +18971,8 @@ var GoodList$6 = function GoodList(props, ref) {
     getCheckboxProps: function getCheckboxProps(record) {
       var options = {
         disabled: (props.selectedRows || []).map(function (row) {
-          return row.id || row.specId;
-        }).includes(record.id || record.specId),
+          return row.specId || record.id;
+        }).includes(record.specId || record.id),
         name: record.id
       };
       return options;
@@ -20346,7 +20419,7 @@ var getColumns$2 = function getColumns(_ref) {
   };
 };
 
-var getYesOrNo$2 = function getYesOrNo(val) {
+var getYesOrNo$3 = function getYesOrNo(val) {
   if (kmkfUtils.isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -20497,7 +20570,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$2(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
       },
       width: 100
     }]
@@ -20509,7 +20582,7 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$3 = function getYesOrNo(val) {
+var getYesOrNo$4 = function getYesOrNo(val) {
   if (kmkfUtils.isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -20624,7 +20697,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
+        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -20643,7 +20716,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -20769,7 +20842,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -20898,7 +20971,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21754,6 +21827,11 @@ var getColumns$6 = function getColumns(_ref) {
       title: "\u4F9B\u5E94\u5546\u7F16\u7801",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'remark',
+      title: "\u5907\u6CE8",
+      width: 200,
+      render: renderTextEllipsis
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
         align: 'center',
@@ -22538,7 +22616,7 @@ var getColumns$9 = function getColumns(_ref) {
       }
     }, {
       dataIndex: 'sellTotal',
-      title: "\u91D1\u989D",
+      title: "\u603B\u91D1\u989D",
       width: 150
     }, {
       dataIndex: 'discountTotal',
@@ -22563,7 +22641,22 @@ var getColumns$9 = function getColumns(_ref) {
     }, {
       dataIndex: 'divideSellTotal',
       title: "\u5B9E\u4ED8\u91D1\u989D",
-      width: 150
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              divideSellTotal: num
+            }, index);
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
     }, {
       dataIndex: 'isGift',
       title: "\u662F\u5426\u8D60\u54C1",
@@ -22582,12 +22675,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val == 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isFit',
@@ -22607,12 +22700,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val == 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isPresell',
@@ -22637,7 +22730,7 @@ var getColumns$9 = function getColumns(_ref) {
             label: '否',
             value: '0'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val == '1' ? '是' : '否');
       }
     }, {
       dataIndex: 'brandName',
@@ -22856,8 +22949,8 @@ var getColumns$9 = function getColumns(_ref) {
       width: 250,
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
-          onChange: function onChange(value) {
-            updateHandle(value, index, 'reason');
+          onChange: function onChange(e) {
+            updateHandle(e.target.value, index, 'reason');
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
@@ -22873,12 +22966,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: '1'
+            value: 1
           }, {
             label: '否',
-            value: '0'
+            value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'isFit',
@@ -22892,12 +22985,12 @@ var getColumns$9 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 'True'
+            value: 1
           }, {
             label: '否',
-            value: 'False'
+            value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 1 ? '是' : '否');
       }
     }, {
       dataIndex: 'brandName',
@@ -23281,6 +23374,13 @@ var processGoods$1 = function processGoods(_ref) {
       canUpdateNumber: canUpdateNumber,
       source: source
     });
+  } else if (isErpType.isJky(type)) {
+    newList = processJkyGoods$1({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber,
+      source: source
+    });
   } else {
     newList = processDefaultGoods({
       list: list,
@@ -23329,11 +23429,45 @@ var processJyGoods = function processJyGoods(_ref2) {
     });
   });
 };
-// 处理不同类型的商品数据
-var processWdtGoods$1 = function processWdtGoods(_ref3) {
+var processJkyGoods$1 = function processJkyGoods(_ref3) {
   var list = _ref3.list,
-    type = _ref3.type,
     canUpdateNumber = _ref3.canUpdateNumber;
+  return list.map(function (item) {
+    var goodName = item.goodName,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      specBarcode = item.specBarcode,
+      retailPrice = item.retailPrice,
+      isGift = item.isGift,
+      skuType = item.skuType,
+      specImgUrl = item.specImgUrl,
+      categoryName = item.categoryName;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      cateName: categoryName,
+      goodsName: goodName,
+      goodsNo: goodNo,
+      goodsId: goodId,
+      barcode: specBarcode,
+      skuImgUrl: specImgUrl,
+      combinationName: goodName,
+      combinationCode: goodNo,
+      isGift: isGift ? 1 : 0,
+      isFit: skuType === 'combine' ? 1 : 0,
+      uuid: kmkfUtils.uuid(),
+      canDelete: true,
+      sellCount: 1,
+      sellPrice: retailPrice,
+      sellTotal: retailPrice ? (retailPrice * 1).toFixed(2) : '',
+      canEdit: true,
+      canUpdateNumber: canUpdateNumber
+    });
+  });
+};
+// 处理不同类型的商品数据
+var processWdtGoods$1 = function processWdtGoods(_ref4) {
+  var list = _ref4.list,
+    type = _ref4.type,
+    canUpdateNumber = _ref4.canUpdateNumber;
   return list.map(function (item) {
     var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
       uuid: kmkfUtils.uuid(),
@@ -23351,9 +23485,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref3) {
     return processedItem;
   });
 };
-var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
-  var list = _ref4.list,
-    canUpdateNumber = _ref4.canUpdateNumber;
+var processBsE3Goods$1 = function processBsE3Goods(_ref5) {
+  var list = _ref5.list,
+    canUpdateNumber = _ref5.canUpdateNumber;
   return list.map(function (item) {
     var specNo = item.specNo,
       specId = item.specId,
@@ -23388,9 +23522,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref4) {
     });
   });
 };
-var processGyGoods$1 = function processGyGoods(_ref5) {
-  var list = _ref5.list,
-    source = _ref5.source;
+var processGyGoods$1 = function processGyGoods(_ref6) {
+  var list = _ref6.list,
+    source = _ref6.source;
   var isFormWorkOrder = source === 'workOrder';
   return list.map(function (item) {
     var goodName = item.goodName,
@@ -23417,8 +23551,8 @@ var processGyGoods$1 = function processGyGoods(_ref5) {
     });
   });
 };
-var processJstGoods$1 = function processJstGoods(_ref6) {
-  var list = _ref6.list;
+var processJstGoods$1 = function processJstGoods(_ref7) {
+  var list = _ref7.list;
   return list.map(function (item) {
     return {
       name: item.goodName,
@@ -23436,9 +23570,9 @@ var processJstGoods$1 = function processJstGoods(_ref6) {
     };
   });
 };
-var processKmGoods$1 = function processKmGoods(_ref7) {
-  var list = _ref7.list,
-    type = _ref7.type;
+var processKmGoods$1 = function processKmGoods(_ref8) {
+  var list = _ref8.list,
+    type = _ref8.type;
   var initParamsMap = {
     KM_GOODS: {
       num: 1
@@ -23457,7 +23591,9 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
       sysOuterId: item.goodNo,
       outerId: item.goodNo,
       skuSysId: item.specId,
+      sysSkuId: item.specId,
       itemSysId: item.goodId,
+      sysItemId: item.goodId,
       sysPicPath: item.goodPicUrl,
       payment: null,
       price: item.retailPrice,
@@ -23468,9 +23604,9 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
     }, initParamsMap[type] || {});
   });
 };
-var processDefaultGoods = function processDefaultGoods(_ref8) {
-  var list = _ref8.list,
-    canUpdateNumber = _ref8.canUpdateNumber;
+var processDefaultGoods = function processDefaultGoods(_ref9) {
+  var list = _ref9.list,
+    canUpdateNumber = _ref9.canUpdateNumber;
   return list.map(function (item) {
     var goodsId = item.goodsId,
       name = item.name,
@@ -23576,7 +23712,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
             systemItemIds = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (item) {
               return item === null || item === void 0 ? void 0 : item.sysItemId;
             }).map(function (item) {
-              return (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
+              return !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
             });
             _context.next = 3;
             return kmkfUtils.servers.KM.getSupplierSingleton(systemItemIds);
@@ -23585,7 +23721,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
             dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$filter = dataSource.filter(function (item) {
               return item === null || item === void 0 ? void 0 : item.sysItemId;
             })) === null || _dataSource$filter === void 0 ? void 0 : _dataSource$filter.forEach(function (item) {
-              var key = (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
+              var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
               var supplierInfo = supplierMap.get(key);
               item.supplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
               item.supplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
@@ -23743,6 +23879,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     }
   }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.length, ")")));
 };
+SelectTradeGoods.displayName = 'SelectTradeGoods';
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
@@ -25132,21 +25269,25 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
       extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
         method: 'post',
         data: {
-          billNo: orderNo
+          sourceTradeNos: orderNo
         }
       }).then(function (res) {
         if (res === null || res === void 0 ? void 0 : res.success) {
-          var _res$data, _res$data$tradeOrderD, _res$data3;
-          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$tradeOrderD = _res$data.tradeOrderDetails) === null || _res$data$tradeOrderD === void 0 ? void 0 : _res$data$tradeOrderD.length) {
-            var _filterJkyOrders, _res$data2;
-            res.data.trades = (_filterJkyOrders = kmkfUtils.filterJkyOrders(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.tradeOrderDetails, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
+          var _res$data, _res$data2;
+          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
+            var _filterJkyOrders;
+            res.data.trades = (_filterJkyOrders = kmkfUtils.filterJkyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo)) === null || _filterJkyOrders === void 0 ? void 0 : _filterJkyOrders.map(function (item) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
+                tradeFrom: kmkfUtils.JKY_ORDER_FROM_MAP[item.tradeFrom],
                 tradeType: kmkfUtils.JKY_ORDER_TYPE_MAP[item.tradeType],
-                tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus]
+                tradeStatus: kmkfUtils.JKY_ORDER_STATUS_MAP[item.tradeStatus],
+                logisticName: kmkfUtils.getJkyLogisticInfo(item, 'logisticName'),
+                logisticCode: kmkfUtils.getJkyLogisticInfo(item, 'logisticCode'),
+                logisticNo: kmkfUtils.getJkyLogisticInfo(item, 'logisticNo')
               });
             });
           }
-          resolve(((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.trades) || []);
+          resolve(((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.trades) || []);
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
             singletonMap$7.delete(orderNo);
@@ -25508,8 +25649,8 @@ var index$2 = (function (props) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
             jyUtils.getJyOrderListSingleton(orderNo).then(function (data) {
-              var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-                return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+              var trades = (data || []).filter(function (item) {
+                return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.tradeId, orderNo);
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
                 orders: trades,
@@ -25539,12 +25680,9 @@ var index$2 = (function (props) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
             jkyUtils.getJkyOrderListSingleton(orderNo).then(function (data) {
-              var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-                return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
-              });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
-                orders: trades,
-                showOrderInfo: trades
+                orders: data || [],
+                showOrderInfo: data || []
               }));
             });
             onceRef.current = false;
@@ -26521,8 +26659,8 @@ var processGyOrders = function processGyOrders(_ref4) {
 var processJyOrders = function processJyOrders(_ref5) {
   var data = _ref5.data,
     orderNo = _ref5.orderNo;
-  var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
-    return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.platformCode, orderNo);
+  var trades = (data || []).filter(function (item) {
+    return kmkfUtils.getIsPlatformCodesIncludeOrderNos(item.tradeId, orderNo);
   });
   return trades;
 };
@@ -26847,7 +26985,7 @@ var CommonGoods = function CommonGoods(props) {
       value === null || value === void 0 ? void 0 : (_value$kmGoods = value.kmGoods) === null || _value$kmGoods === void 0 ? void 0 : (_value$kmGoods$filter = _value$kmGoods.filter(function (item) {
         return item === null || item === void 0 ? void 0 : item.sysItemId;
       })) === null || _value$kmGoods$filter === void 0 ? void 0 : _value$kmGoods$filter.forEach(function (item) {
-        var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
+        var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
         map[key] = item;
       });
     }
@@ -26888,7 +27026,8 @@ var CommonGoods = function CommonGoods(props) {
               hasChange = false;
               currentValue = valueRef.current;
               kmGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmGoods = currentValue.kmGoods) === null || _currentValue$kmGoods === void 0 ? void 0 : _currentValue$kmGoods.map(function (item) {
-                var supplierInfo = supplierMap.get(item.sysItemId);
+                var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
+                var supplierInfo = supplierMap.get(key);
                 var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
                 var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
                 // 如果供应商信息有变化，标记需要更新
@@ -27172,7 +27311,6 @@ var CommonGoods = function CommonGoods(props) {
         orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
         type: compType
       });
-      console.log('getDataSourceAsync', list);
       onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
         allOrders: list || []
       }));
@@ -27208,6 +27346,7 @@ var CommonGoods = function CommonGoods(props) {
     }
   }));
 };
+CommonGoods.displayName = 'CommonGoods';
 
 var componentMap$3 = {
   WDT_RETURN_GOODS: {
@@ -27871,14 +28010,14 @@ var typeMap$2 = {
     alwaysShowChooseErpGoodsBtn: true,
     orderTypeKey: 'orderType',
     oIdKey: 'tradeNo',
-    outerOiIdKey: '',
-    goodDetailsKey: 'subOrderDetails',
+    outerOiIdKey: 'sourceSubtradeNo',
+    goodDetailsKey: 'goodsDetail',
     isShowSelectTradeGoods: true,
     showModeBtn: true
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _value$typeMap$type$s9, _typeMap$type54, _typeMap$type55, _typeMap$type56, _typeMap$type57;
+  var _typeMap$type35, _typeMap$type41, _typeMap$type42, _typeMap$type43, _typeMap$type44, _value$typeMap$type$s8, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55, _typeMap$type56;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -28001,7 +28140,7 @@ var PublicReissue = function PublicReissue(props) {
       value === null || value === void 0 ? void 0 : (_value$kmReissueGoods = value.kmReissueGoods) === null || _value$kmReissueGoods === void 0 ? void 0 : (_value$kmReissueGoods2 = _value$kmReissueGoods.filter(function (item) {
         return item === null || item === void 0 ? void 0 : item.sysItemId;
       })) === null || _value$kmReissueGoods2 === void 0 ? void 0 : _value$kmReissueGoods2.forEach(function (item) {
-        var key = item.sysSkuId == '-1' ? item.sysItemId : "".concat(item.sysItemId, "-").concat(item.sysSkuId);
+        var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
         map[key] = item;
       });
     }
@@ -28042,7 +28181,8 @@ var PublicReissue = function PublicReissue(props) {
               hasChange = false;
               currentValue = valueRef.current;
               kmReissueGoods = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$kmReiss = currentValue.kmReissueGoods) === null || _currentValue$kmReiss === void 0 ? void 0 : _currentValue$kmReiss.map(function (item) {
-                var supplierInfo = supplierMap.get(item.sysItemId);
+                var key = !(item === null || item === void 0 ? void 0 : item.sysSkuId) || (item === null || item === void 0 ? void 0 : item.sysSkuId) == '-1' || (item === null || item === void 0 ? void 0 : item.sysSkuId) == (item === null || item === void 0 ? void 0 : item.sysItemId) ? item === null || item === void 0 ? void 0 : item.sysItemId : "".concat(item === null || item === void 0 ? void 0 : item.sysItemId, "-").concat(item === null || item === void 0 ? void 0 : item.sysSkuId);
+                var supplierInfo = supplierMap.get(key);
                 var newSupplierCode = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierCode;
                 var newSupplierName = supplierInfo === null || supplierInfo === void 0 ? void 0 : supplierInfo.supplierName;
                 // 如果供应商信息有变化，标记需要更新
@@ -28078,7 +28218,7 @@ var PublicReissue = function PublicReissue(props) {
     }
   }, [sysItemIdMap]);
   var getGoodDetails = function getGoodDetails(_ref5) {
-    var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23, _typeMap$type24;
+    var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22, _typeMap$type23;
     var mode = _ref5.mode,
       sysOrderNo = _ref5.sysOrderNo,
       _ref5$isAllOrders = _ref5.isAllOrders,
@@ -28110,8 +28250,7 @@ var PublicReissue = function PublicReissue(props) {
       var _order$typeMap$type$g;
       return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
     });
-    console.log(type, orders, (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest));
-    var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest)) : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.updateGoodsHandle(orders, orderRest) : [];
+    var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.updateGoodsHandle(orders, orderRest)) : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
@@ -28119,30 +28258,30 @@ var PublicReissue = function PublicReissue(props) {
     return list;
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type25;
+    var _typeMap$type24;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)] = val || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = val || [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type26, _typeMap$type27, _value$typeMap$type$t2, _typeMap$type32, _value$typeMap$type$t3, _typeMap$type34;
+    var _typeMap$type25, _typeMap$type26, _value$typeMap$type$t2, _typeMap$type31, _value$typeMap$type$t3, _typeMap$type33;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo)] = val;
-    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderBillType) {
-      var _value$typeMap$type$s7, _typeMap$type28, _typeMap$type30, _typeMap$type31;
-      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo)] = val;
+    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderBillType) {
+      var _value$typeMap$type$s7, _typeMap$type27, _typeMap$type29, _typeMap$type30;
+      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
       var targetOrder = val && orders.find(function (oItem) {
-        var _typeMap$type29;
-        return oItem[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.oIdKey] === val;
+        var _typeMap$type28;
+        return oItem[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.oIdKey] === val;
       });
-      newValue[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.orderTypeKey];
-    }
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
-      var _typeMap$type33;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
-      var _typeMap$type35;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)] = getGoodDetails({
+      newValue[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.orderTypeKey];
+    }
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
+      var _typeMap$type32;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+      var _typeMap$type34;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -28150,27 +28289,27 @@ var PublicReissue = function PublicReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue, 'systemOrder');
   };
   //显示选择商品按钮
-  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrderNo]);
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.systemOrderNo]);
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _typeMap$type37, _typeMap$type38, _typeMap$type39, _uniqBy, _typeMap$type40;
+    var _typeMap$type36, _typeMap$type37, _typeMap$type38, _uniqBy, _typeMap$type39;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
       mode: isStrict,
-      isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.isShowSelectTradeGoods
+      isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.isShowSelectTradeGoods
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)]) || [];
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
-      var _typeMap$type41;
-      return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.uniqueKey) || 'uuid']);
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)]) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      var _typeMap$type40;
+      return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.uniqueKey) || 'uuid']);
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.key)], isStrict]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true,
-    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.key) || "".concat(Date.now())
+    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.key) || "".concat(Date.now())
   }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
@@ -28186,12 +28325,12 @@ var PublicReissue = function PublicReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
-    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.compType) || '', "\u7CFB\u7EDF\u5355")
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
+    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.compType) || '', "\u7CFB\u7EDF\u5355")
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: item[typeMap$2[type].oIdKey],
       value: item[typeMap$2[type].oIdKey],
@@ -28213,11 +28352,11 @@ var PublicReissue = function PublicReissue(props) {
     disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
-  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
+  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
       span: 11
@@ -28226,7 +28365,7 @@ var PublicReissue = function PublicReissue(props) {
       span: 6
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.systemOrderBillType)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.systemOrderBillType)],
     disabled: disabled,
     readOnly: true
   }))), /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -28237,29 +28376,30 @@ var PublicReissue = function PublicReissue(props) {
     canUpdateNumber: showChangeBtn,
     hasSelectedSystemOrder: showChangeBtn,
     // showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
-    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.alwaysShowChooseErpGoodsBtn,
+    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.alwaysShowChooseErpGoodsBtn,
     // showErpGoodsBtn={typeMap?.[type]?.showErpGoodsBtn}
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
-    showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.showModeBtn),
+    showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.showModeBtn),
     isStrict: isStrict,
-    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods,
-    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
-    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.systemOrderNo)]] : [],
+    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
         mode: isStrict,
-        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.isShowSelectTradeGoods
+        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.isShowSelectTradeGoods
       }),
-      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.uniqueKey) || 'uuid',
+      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.uniqueKey) || 'uuid',
       selectedGoodsChange: selectedGoodsChange
     }
   })));
 };
+PublicReissue.displayName = 'PublicReissue';
 
 var css_248z$g = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border: 1px solid #F2F3F5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4E5969;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 265px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodMain .goodItem {\n  width: 140px;\n  height: 175px;\n  padding: 11px 10px 0;\n  text-align: center;\n  display: inline-block;\n  vertical-align: top;\n  margin-bottom: 10px;\n  margin-right: 30px;\n  border: 1px solid #e6e6e6;\n  cursor: pointer;\n  transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n  width: 120px;\n  height: 120px;\n}\n.goodMain .goodItem .goodText {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodMain .goodItem.active {\n  border: 1px solid #3089dc;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n";
 styleInject(css_248z$g);