@kmkf-fe-packages/basic-components 1.22.2 → 1.22.5

package/dist/index.js

@@ -10968,12 +10968,18 @@ var jstGoods = function jstGoods(props) {
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
+  var isSelectName = ['wdt', 'bsE3', 'km'].includes(platformType);
   React.useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
       onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
     }
   }, [value, type]);
+  React.useEffect(function () {
+    if (changeIndex > (value === null || value === void 0 ? void 0 : value.length) - 1) {
+      setChangeIndex(0);
+    }
+  }, value);
   var content = function content(item, index) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
@@ -10984,7 +10990,7 @@ var jstGoods = function jstGoods(props) {
       style: {
         textAlign: 'center'
       }
-    }, "\u5305\u88F9".concat(index + 1, "\u5546\u54C1\u4FE1\u606F")), ((item === null || item === void 0 ? void 0 : item.items) || []).map(function (t, index) {
+    }, "\u5305\u88F9".concat(index + 1, "\u5546\u54C1\u4FE1\u606F"), item.sid && /*#__PURE__*/React__default['default'].createElement("span", null, "(\u7CFB\u7EDF\u5355\u53F7:", item.sid, ")")), ((item === null || item === void 0 ? void 0 : item.items) || []).map(function (t, index) {
       return /*#__PURE__*/React__default['default'].createElement("div", {
         key: index
       }, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Image, {
@@ -10998,7 +11004,7 @@ var jstGoods = function jstGoods(props) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
     changeOrderInfo[type] = val;
     changeOrderInfo['sendId'] = option.value;
-    if ((platformType === 'wdt' || platformType === 'bsE3') && type === 'sendName') {
+    if (isSelectName && type === 'sendName') {
       changeOrderInfo['sendSnapshotName'] = option.label;
     }
     var newList = _toConsumableArray(value);
@@ -11081,7 +11087,7 @@ var jstGoods = function jstGoods(props) {
       return changeInputHandle(e.target.value, 'sendId');
     },
     value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
-  }), ['sendName', 'all'].includes(showField) && (platformType === 'wdt' || platformType === 'bsE3' ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+  }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     style: {
       minWidth: '100px',
       maxWidth: '180px'
@@ -12587,6 +12593,104 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
   });
 };
 
+var renderGiftType = function renderGiftType(val) {
+  var giftTypeMap = {
+    0: '非赠品',
+    1: '自动赠送',
+    2: '手工赠送',
+    3: '回购自动送赠品',
+    4: '前N有礼送赠品',
+    6: '天猫优仓赠品',
+    7: '淘宝CRM会员送赠'
+  };
+  return /*#__PURE__*/React__default['default'].createElement("span", null, giftTypeMap[val]);
+};
+var columns$4 = [{
+  dataIndex: 'goodId',
+  title: "\u5546\u54C1ID",
+  width: 120
+}, {
+  dataIndex: 'goodNo',
+  title: "\u5546\u54C1\u7F16\u7801",
+  width: 200
+}, {
+  dataIndex: 'goodName',
+  title: "\u5546\u54C1\u540D\u79F0",
+  width: 200
+}, {
+  dataIndex: 'specId',
+  title: "SKUID",
+  width: 150
+}, {
+  dataIndex: 'specNo',
+  title: "\u5546\u54C1SKU\u7F16\u7801",
+  width: 200
+}, {
+  dataIndex: 'specName',
+  title: "\u5546\u54C1SKU\u540D\u79F0",
+  width: 250
+}, {
+  dataIndex: 'orderPrice',
+  title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
+  width: 200
+}, {
+  dataIndex: 'num',
+  title: "\u6570\u91CF",
+  width: 100
+}, {
+  dataIndex: 'sharePrice',
+  title: "\u5206\u644A\u4EF7",
+  width: 150
+}, {
+  dataIndex: 'giftType',
+  title: "\u8D60\u54C1\u65B9\u5F0F",
+  width: 100,
+  render: renderGiftType
+}];
+var renderFieldMap$1 = {
+  num: function num(_ref) {
+    var disabled = _ref.disabled,
+      updateHandle = _ref.updateHandle;
+    return function (val, record, index) {
+      return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        style: {
+          width: 70
+        },
+        value: val,
+        min: 1,
+        precision: 0,
+        onChange: function onChange(num) {
+          return updateHandle(num, index, 'num');
+        }
+      }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+    };
+  },
+  giftType: function giftType() {
+    return renderGiftType;
+  }
+};
+var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
+  var disabled = _ref2.disabled,
+    updateHandle = _ref2.updateHandle,
+    operate = _ref2.operate;
+  return columns$4.map(function (item) {
+    var newItem = _objectSpread2({
+      align: 'center',
+      ellipsis: true
+    }, item);
+    if (operate && (renderFieldMap$1 === null || renderFieldMap$1 === void 0 ? void 0 : renderFieldMap$1[item.dataIndex])) {
+      return _objectSpread2(_objectSpread2({}, newItem), {}, {
+        render: renderFieldMap$1 === null || renderFieldMap$1 === void 0 ? void 0 : renderFieldMap$1[item.dataIndex]({
+          disabled: disabled,
+          updateHandle: updateHandle
+        })
+      });
+    }
+    return newItem;
+  });
+};
+
+var MAIN_FIELD = 'uuid';
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
     dataSource = _ref.dataSource,
