@kmkf-fe-packages/basic-components 0.7.15-alpha.7 → 0.7.15-alpha.71

package/dist/index.esm.js

@@ -1,8 +1,8 @@
 import React, { useRef, useState, useEffect, useMemo, forwardRef, useImperativeHandle, useCallback } from 'react';
-import { Cascader, DatePicker, Input, InputNumber, Select, Upload, Image, message, Radio, Space, Spin, Checkbox, Row, Col, Slider, Rate, Button, Form, Tabs, Modal, ConfigProvider, Pagination, Popover, Table } from 'antd';
+import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Checkbox, Row, Col, Slider, Rate, Button, Form, Tabs, Modal, ConfigProvider, Pagination, Popover, Table } from 'antd';
 import { EyeOutlined, DeleteOutlined, InboxOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
-import { AddressData, BsAddressData, request as request$1, LogisticsAddressData } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, request as request$1, LogisticsAddressData, uuid } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
 import pubsub from 'pubsub-js';
 import { cloneDeep } from 'lodash';
@@ -505,7 +505,8 @@ function ApaasInput(props) {
   var isNumber = props.isNumber,
     replaceWarn = props.replaceWarn,
     other = _objectWithoutProperties(props, _excluded$1);
-  return /*#__PURE__*/React.createElement(Input, _objectSpread2({}, other));
+  // @ts-ignore
+  return isNumber ? /*#__PURE__*/React.createElement(InputNumber, _objectSpread2({}, other)) : /*#__PURE__*/React.createElement(Input, _objectSpread2({}, other));
 }
 
 function ApaasInputNumber(props) {
@@ -819,21 +820,23 @@ function ApaasRadio(props) {
   var triggerChange = function triggerChange(changedValue) {
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), changedValue));
   };
-  var onRadioChange = function onRadioChange(e) {
-    var radioValue = e.target.value;
-    triggerChange({
-      value: radioValue
-    });
-  };
   var onOtherChange = function onOtherChange(e) {
     var other = e.target.value;
     triggerChange({
       other: other
     });
   };
+  var onRadioClick = function onRadioClick(e) {
+    var selectValue = e.target.value;
+    if (selectValue === radioValue) {
+      selectValue = '';
+    }
+    triggerChange({
+      value: selectValue
+    });
+  };
   return /*#__PURE__*/React.createElement(Radio.Group, _objectSpread2({
-    value: radioValue,
-    onChange: onRadioChange
+    value: radioValue
   }, otherProps), /*#__PURE__*/React.createElement(Space, {
     direction: horizontal ? 'horizontal' : 'vertical',
     wrap: true
@@ -841,11 +844,13 @@ function ApaasRadio(props) {
     return /*#__PURE__*/React.createElement(Radio, {
       value: item.value,
       key: item.label,
-      disabled: disabled
+      disabled: disabled,
+      onClick: onRadioClick
     }, item.label);
   }), showOther && /*#__PURE__*/React.createElement(Radio, {
     value: "\u5176\u4ED6",
-    disabled: disabled
+    disabled: disabled,
+    onClick: onRadioClick
   }, "\u5176\u4ED6", /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     value: other,
@@ -6940,7 +6945,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;
     }
@@ -6963,7 +6968,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,
@@ -7152,7 +7157,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],
@@ -7163,7 +7169,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();
@@ -7182,6 +7188,9 @@ var Province = function Province(props) {
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
     options: option,
+    style: {
+      minWidth: '100px'
+    },
     placeholder: "\u8BF7\u9009\u62E9\u7701\u5E02\u533A"
   })));
 };
@@ -7211,7 +7220,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) {
@@ -7258,12 +7267,14 @@ var IdentifyAddress = function IdentifyAddress(props) {
     value: value.receiverName,
     disabled: disabled,
     placeholder: "\u6536\u4EF6\u4EBA\u59D3\u540D",
+    allowClear: true,
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'receiverName');
     }
   }), /*#__PURE__*/React.createElement(Input, {
     value: value.receiverMobile,
     disabled: disabled,
+    allowClear: true,
     placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'receiverMobile');
@@ -7280,6 +7291,7 @@ var IdentifyAddress = function IdentifyAddress(props) {
     value: value.detail,
     disabled: disabled,
     placeholder: "\u8BE6\u7EC6\u5730\u5740",
+    allowClear: true,
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'detail');
     }
