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

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"];
@@ -6939,7 +6940,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
   var beforeUpload = function beforeUpload(file) {
     console.log('beforeUpload', file);
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    if (value.length >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u4E2A\u6587\u4EF6\uFF01"));
       return Upload.LIST_IGNORE;
     }
@@ -6962,7 +6963,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     className: styles$2.tips
   }, "\u5141\u8BB8\u4E0A\u4F20", maxCount, "\u4E2A\u6587\u4EF6"), /*#__PURE__*/React.createElement(Dragger, _objectSpread2({
     disabled: disabled,
-    multiple: true,
+    multiple: false,
     accept: accept,
     name: "file",
     maxCount: maxCount,
@@ -7151,7 +7152,8 @@ function ApaasRate(props) {
 var address = AddressData.getInstance();
 var bsAddress = BsAddressData.getInstance();
 var Province = function Province(props) {
-  var type = props.type;
+  var _props$type = props.type,
+    type = _props$type === void 0 ? 'workOrder' : _props$type;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     option = _useState2[0],
@@ -7162,7 +7164,7 @@ var Province = function Province(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setOptions(type === 'workOrder' ? address.addressOptions || [] : bsAddress.addressOptions || []);
+            setOptions(type !== 'bs' ? address.addressOptions || [] : bsAddress.addressOptions || []);
           case 1:
           case "end":
             return _context.stop();
@@ -7210,7 +7212,7 @@ var ParseLogistics = function ParseLogistics(props) {
     });
   };
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(TextArea, {
-    placeholder: "\u590D\u5236\u7269\u6D41\u4FE1\u606F\uFF0C\u70B9\u51FB\u667A\u80FD\u8BC6\u522B",
+    placeholder: "\u590D\u5236\u4FE1\u606F\uFF0C\u70B9\u51FB\u667A\u80FD\u8BC6\u522B",
     rows: 3,
     value: value,
     onChange: function onChange(e) {
@@ -7370,9 +7372,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 +7576,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 +7586,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
   })));
 };
 
@@ -8980,6 +8973,12 @@ var Payment = function Payment(props) {
     placeholder: '请输入支付宝账号',
     required: zhiFubaoRequired,
     show: true
+  }, {
+    label: '打款状态',
+    name: 'enterprisePaymentStatus',
+    placeholder: '',
+    required: false,
+    show: true
   }];
   return /*#__PURE__*/React.createElement(React.Fragment, null, PaymentList.map(function (item) {
     return item.show && /*#__PURE__*/React.createElement(Form.Item, {
@@ -9318,6 +9317,47 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     typeof onChange === 'function' && onChange(_objectSpread2(_objectSpread2({}, value), {}, {
       trajectoryCompany: val
     }));
+    handleSearchSnapshot(val);
+  };
+  var handleSearchSnapshot = function handleSearchSnapshot(company) {
+    var trajectoryCompany = value.trajectoryCompany,
+      trajectoryCode = value.trajectoryCode,
+      trajectoryPhone = value.trajectoryPhone;
+    var newCompany = company ? company : trajectoryCompany;
+    if (newCompany === 'SF' && !(newCompany && trajectoryCode && trajectoryPhone)) {
+      return;
+    } else if (!(newCompany && trajectoryCode)) {
+      return;
+    }
+    try {
+      extendRequest('/qy/logistics/logisticsTraceSearch', {
+        method: 'post',
+        data: {
+          mailNo: trajectoryCode,
+          cpCode: newCompany,
+          mobile: trajectoryPhone
+        }
+      }).then(function (res) {
+        var result = res.result,
+          success = res.success,
+          data = res.data,
+          msg = res.message;
+        if (result === 100 || success) {
+          onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+            trajectorySnapshot: data === null || data === void 0 ? void 0 : data.logisticsStatusDesc,
+            trajectoryCompany: newCompany
+          }));
+        } else {
+          msg && message.error(msg);
+        }
+      });
+    } catch (err) {
+      onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        trajectorySnapshot: '',
+        trajectoryCompany: newCompany
+      }));
+      (err === null || err === void 0 ? void 0 : err.message) && message.error(err === null || err === void 0 ? void 0 : err.message);
+    }
   };
   //物流公司
   var LogisticsCompany = function LogisticsCompany() {
@@ -9329,7 +9369,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);
@@ -9344,12 +9385,35 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       onChange: function onChange(e) {
         return handleInputChange(e, 'trajectoryCode');
       },
-      value: value === null || value === void 0 ? void 0 : value.trajectoryCode
+      value: value === null || value === void 0 ? void 0 : value.trajectoryCode,
+      onBlur: function onBlur() {
+        return handleSearchSnapshot();
+      }
+    });
+  };
+  //sf手机号
+  var LogisticsPhone = function LogisticsPhone() {
+    return /*#__PURE__*/React.createElement(Input, {
+      disabled: disabled,
+      style: {
+        marginTop: '8px'
+      },
+      placeholder: "\u624B\u673A\u53F7",
+      onChange: function onChange(e) {
+        return handleInputChange(e, 'trajectoryPhone');
+      },
+      value: value === null || value === void 0 ? void 0 : value.trajectoryPhone,
+      onBlur: function onBlur() {
+        return handleSearchSnapshot();
+      }
     });
   };
   //物流快照
   var LogisticsSnapshot = function LogisticsSnapshot() {
     return /*#__PURE__*/React.createElement(Input, {
+      style: {
+        marginTop: '8px'
+      },
       disabled: true,
       placeholder: "\u7269\u6D41\u5FEB\u7167",
       onChange: function onChange(e) {
@@ -9358,7 +9422,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
     });
   };
-  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
+  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
 };
 
 var jstGoods = function jstGoods(props) {
@@ -9422,7 +9486,7 @@ var jstGoods = function jstGoods(props) {
         return setChangeIndex(index);
       }
     }, "\u5305\u88F9".concat(index + 1)));
-  }))) : null, value.length ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, {
+  }))) : null, value.length ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React.createElement(Select, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     onChange: function onChange(val) {
@@ -9437,14 +9501,14 @@ var jstGoods = function jstGoods(props) {
     style: {
       minWidth: '100px'
     }
-  }), /*#__PURE__*/React.createElement(Input, {
+  }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'logisticsCode');
     },
     value: (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2.logisticsCode
-  })) : null, type === 2 ? /*#__PURE__*/React.createElement(Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
+  }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement(Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u7F16\u7801",
     onChange: function onChange(e) {
@@ -9630,15 +9694,13 @@ 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([{
-      tab: '所选商品',
-      key: 'onSale'
-    }
-    // { tab: '已选商品', key: 'select' },
-    ]),
-    _useState18 = _slicedToArray(_useState17, 1),
-    tabs = _useState18[0];
+  var _useState17 = useState({}),
+    _useState18 = _slicedToArray(_useState17, 2),
+    shopInfo = _useState18[0],
+    setShopInfo = _useState18[1]; //店铺信息
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
   //选择页码
   var pageChange = function pageChange(page, pageSize) {
     setSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, {
@@ -9668,53 +9730,56 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   /**
    * 查询商品
    */
-  var queryItems = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var res, _ref2, items, totalCount;
-      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', {
-              method: 'post',
-              data: queryPd()
-            });
-          case 4:
-            res = _context.sent;
-            _ref2 = res.data || {
-              items: [],
-              totalCount: 0
-            }, items = _ref2.items, totalCount = _ref2.totalCount;
-            items.forEach(function (item) {
-              item.platform = platform;
-              item.key = item.numIid;
-            });
-            setGoodList(_toConsumableArray(items));
-            setTotal(totalCount);
-          case 9:
-            _context.prev = 9;
-            setLoading(false);
-            return _context.finish(9);
-          case 12:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[0,, 9, 12]]);
-    }));
-    return function queryItems() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+  var queryItems = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    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);
+          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: params
+          });
+        case 9:
+          res = _context.sent;
+          _ref2 = res.data || {
+            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;
+          });
+          setGoodList(newList);
+          setTotal(_total);
+        case 15:
+          _context.prev = 15;
+          setLoading(false);
+          return _context.finish(15);
+        case 18:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0,, 15, 18]]);
+  })), [searchParams]);
   useEffect(function () {
     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) {
@@ -9730,8 +9795,15 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     onSubmit(selectList);
     _onCancel();
   };
+  var onFinish = function onFinish(value) {
+    setSearch(_objectSpread2({}, searchParams));
+  };
+  var onReset = function onReset() {
+    setSearch(_objectSpread2({}, searchParams));
+    form.resetFields();
+  };
   return /*#__PURE__*/React.createElement(Modal, {
-    title: '选择商品编码',
+    title: '选择商品',
     okText: '确认',
     cancelText: '取消',
     visible: visible,
@@ -9741,42 +9813,33 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, /*#__PURE__*/React.createElement(Tabs, {
-    type: "card",
-    activeKey: searchParams.type,
-    onChange: function onChange(e) {
-      var params = _objectSpread2(_objectSpread2({}, searchParams), {}, {
-        type: e,
-        pageNo: 1
-      });
-      setSearch(params);
-    }
-  }, tabs.map(function (tab) {
-    return /*#__PURE__*/React.createElement(TabPane$1, {
-      tab: tab.tab + (tab.key === 'select' ? "(".concat(selectList.length, ")") : ''),
-      key: tab.key
-    });
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "searchBox",
-    style: {
-      display: searchParams.type === 'select' ? 'none' : ''
-    }
   }, /*#__PURE__*/React.createElement(Form, {
-    layout: "inline"
-  }, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
+    layout: "inline",
+    form: form,
+    onFinish: onFinish
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "code"
+  }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u6B3E\u5F0F\u7F16\u7801"
-  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "sku"
+  }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u5546\u54C1\u7F16\u7801"
-  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "name"
+  }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u5546\u54C1\u540D\u79F0"
   })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     htmlType: "submit"
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, null, "\u91CD\u7F6E")))), /*#__PURE__*/React.createElement(Spin, {
+  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
+    onClick: onReset
+  }, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement(Table, {
     rowSelection: rowSelection,
     columns: columns,
+    rowKey: 'numIid',
     dataSource: searchParams.type == 'select' ? selectList : goodList,
     scroll: {
       y: 300
@@ -9804,8 +9867,8 @@ var GoodItem = function GoodItem(props) {
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
     disabled = props.disabled,
-    _props$showField = props.showField,
-    showField = _props$showField === void 0 ? [] : _props$showField,
+    _props$showHeader = props.showHeader,
+    showHeader = _props$showHeader === void 0 ? [] : _props$showHeader,
     width = props.width,
     _props$shopList = props.shopList,
     shopList = _props$shopList === void 0 ? [] : _props$shopList,
@@ -9821,11 +9884,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 +9898,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;
@@ -9845,37 +9913,49 @@ var GoodItem = function GoodItem(props) {
   var GOODS_INFO_COLUMNS = function GOODS_INFO_COLUMNS() {
     var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     return [{
+      dataIndex: 'pic',
+      title: "\u56FE\u7247",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
       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 +9964,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
@@ -9906,20 +9986,8 @@ var GoodItem = function GoodItem(props) {
       render: function render(val, record, index) {
         return /*#__PURE__*/React.createElement("span", null, index + 1);
       }
-    }, {
-      dataIndex: 'pic',
-      title: "bs\u56FE\u7247",
-      align: 'center',
-      ellipsis: true,
-      width: 200,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement(Image, {
-          width: 60,
-          src: val
-        });
-      }
-    }].concat(_toConsumableArray(GOODS_INFO_COLUMNS(headerText).filter(function (t) {
-      return showField.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
+    }].concat(_toConsumableArray(GOODS_INFO_COLUMNS().filter(function (t) {
+      return showHeader.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
     })));
     if (!disabled) {
       columnList.push({
@@ -9927,6 +9995,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",
@@ -9938,7 +10007,7 @@ var GoodItem = function GoodItem(props) {
       });
     }
     return columnList;
-  }, [showField, value, disabled]);
+  }, [showHeader, value, disabled]);
   var onSubmit = function onSubmit(list) {
     var newList = list.map(function (item) {
       var picUrl = item.picUrl,
@@ -9953,9 +10022,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 +10050,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 +10097,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 +10105,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 +10114,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 +10124,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 +10133,7 @@ var BsGoods = function BsGoods(props) {
           })
         });
       }
-      // pubsub.unsubscribe('reissueType');
     });
-
     return function () {
       pubsub.unsubscribe(ref.current);
       pubsub.unsubscribe(reissueRef.current);
@@ -10072,30 +10141,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,25 +10180,39 @@ 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) {
-    var _val$bsExchangeType;
+    var _val$bsExchangeType, _val$bsExchangeType2;
     //如果是原单换
     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) {
@@ -10138,7 +10229,7 @@ var BsExchange = function BsExchange(props) {
         }
         return prv;
       }, []);
-    } 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])) {
       //补发换货
       return list.reduce(function (prv, next, index) {
         next.canDelete = true;
@@ -10163,6 +10254,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 +10276,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 +10300,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 +10335,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 +10366,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 +10414,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 +10425,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) {