@kmkf-fe-packages/basic-components 0.7.15-alpha.3 → 0.7.15-alpha.5

package/dist/index.esm.js

@@ -5,6 +5,7 @@ import request, { extend as extend$1 } from 'umi-request';
 import { AddressData, BsAddressData, request as request$1, LogisticsAddressData } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
 import pubsub from 'pubsub-js';
+import { cloneDeep } from 'lodash';
 
 function _iterableToArrayLimit(arr, i) {
   var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"];
@@ -7370,9 +7371,6 @@ var BuyerNick = function BuyerNick(props) {
     },
     onBlur: function onBlur(e) {
       _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value, 'buyerNick');
-    },
-    style: {
-      marginRight: '8px'
     }
   });
 };
@@ -7577,9 +7575,6 @@ var AliPay = function AliPay(props) {
     value: value === null || value === void 0 ? void 0 : value.name,
     onChange: function onChange(e) {
       changeValue(e, 'name');
-    },
-    style: {
-      marginRight: '8px'
     }
   })) : null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u652F\u4ED8\u5B9D\u8D26\u53F7",
@@ -7590,10 +7585,7 @@ var AliPay = function AliPay(props) {
     onBlur: function onBlur(e) {
       _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value, 'alipayAccount');
     },
-    disabled: disabled,
-    style: {
-      marginRight: '8px'
-    }
+    disabled: disabled
   })));
 };
 