@@ -8947,31 +8959,43 @@ var Payment = function Payment(props) {
     name: 'enterprisePaymentTid',
     placeholder: '请输入订单编号',
     required: required,
-    show: true
+    show: true,
+    hidden: false
   }, {
     label: '打款金额',
     name: 'enterprisePaymentRefundFee',
     placeholder: '请输入打款金额',
     required: required,
-    show: true
+    show: true,
+    hidden: false
   }, {
     label: '买家昵称',
     name: 'enterprisePaymentBuyerNick',
     placeholder: '请输入买家昵称',
     required: false,
-    show: true
+    show: true,
+    hidden: false
   }, {
     label: '支付宝名称',
     name: 'enterprisePaymentAlipayNick',
     placeholder: '请输入支付宝名称',
     required: zhiFubaoRequired,
-    show: true
+    show: true,
+    hidden: false
   }, {
     label: '支付宝账号',
     name: 'enterprisePaymentAlipayNo',
     placeholder: '请输入支付宝账号',
     required: zhiFubaoRequired,
-    show: true
+    show: true,
+    hidden: false
+  }, {
+    label: '打款状态',
+    name: 'enterprisePaymentStatus',
+    placeholder: '',
+    required: false,
+    show: false,
+    hidden: true
   }];
   return /*#__PURE__*/React.createElement(React.Fragment, null, PaymentList.map(function (item) {
     return item.show && /*#__PURE__*/React.createElement(Form.Item, {
@@ -9310,6 +9334,58 @@ 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 (!(showField && showField.includes('snapshot'))) {
+      return;
+    }
+    if (disabled) {
+      return;
+    }
+    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 {
+          onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+            trajectorySnapshot: '',
+            trajectoryCompany: newCompany
+          }));
+          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() {
@@ -9332,20 +9408,40 @@ 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) {
         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) {
@@ -9354,7 +9450,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 && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
 };
 
 var jstGoods = function jstGoods(props) {
@@ -9368,7 +9464,7 @@ var jstGoods = function jstGoods(props) {
     _props$type = props.type,
     type = _props$type === void 0 ? 1 : _props$type,
     _props$showField = props.showField,
-    showField = _props$showField === void 0 ? 'all' : _props$showField;
+    showField = _props$showField === void 0 ? '' : _props$showField;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -9377,7 +9473,12 @@ var jstGoods = function jstGoods(props) {
     setChangeIndex(0);
   }, []);
   var content = function content(item, index) {
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        maxHeight: '300px',
+        overflowY: 'auto'
+      }
+    }, /*#__PURE__*/React.createElement("div", {
       style: {
         textAlign: 'center'
       }
@@ -9418,7 +9519,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) {
@@ -9433,14 +9534,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) {
@@ -9545,44 +9646,79 @@ var ItemList = function ItemList(props) {
   }, "\u6682\u4E0D\u652F\u6301\u6DFB\u52A0")) : null);
 };
 
-var TabPane$1 = Tabs.TabPane;
 var columns = [{
-  dataIndex: 'picUrl',
-  title: '主图',
-  render: function render(val) {
-    return /*#__PURE__*/React.createElement(Image, {
-      width: 60,
-      src: val
-    });
+  dataIndex: 'index',
+  title: '序号',
+  render: function render(val, record, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '50px'
+      }
+    }, index + 1);
   }
 }, {
-  dataIndex: 'outerId',
-  title: '款式编码'
+  dataIndex: 'name',
+  title: '商品名称',
+  with: 200,
+  ellipsis: true
 }, {
-  dataIndex: 'numIid',
-  title: '商品编码'
+  dataIndex: 'goodsId',
+  title: '商品id',
+  with: 200,
+  ellipsis: true
 }, {
-  dataIndex: 'title',
-  title: '商品名称'
+  dataIndex: 'skuName',
+  title: '商品sku名称',
+  with: 200,
+  ellipsis: true
 }, {
-  dataIndex: 'skus',
-  title: '颜色及规格'
+  dataIndex: 'code',
+  title: '商品编码',
+  with: 200,
+  // ellipsis: true,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '100px'
+      }
+    }, val);
+  }
+}, {
+  dataIndex: 'skuCode',
+  title: '商品sku编码',
+  with: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'marketPrice',
+  title: '市场价',
+  // with: 200,
+  // ellipsis: true,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '70px'
+      }
+    }, val);
+  }
 }];
 var GoodsModal$1 = function GoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       open: function open() {
         setVisible(true);
+        setPageNo(1);
         setSelect([]);
         setSelectIds([]);
         queryItems();
+        onReset();
       }
     };
   });
   var onSubmit = props.onSubmit,
     shopId = props.shopId,
     shopList = props.shopList,