@@ -12602,11 +12706,20 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
+  var currentTradeOriginGoods = lodash.intersection(dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
+  }), selectedRowKeys);
+  var unCurrentTradeOriginGoods = lodash.difference(selectedRowKeys, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item[MAIN_FIELD];
+  }));
+  var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
+    console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
+    onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
+  };
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
-    onChange: onChangeSelectedKeys
+    onChange: handleChangeSelectedKeys
   };
-  console.debug('选择订单商品-dataSource', dataSource, selectedRowKeys);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: openModal
@@ -12616,7 +12729,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     footer: null,
     onCancel: closeModal
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
-    rowKey: "id",
+    rowKey: MAIN_FIELD,
     rowSelection: rowSelection,
     columns: columns,
     dataSource: dataSource,
@@ -12625,7 +12738,17 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
       x: 500,
       y: 500
     }
-  }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
+  }), /*#__PURE__*/React__default['default'].createElement("span", null, "\u5DF2\u9009\u62E9(", currentTradeOriginGoods === null || currentTradeOriginGoods === void 0 ? void 0 : currentTradeOriginGoods.length, "/", dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, ")")));
+};
+var getButtonText = function getButtonText() {
+  var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
+    return '选择百胜ERP商品';
+  }
+  if (['WDT_REISSUE_GOODS'].includes(type)) {
+    return '选择旺店通商品';
+  }
+  return '选择商品';
 };
 var GoodItem$1 = function GoodItem(props) {
   var _props$value = props.value,
@@ -12682,7 +12805,7 @@ var GoodItem$1 = function GoodItem(props) {
   // TODO: 商品订单中以选中商品
   var selectedGoods = React.useMemo(function () {
     return value === null || value === void 0 ? void 0 : value.map(function (v) {
-      return v.id;
+      return v === null || v === void 0 ? void 0 : v[MAIN_FIELD];
     });
   }, [value]);
   var updateHandle = function updateHandle(val, index, columnType) {
@@ -12723,6 +12846,14 @@ var GoodItem$1 = function GoodItem(props) {
       var columns = [];
       switch (type) {
         case 'WDT_REISSUE_GOODS':
+          {
+            columns = getWdtReissueGoodColumns({
+              disabled: disabled,
+              updateHandle: updateHandle,
+              operate: operate
+            });
+          }
+          break;
         case 'WDT_GOODS':
           columns = [{
             dataIndex: 'goodId',
@@ -13158,13 +13289,39 @@ var GoodItem$1 = function GoodItem(props) {
               title: "\u5546\u54C1\u6570\u91CF",
               align: 'center',
               ellipsis: true,
-              width: 100
+              width: 100,
+              render: function render(val, record, index) {
+                return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+                  style: {
+                    width: 70
+                  },
+                  value: val,
+                  min: 1,
+                  precision: 0,
+                  onChange: function onChange(num) {
+                    return updateHandle(num, index, 'goodsNumber');
+                  }
+                }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+              }
             }, {
               dataIndex: 'goodsPrice',
               title: "\u5546\u54C1\u5355\u4EF7",
               align: 'center',
               ellipsis: true,
-              width: 120
+              width: 120,
+              render: function render(val, record, index) {
+                return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+                  style: {
+                    width: 70
+                  },
+                  value: val,
+                  min: 0,
+                  precision: 2,
+                  onChange: function onChange(num) {
+                    return updateHandle(num, index, 'goodsPrice');
+                  }
+                }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+              }
             }, {
               dataIndex: 'shopPrice',
               title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
@@ -13188,7 +13345,20 @@ var GoodItem$1 = function GoodItem(props) {
               title: "\u5B9E\u4ED8\u91D1\u989D",
               align: 'center',
               ellipsis: true,
-              width: 120
+              width: 120,
+              render: function render(val, record, index) {
+                return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+                  style: {
+                    width: 70
+                  },
+                  value: val,
+                  min: 0,
+                  precision: 2,
+                  onChange: function onChange(num) {
+                    return updateHandle(num, index, 'payment');
+                  }
+                }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+              }
             }, {
               dataIndex: 'tcSku',
               title: "\u5957\u9910SKU",
@@ -13228,6 +13398,116 @@ var GoodItem$1 = function GoodItem(props) {
             });
           }
           break;
+        case 'BS_GOODS':
+          columns = [{
+            dataIndex: 'mark',
+            title: "\u5546\u54C1\u6807\u8BB0",
+            align: 'center',
+            ellipsis: true,
+            width: 70,
+            render: function render(val, record, index) {
+              return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+                options: [{
+                  label: '是',
+                  value: '是'
+                }, {
+                  label: '否',
+                  value: '否'
+                }],
+                disabled: disabled,
+                value: val,
+                onChange: function onChange(val) {
+                  return updateHandle(val, index, 'mark');
+                }
+              });
+            }
+          }, {
+            dataIndex: 'skuName',
+            title: "".concat(text, "sku\u540D\u79F0"),
+            align: 'center',
+            ellipsis: true,
+            width: 250
+          }, {
+            dataIndex: 'sku',
+            title: "".concat(text, "sku\u7F16\u7801"),
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'name',
+            title: "".concat(text, "\u540D\u79F0"),
+            align: 'center',
+            ellipsis: true,
+            width: 250
+          }, {
+            dataIndex: 'pic',
+            title: "\u56FE\u7247",
+            align: 'center',
+            ellipsis: true,
+            width: 100,
+            render: function render(val) {
+              return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+                width: 60,
+                src: val
+              });
+            }
+          }, {
+            dataIndex: 'code',
+            title: "".concat(text, "\u7F16\u7801"),
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'money',
+            title: "\u5B9E\u4ED8\u91D1\u989D",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'number',
+            title: "".concat(text, "\u6570\u91CF"),
+            align: 'center',
+            ellipsis: true,
+            width: 100,
+            render: function render(val, record, index) {
+              return record.canUpdateNumber && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+                style: {
+                  width: 70
+                },
+                value: val,
+                min: 1,
+                precision: 0,
+                onChange: function onChange(num) {
+                  return updateHandle(num, index, 'number');
+                }
+              }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+            }
+          }, {
+            dataIndex: 'share',
+            title: "\u5206\u644A\u4EF7",
+            align: 'center',
+            ellipsis: true,
+            width: 70
+          }, {
+            dataIndex: 'type',
+            title: "\u8D60\u54C1\u7C7B\u578B",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'batch',
+            title: "\u6279\u6B21\u53F7",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }, {
+            dataIndex: 'expireDate',
+            title: "\u6709\u6548\u671F",
+            align: 'center',
+            ellipsis: true,
+            width: 100
+          }];
+          break;
         default:
           columns = [{
             dataIndex: 'mark',
@@ -13381,6 +13661,7 @@ var GoodItem$1 = function GoodItem(props) {
     }].concat(_toConsumableArray(columns));
   }, []);
   var onSubmit = function onSubmit(list) {
+    console.log('🚀 ~ onSubmit ~ list:', list);
     var newList = [];
     if (['WDT_REISSUE_GOODS', 'WDT_GOODS', 'WDT_EXCHANGE_GOODS'].includes(type)) {
       newList = list.map(function (item) {
@@ -13425,6 +13706,7 @@ var GoodItem$1 = function GoodItem(props) {
           isGift: '',
           uuid: kmkfUtils.uuid(),
           canDelete: true,
+          canEdit: true,
           goodsNumber: 1,
           canUpdateNumber: canUpdateNumber
         });
@@ -13496,7 +13778,7 @@ var GoodItem$1 = function GoodItem(props) {
   }), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: handleChangeGoods
-  }, ['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type) ? '选择百胜ERP商品' : '选择商品'), otherOperations), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
+  }, getButtonText(type)), otherOperations), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
     columns: newColumns,
     dataSource: value,
     rowKey: 'uuid',
