@kmkf-fe-packages/basic-components 1.17.8-beta.2 → 1.17.8-beta.23

package/dist/index.esm.js

@@ -7520,7 +7520,9 @@ var IdentifyAddress = function IdentifyAddress(props) {
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'receiverMobile');
     }
-  })), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Province, {
+  })), /*#__PURE__*/React.createElement(Space, {
+    wrap: true
+  }, /*#__PURE__*/React.createElement(Province, {
     value: value.address,
     onChange: function onChange(val) {
       return changeHandle(val, 'address');
@@ -12022,6 +12024,347 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
 };
 var WdtGoodsModal = /*#__PURE__*/forwardRef(GoodsModal$3);
 
+var getTableData$1 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  var data = {
+    goodsSn: formData.goodsSn || null,
+    goodsname: formData.goodsname || null,
+    sku: formData.sku || null,
+    skuId: formData.skuId || null
+  };
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'WDT_ERP'
+    }, data)
+  }).then(function (res) {
+    var _res$data = res.data,
+      _res$data$productSkuL = _res$data.productSkuList,
+      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
+      _res$data$total = _res$data.total,
+      total = _res$data$total === void 0 ? 0 : _res$data$total;
+    var newProducts = productSkuList.map(function (item, index) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        index: index + 1
+      });
+    });
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
+var columns$2 = [{
+  dataIndex: 'index',
+  title: 'NO',
+  render: function render(val, record, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: 25
+      }
+    }, index + 1);
+  },
+  width: 100
+}, {
+  dataIndex: 'specName',
+  title: 'SKU名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'specNo',
+  title: 'SKU编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'specId',
+  title: 'SKUID',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'specImgUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React.createElement("img", {
+      style: {
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodId',
+  title: '商品ID',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'marketPrice',
+  title: '市场价',
+  width: 140,
+  render: function render(price) {
+    return Number(price).toFixed(2);
+  }
+}, {
+  dataIndex: 'retailPrice',
+  title: '零售价',
+  width: 140,
+  render: function render(price) {
+    return Number(price).toFixed(2);
+  }
+}, {
+  dataIndex: 'memberPrice',
+  title: '会员价',
+  width: 140,
+  render: function render(price) {
+    return Number(price).toFixed(2);
+  }
+}];
+var GoodList$1 = function GoodList(props, ref) {
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectIds = _useState4[0],
+    setSelectIds = _useState4[1];
+  useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = useAntdTable(getTableData$1, {
+      defaultPageSize: 10,
+      form: form
+    }),
+    tableProps = _useAntdTable.tableProps,
+    search = _useAntdTable.search,
+    params = _useAntdTable.params;
+  var submit = search.submit,
+    reset = search.reset;
+  var advanceSearchForm = /*#__PURE__*/React.createElement(Form, {
+    layout: "inline",
+    form: form
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "goodsSn",
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u5546\u54C1\u8D27\u53F7",
+    allowClear: true,
+    style: {
+      width: 150
+    }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "goodsname",
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u5546\u54C1\u540D\u79F0",
+    allowClear: true,
+    style: {
+      width: 150
+    }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "sku",
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "SKU",
+    allowClear: true,
+    style: {
+      width: 150
+    }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "skuId",
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "SKU ID",
+    allowClear: true,
+    style: {
+      width: 150
+    }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    style: {
+      marginRight: '8px'
+    },
+    onClick: submit
+  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
+    onClick: reset
+  }, "\u91CD\u7F6E")));
+  var rowSelection = {
+    selectedRowKeys: selectIds,
+    fixed: true,
+    onSelect: function onSelect(record, selected) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.specNo;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.specNo !== record.specNo;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.specNo;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(difference(selectIds, changeRows.map(function (t) {
+          return t.specNo;
+        })));
+        var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.specNo !== othVal.specNo;
+        });
+        setSelect(list);
+      }
+    }
+  };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.specNo;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.specNo !== record.specNo;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React.createElement(Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }].concat(takeRight(columns$2, columns$2.length - 1));
+    return selectList.length ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '387px'
+      }
+    }, /*#__PURE__*/React.createElement(Table, {
+      columns: showColumns,
+      rowKey: 'specNo',
+      dataSource: selectList,
+      scroll: {
+        x: '100%',
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: 10,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, advanceSearchForm, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '4px'
+    }
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
+    rowSelection: rowSelection,
+    rowKey: "specNo",
+    columns: columns$2,
+    scroll: {
+      x: '100%',
+      y: 250
+    }
+  }, tableProps))), /*#__PURE__*/React.createElement(Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectList.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React.createElement(Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
+};
+var BsE3GoodList = /*#__PURE__*/forwardRef(GoodList$1);
+
+var GoodsModal$4 = function GoodsModal(props, ref) {
+  useImperativeHandle(ref, function () {
+    return {
+      open: function open() {
+        setVisible(true);
+      }
+    };
+  });
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var bsE3GoodListRef = useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _bsE3GoodListRef$curr;
+    var selectedList = ((_bsE3GoodListRef$curr = bsE3GoodListRef.current) === null || _bsE3GoodListRef$curr === void 0 ? void 0 : _bsE3GoodListRef$curr.getSelectGoodList()) || [];
+    onSubmit(selectedList);
+    _onCancel();
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React.createElement(BsE3GoodList, {
+    ref: bsE3GoodListRef
+  })));
+};
+var BsE3GoodsModal = /*#__PURE__*/forwardRef(GoodsModal$4);
+
 // interface GoodsItem {
 //   title: string;
 //   pic: string;
@@ -12692,6 +13035,14 @@ var GoodItem$1 = function GoodItem(props) {
     shopId: shopId,
     maxLength: maxLength,
     companyKey: companyKey
+  }) : ['BS_E3_REISSUE_GOODS', 'BS_E3_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type) ? /*#__PURE__*/React.createElement(BsE3GoodsModal, {
+    ref: refModal,
+    onSubmit: onSubmit,
+    width: width,
+    shopList: shopList,
+    shopId: shopId,
+    maxLength: maxLength,
+    companyKey: companyKey
   }) : /*#__PURE__*/React.createElement(GoodsModal$2, {
     ref: refModal,
     onSubmit: onSubmit,
@@ -13311,19 +13662,89 @@ var BsReturnGoods = function BsReturnGoods(props) {
   })));
 };
 
-var columnsNameMap = {
-  BS_SYSTEM_ORDER: {
-    typeName: '单据类型',
-    tagName: '标签'
-  },
-  WLN_SYSTEM_ORDER: {
-    typeName: '订单类型',
-    tagName: '标记'
-  },
-  WDT_SYSTEM_ORDER: {
-    typeName: '订单类型',
-    tagName: '订单标签'
-  }
+var columnsMap = {
+  BS_SYSTEM_ORDER: [{
+    title: '单据类型',
+    dataIndex: 'billType',
+    width: 150
+  }, {
+    title: '系统订单号',
+    dataIndex: 'billNo',
+    width: 150
+  }, {
+    title: '标签',
+    dataIndex: 'billTag',
+    width: 150
+  }],
+  WLN_SYSTEM_ORDER: [{
+    title: '订单类型',
+    dataIndex: 'billType',
+    width: 150
+  }, {
+    title: '系统订单号',
+    dataIndex: 'billNo',
+    width: 150
+  }, {
+    title: '标记',
+    dataIndex: 'billTag',
+    width: 150
+  }],
+  WDT_SYSTEM_ORDER: [{
+    title: '订单类型',
+    dataIndex: 'billType',
+    width: 150
+  }, {
+    title: '系统订单号',
+    dataIndex: 'billNo',
+    width: 150
+  }, {
+    title: '订单标签',
+    dataIndex: 'billTag',
+    width: 150
+  }],
+  BS_E3_SYSTEM_ORDER: [{
+    title: '系统订单号',
+    dataIndex: 'orderSn',
+    width: 150
+  }, {
+    title: '订单状态',
+    dataIndex: 'orderStatus',
+    width: 100
+  }, {
+    title: '是否被拆分',
+    dataIndex: 'isSplit',
+    width: 100
+  }, {
+    title: '是否拆分子单',
+    dataIndex: 'isSplitNew',
+    width: 100
+  }, {
+    title: '是否被合并',
+    dataIndex: 'isCombine',
+    width: 100
+  }, {
+    title: '是否合并新单',
+    dataIndex: 'isCombineNew',
+    width: 100
+  }, {
+    title: '是否复制单',
+    dataIndex: 'isCopy',
+    width: 100
+  }, {
+    title: '是否换货单',
+    dataIndex: 'isHH',
+    width: 100
+  }, {
+    title: '订单备注',
+    dataIndex: 'orderMsg',
+    width: 150
+  }]
+};
+var rowKeyMap = {
+  BS_SYSTEM_ORDER: 'billNo',
+  WLN_SYSTEM_ORDER: 'billNo',
+  WDT_SYSTEM_ORDER: 'billNo',
+  BS_E3_SYSTEM_ORDER: 'orderSn'
 };
 var index$1 = (function (props) {
   var value = props.value,
@@ -13341,21 +13762,13 @@ var index$1 = (function (props) {
         getWlnOrderList(value.orderNo);
       } else if (type === 'WDT_SYSTEM_ORDER') {
         getWdtOrderList(value.orderNo);
+      } else if (type === 'BS_E3_SYSTEM_ORDER') {
+        getBsE3OrderList(value.orderNo);
       }
     }
   }, [value, type]);
   var columns = useMemo(function () {
-    var _columnsNameMap$type, _columnsNameMap$type2;
-    return [{
-      dataIndex: 'billType',
-      title: columnsNameMap === null || columnsNameMap === void 0 ? void 0 : (_columnsNameMap$type = columnsNameMap[type]) === null || _columnsNameMap$type === void 0 ? void 0 : _columnsNameMap$type.typeName
-    }, {
-      dataIndex: 'billNo',
-      title: '系统订单号'
-    }, {
-      dataIndex: 'billTag',
-      title: columnsNameMap === null || columnsNameMap === void 0 ? void 0 : (_columnsNameMap$type2 = columnsNameMap[type]) === null || _columnsNameMap$type2 === void 0 ? void 0 : _columnsNameMap$type2.tagName
-    }];
+    return columnsMap[type] || [];
   }, [type]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
@@ -13499,6 +13912,62 @@ var index$1 = (function (props) {
       return _ref3.apply(this, arguments);
     };
   }();
+  var getBsE3OrderList = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(orderNo) {
+      var _yield$request4, success, data, trades;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.next = 2;
+            return extendRequest('/qy/gdfw/order/bsE3OrderDetail', {
+              method: 'post',
+              data: {
+                billNo: orderNo
+              }
+            });
+          case 2:
+            _yield$request4 = _context4.sent;
+            success = _yield$request4.success;
+            data = _yield$request4.data;
+            if (success) {
+              trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
+                return (item.srcTid || '').split(',').includes(orderNo);
+              }).map(function (item) {
+                if (Array.isArray(item.goodDetails)) {
+                  item.goodDetails = item.goodDetails.filter(function (good) {
+                    return good.srcTid === orderNo;
+                  });
+                }
+                return item;
+              });
+              _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+                orders: trades.map(function (item) {
+                  return _objectSpread2(_objectSpread2({}, item), {}, {
+                    billNo: item.tradeNo,
+                    billType: WDT_ORDER_TYPE_MAP[item.tradeType],
+                    billTag: item.tagName
+                  });
+                }),
+                showOrderInfo: trades.map(function (item) {
+                  return {
+                    billNo: item.tradeNo,
+                    billType: WDT_ORDER_TYPE_MAP[item.tradeType],
+                    billTag: item.tagName
+                  };
+                })
+              }));
+            }
+            onceRef.current = false;
+          case 7:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function getBsE3OrderList(_x4) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
@@ -13519,7 +13988,7 @@ var index$1 = (function (props) {
     dataSource: (value === null || value === void 0 ? void 0 : value.orders) || [],
     columns: columns,
     rowSelection: rowSelection,
-    rowKey: 'billNo',
+    rowKey: rowKeyMap[type] || 'billNo',
     size: "small",
     pagination: false,
     scroll: {
@@ -13971,8 +14440,8 @@ var typeMap$1 = {
     key: 'wdtReissueGoods',
     name: '旺店通',
     typeName: 'wdtReissueType',
-    wdtSystemOrder: 'wdtSystemOrder',
-    wdtSystemOrderNo: 'wdtSystemOrderNo',
+    systemOrder: 'wdtSystemOrder',
+    systemOrderNo: 'wdtSystemOrderNo',
     reissueSelectList: 'wdtReissueSelectList',
     reissueSelectListReturn: 'wdtReissueSelectListReturn',
     reissueDeleteGood: 'wdtReissueDeleteGood',
@@ -13985,7 +14454,7 @@ var typeMap$1 = {
   }
 };
 var wdtReissue = function wdtReissue(props) {
-  var _typeMap$type7, _value$typeMap$type$t3, _typeMap$type10, _typeMap$type26, _typeMap$type27, _value$typeMap$type$w2, _typeMap$type28, _typeMap$type29, _typeMap$type30;
+  var _typeMap$type7, _value$typeMap$type$t3, _typeMap$type10, _typeMap$type26, _typeMap$type27, _value$typeMap$type$s2, _typeMap$type28, _typeMap$type29, _typeMap$type30;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -14014,6 +14483,7 @@ var wdtReissue = function wdtReissue(props) {
       }));
     });
   }, [value, disabled]);
+  // 用于暂存等系统订单下拉的回显，这块代码有bug，需要跟系统订单组件维护一个公共的slice
   useEffect(function () {
     var _value$orders, _value$showOrderInfo;
     if (!(value === null || value === void 0 ? void 0 : (_value$orders = value.orders) === null || _value$orders === void 0 ? void 0 : _value$orders.length) && (value === null || value === void 0 ? void 0 : value.orderNo) && (value === null || value === void 0 ? void 0 : (_value$showOrderInfo = value.showOrderInfo) === null || _value$showOrderInfo === void 0 ? void 0 : _value$showOrderInfo.length)) {
@@ -14025,33 +14495,32 @@ var wdtReissue = function wdtReissue(props) {
   }, [value]);
   useEffect(function () {
     var _typeMap$type5;
-    var wdtSystemOrderNo = value === null || value === void 0 ? void 0 : value[(_typeMap$type5 = typeMap$1[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.wdtSystemOrderNo];
-    if (wdtSystemOrderNo) {
+    var systemOrderNo = value === null || value === void 0 ? void 0 : value[(_typeMap$type5 = typeMap$1[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrderNo];
+    if (systemOrderNo) {
       var _value$typeMap$type$t, _typeMap$type6;
       if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t = value[(_typeMap$type6 = typeMap$1[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.typeName]) === null || _value$typeMap$type$t === void 0 ? void 0 : _value$typeMap$type$t[0])) {
-        getGoodItems(wdtSystemOrderNo);
+        getGoodItems(systemOrderNo);
       }
     }
     return;
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type7 = typeMap$1[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.wdtSystemOrderNo]]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type7 = typeMap$1[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrderNo]]);
   useEffect(function () {
     var _value$typeMap$type$t2, _typeMap$type8, _typeMap$type9;
     var typeName = value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type8 = typeMap$1[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0];
-    var wdtSystemOrderNo = value === null || value === void 0 ? void 0 : value[(_typeMap$type9 = typeMap$1[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.wdtSystemOrderNo];
+    var systemOrderNo = value === null || value === void 0 ? void 0 : value[(_typeMap$type9 = typeMap$1[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.systemOrderNo];
     if (['1'].includes(typeName)) {
-      wdtSystemOrderNo && getGoodItems(wdtSystemOrderNo);
+      systemOrderNo && getGoodItems(systemOrderNo);
     } else if (['2'].includes(typeName)) {
       var newValue = _objectSpread2({}, value);
-      // newValue[`${typeMap?.[type]?.key}`] = [];
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     }
     return;
   }, [value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type10 = typeMap$1[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0]]);
-  var getGoodItems = function getGoodItems(wdtSystemOrderNo) {
-    var _value$typeMap$type$w, _typeMap$type11, _ref;
-    var orders = value === null || value === void 0 ? void 0 : (_value$typeMap$type$w = value[(_typeMap$type11 = typeMap$1[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.wdtSystemOrder]) === null || _value$typeMap$type$w === void 0 ? void 0 : _value$typeMap$type$w.orders;
+  var getGoodItems = function getGoodItems(systemOrderNo) {
+    var _value$typeMap$type$s, _typeMap$type11, _ref;
+    var orders = value === null || value === void 0 ? void 0 : (_value$typeMap$type$s = value[(_typeMap$type11 = typeMap$1[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.systemOrder]) === null || _value$typeMap$type$s === void 0 ? void 0 : _value$typeMap$type$s.orders;
     var order = (_ref = orders || []) === null || _ref === void 0 ? void 0 : _ref.find(function (orderItem) {
-      return orderItem.billNo === wdtSystemOrderNo;
+      return orderItem.billNo === systemOrderNo;
     });
     if (order) {
       var _typeMap$type12, _order$goodDetails;
@@ -14098,7 +14567,7 @@ var wdtReissue = function wdtReissue(props) {
                   billTag: item.tagName
                 };
               });
-              onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type15 = typeMap$1[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.wdtSystemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type16 = typeMap$1[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.wdtSystemOrder]), {}, {
+              onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type15 = typeMap$1[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type16 = typeMap$1[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.systemOrder]), {}, {
                 showOrderInfo: showOrderInfo,
                 orders: orders
               }))));
@@ -14120,16 +14589,7 @@ var wdtReissue = function wdtReissue(props) {
     newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type18 = typeMap$1[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.key)] = [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     valueRef.current = newValue;
-    // if (['2'].includes(val[0])) {
-    //   onChange?.(newValue);
-    //   valueRef.current = newValue;
-    // }
-    // pubsub.publish(`${typeMap?.[type]?.reissueType}`, {
-    //   val: val[0],
-    //   goodValue: newValue,
-    // });
   };
-
   var changeGoodHandle = function changeGoodHandle(val) {
     var _typeMap$type19;
     var newValue = _objectSpread2({}, value);
@@ -14144,7 +14604,7 @@ var wdtReissue = function wdtReissue(props) {
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
     var _typeMap$type22, _value$typeMap$type$t4, _typeMap$type23;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type22 = typeMap$1[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.wdtSystemOrderNo)] = val;
+    newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type22 = typeMap$1[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.systemOrderNo)] = val;
     if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t4 = value[(_typeMap$type23 = typeMap$1[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.typeName]) === null || _value$typeMap$type$t4 === void 0 ? void 0 : _value$typeMap$type$t4[0])) {
       var _typeMap$type24;
       newValue["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type24 = typeMap$1[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.key)] = [];
@@ -14154,8 +14614,8 @@ var wdtReissue = function wdtReissue(props) {
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {
     var _typeMap$type25;
-    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.wdtSystemOrderNo]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.wdtSystemOrderNo]]);
+    return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo]]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     gutter: 8
   }, /*#__PURE__*/React.createElement(Col, {
@@ -14172,12 +14632,12 @@ var wdtReissue = function wdtReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.wdtSystemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type27 = typeMap$1[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
     placeholder: "\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$w2 = value[(_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.wdtSystemOrder]) === null || _value$typeMap$type$w2 === void 0 ? void 0 : _value$typeMap$type$w2.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s2 = value[(_typeMap$type28 = typeMap$1[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrder]) === null || _value$typeMap$type$s2 === void 0 ? void 0 : _value$typeMap$type$s2.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: item.billNo,
       value: item.billNo,
@@ -14223,7 +14683,7 @@ styleInject(css_248z$a);
 var TabPane$1 = Tabs.TabPane;
 var Option$2 = Select.Option;
 var Search$1 = Input.Search;
-var GoodsModal$4 = function GoodsModal(props) {
+var GoodsModal$5 = function GoodsModal(props) {
   var onSubmit = props.onSubmit,
     _onCancel = props.onCancel,
     visible = props.visible,
@@ -14674,7 +15134,7 @@ var Goods$1 = function Goods(props, ref) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "goodsBox"
-  }, /*#__PURE__*/React.createElement(GoodsModal$4, {
+  }, /*#__PURE__*/React.createElement(GoodsModal$5, {
     visible: visible,
     onSubmit: onSubmit,
     type: type,