-    width = props.width;
+    width = props.width,
+    shopCode = props.shopCode;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
@@ -9597,123 +9733,85 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     setSelectIds = _useState6[1];
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    goodList = _useState8[0],
-    setGoodList = _useState8[1];
-  var _useState9 = useState(false),
+    allList = _useState8[0],
+    setAllList = _useState8[1]; //获取到的所有数据
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    loading = _useState10[0],
-    setLoading = _useState10[1];
-  var _useState11 = useState({
-      apiName: 'queryItems',
-      desc: true,
-      numIids: '',
-      orderBy: 'list_time',
-      pageNo: 1,
-      pageSize: 10,
-      shopId: shopId,
-      type: 'onSale',
-      cids: '',
-      title: ''
-    }),
+    filterList = _useState10[0],
+    setFilterList = _useState10[1]; //获取到的筛选数据
+  var _useState11 = useState(1),
     _useState12 = _slicedToArray(_useState11, 2),
-    searchParams = _useState12[0],
-    setSearch = _useState12[1];
-  var _useState13 = useState(0),
-    _useState14 = _slicedToArray(_useState13, 2),
-    total = _useState14[0],
-    setTotal = _useState14[1];
-  var _useState15 = useState(''),
+    pageNo = _useState12[0],
+    setPageNo = _useState12[1];
+  var _useState13 = useState(20),
+    _useState14 = _slicedToArray(_useState13, 1),
+    pageSize = _useState14[0];
+  var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    platform = _useState16[0],
-    setPlatform = _useState16[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
-  var _useState17 = useState({}),
+    goodList = _useState16[0],
+    setGoodList = _useState16[1];
+  var _useState17 = useState(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    shopInfo = _useState18[0],
-    setShopInfo = _useState18[1]; //店铺信息
-  var _useState19 = useState([{
-      tab: '所选商品',
-      key: 'onSale'
-    }
-    // { tab: '已选商品', key: 'select' },
-    ]),
-    _useState20 = _slicedToArray(_useState19, 1),
-    tabs = _useState20[0];
+    loading = _useState18[0],
+    setLoading = _useState18[1];
+  var _useState19 = useState(0),
+    _useState20 = _slicedToArray(_useState19, 2),
+    total = _useState20[0],
+    setTotal = _useState20[1];
+  var _useState21 = useState(''),
+    _useState22 = _slicedToArray(_useState21, 2),
+    platform = _useState22[0],
+    setPlatform = _useState22[1]; //平台 taobao=淘宝 fxg=抖音 pdd=拼多多 sph=微信视屏号
+  var _useState23 = useState({}),
+    _useState24 = _slicedToArray(_useState23, 2),
+    shopInfo = _useState24[0],
+    setShopInfo = _useState24[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), {}, {
-      pageNo: page,
-      pageSize: pageSize
-    }));
-  };
-  /**
-   *
-   * @returns 获取查询参数
-   */
-  var queryPd = function queryPd() {
-    var params = {
-      apiName: 'queryItems',
-      desc: searchParams.desc,
-      productIds: searchParams.numIids,
-      orderBy: searchParams.orderBy,
-      pageNo: searchParams.pageNo,
-      pageSize: searchParams.pageSize,
-      shopId: shopId,
-      type: searchParams.type,
-      title: searchParams.title,
-      cids: searchParams.cids
-    };
-    return params;
+  var pageChange = function pageChange(page) {
+    setPageNo(page);
+    setGoodList(_toConsumableArray(filterList).splice((page - 1) * pageSize, pageSize));
   };
   /**
    * 查询商品
    */
-  var queryItems = /*#__PURE__*/function () {
-    var _ref = _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;
+  var queryItems = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var params, res, products, newProducts;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          setLoading(true);
+          params = {
+            shopCode: shopCode
+          };
+          _context.next = 5;
+          return extendRequest('/qy/gdfw/product/bsListProduct', {
+            method: 'post',
+            data: params
+          });
+        case 5:
+          res = _context.sent;
+          products = res.data.products;
+          newProducts = products.map(function (item, index) {
+            return _objectSpread2(_objectSpread2({}, item), {}, {
+              index: index + 1
             });
-            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]]);
-    }));
-    return function queryItems() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+          });
+          setAllList(_toConsumableArray(newProducts));
+          initData(_toConsumableArray(newProducts));
+        case 10:
+          _context.prev = 10;
+          setLoading(false);
+          return _context.finish(10);
+        case 13:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0,, 10, 13]]);
+  })), [shopCode]);
   useEffect(function () {
     var shopInfo = shopList.find(function (item) {
       return shopId === item.shopId || shopId === item.shopName;
@@ -9724,12 +9822,19 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }, [shopId]);
   var rowSelection = {
     selectedRowKeys: selectIds,
+    fixed: true,
     onChange: function onChange(selectedRowKeys, selectedRows, info) {
       console.log(selectedRowKeys, selectedRows, info);
       setSelectIds(selectedRowKeys);
       setSelect(_toConsumableArray(selectedRows));
     }
   };
+  var initData = function initData(list) {
+    setFilterList(_toConsumableArray(list));
+    setGoodList(_toConsumableArray(list).splice(0, pageSize));
+    setTotal(list.length);
+    setPageNo(1);
+  };
   var _onCancel = function onCancel() {
     setVisible(false);
   };
@@ -9737,8 +9842,23 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     onSubmit(selectList);
     _onCancel();
   };
+  var onFinish = function onFinish(value) {
+    var newFilterList = [];
+    Object.keys(value).forEach(function (key) {
+      if (value[key]) {
+        newFilterList = allList.filter(function (item) {
+          return item[key].indexOf(value[key]) > -1;
+        });
+      }
+    });
+    initData(newFilterList);
+  };
+  var onReset = function onReset() {
+    form.resetFields();
+    initData(_toConsumableArray(allList));
+  };
   return /*#__PURE__*/React.createElement(Modal, {
-    title: '选择商品编码',
+    title: '选择商品',
     okText: '确认',
     cancelText: '取消',
     visible: visible,
@@ -9748,52 +9868,53 @@ 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);
+  }, /*#__PURE__*/React.createElement(Form, {
+    layout: "inline",
+    form: form,
+    onFinish: onFinish
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "name"
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1\u540D\u79F0",
+    style: {
+      width: 150
     }
-  }, 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",
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "code"
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1\u7F16\u7801",
     style: {
-      display: searchParams.type === 'select' ? 'none' : ''
+      width: 150
+    }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "skuCode"
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8BF7\u8F93\u5165\u5546\u54C1sku\u7F16\u7801",
+    style: {
+      width: 150
     }
-  }, /*#__PURE__*/React.createElement(Form, {
-    layout: "inline"
-  }, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u6B3E\u5F0F\u7F16\u7801"
-  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801"
-  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__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,
+    rowKey: 'skuCode',
+    dataSource: goodList,
     scroll: {
+      x: true,
       y: 300
     },
     pagination: {
       size: 'small',
       total: total,
-      current: searchParams.pageNo,
-      pageSize: searchParams.pageSize,
+      current: pageNo,
+      pageSize: pageSize,
+      pageSizeOptions: [],
       onChange: pageChange
     }
   })));