@@ -14221,6 +14503,53 @@ var bsE3Utils = {
   getBsE3OrderListSingleton: getBsE3OrderListSingleton
 };
 
+var singletonMap$2 = new Map();
+var getOrderListSingleton = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$2.has(orderNo)) {
+    var p = new Promise(function (resolve, reject) {
+      var doReject = function doReject(err) {
+        // 清空掉错误的请求记录
+        singletonMap$2.delete(orderNo);
+        reject(err);
+      };
+      extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
+        method: 'post',
+        data: {
+          tid: orderNo
+        }
+      }).then(function (data) {
+        if (data === null || data === void 0 ? void 0 : data.success) {
+          var _data$data, _data$data$orderDetai;
+          if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$orderDetai = _data$data.orderDetailDtoList) === null || _data$data$orderDetai === void 0 ? void 0 : _data$data$orderDetai.length) {
+            var list = kmkfUtils.filterKmOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                billNo: item.sid,
+                sysStatus: item.sysStatus,
+                billType: item.type,
+                billTag: item.tags
+              });
+            });
+            resolve(list);
+          } else {
+            resolve([]);
+          }
+          // 延迟10秒清除,保证订单的时效性
+          setTimeout(function () {
+            singletonMap$2.delete(orderNo);
+          }, 1000 * 10);
+        } else {
+          doReject(data);
+        }
+      }).catch(doReject);
+    });
+    singletonMap$2.set(orderNo, p);
+  }
+  return singletonMap$2.get(orderNo);
+};
+var kmUtils = {
+  getOrderListSingleton: getOrderListSingleton
+};
+
 var columnsMap = {
   BS_SYSTEM_ORDER: [{
     title: '单据类型',
@@ -14250,6 +14579,7 @@ var columnsMap = {
   // },
   ],
 
+  KM_SYSTEM_ORDER: kmkfUtils.KM_SYSTEM_ORDER_CONFIG.columns,
   WLN_SYSTEM_ORDER: [{
     title: '订单类型',
     dataIndex: 'billType',
@@ -14346,6 +14676,7 @@ var columnsMap = {
 };
 var rowKeyMap = {
   BS_SYSTEM_ORDER: 'billNo',
+  KM_SYSTEM_ORDER: 'billNo',
   WLN_SYSTEM_ORDER: 'billNo',
   WDT_SYSTEM_ORDER: 'billNo',
   BS_E3_SYSTEM_ORDER: 'orderSn'
@@ -14362,6 +14693,8 @@ var index$1 = (function (props) {
       onceRef.current = true;
       if (type === 'BS_SYSTEM_ORDER') {
         getOrderList(value.orderNo);
+      } else if (type === 'KM_SYSTEM_ORDER') {
+        getKmOrderList(value.orderNo);
       } else if (type === 'WLN_SYSTEM_ORDER') {
         getWlnOrderList(value.orderNo);
       } else if (type === 'WDT_SYSTEM_ORDER') {
@@ -14523,6 +14856,37 @@ var index$1 = (function (props) {
       return _ref5.apply(this, arguments);
     };
   }();
+  var getKmOrderList = /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            kmUtils.getOrderListSingleton(orderNo).then(function (trades) {
+              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+                orders: trades,
+                showOrderInfo: trades.map(function (_ref7) {
+                  var billNo = _ref7.billNo,
+                    billType = _ref7.billType,
+                    billTag = _ref7.billTag;
+                  return {
+                    billNo: billNo,
+                    billType: billType,
+                    billTag: billTag
+                  };
+                })
+              }));
+            });
+            onceRef.current = false;
+          case 2:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return function getKmOrderList(_x5) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
@@ -15093,7 +15457,7 @@ var typeMap$1 = {
   }
 };
 var wdtReissue = function wdtReissue(props) {
-  var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type25, _value$typeMap$type$s5, _typeMap$type26, _typeMap$type27, _typeMap$type28;
+  var _value$wdtSystemOrder, _typeMap$type26, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -15253,11 +15617,26 @@ var wdtReissue = function wdtReissue(props) {
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
+  var selectedGoodsChange = React.useCallback(function (skuList) {
+    var _typeMap$type23, _typeMap$type24, _uniqBy, _typeMap$type25;
+    var newValue = _objectSpread2({}, value);
+    // 原订单商品
+    var originTradeGoodList = getGoodDetails({
+      mode: isStrict
+    }) || [];
+    // 当前选中的所有商品【包含了原订单+商品库】
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)]) || [];
+    newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      return skuList.includes(item.uuid);
+    });
+    console.log('商品发生变化', newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.key)]);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.key)], isStrict]);
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = React.useMemo(function () {
-    var _typeMap$type23;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo]]);
+    var _typeMap$type27;
+    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true
@@ -15275,12 +15654,12 @@ var wdtReissue = function wdtReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type29 = typeMap$1[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -15301,7 +15680,7 @@ var wdtReissue = function wdtReissue(props) {
     disabled: disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type31 = typeMap$1[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -15313,13 +15692,19 @@ var wdtReissue = function wdtReissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type32 = typeMap$1[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     showModeBtn: showModeBtn,
-    isStrict: isStrict
+    isStrict: isStrict,
+    tradeGoods: {
+      originDataSource: getGoodDetails({
+        mode: isStrict
+      }),
+      selectedGoodsChange: selectedGoodsChange
+    }
   })));
 };
 