@@ -9329,7 +9321,8 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       options: options,
       showSearch: true,
       style: {
-        width: '100%'
+        width: '100%',
+        marginBottom: '8px'
       },
       filterOption: function filterOption(input, option) {
         return option.label.includes(input);
@@ -9339,6 +9332,9 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   //物流单号
   var LogisticsCode = function LogisticsCode() {
     return /*#__PURE__*/React.createElement(Input, {
+      style: {
+        marginBottom: '8px'
+      },
       disabled: disabled,
       placeholder: "\u7269\u6D41\u5355\u53F7",
       onChange: function onChange(e) {
@@ -9630,15 +9626,18 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _useState16 = _slicedToArray(_useState15, 2),
     platform = _useState16[0],
     setPlatform = _useState16[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
-  // const [shopInfo, setShopInfo] = useState<any>({}); //店铺信息
-  var _useState17 = useState([{
+  var _useState17 = useState({}),
+    _useState18 = _slicedToArray(_useState17, 2),
+    shopInfo = _useState18[0],
+    setShopInfo = _useState18[1]; //店铺信息
+  var _useState19 = useState([{
       tab: '所选商品',
       key: 'onSale'
     }
     // { tab: '已选商品', key: 'select' },
     ]),
-    _useState18 = _slicedToArray(_useState17, 1),
-    tabs = _useState18[0];
+    _useState20 = _slicedToArray(_useState19, 1),
+    tabs = _useState20[0];
   //选择页码
   var pageChange = function pageChange(page, pageSize) {
     setSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, {
@@ -9670,38 +9669,46 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
    */
   var queryItems = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var res, _ref2, items, totalCount;
+      var params, res, _ref2, list, _total, nextKey, newList;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
             setLoading(true);
-            _context.next = 4;
-            return extendRequest('/qy/gdfw/workOrder/queryItems', {
+            params = _objectSpread2({}, queryPd());
+            params.shopName = shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.shopName;
+            params.platform = platform;
+            params.status = params.type === 'onSale' ? 1 : 0;
+            delete params.type;
+            _context.next = 9;
+            return extendRequest('/qy/gdfw/product/listProduct', {
               method: 'post',
-              data: queryPd()
+              data: params
             });
-          case 4:
+          case 9:
             res = _context.sent;
             _ref2 = res.data || {
-              items: [],
-              totalCount: 0
-            }, items = _ref2.items, totalCount = _ref2.totalCount;
-            items.forEach(function (item) {
+              result: [],
+              total: 0
+            }, list = _ref2.result, _total = _ref2.total, nextKey = _ref2.nextKey;
+            newList = list || [];
+            newList.forEach(function (item) {
+              item.numIid = item.productId;
+              item.outerId = item.outId;
+              item.title = item.productName;
               item.platform = platform;
-              item.key = item.numIid;
             });
-            setGoodList(_toConsumableArray(items));
-            setTotal(totalCount);
-          case 9:
-            _context.prev = 9;
+            setGoodList(newList);
+            setTotal(_total);
+          case 15:
+            _context.prev = 15;
             setLoading(false);
-            return _context.finish(9);
-          case 12:
+            return _context.finish(15);
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0,, 9, 12]]);
+      }, _callee, null, [[0,, 15, 18]]);
     }));
     return function queryItems() {
       return _ref.apply(this, arguments);
@@ -9711,10 +9718,10 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     var shopInfo = shopList.find(function (item) {
       return shopId === item.shopId || shopId === item.shopName;
     });
-    // setShopInfo(shopInfo);
+    setShopInfo(shopInfo);
     var platform = shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.shopSourceStr.toLowerCase();
     setPlatform(platform);
-  }, []);
+  }, [shopId]);
   var rowSelection = {
     selectedRowKeys: selectIds,
     onChange: function onChange(selectedRowKeys, selectedRows, info) {
@@ -9777,6 +9784,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }, /*#__PURE__*/React.createElement(Table, {
     rowSelection: rowSelection,
     columns: columns,
+    rowKey: 'numIid',
     dataSource: searchParams.type == 'select' ? selectList : goodList,
     scroll: {
       y: 300
@@ -9821,11 +9829,11 @@ var GoodItem = function GoodItem(props) {
     otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
-    _props$headerText = props.headerText,
-    headerText = _props$headerText === void 0 ? '' : _props$headerText,
-    onSelect = props.onSelect;
+    onSelect = props.onSelect,
+    onDelete = props.onDelete;
   var refModal = useRef();
   var handleDelete = function handleDelete(index) {
+    onDelete === null || onDelete === void 0 ? void 0 : onDelete(value[index]);
     var newList = value.filter(function (item, i) {
       return index !== i;
     });
@@ -9835,6 +9843,11 @@ var GoodItem = function GoodItem(props) {
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowKeys = _useState2[0],
     setSelectedRowKeys = _useState2[1];
+  useEffect(function () {
+    if (!tableSelect) {
+      setSelectedRowKeys([]);
+    }
+  }, [tableSelect]);
   var updateHandle = function updateHandle(val, index, type) {
     if (value === null || value === void 0 ? void 0 : value.length) {
       value[index][type] = val;
@@ -9846,36 +9859,36 @@ var GoodItem = function GoodItem(props) {
     var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     return [{
       dataIndex: 'name',
-      title: "bs".concat(text, "\u540D\u79F0"),
+      title: "".concat(text, "\u540D\u79F0"),
       align: 'center',
       ellipsis: true,
-      width: 200
+      width: 100
     }, {
       dataIndex: 'code',
-      title: "bs".concat(text, "\u7F16\u7801"),
+      title: "".concat(text, "\u7F16\u7801"),
       align: 'center',
       ellipsis: true,
-      width: 200
+      width: 100
     }, {
       dataIndex: 'sku',
-      title: "bs".concat(text, "sku\u7F16\u7801"),
+      title: "".concat(text, "sku\u7F16\u7801"),
       align: 'center',
       ellipsis: true,
-      width: 200
+      width: 100
     }, {
       dataIndex: 'money',
-      title: "bs\u5B9E\u4ED8\u91D1\u989D",
+      title: "\u5B9E\u4ED8\u91D1\u989D",
       align: 'center',
       ellipsis: true,
       width: 100
     }, {
       dataIndex: 'number',
-      title: "bs".concat(text, "\u6570\u91CF"),
+      title: "".concat(text, "\u6570\u91CF"),
       align: 'center',
       ellipsis: true,
       width: 100,
       render: function render(val, record, index) {
-        return canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+        return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           value: val,
           onChange: function onChange(num) {
             return updateHandle(num, index, 'number');
@@ -9884,13 +9897,13 @@ var GoodItem = function GoodItem(props) {
       }
     }, {
       dataIndex: 'share',
-      title: "bs\u5206\u644A\u4EF7",
+      title: "\u5206\u644A\u4EF7",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 70
     }, {
       dataIndex: 'type',
-      title: "bs\u8D60\u54C1\u7C7B\u578B",
+      title: "\u8D60\u54C1\u7C7B\u578B",
       align: 'center',
       ellipsis: true,
       width: 100
@@ -9908,17 +9921,17 @@ var GoodItem = function GoodItem(props) {
       }
     }, {
       dataIndex: 'pic',
-      title: "bs\u56FE\u7247",
+      title: "\u56FE\u7247",
       align: 'center',
       ellipsis: true,
-      width: 200,
+      width: 100,
       render: function render(val) {
         return /*#__PURE__*/React.createElement(Image, {
           width: 60,
           src: val
         });
       }
-    }].concat(_toConsumableArray(GOODS_INFO_COLUMNS(headerText).filter(function (t) {
+    }].concat(_toConsumableArray(GOODS_INFO_COLUMNS().filter(function (t) {
       return showField.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
     })));
     if (!disabled) {
@@ -9927,6 +9940,7 @@ var GoodItem = function GoodItem(props) {
         title: "\u64CD\u4F5C",
         align: 'center',
         ellipsis: true,
+        width: 100,
         render: function render(val, record, index) {
           return record.canDelete ? /*#__PURE__*/React.createElement(Button, {
             type: "link",
@@ -9953,9 +9967,10 @@ var GoodItem = function GoodItem(props) {
         sku: '',
         money: price,
         share: '',
-        number: 3,
+        number: 1,
         type: '',
-        canDelete: true
+        canDelete: true,
+        canUpdateNumber: canUpdateNumber
       };
     });
     onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), _toConsumableArray(newList)));
@@ -9980,9 +9995,11 @@ var GoodItem = function GoodItem(props) {
       params.rowSelection = rowSelection;
     }
     return params;
-  }, [tableSelect]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && showChangeBtn && /*#__PURE__*/React.createElement(Space, {
-    align: "end"
+  }, [tableSelect, selectedRowKeys]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && showChangeBtn && /*#__PURE__*/React.createElement("div", {
+    style: {
+      float: 'right'
+    }
   }, /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: handleChangeGoods
@@ -10025,7 +10042,7 @@ var BsGoods = function BsGoods(props) {
   var ref = useRef();
   var reissueRef = useRef();
   useEffect(function () {
-    ref.current = pubsub.subscribe('type', function (type, val) {
+    ref.current = pubsub.subscribeOnce('type', function (type, val) {
       console.log('goods', type, val, value);
       if (disabled) return;
       setWithInfo({
@@ -10033,7 +10050,7 @@ var BsGoods = function BsGoods(props) {
         val: val
       });
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val)) {
+      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : value.length)) {
         pubsub.publish('selectList', {
           type: val,
           list: _toConsumableArray(value).map(function (item) {
@@ -10042,10 +10059,9 @@ var BsGoods = function BsGoods(props) {
           })
         });
       }
-      // pubsub.unsubscribe('type');
     });
     //补发
-    reissueRef.current = pubsub.subscribe('reissueType', function (type, val) {
+    reissueRef.current = pubsub.subscribeOnce('reissueType', function (type, val) {
       if (disabled) return;
       console.log('reissueType', type, val, value);
       setWithInfo({
@@ -10053,7 +10069,7 @@ var BsGoods = function BsGoods(props) {
         val: val
       });
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val)) {
+      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : value.length)) {
         pubsub.publish('reissueSelectList', {
           type: val,
           list: (value || []).map(function (item) {
@@ -10062,9 +10078,7 @@ var BsGoods = function BsGoods(props) {
           })
         });
       }
-      // pubsub.unsubscribe('reissueType');
     });
-
     return function () {
       pubsub.unsubscribe(ref.current);
       pubsub.unsubscribe(reissueRef.current);
@@ -10072,30 +10086,38 @@ var BsGoods = function BsGoods(props) {
   }, [value, withInfo, disabled]);
   var _onSelect = useCallback(function (list) {
     if (disabled) return;
-    // console.log('withInfo', withInfo, list);
+    console.log('withInfo', withInfo, list);
+    var newList = cloneDeep(list);
     pubsub.publish(withInfo.type === 'reissueType' ? 'reissueSelectList' : 'selectList', {
       type: withInfo.val,
-      list: list.map(function (item) {
+      list: newList.map(function (item) {
         item.canDelete = true;
         return item;
       })
     });
   }, [withInfo]);
+  var _onDelete = function onDelete(item) {
+    var deleteId = item === null || item === void 0 ? void 0 : item.id;
+    pubsub.publish('deleteGood', deleteId);
+    pubsub.publish('reissueDeleteGood', deleteId);
+  };
   return /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'bsGoods',
-    headerText: "\u5546\u54C1",
     disabled: disabled
   }, props), {}, {
     tableSelect: tableSelect,
     onSelect: function onSelect(list) {
       return _onSelect(list);
+    },
+    onDelete: function onDelete(item) {
+      return _onDelete(item);
     }
   }));
 };
 
 var _excluded$b = ["value", "onChange", "reasonList", "disabled"];
 var BsExchange = function BsExchange(props) {
-  var _value$bsExchangeType2, _value$bsExchangeType3, _value$bsExchangeType4;
+  var _value$bsExchangeType4, _value$bsExchangeType5, _value$bsExchangeType6;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -10103,21 +10125,35 @@ var BsExchange = function BsExchange(props) {
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$b);
   useEffect(function () {
-    pubsub.subscribe('selectList', function (_, data) {
+    pubsub.subscribeOnce('selectList', function (_, data) {
       if (disabled) return;
       if (value) {
-        // console.log(
-        //   'BsExchange',
-        //   'getListHandle',
-        //   data,
-        //   value,
-        //   getListHandle([...data.list], value),
-        // );
+        var newData = cloneDeep(data);
+        console.log('BsExchange', 'getListHandle', data, value, getListHandle(_toConsumableArray(newData.list), value));
         onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          bsExchangeReturnGoods: getListHandle(_toConsumableArray(data.list), value)
+          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), value)
         }));
       }
-      pubsub.unsubscribe('selectList');
+    });
+    pubsub.subscribeOnce('deleteGood', function (_, data) {
+      if (disabled) return;
+      if (value) {
+        var _value$bsExchangeType, _value$bsExchangeType2;
+        var newValue = _objectSpread2({}, value);
+        if (['2', '4'].includes((_value$bsExchangeType = value.bsExchangeType) === null || _value$bsExchangeType === void 0 ? void 0 : _value$bsExchangeType[0])) {
+          newValue.bsExchangeReturnGoods = newValue.bsExchangeReturnGoods.map(function (item) {
+            item.bsExchangeReturnGoods = item.bsExchangeReturnGoods.filter(function (t) {
+              return t.id !== data;
+            });
+            return item;
+          });
+        } else if (['1', '3'].includes((_value$bsExchangeType2 = value.bsExchangeType) === null || _value$bsExchangeType2 === void 0 ? void 0 : _value$bsExchangeType2[0])) {
+          newValue.bsExchangeReturnGoods = newValue.bsExchangeReturnGoods.filter(function (item) {
+            return item.id !== data;
+          });
+        }
+        onChange(newValue);
+      }
     });
   }, [value]);
   var getListHandle = function getListHandle(list, val) {
@@ -10125,6 +10161,7 @@ var BsExchange = function BsExchange(props) {
     //如果是原单换
     if (['1', '3'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType = val.bsExchangeType) === null || _val$bsExchangeType === void 0 ? void 0 : _val$bsExchangeType[0])) {
       return list.reduce(function (prv, next) {
+        var _val$bsExchangeType2;
         next.canDelete = false;
         //数量大于1 拆开
         if (next.number > 1) {
@@ -10133,7 +10170,7 @@ var BsExchange = function BsExchange(props) {
             return t;
           });
           prv.push.apply(prv, _toConsumableArray(newList));
-        } else {
+        } else if (['2', '4'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType2 = val.bsExchangeType) === null || _val$bsExchangeType2 === void 0 ? void 0 : _val$bsExchangeType2[0])) {
           prv.push(_objectSpread2({}, next));
         }
         return prv;
@@ -10163,6 +10200,14 @@ var BsExchange = function BsExchange(props) {
       }, []);
     }
   };
+  var changeTypeHandle = function changeTypeHandle(val) {
+    var newValue = _objectSpread2({}, value);
+    newValue.bsExchangeType = val;
+    newValue.bsExchangeReturnGoods = [];
+    newValue.bsExchangeGiftGoods = [];
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    pubsub.publish('type', val[0]);
+  };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
     newValue[key] = val;
@@ -10177,19 +10222,22 @@ var BsExchange = function BsExchange(props) {
     var newValue = _objectSpread2({}, value);
     newValue.bsExchangeReturnGoods[index][key] = (val || []).map(function (t) {
       t.index = index;
+      if (key === 'bsExchangeGiftGoods') {
+        t.money = 0;
+      }
       return t;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {
-    var _value$bsExchangeType;
-    return ['2', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType = value.bsExchangeType) === null || _value$bsExchangeType === void 0 ? void 0 : _value$bsExchangeType[0]) || disabled;
+    var _value$bsExchangeType3;
+    return ['2', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType3 = value.bsExchangeType) === null || _value$bsExchangeType3 === void 0 ? void 0 : _value$bsExchangeType3[0]) || !!disabled;
   }, [value === null || value === void 0 ? void 0 : value.bsExchangeType]);
   var copyGoods = function copyGoods(index) {
     var copyHandle = function copyHandle() {
       var newValue = _objectSpread2({}, value);
-      newValue.bsExchangeReturnGoods[index]['bsExchangeSwapOutGoods'] = _objectSpread2(_objectSpread2({}, newValue.bsExchangeReturnGoods[index]['bsExchangeSwapOutGoods']), newValue.bsExchangeReturnGoods[index]['bsExchangeReturnGoods']);
+      newValue.bsExchangeReturnGoods[index]['bsExchangeSwapOutGoods'] = [].concat(_toConsumableArray(newValue.bsExchangeReturnGoods[index]['bsExchangeSwapOutGoods']), _toConsumableArray(newValue.bsExchangeReturnGoods[index]['bsExchangeReturnGoods']));
       onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
     };
     return /*#__PURE__*/React.createElement(Button, {
@@ -10198,32 +10246,32 @@ var BsExchange = function BsExchange(props) {
     }, "\u590D\u5236\u9000\u56DE\u5546\u54C1");
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cascader, {
+    style: {
+      marginBottom: '8px'
+    },
     disabled: disabled,
     allowClear: false,
     options: reasonList,
     value: value === null || value === void 0 ? void 0 : value.bsExchangeType,
     onChange: function onChange(val) {
-      return changeHandle(val, 'bsExchangeType');
+      return changeTypeHandle(val);
     }
-  }), !(value === null || value === void 0 ? void 0 : (_value$bsExchangeType2 = value.bsExchangeType) === null || _value$bsExchangeType2 === void 0 ? void 0 : _value$bsExchangeType2.length) ? /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
+  }), !(value === null || value === void 0 ? void 0 : (_value$bsExchangeType4 = value.bsExchangeType) === null || _value$bsExchangeType4 === void 0 ? void 0 : _value$bsExchangeType4.length) ? /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'bsExchangeGoods'
   }, other), {}, {
-    headerText: "\u5546\u54C1",
     disabled: disabled,
     showChangeBtn: false
-  })) : null, ['1', '3'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType3 = value.bsExchangeType) === null || _value$bsExchangeType3 === void 0 ? void 0 : _value$bsExchangeType3[0]) ? /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
+  })) : null, ['1', '3'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType5 = value.bsExchangeType) === null || _value$bsExchangeType5 === void 0 ? void 0 : _value$bsExchangeType5[0]) ? /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'bsExchangeGoods'
   }, other), {}, {
-    headerText: "\u5546\u54C1",
     disabled: disabled,
-    showChangeBtn: showChangeBtn,
+    showChangeBtn: false,
     value: value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods,
     onChange: function onChange(val) {
       return changeHandle(val, 'bsExchangeReturnGoods');
     }
   })) : /*#__PURE__*/React.createElement(React.Fragment, null, ((value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods) || []).map(function (item, index) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
-      headerText: "\u9000\u56DE",
       key: 'bsReturnGoods'
     }, other), {}, {
       disabled: disabled,
@@ -10233,20 +10281,17 @@ var BsExchange = function BsExchange(props) {
         return changeReturnHandle(val, index, 'bsExchangeReturnGoods');
       }
     })), /*#__PURE__*/React.createElement("div", null, "\u6362\u51FA\u5546\u54C1"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
-      headerText: "\u6362\u51FA",
       key: 'bsOutGoods'
     }, other), {}, {
       disabled: disabled,
       showChangeBtn: showChangeBtn,
-      otherOperations: function otherOperations() {
-        return copyGoods(index);
-      },
+      otherOperations: copyGoods(index),
       value: item === null || item === void 0 ? void 0 : item.bsExchangeSwapOutGoods,
       onChange: function onChange(val) {
         return changeReturnHandle(val, index, 'bsExchangeSwapOutGoods');
       }
     })));
-  })), ['3', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType4 = value.bsExchangeType) === null || _value$bsExchangeType4 === void 0 ? void 0 : _value$bsExchangeType4[0]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\u8D60\u54C1\u4FE1\u606F"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
+  })), ['3', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType6 = value.bsExchangeType) === null || _value$bsExchangeType6 === void 0 ? void 0 : _value$bsExchangeType6[0]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\u8D60\u54C1\u4FE1\u606F"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
     headerText: "\u8D60\u54C1",
     key: 'bsGiftGoods',
     disabled: disabled
@@ -10267,22 +10312,32 @@ var BsReissue = function BsReissue(props) {
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$c);
   useEffect(function () {
-    pubsub.subscribe('reissueSelectList', function (_, data) {
+    pubsub.subscribeOnce('reissueSelectList', function (_, data) {
       if (disabled) return;
-      // console.log(data, value);
+      console.log(data, value);
       if (value) {
+        var newData = cloneDeep(data);
         onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          bsReissueGoods: ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (item) {
+          bsReissueGoods: ((newData === null || newData === void 0 ? void 0 : newData.list) || []).map(function (item) {
             item.money = 0;
+            item.canUpdateNumber = ['2', '4'].includes(newData === null || newData === void 0 ? void 0 : newData.type);
             return item;
           })
         }));
       }
-      pubsub.unsubscribe('reissueSelectList');
+    });
+    pubsub.subscribeOnce('reissueDeleteGood', function (_, data) {
+      if (disabled) return;
+      if (value) {
+        var newValue = _objectSpread2({}, value);
+        newValue.bsReissueGoods = newValue.bsReissueGoods.filter(function (item) {
+          return item.id !== data;
+        });
+        onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+      }
     });
   }, [value, disabled]);
   var changeHandle = function changeHandle(val, key) {
-    console.log('changeHandle', val, key, value);
     var newValue = _objectSpread2({}, value);
     if (key === 'bsReissueGoods') {
       val = (val || []).map(function (item) {
@@ -10305,6 +10360,9 @@ var BsReissue = function BsReissue(props) {
     return ['2', '3', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsReissueType = value.bsReissueType) === null || _value$bsReissueType === void 0 ? void 0 : _value$bsReissueType[0]);
   }, [value === null || value === void 0 ? void 0 : value.bsReissueType]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cascader, {
+    style: {
+      marginBottom: '8px'
+    },
     disabled: disabled,
     allowClear: false,
     options: reasonList,
@@ -10313,11 +10371,10 @@ var BsReissue = function BsReissue(props) {
       return changeHandle(val, 'bsReissueType');
     }
   }), /*#__PURE__*/React.createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
-    headerText: "\u8865\u53D1",
     key: 'reissueGoods'
   }, other), {}, {
     disabled: disabled,
-    canUpdateNumber: true,
+    canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     value: value === null || value === void 0 ? void 0 : value.bsReissueGoods,
     onChange: function onChange(val) {

package/dist/index.js

@@ -9,6 +9,7 @@ var request = require('umi-request');
 var kmkfUtils = require('@kmkf-fe-packages/kmkf-utils');
 var zhCN = require('antd/lib/locale/zh_CN');
 var pubsub = require('pubsub-js');
+var lodash = require('lodash');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -7381,9 +7382,6 @@ var BuyerNick = function BuyerNick(props) {
     },
     onBlur: function onBlur(e) {
       _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value, 'buyerNick');
-    },
-    style: {
-      marginRight: '8px'
     }
   });
 };
@@ -7588,9 +7586,6 @@ var AliPay = function AliPay(props) {
     value: value === null || value === void 0 ? void 0 : value.name,
     onChange: function onChange(e) {
       changeValue(e, 'name');
-    },
-    style: {
-      marginRight: '8px'
     }
   })) : null, /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u8BF7\u8F93\u5165\u652F\u4ED8\u5B9D\u8D26\u53F7",
@@ -7601,10 +7596,7 @@ var AliPay = function AliPay(props) {
     onBlur: function onBlur(e) {
       _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur(e.target.value, 'alipayAccount');
     },
-    disabled: disabled,
-    style: {
-      marginRight: '8px'
-    }
+    disabled: disabled
   })));
 };
 
@@ -9340,7 +9332,8 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       options: options,
       showSearch: true,
       style: {
-        width: '100%'
+        width: '100%',
+        marginBottom: '8px'
       },
       filterOption: function filterOption(input, option) {
         return option.label.includes(input);
@@ -9350,6 +9343,9 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   //物流单号
   var LogisticsCode = function LogisticsCode() {
     return /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+      style: {
+        marginBottom: '8px'
+      },
       disabled: disabled,
       placeholder: "\u7269\u6D41\u5355\u53F7",
       onChange: function onChange(e) {
@@ -9641,15 +9637,18 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _useState16 = _slicedToArray(_useState15, 2),
     platform = _useState16[0],
     setPlatform = _useState16[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
-  // const [shopInfo, setShopInfo] = useState<any>({}); //店铺信息
-  var _useState17 = React.useState([{
+  var _useState17 = React.useState({}),
+    _useState18 = _slicedToArray(_useState17, 2),
+    shopInfo = _useState18[0],
+    setShopInfo = _useState18[1]; //店铺信息
+  var _useState19 = React.useState([{
       tab: '所选商品',
       key: 'onSale'
     }
     // { tab: '已选商品', key: 'select' },
     ]),
-    _useState18 = _slicedToArray(_useState17, 1),
-    tabs = _useState18[0];
+    _useState20 = _slicedToArray(_useState19, 1),
+    tabs = _useState20[0];
   //选择页码
   var pageChange = function pageChange(page, pageSize) {
     setSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, {
@@ -9681,38 +9680,46 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
    */
   var queryItems = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var res, _ref2, items, totalCount;
+      var params, res, _ref2, list, _total, nextKey, newList;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
             setLoading(true);
-            _context.next = 4;
-            return extendRequest('/qy/gdfw/workOrder/queryItems', {
+            params = _objectSpread2({}, queryPd());
+            params.shopName = shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.shopName;
+            params.platform = platform;
+            params.status = params.type === 'onSale' ? 1 : 0;
+            delete params.type;
+            _context.next = 9;
+            return extendRequest('/qy/gdfw/product/listProduct', {
               method: 'post',
-              data: queryPd()
+              data: params
             });
-          case 4:
+          case 9:
             res = _context.sent;
             _ref2 = res.data || {
-              items: [],
-              totalCount: 0
-            }, items = _ref2.items, totalCount = _ref2.totalCount;
-            items.forEach(function (item) {
+              result: [],
+              total: 0
+            }, list = _ref2.result, _total = _ref2.total, nextKey = _ref2.nextKey;
+            newList = list || [];
+            newList.forEach(function (item) {
+              item.numIid = item.productId;
+              item.outerId = item.outId;
+              item.title = item.productName;
               item.platform = platform;
-              item.key = item.numIid;
             });
-            setGoodList(_toConsumableArray(items));
-            setTotal(totalCount);
-          case 9:
-            _context.prev = 9;
+            setGoodList(newList);
+            setTotal(_total);
+          case 15:
+            _context.prev = 15;
             setLoading(false);
-            return _context.finish(9);
-          case 12:
+            return _context.finish(15);
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0,, 9, 12]]);
+      }, _callee, null, [[0,, 15, 18]]);
     }));
     return function queryItems() {
       return _ref.apply(this, arguments);
@@ -9722,10 +9729,10 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     var shopInfo = shopList.find(function (item) {
       return shopId === item.shopId || shopId === item.shopName;
     });
-    // setShopInfo(shopInfo);
+    setShopInfo(shopInfo);
     var platform = shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.shopSourceStr.toLowerCase();
     setPlatform(platform);
-  }, []);
+  }, [shopId]);
   var rowSelection = {
     selectedRowKeys: selectIds,
     onChange: function onChange(selectedRowKeys, selectedRows, info) {
@@ -9788,6 +9795,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     rowSelection: rowSelection,
     columns: columns,
+    rowKey: 'numIid',
     dataSource: searchParams.type == 'select' ? selectList : goodList,
     scroll: {
       y: 300
@@ -9832,11 +9840,11 @@ var GoodItem = function GoodItem(props) {
     otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
-    _props$headerText = props.headerText,
-    headerText = _props$headerText === void 0 ? '' : _props$headerText,
-    onSelect = props.onSelect;
+    onSelect = props.onSelect,
+    onDelete = props.onDelete;
   var refModal = React.useRef();
   var handleDelete = function handleDelete(index) {
+    onDelete === null || onDelete === void 0 ? void 0 : onDelete(value[index]);
     var newList = value.filter(function (item, i) {
       return index !== i;
     });
@@ -9846,6 +9854,11 @@ var GoodItem = function GoodItem(props) {
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowKeys = _useState2[0],
     setSelectedRowKeys = _useState2[1];
+  React.useEffect(function () {
+    if (!tableSelect) {
+      setSelectedRowKeys([]);
+    }
+  }, [tableSelect]);
   var updateHandle = function updateHandle(val, index, type) {
     if (value === null || value === void 0 ? void 0 : value.length) {
       value[index][type] = val;
@@ -9857,36 +9870,36 @@ var GoodItem = function GoodItem(props) {
     var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     return [{
       dataIndex: 'name',
-      title: "bs".concat(text, "\u540D\u79F0"),
+      title: "".concat(text, "\u540D\u79F0"),
       align: 'center',
       ellipsis: true,
-      width: 200
+      width: 100
     }, {
       dataIndex: 'code',
-      title: "bs".concat(text, "\u7F16\u7801"),
+      title: "".concat(text, "\u7F16\u7801"),
       align: 'center',
       ellipsis: true,
-      width: 200
+      width: 100
     }, {
       dataIndex: 'sku',
-      title: "bs".concat(text, "sku\u7F16\u7801"),
+      title: "".concat(text, "sku\u7F16\u7801"),
       align: 'center',
       ellipsis: true,
-      width: 200
+      width: 100
     }, {
       dataIndex: 'money',
-      title: "bs\u5B9E\u4ED8\u91D1\u989D",
+      title: "\u5B9E\u4ED8\u91D1\u989D",
       align: 'center',
       ellipsis: true,
       width: 100
     }, {
       dataIndex: 'number',
-      title: "bs".concat(text, "\u6570\u91CF"),
+      title: "".concat(text, "\u6570\u91CF"),
       align: 'center',
       ellipsis: true,
       width: 100,
       render: function render(val, record, index) {
-        return canUpdateNumber && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        return record.canUpdateNumber && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           value: val,
           onChange: function onChange(num) {
             return updateHandle(num, index, 'number');
@@ -9895,13 +9908,13 @@ var GoodItem = function GoodItem(props) {
       }
     }, {
       dataIndex: 'share',
-      title: "bs\u5206\u644A\u4EF7",
+      title: "\u5206\u644A\u4EF7",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 70
     }, {
       dataIndex: 'type',
-      title: "bs\u8D60\u54C1\u7C7B\u578B",
+      title: "\u8D60\u54C1\u7C7B\u578B",
       align: 'center',
       ellipsis: true,
       width: 100
@@ -9919,17 +9932,17 @@ var GoodItem = function GoodItem(props) {
       }
     }, {
       dataIndex: 'pic',
-      title: "bs\u56FE\u7247",
+      title: "\u56FE\u7247",
       align: 'center',
       ellipsis: true,
-      width: 200,
+      width: 100,
       render: function render(val) {
         return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
           width: 60,
           src: val
         });
       }
-    }].concat(_toConsumableArray(GOODS_INFO_COLUMNS(headerText).filter(function (t) {
+    }].concat(_toConsumableArray(GOODS_INFO_COLUMNS().filter(function (t) {
       return showField.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
     })));
     if (!disabled) {
@@ -9938,6 +9951,7 @@ var GoodItem = function GoodItem(props) {
         title: "\u64CD\u4F5C",
         align: 'center',
         ellipsis: true,
+        width: 100,
         render: function render(val, record, index) {
           return record.canDelete ? /*#__PURE__*/React__default['default'].createElement(antd.Button, {
             type: "link",
@@ -9964,9 +9978,10 @@ var GoodItem = function GoodItem(props) {
         sku: '',
         money: price,
         share: '',
-        number: 3,
+        number: 1,
         type: '',
-        canDelete: true
+        canDelete: true,
+        canUpdateNumber: canUpdateNumber
       };
     });
     onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), _toConsumableArray(newList)));
@@ -9991,9 +10006,11 @@ var GoodItem = function GoodItem(props) {
       params.rowSelection = rowSelection;
     }
     return params;
-  }, [tableSelect]);
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && showChangeBtn && /*#__PURE__*/React__default['default'].createElement(antd.Space, {
-    align: "end"
+  }, [tableSelect, selectedRowKeys]);
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && showChangeBtn && /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      float: 'right'
+    }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: handleChangeGoods
@@ -10036,7 +10053,7 @@ var BsGoods = function BsGoods(props) {
   var ref = React.useRef();
   var reissueRef = React.useRef();
   React.useEffect(function () {
-    ref.current = pubsub__default['default'].subscribe('type', function (type, val) {
+    ref.current = pubsub__default['default'].subscribeOnce('type', function (type, val) {
       console.log('goods', type, val, value);
       if (disabled) return;
       setWithInfo({
@@ -10044,7 +10061,7 @@ var BsGoods = function BsGoods(props) {
         val: val
       });
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val)) {
+      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : value.length)) {
         pubsub__default['default'].publish('selectList', {
           type: val,
           list: _toConsumableArray(value).map(function (item) {
@@ -10053,10 +10070,9 @@ var BsGoods = function BsGoods(props) {
           })
         });
       }
-      // pubsub.unsubscribe('type');
     });
     //补发
-    reissueRef.current = pubsub__default['default'].subscribe('reissueType', function (type, val) {
+    reissueRef.current = pubsub__default['default'].subscribeOnce('reissueType', function (type, val) {
       if (disabled) return;
       console.log('reissueType', type, val, value);
       setWithInfo({
@@ -10064,7 +10080,7 @@ var BsGoods = function BsGoods(props) {
         val: val
       });
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val)) {
+      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : value.length)) {
         pubsub__default['default'].publish('reissueSelectList', {
           type: val,
           list: (value || []).map(function (item) {
@@ -10073,9 +10089,7 @@ var BsGoods = function BsGoods(props) {
           })
         });
       }
-      // pubsub.unsubscribe('reissueType');
     });
-
     return function () {
       pubsub__default['default'].unsubscribe(ref.current);
       pubsub__default['default'].unsubscribe(reissueRef.current);
@@ -10083,30 +10097,38 @@ var BsGoods = function BsGoods(props) {
   }, [value, withInfo, disabled]);
   var _onSelect = React.useCallback(function (list) {
     if (disabled) return;
-    // console.log('withInfo', withInfo, list);
+    console.log('withInfo', withInfo, list);
+    var newList = lodash.cloneDeep(list);
     pubsub__default['default'].publish(withInfo.type === 'reissueType' ? 'reissueSelectList' : 'selectList', {
       type: withInfo.val,
-      list: list.map(function (item) {
+      list: newList.map(function (item) {
         item.canDelete = true;
         return item;
       })
     });
   }, [withInfo]);
+  var _onDelete = function onDelete(item) {
+    var deleteId = item === null || item === void 0 ? void 0 : item.id;
+    pubsub__default['default'].publish('deleteGood', deleteId);
+    pubsub__default['default'].publish('reissueDeleteGood', deleteId);
+  };
   return /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'bsGoods',
-    headerText: "\u5546\u54C1",
     disabled: disabled
   }, props), {}, {
     tableSelect: tableSelect,
     onSelect: function onSelect(list) {
       return _onSelect(list);
+    },
+    onDelete: function onDelete(item) {
+      return _onDelete(item);
     }
   }));
 };
 
 var _excluded$b = ["value", "onChange", "reasonList", "disabled"];
 var BsExchange = function BsExchange(props) {
-  var _value$bsExchangeType2, _value$bsExchangeType3, _value$bsExchangeType4;
+  var _value$bsExchangeType4, _value$bsExchangeType5, _value$bsExchangeType6;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -10114,21 +10136,35 @@ var BsExchange = function BsExchange(props) {
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$b);
   React.useEffect(function () {
-    pubsub__default['default'].subscribe('selectList', function (_, data) {
+    pubsub__default['default'].subscribeOnce('selectList', function (_, data) {
       if (disabled) return;
       if (value) {
-        // console.log(
-        //   'BsExchange',
-        //   'getListHandle',
-        //   data,
-        //   value,
-        //   getListHandle([...data.list], value),
-        // );
+        var newData = lodash.cloneDeep(data);
+        console.log('BsExchange', 'getListHandle', data, value, getListHandle(_toConsumableArray(newData.list), value));
         onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          bsExchangeReturnGoods: getListHandle(_toConsumableArray(data.list), value)
+          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), value)
         }));
       }
-      pubsub__default['default'].unsubscribe('selectList');
+    });
+    pubsub__default['default'].subscribeOnce('deleteGood', function (_, data) {
+      if (disabled) return;
+      if (value) {
+        var _value$bsExchangeType, _value$bsExchangeType2;
+        var newValue = _objectSpread2({}, value);
+        if (['2', '4'].includes((_value$bsExchangeType = value.bsExchangeType) === null || _value$bsExchangeType === void 0 ? void 0 : _value$bsExchangeType[0])) {
+          newValue.bsExchangeReturnGoods = newValue.bsExchangeReturnGoods.map(function (item) {
+            item.bsExchangeReturnGoods = item.bsExchangeReturnGoods.filter(function (t) {
+              return t.id !== data;
+            });
+            return item;
+          });
+        } else if (['1', '3'].includes((_value$bsExchangeType2 = value.bsExchangeType) === null || _value$bsExchangeType2 === void 0 ? void 0 : _value$bsExchangeType2[0])) {
+          newValue.bsExchangeReturnGoods = newValue.bsExchangeReturnGoods.filter(function (item) {
+            return item.id !== data;
+          });
+        }
+        onChange(newValue);
+      }
     });
   }, [value]);
   var getListHandle = function getListHandle(list, val) {
@@ -10136,6 +10172,7 @@ var BsExchange = function BsExchange(props) {
     //如果是原单换
     if (['1', '3'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType = val.bsExchangeType) === null || _val$bsExchangeType === void 0 ? void 0 : _val$bsExchangeType[0])) {
       return list.reduce(function (prv, next) {
+        var _val$bsExchangeType2;
         next.canDelete = false;
         //数量大于1 拆开
         if (next.number > 1) {
@@ -10144,7 +10181,7 @@ var BsExchange = function BsExchange(props) {
             return t;
           });
           prv.push.apply(prv, _toConsumableArray(newList));
-        } else {
+        } else if (['2', '4'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType2 = val.bsExchangeType) === null || _val$bsExchangeType2 === void 0 ? void 0 : _val$bsExchangeType2[0])) {
           prv.push(_objectSpread2({}, next));
         }
         return prv;
@@ -10174,6 +10211,14 @@ var BsExchange = function BsExchange(props) {
       }, []);
     }
   };
+  var changeTypeHandle = function changeTypeHandle(val) {
+    var newValue = _objectSpread2({}, value);
+    newValue.bsExchangeType = val;
+    newValue.bsExchangeReturnGoods = [];
+    newValue.bsExchangeGiftGoods = [];
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    pubsub__default['default'].publish('type', val[0]);
+  };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
     newValue[key] = val;
@@ -10188,19 +10233,22 @@ var BsExchange = function BsExchange(props) {
     var newValue = _objectSpread2({}, value);
     newValue.bsExchangeReturnGoods[index][key] = (val || []).map(function (t) {
       t.index = index;
+      if (key === 'bsExchangeGiftGoods') {
+        t.money = 0;
+      }
       return t;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = React.useMemo(function () {
-    var _value$bsExchangeType;
-    return ['2', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType = value.bsExchangeType) === null || _value$bsExchangeType === void 0 ? void 0 : _value$bsExchangeType[0]) || disabled;
+    var _value$bsExchangeType3;
+    return ['2', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType3 = value.bsExchangeType) === null || _value$bsExchangeType3 === void 0 ? void 0 : _value$bsExchangeType3[0]) || !!disabled;
   }, [value === null || value === void 0 ? void 0 : value.bsExchangeType]);
   var copyGoods = function copyGoods(index) {
     var copyHandle = function copyHandle() {
       var newValue = _objectSpread2({}, value);
-      newValue.bsExchangeReturnGoods[index]['bsExchangeSwapOutGoods'] = _objectSpread2(_objectSpread2({}, newValue.bsExchangeReturnGoods[index]['bsExchangeSwapOutGoods']), newValue.bsExchangeReturnGoods[index]['bsExchangeReturnGoods']);
+      newValue.bsExchangeReturnGoods[index]['bsExchangeSwapOutGoods'] = [].concat(_toConsumableArray(newValue.bsExchangeReturnGoods[index]['bsExchangeSwapOutGoods']), _toConsumableArray(newValue.bsExchangeReturnGoods[index]['bsExchangeReturnGoods']));
       onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
     };
     return /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -10209,32 +10257,32 @@ var BsExchange = function BsExchange(props) {
     }, "\u590D\u5236\u9000\u56DE\u5546\u54C1");
   };
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
+    style: {
+      marginBottom: '8px'
+    },
     disabled: disabled,
     allowClear: false,
     options: reasonList,
     value: value === null || value === void 0 ? void 0 : value.bsExchangeType,
     onChange: function onChange(val) {
-      return changeHandle(val, 'bsExchangeType');
+      return changeTypeHandle(val);
     }
-  }), !(value === null || value === void 0 ? void 0 : (_value$bsExchangeType2 = value.bsExchangeType) === null || _value$bsExchangeType2 === void 0 ? void 0 : _value$bsExchangeType2.length) ? /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
+  }), !(value === null || value === void 0 ? void 0 : (_value$bsExchangeType4 = value.bsExchangeType) === null || _value$bsExchangeType4 === void 0 ? void 0 : _value$bsExchangeType4.length) ? /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'bsExchangeGoods'
   }, other), {}, {
-    headerText: "\u5546\u54C1",
     disabled: disabled,
     showChangeBtn: false
-  })) : null, ['1', '3'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType3 = value.bsExchangeType) === null || _value$bsExchangeType3 === void 0 ? void 0 : _value$bsExchangeType3[0]) ? /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
+  })) : null, ['1', '3'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType5 = value.bsExchangeType) === null || _value$bsExchangeType5 === void 0 ? void 0 : _value$bsExchangeType5[0]) ? /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'bsExchangeGoods'
   }, other), {}, {
-    headerText: "\u5546\u54C1",
     disabled: disabled,
-    showChangeBtn: showChangeBtn,
+    showChangeBtn: false,
     value: value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods,
     onChange: function onChange(val) {
       return changeHandle(val, 'bsExchangeReturnGoods');
     }
   })) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, ((value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods) || []).map(function (item, index) {
     return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
-      headerText: "\u9000\u56DE",
       key: 'bsReturnGoods'
     }, other), {}, {
       disabled: disabled,
@@ -10244,20 +10292,17 @@ var BsExchange = function BsExchange(props) {
         return changeReturnHandle(val, index, 'bsExchangeReturnGoods');
       }
     })), /*#__PURE__*/React__default['default'].createElement("div", null, "\u6362\u51FA\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
-      headerText: "\u6362\u51FA",
       key: 'bsOutGoods'
     }, other), {}, {
       disabled: disabled,
       showChangeBtn: showChangeBtn,
-      otherOperations: function otherOperations() {
-        return copyGoods(index);
-      },
+      otherOperations: copyGoods(index),
       value: item === null || item === void 0 ? void 0 : item.bsExchangeSwapOutGoods,
       onChange: function onChange(val) {
         return changeReturnHandle(val, index, 'bsExchangeSwapOutGoods');
       }
     })));
-  })), ['3', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType4 = value.bsExchangeType) === null || _value$bsExchangeType4 === void 0 ? void 0 : _value$bsExchangeType4[0]) ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", null, "\u8D60\u54C1\u4FE1\u606F"), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
+  })), ['3', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType6 = value.bsExchangeType) === null || _value$bsExchangeType6 === void 0 ? void 0 : _value$bsExchangeType6[0]) ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", null, "\u8D60\u54C1\u4FE1\u606F"), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
     headerText: "\u8D60\u54C1",
     key: 'bsGiftGoods',
     disabled: disabled
@@ -10278,22 +10323,32 @@ var BsReissue = function BsReissue(props) {
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$c);
   React.useEffect(function () {
-    pubsub__default['default'].subscribe('reissueSelectList', function (_, data) {
+    pubsub__default['default'].subscribeOnce('reissueSelectList', function (_, data) {
       if (disabled) return;
-      // console.log(data, value);
+      console.log(data, value);
       if (value) {
+        var newData = lodash.cloneDeep(data);
         onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          bsReissueGoods: ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (item) {
+          bsReissueGoods: ((newData === null || newData === void 0 ? void 0 : newData.list) || []).map(function (item) {
             item.money = 0;
+            item.canUpdateNumber = ['2', '4'].includes(newData === null || newData === void 0 ? void 0 : newData.type);
             return item;
           })
         }));
       }
-      pubsub__default['default'].unsubscribe('reissueSelectList');
+    });
+    pubsub__default['default'].subscribeOnce('reissueDeleteGood', function (_, data) {
+      if (disabled) return;
+      if (value) {
+        var newValue = _objectSpread2({}, value);
+        newValue.bsReissueGoods = newValue.bsReissueGoods.filter(function (item) {
+          return item.id !== data;
+        });
+        onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+      }
     });
   }, [value, disabled]);
   var changeHandle = function changeHandle(val, key) {
-    console.log('changeHandle', val, key, value);
     var newValue = _objectSpread2({}, value);
     if (key === 'bsReissueGoods') {
       val = (val || []).map(function (item) {
@@ -10316,6 +10371,9 @@ var BsReissue = function BsReissue(props) {
     return ['2', '3', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsReissueType = value.bsReissueType) === null || _value$bsReissueType === void 0 ? void 0 : _value$bsReissueType[0]);
   }, [value === null || value === void 0 ? void 0 : value.bsReissueType]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
+    style: {
+      marginBottom: '8px'
+    },
     disabled: disabled,
     allowClear: false,
     options: reasonList,
@@ -10324,11 +10382,10 @@ var BsReissue = function BsReissue(props) {
       return changeHandle(val, 'bsReissueType');
     }
   }), /*#__PURE__*/React__default['default'].createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
-    headerText: "\u8865\u53D1",
     key: 'reissueGoods'
   }, other), {}, {
     disabled: disabled,
-    canUpdateNumber: true,
+    canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     value: value === null || value === void 0 ? void 0 : value.bsReissueGoods,
     onChange: function onChange(val) {

package/dist/src/bs/component/GoodItem/index.d.ts

@@ -13,9 +13,9 @@ interface BsGoodsProps {
     tableSelect: boolean;
     otherOperations: any;
     canUpdateNumber: boolean;
-    headerText?: string;
     onChange: (val: any[]) => void;
     onSelect: (val: any[]) => void;
+    onDelete: (val: any[]) => void;
 }
 declare const GoodItem: (props: Partial<BsGoodsProps>) => React.JSX.Element;
 export default GoodItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.7.15-alpha.3",
+  "version": "0.7.15-alpha.5",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,8 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.3",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.5",
+    "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "umi-request": "^1.4.0"
   },
@@ -56,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ed7ac8d0c87afbda8f080748adc790cd6755c9e0"
+  "gitHead": "e0a00366bed469e96b301ebf6753c2078cb8492c"
 }