@@ -9812,8 +9933,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,
@@ -9825,16 +9946,19 @@ var GoodItem = function GoodItem(props) {
     showChangeBtn = _props$showChangeBtn === void 0 ? true : _props$showChangeBtn,
     _props$tableSelect = props.tableSelect,
     tableSelect = _props$tableSelect === void 0 ? false : _props$tableSelect,
+    _props$selectType = props.selectType,
+    selectType = _props$selectType === void 0 ? '' : _props$selectType,
     _props$otherOperation = props.otherOperations,
     otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
+    shopCode = props.shopCode,
     onSelect = props.onSelect,
     onDelete = props.onDelete;
   var refModal = useRef();
-  var handleDelete = function handleDelete(index) {
+  var handleDelete = function handleDelete(record, index) {
     onDelete === null || onDelete === void 0 ? void 0 : onDelete(value[index]);
-    var newList = value.filter(function (item, i) {
+    var newList = _toConsumableArray(value).filter(function (item, i) {
       return index !== i;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(newList));
@@ -9844,10 +9968,8 @@ var GoodItem = function GoodItem(props) {
     selectedRowKeys = _useState2[0],
     setSelectedRowKeys = _useState2[1];
   useEffect(function () {
-    if (!tableSelect) {
-      setSelectedRowKeys([]);
-    }
-  }, [tableSelect]);
+    setSelectedRowKeys([]);
+  }, [tableSelect, selectType]);
   var updateHandle = function updateHandle(val, index, type) {
     if (value === null || value === void 0 ? void 0 : value.length) {
       value[index][type] = val;
@@ -9858,6 +9980,18 @@ 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: "".concat(text, "\u540D\u79F0"),
       align: 'center',
@@ -9890,6 +10024,8 @@ var GoodItem = function GoodItem(props) {
       render: function render(val, record, index) {
         return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           value: val,
+          min: 0,
+          precision: 0,
           onChange: function onChange(num) {
             return updateHandle(num, index, 'number');
           }
@@ -9919,20 +10055,8 @@ var GoodItem = function GoodItem(props) {
       render: function render(val, record, index) {
         return /*#__PURE__*/React.createElement("span", null, index + 1);
       }
-    }, {
-      dataIndex: 'pic',
-      title: "\u56FE\u7247",
-      align: 'center',
-      ellipsis: true,
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement(Image, {
-          width: 60,
-          src: val
-        });
-      }
     }].concat(_toConsumableArray(GOODS_INFO_COLUMNS().filter(function (t) {
-      return showField.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
+      return showHeader.includes(t === null || t === void 0 ? void 0 : t.dataIndex);
     })));
     if (!disabled) {
       columnList.push({
@@ -9945,30 +10069,32 @@ var GoodItem = function GoodItem(props) {
           return record.canDelete ? /*#__PURE__*/React.createElement(Button, {
             type: "link",
             onClick: function onClick() {
-              return handleDelete(index);
+              return handleDelete(record, index);
             }
           }, "\u5220\u9664") : null;
         }
       });
     }
     return columnList;
-  }, [showField, value, disabled]);
+  }, [showHeader, value, disabled]);
   var onSubmit = function onSubmit(list) {
     var newList = list.map(function (item) {
-      var picUrl = item.picUrl,
-        title = item.title,
-        price = item.price,
-        numIid = item.numIid;
+      var goodsId = item.goodsId,
+        name = item.name,
+        code = item.code,
+        skuCode = item.skuCode,
+        marketPrice = item.marketPrice;
       return {
-        id: numIid,
-        pic: picUrl,
-        name: title,
-        code: '',
-        sku: '',
-        money: price,
-        share: '',
+        id: goodsId,
+        pic: '',
+        name: name,
+        code: code,
+        sku: skuCode,
+        money: marketPrice || 0,
+        share: marketPrice || 0,
         number: 1,
         type: '',
+        uuid: uuid(),
         canDelete: true,
         canUpdateNumber: canUpdateNumber
       };
@@ -9978,7 +10104,7 @@ var GoodItem = function GoodItem(props) {
   var onSelectChange = function onSelectChange(newSelectedRowKeys) {
     setSelectedRowKeys(newSelectedRowKeys);
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(value.filter(function (t) {
-      return newSelectedRowKeys.includes(t.id);
+      return newSelectedRowKeys.includes(t.uuid);
     }));
   };
   var handleChangeGoods = function handleChangeGoods() {
@@ -10006,7 +10132,7 @@ var GoodItem = function GoodItem(props) {
   }, "\u9009\u62E9\u5546\u54C1"), otherOperations), /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
     columns: newColumns,
     dataSource: value,
-    rowKey: 'id',
+    rowKey: 'uuid',
     size: "small",
     pagination: false,
     scroll: {
@@ -10021,96 +10147,102 @@ var GoodItem = function GoodItem(props) {
     width: width,
     shopList: shopList,
     shopId: shopId,
-    maxLength: maxLength
+    maxLength: maxLength,
+    shopCode: shopCode
   }));
 };
 
 var BsGoods = function BsGoods(props) {
+  var _withInfo$current3, _withInfo$current4;
   var value = props.value,
-    disabled = props.disabled;
+    disabled = props.disabled,
+    onChange = props.onChange;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     tableSelect = _useState2[0],
     setTableSelect = _useState2[1];
-  var _useState3 = useState({
-      type: '',
-      val: ''
-    }),
-    _useState4 = _slicedToArray(_useState3, 2),
-    withInfo = _useState4[0],
-    setWithInfo = _useState4[1];
-  var ref = useRef();
-  var reissueRef = useRef();
+  var withInfo = useRef(null);
+  var valueRef = useRef(null);
   useEffect(function () {
-    ref.current = pubsub.subscribeOnce('type', function (type, val) {
-      console.log('goods', type, val, value);
+    valueRef.current = value;
+    pubsub.subscribe('type', function (type, data) {
+      console.log(type, data);
       if (disabled) return;
-      setWithInfo({
+      withInfo.current = {
         type: type,
-        val: val
-      });
-      setTableSelect(['2', '4'].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) {
-            item.canDelete = false;
-            return item;
-          })
+        val: data.val
+      };
+      setTableSelect(['2', '4'].includes(data.val));
+      if (['1', '3'].includes(data.val)) {
+        var _valueRef$current;
+        pubsub.publish('selectListReturn', {
+          list: cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current.bsGoods) || []),
+          newValue: data === null || data === void 0 ? void 0 : data.newValue
         });
       }
     });
     //补发
-    reissueRef.current = pubsub.subscribeOnce('reissueType', function (type, val) {
+    pubsub.subscribe('reissueType', function (type, data) {
       if (disabled) return;
-      console.log('reissueType', type, val, value);
-      setWithInfo({
+      withInfo.current = {
         type: type,
-        val: val
-      });
-      setTableSelect(['2', '4'].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) {
-            item.canDelete = false;
-            return item;
-          })
+        val: data.val
+      };
+      setTableSelect(['2', '4'].includes(data.val));
+      if (['1', '3'].includes(data.val)) {
+        var _valueRef$current2;
+        pubsub.publish('reissueSelectListReturn', {
+          list: cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.bsGoods) || [])
         });
       }
     });
-    return function () {
-      pubsub.unsubscribe(ref.current);
-      pubsub.unsubscribe(reissueRef.current);
-    };
-  }, [value, withInfo, disabled]);
-  var _onSelect = useCallback(function (list) {
+  }, [disabled, value]);
+  // useEffect(() => {
+  //   if (!disabled) {
+  //     pubsub.publish('goodList', {
+  //       list: cloneDeep(value?.bsGoods || []),
+  //     });
+  //   }
+  // }, [value, disabled]);
+  var _onSelect = function onSelect(list) {
+    var _withInfo$current, _withInfo$current2;
     if (disabled) return;
-    console.log('withInfo', withInfo, list);
     var newList = cloneDeep(list);
-    pubsub.publish(withInfo.type === 'reissueType' ? 'reissueSelectList' : 'selectList', {
-      type: withInfo.val,
+    var type = ((_withInfo$current = withInfo.current) === null || _withInfo$current === void 0 ? void 0 : _withInfo$current.type) === 'reissueType' ? 'reissueSelectList' : 'selectList';
+    pubsub.publish(type, {
+      type: (_withInfo$current2 = withInfo.current) === null || _withInfo$current2 === void 0 ? void 0 : _withInfo$current2.val,
       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;
+    var deleteId = item === null || item === void 0 ? void 0 : item.sku;
     pubsub.publish('deleteGood', deleteId);
     pubsub.publish('reissueDeleteGood', deleteId);
   };
+  var changeHandle = function changeHandle(list) {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+      bsGoods: list
+    }));
+  };
   return /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
-    key: 'bsGoods',
-    disabled: disabled
+    key: 'bsGoods'
   }, props), {}, {
-    tableSelect: tableSelect,
+    disabled: disabled,
+    value: value === null || value === void 0 ? void 0 : value.bsGoods,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
+    tableSelect: ['2', '4'].includes(withInfo === null || withInfo === void 0 ? void 0 : (_withInfo$current3 = withInfo.current) === null || _withInfo$current3 === void 0 ? void 0 : _withInfo$current3.val),
+    selectType: withInfo === null || withInfo === void 0 ? void 0 : (_withInfo$current4 = withInfo.current) === null || _withInfo$current4 === void 0 ? void 0 : _withInfo$current4.type,
     onSelect: function onSelect(list) {
       return _onSelect(list);
     },
     onDelete: function onDelete(item) {
       return _onDelete(item);
+    },
+    onChange: function onChange(val) {
+      return changeHandle(val);
     }
   }));
 };
@@ -10124,17 +10256,18 @@ var BsExchange = function BsExchange(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$b);
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    bsGoods = _useState2[0],
+    setBsGoods = _useState2[1];
+  var valueRef = useRef({});
+  // useEffect(() => {
+  //   pubsub.subscribe('goodList', (_: any, data: any) => {
+  //     setBsGoods(data.list);
+  //   });
+  // }, []);
   useEffect(function () {
-    pubsub.subscribeOnce('selectList', function (_, data) {
-      if (disabled) return;
-      if (value) {
-        var newData = cloneDeep(data);
-        console.log('BsExchange', 'getListHandle', data, value, getListHandle(_toConsumableArray(newData.list), value));
-        onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), value)
-        }));
-      }
-    });
+    valueRef.current = value;
     pubsub.subscribeOnce('deleteGood', function (_, data) {
       if (disabled) return;
       if (value) {
@@ -10143,48 +10276,84 @@ var BsExchange = function BsExchange(props) {
         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 t.sku !== 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;
+            return item.sku !== data;
           });
         }
         onChange(newValue);
       }
     });
+    // pubsub.subscribeOnce('selectList', (_: any, data: any) => {
+    //   if (disabled) return;
+    //   if (value) {
+    //     const newData = cloneDeep(data);
+    //     onChange({
+    //       ...value,
+    //       bsExchangeReturnGoods: getListHandle([...newData.list], value),
+    //     });
+    //   }
+    // });
   }, [value]);
+  useEffect(function () {
+    pubsub.subscribe('selectList', function (_, data) {
+      if (disabled) return;
+      console.log('selectList', valueRef.current, data);
+      if (valueRef.current) {
+        var newDataList = cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
+        onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
+          bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
+        }));
+      }
+    });
+  }, []);
+  useEffect(function () {
+    pubsub.subscribe('selectListReturn', function (_, data) {
+      if (disabled) return;
+      var newDataList = cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
+      onChange(_objectSpread2(_objectSpread2({}, data.newValue), {}, {
+        bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
+      }));
+    });
+  }, []);
   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) {
-        var _val$bsExchangeType2;
         next.canDelete = false;
         //数量大于1 拆开
         if (next.number > 1) {
-          var newList = Array(next.number).fill(_objectSpread2({}, next)).map(function (t) {
-            t.number = 1;
-            return t;
+          var newList = Array(next.number).fill({}).map(function () {
+            var newNext = _objectSpread2({}, next);
+            newNext.money = newNext.share;
+            newNext.number = 1;
+            newNext.uuid = uuid();
+            return newNext;
           });
           prv.push.apply(prv, _toConsumableArray(newList));
-        } 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])) {
+        } else {
           prv.push(_objectSpread2({}, next));
         }
         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;
         next.index = index;
         //数量大于1 拆开
         if (next.number > 1) {
-          var newList = Array(next.number).fill(_objectSpread2({}, next)).map(function (t) {
-            t.number = 1;
-            return t;
+          var newList = Array(next.number).fill({}).map(function () {
+            var newNext = _objectSpread2({}, next);
+            newNext.money = newNext.share;
+            newNext.number = 1;
+            newNext.uuid = uuid();
+            return newNext;
           });
           prv.push({
             bsExchangeReturnGoods: _toConsumableArray(newList),
@@ -10205,11 +10374,25 @@ var BsExchange = function BsExchange(props) {
     newValue.bsExchangeType = val;
     newValue.bsExchangeReturnGoods = [];
     newValue.bsExchangeGiftGoods = [];
-    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-    pubsub.publish('type', val[0]);
+    // if (['1', '3'].includes(val[0])) {
+    //   newValue.bsExchangeReturnGoods = getListHandle(bsGoods, newValue);
+    // }
+    if (['2', '4'].includes(val[0])) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    }
+    pubsub.publish('type', {
+      val: val[0],
+      newValue: newValue
+    });
   };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
+    if (key === 'bsExchangeGiftGoods') {
+      val = cloneDeep(val).map(function (t) {
+        t.money = 0;
+        return t;
+      });
+    }
     newValue[key] = val;
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     if (key === 'bsExchangeType') {
@@ -10218,7 +10401,7 @@ var BsExchange = function BsExchange(props) {
     }
   };
   var changeReturnHandle = function changeReturnHandle(val, index, key) {
-    // console.log('changeReturnHandle', val, index, key);
+    console.log('changeReturnHandle', val, index, key);
     var newValue = _objectSpread2({}, value);
     newValue.bsExchangeReturnGoods[index][key] = (val || []).map(function (t) {
       t.index = index;
@@ -10267,15 +10450,22 @@ var BsExchange = function BsExchange(props) {
     disabled: disabled,
     showChangeBtn: false,
     value: value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     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({
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        border: '1px dashed',
+        marginBottom: '8px'
+      }
+    }, /*#__PURE__*/React.createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
       key: 'bsReturnGoods'
     }, other), {}, {
       disabled: disabled,
       showChangeBtn: showChangeBtn,
+      shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
       value: item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods,
       onChange: function onChange(val) {
         return changeReturnHandle(val, index, 'bsExchangeReturnGoods');
@@ -10287,6 +10477,7 @@ var BsExchange = function BsExchange(props) {
       showChangeBtn: showChangeBtn,
       otherOperations: copyGoods(index),
       value: item === null || item === void 0 ? void 0 : item.bsExchangeSwapOutGoods,
+      shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
       onChange: function onChange(val) {
         return changeReturnHandle(val, index, 'bsExchangeSwapOutGoods');
       }
@@ -10294,7 +10485,8 @@ var BsExchange = function BsExchange(props) {
   })), ['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
+    disabled: disabled,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode
   }, other), {}, {
     value: value === null || value === void 0 ? void 0 : value.bsExchangeGiftGoods,
     onChange: function onChange(val) {
@@ -10311,37 +10503,76 @@ var BsReissue = function BsReissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$c);
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    bsGoods = _useState2[0],
+    setBsGoods = _useState2[1];
+  var valueRef = useRef({});
+  // useEffect(() => {
+  //   pubsub.subscribe('goodList', (_: any, data: any) => {
+  //     setBsGoods(data.list);
+  //   });
+  // }, []);
   useEffect(function () {
-    pubsub.subscribeOnce('reissueSelectList', function (_, data) {
+    pubsub.subscribe('reissueSelectList', function (_, data) {
       if (disabled) return;
-      console.log(data, value);
-      if (value) {
-        var newData = cloneDeep(data);
-        onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          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;
-          })
-        }));
+      if (valueRef.current) {
+        var newValue = _objectSpread2({}, valueRef.current);
+        newValue.bsReissueGoods = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
+          item.money = 0;
+          item.share = 0;
+          item.canUpdateNumber = true;
+          return item;
+        });
+        onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       }
     });
+  }, []);
+  useEffect(function () {
+    pubsub.subscribe('reissueSelectListReturn', function (_, data) {
+      if (disabled) return;
+      var newValue = _objectSpread2({}, data.newValue);
+      newValue.bsReissueGoods = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
+        item.money = 0;
+        item.share = 0;
+        item.canUpdateNumber = true;
+        return item;
+      });
+      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    });
+  }, []);
+  useEffect(function () {
+    valueRef.current = value;
     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;
+          return item.sku !== data;
         });
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       }
     });
+    // pubsub.subscribeOnce('reissueSelectList', (_: any, data: any) => {
+    //   if (disabled) return;
+    //   if (value) {
+    //     const newValue = { ...value };
+    //     newValue.bsReissueGoods = data?.list.map((item: any) => {
+    //       item.money = 0;
+    //       item.share = 0;
+    //       item.canUpdateNumber = true;
+    //       return item;
+    //     });
+    //     onChange?.(newValue);
+    //   }
+    // });
   }, [value, disabled]);
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
     if (key === 'bsReissueGoods') {
       val = (val || []).map(function (item) {
         item.money = 0;
+        item.share = 0;
         return item;
       });
     }
@@ -10349,10 +10580,13 @@ var BsReissue = function BsReissue(props) {
     if (key === 'bsReissueType') {
       newValue.bsReissueGoods = [];
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
-    if (key === 'bsReissueType') {
-      pubsub.publish('reissueType', val[0]);
+    if (['2', '4'].includes(val[0])) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     }
+    pubsub.publish('reissueType', {
+      val: val[0],
+      newValue: newValue
+    });
   };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {
@@ -10370,12 +10604,13 @@ var BsReissue = function BsReissue(props) {
     onChange: function onChange(val) {
       return changeHandle(val, 'bsReissueType');
     }
-  }), /*#__PURE__*/React.createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
+  }), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'reissueGoods'
   }, other), {}, {
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value.bsReissueGoods,
     onChange: function onChange(val) {
       return changeHandle(val, 'bsReissueGoods');
@@ -10386,7 +10621,7 @@ var BsReissue = function BsReissue(props) {
 var css_248z$9 = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border: 1px solid #F2F3F5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4E5969;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 265px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodMain .goodItem {\n  width: 140px;\n  height: 175px;\n  padding: 11px 10px 0;\n  text-align: center;\n  display: inline-block;\n  vertical-align: top;\n  margin-bottom: 10px;\n  margin-right: 30px;\n  border: 1px solid #e6e6e6;\n  cursor: pointer;\n  transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n  width: 120px;\n  height: 120px;\n}\n.goodMain .goodItem .goodText {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodMain .goodItem.active {\n  border: 1px solid #3089dc;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n";
 styleInject(css_248z$9);
 
-var TabPane$2 = Tabs.TabPane;
+var TabPane$1 = Tabs.TabPane;
 var Option$2 = Select.Option;
 var Search$1 = Input.Search;
 var GoodsModal$3 = function GoodsModal(props) {
@@ -10702,7 +10937,7 @@ var GoodsModal$3 = function GoodsModal(props) {
       }));
     }
   }, tabs.map(function (tab) {
-    return /*#__PURE__*/React.createElement(TabPane$2, {
+    return /*#__PURE__*/React.createElement(TabPane$1, {
       tab: tab.tab + (tab.key === 'all' ? "(".concat(selectList.length, ")") : ''),
       key: tab.key
     });