@@ -16104,7 +16489,7 @@ var typeMap$2 = {
   }
 };
 var bsE3Reissue = function bsE3Reissue(props) {
-  var _typeMap$type21, _typeMap$type23, _typeMap$type24, _value$typeMap$type$s5, _typeMap$type25, _typeMap$type26, _typeMap$type27;
+  var _typeMap$type21, _typeMap$type24, _typeMap$type25, _value$typeMap$type$s5, _typeMap$type26, _typeMap$type27, _typeMap$type28;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -16242,15 +16627,19 @@ var bsE3Reissue = function bsE3Reissue(props) {
     return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo]);
   }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrderNo]]);
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _typeMap$type22, _getGoodDetails;
+    var _typeMap$type22, _typeMap$type23, _uniqBy;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = (_getGoodDetails = getGoodDetails({
+    // 原订单商品
+    var originTradeGoodList = getGoodDetails({
       mode: isStrict
-    })) === null || _getGoodDetails === void 0 ? void 0 : _getGoodDetails.filter(function (item) {
-      return skuList.includes(item.id);
+    }) || [];
+    // 当前选中的所有商品【包含了原订单+商品库】
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)]) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      return skuList.includes(item.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$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".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)], isStrict]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true,
@@ -16269,12 +16658,12 @@ var bsE3Reissue = function bsE3Reissue(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$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".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)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s5 = value[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s5 === void 0 ? void 0 : _value$typeMap$type$s5.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -16295,7 +16684,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
     disabled: 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$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -16307,7 +16696,7 @@ var bsE3Reissue = function bsE3Reissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     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$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },