@kmkf-fe-packages/basic-components 2.2.29 → 2.2.31-beta.0

package/dist/index.js

@@ -8123,6 +8123,11 @@ var systemOrderMap = {
     no: 'jstSystemOrderNo',
     ids: 'jstSystemSelectIds',
     order: 'jstSystemShowOrder'
+  },
+  WDT_RETURN_BILL_NO: {
+    no: 'wdtReturnBillNo',
+    ids: 'wdtReturnBillSelectIds',
+    order: 'wdtReturnBillShowOrder'
   }
 };
 //直接将key component 添加到 transformWorkOrderData中的componentProcessors
@@ -8695,6 +8700,52 @@ var processWdtGoods = function processWdtGoods(templateColumns) {
     };
   };
 };
+var processWdtAftersaleGoods = function processWdtAftersaleGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var _values = {
+        wdtAftersaleGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wdtAftersaleGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
+      };
+      var selectIds = [];
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      var wdtAftersaleSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'WDT_RETURN_BILL_NO';
+      });
+      if (wdtAftersaleSystemOrder) {
+        selectIds = jsonParseSecurity(getValue("".concat(wdtAftersaleSystemOrder.uniqueKey, "_").concat(systemOrderMap[wdtAftersaleSystemOrder.workOrderComponentType].ids)), []);
+      }
+      _values.selectIds = selectIds;
+      _values.orderNo = orderNo;
+      return _defineProperty({}, nex.uniqueKey, _values);
+    };
+  };
+};
+var processJstAftersaleGoods = function processJstAftersaleGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex) {
+      var _values = {
+        jstAftersaleGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jstAftersaleGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
+      };
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      _values.orderNo = orderNo;
+      return _defineProperty({}, nex.uniqueKey, _values);
+    };
+  };
+};
 var processBsE3Goods = function processBsE3Goods(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
@@ -8927,11 +8978,16 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
         no: 'jstSystemOrderNo',
         ids: 'jstSystemSelectIds',
         order: 'jstSystemShowOrder'
+      },
+      WDT_RETURN_BILL_NO: {
+        no: 'wdtReturnBillNo',
+        ids: 'wdtReturnBillSelectIds',
+        order: 'wdtReturnBillShowOrder'
       }
     };
     return _defineProperty({}, nex.uniqueKey, {
       orderNo: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].no)),
-      orders: [],
+      orders: nex.workOrderComponentType === 'WDT_RETURN_BILL_NO' ? jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), []) : [],
       selectIds: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].ids)), []),
       showOrderInfo: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), [])
     });
@@ -9167,14 +9223,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref72;
-    return _ref72 = {}, _defineProperty(_ref72, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref72, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref72;
+    var _ref74;
+    return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref74;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref73;
-    return _ref73 = {}, _defineProperty(_ref73, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref73, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref73;
+    var _ref75;
+    return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref75;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9292,6 +9348,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_POSTING: processBsPosting,
       BS_GOODS: processBsGoods,
       WDT_GOODS: processWdtGoods(templateColumns),
+      WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
+      JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
       BS_E3_GOODS: processBsE3Goods(templateColumns),
       GY_GOODS: processGyGoods(templateColumns),
       KM_GOODS: processKmGoods(templateColumns),
@@ -9308,6 +9366,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       KM_SYSTEM_ORDER: processErpSystemOrder,
       WLN_SYSTEM_ORDER: processErpSystemOrder,
       WDT_SYSTEM_ORDER: processErpSystemOrder,
+      WDT_RETURN_BILL_NO: processErpSystemOrder,
       BS_E3_SYSTEM_ORDER: processErpSystemOrder,
       JST_SYSTEM_ORDER: processErpSystemOrder,
       GY_SYSTEM_ORDER: processErpSystemOrder,
@@ -9922,8 +9981,8 @@ var SubForm = function SubForm(props) {
     tableHeader = props.tableHeader,
     disabled = props.disabled,
     platform = props.platform,
-    manual = props.manual,
-    maxCount = props.maxCount;
+    maxCount = props.maxCount,
+    manual = props.manual;
   var ref = React.useRef(null);
   var isRequest = React.useRef(false);
   var _useState = React.useState(false),
@@ -12900,6 +12959,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return item.value === (value === null || value === void 0 ? void 0 : value.interceptType);
     })) === null || _find3 === void 0 ? void 0 : (_find3$config = _find3.config) === null || _find3$config === void 0 ? void 0 : _find3$config.showSenderMobile;
   }, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  var senderMobileLabel = React.useMemo(function () {
+    return (value === null || value === void 0 ? void 0 : value.interceptCompany) === 'ZTO' ? '发件人/收件人手机号' : '发件人手机号';
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
   var showKcode = React.useMemo(function () {
     var isShow = false;
     if (value === null || value === void 0 ? void 0 : value.interceptCompany) {
@@ -13134,14 +13196,14 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   })), /*#__PURE__*/React__default['default'].createElement(Item, {
-    label: '发件人手机号',
+    label: senderMobileLabel,
     // required={true}
     key: 'interceptSenderMobile',
     hidden: !showSenderMobile
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptSenderMobile,
     disabled: disabled || isEdit,
-    placeholder: "\u53D1\u4EF6\u4EBA\u624B\u673A\u53F7",
+    placeholder: senderMobileLabel,
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptSenderMobile');
     }
@@ -13362,7 +13424,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     if (disabled) {
       return;
     }
-    if (newCompany === 'SF' && !(newCompany && trajectoryCode && trajectoryPhone)) {
+    if (['KYE', 'SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
       return;
     } else if (!(newCompany && trajectoryCode)) {
       return;
@@ -13443,13 +13505,13 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     });
   };
   //sf手机号
-  var LogisticsPhone = function LogisticsPhone() {
+  var LogisticsPhone = function LogisticsPhone(company) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Input, {
       disabled: disabled,
       style: {
         marginTop: '8px'
       },
-      placeholder: "\u624B\u673A\u53F7",
+      placeholder: company === 'ZTO' ? '发件人/收件人手机号' : '手机号',
       onChange: function onChange(e) {
         return handleInputChange(e, 'trajectoryPhone');
       },
@@ -13498,7 +13560,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
     });
   };
-  return /*#__PURE__*/React__default['default'].createElement("div", null, LogisticsCompany(), LogisticsCode(), (value === null || value === void 0 ? void 0 : value.trajectoryCompany) === 'SF' ? LogisticsPhone() : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
+  return /*#__PURE__*/React__default['default'].createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO', 'KYE'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
 };
 
 var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -13548,7 +13610,7 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
             initValue = _ref.initValue, value = _ref.value;
             hasSnapshot = showField && showField.includes('snapshot');
             initList = initValue.map(function (item) {
-              if (item.trajectoryCompany === 'SF') {
+              if (['SF', 'ZTO'].includes(item.trajectoryCompany)) {
                 return {
                   trajectoryCompany: item.trajectoryCompany,
                   trajectoryCode: item.trajectoryCode,
@@ -13562,7 +13624,7 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
               }
             });
             valueList = value.map(function (item) {
-              if (item.trajectoryCompany === 'SF') {
+              if (['SF', 'ZTO'].includes(item.trajectoryCompany)) {
                 return {
                   trajectoryCompany: item.trajectoryCompany,
                   trajectoryCode: item.trajectoryCode,
@@ -13576,7 +13638,7 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
               }
             });
             changeList = changeValue.map(function (item) {
-              if (item.trajectoryCompany === 'SF') {
+              if (['SF', 'ZTO'].includes(item.trajectoryCompany)) {
                 return {
                   trajectoryCompany: item.trajectoryCompany,
                   trajectoryCode: item.trajectoryCode,
@@ -15870,6 +15932,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
+    goodShortName: formData.goodShortName || null,
     goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
     skuCode: formData.skuCode || null,
@@ -18847,7 +18910,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -18967,7 +19031,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19091,7 +19156,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19254,7 +19320,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19341,6 +19408,141 @@ var getColumns$2 = function getColumns(_ref) {
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeMap[val]);
       }
+    }],
+    // 旺店通售后商品信息
+    WDT_AFTERSALE_GOODS: [{
+      dataIndex: 'oid',
+      title: "\u539F\u59CB\u5B50\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsName',
+      title: "\u8D27\u54C1\u540D\u79F0",
+      width: 250,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsNo',
+      title: "\u8D27\u54C1\u7F16\u53F7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'specName',
+      title: "\u89C4\u683C\u540D\u79F0",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'specNo',
+      title: "\u5546\u5BB6\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'specCode',
+      title: "\u89C4\u683C\u7F16\u53F7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'barcode',
+      title: "\u6761\u7801",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'apiGoodsName',
+      title: "\u5E73\u53F0\u8D27\u54C1\u540D\u79F0",
+      width: 250,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'apiSpecName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      width: 250,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'suiteName',
+      title: "\u7EC4\u5408\u88C5\u540D\u79F0",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'suiteNo',
+      title: "\u7EC4\u5408\u88C5\u7F16\u53F7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'stockinNum',
+      title: "\u5165\u5E93\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'refundNum',
+      title: "\u9000\u6B3E\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'totalAmount',
+      title: "\u9000\u8D27\u603B\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'refundAmount',
+      title: "\u5DF2\u9000\u6B3E\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'orderNum',
+      title: "\u5B9E\u9645\u53D1\u51FA\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'price',
+      title: "\u4EF7\u683C",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'originalPrice',
+      title: "\u539F\u4EF7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'giftType',
+      title: "\u8D60\u54C1\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
     }]
   };
 };
@@ -20023,7 +20225,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -20311,7 +20513,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -20426,7 +20628,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'isGift',
@@ -20461,7 +20663,161 @@ var getColumns$5 = function getColumns() {
           }
         }) : renderTextEllipsis(val);
       }
-    }].map(fillAttrs)
+    }].map(fillAttrs),
+    // jst售后商品信息
+    JST_AFTERSALE_GOODS: [{
+      dataIndex: 'asId',
+      title: "\u805A\u6C34\u6F6D\u552E\u540E\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'asiId',
+      title: "\u552E\u540E\u5B50\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'outerOiId',
+      title: "\u5B50\u8BA2\u5355\u53F7",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pic',
+      title: "\u56FE\u7247",
+      width: 100,
+      align: 'center',
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 30,
+          src: val
+        });
+      },
+      headerComponentType: 'pic'
+    }, {
+      dataIndex: 'name',
+      title: "\u5546\u54C1\u540D\u79F0",
+      width: 250,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: "\u5546\u54C1\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'propertiesValue',
+      title: "\u89C4\u683C\u5C5E\u6027\u503C",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'qty',
+      title: "\u7533\u8BF7\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'rQty',
+      title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'defectiveQty',
+      title: "\u6B21\u54C1\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'amount',
+      title: "\u7533\u8BF7\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shopAmount',
+      title: "\u7EBF\u4E0A\u660E\u7EC6\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'price',
+      title: "\u5355\u4EF7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'combineSkuId',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shopSkuId',
+      title: "\u5E97\u94FA\u5546\u54C1\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'iId',
+      title: "\u6B3E\u5F0F\u7F16\u7801",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'type',
+      title: "\u552E\u540E\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuType',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement("span", null, typeof val !== 'boolean' ? '' : val ? '是' : '否');
+      }
+    }, {
+      dataIndex: 'receiveDate',
+      title: "\u5165\u4ED3\u65F6\u95F4",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'remark',
+      title: "\u660E\u7EC6\u5907\u6CE8",
+      width: 200,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }]
   };
 };
 
@@ -21132,6 +21488,12 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
           value: val,
           onChange: function onChange(value) {
             updateHandle(value, index, 'bfit');
@@ -21161,6 +21523,12 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
           value: val,
           onChange: function onChange(value) {
             updateHandle(value, index, 'gift');
@@ -21820,11 +22188,17 @@ var systemOrderNoMap = {
   GY_GOODS: 'code',
   KM_GOODS: 'sid',
   WDT_GOODS: 'tradeNo',
+  WDT_AFTERSALE_GOODS: 'tid',
   BS_E3_GOODS: 'orderSn',
   JST_GOODS: 'oId',
   WLN_GOODS: 'tradeNo',
   JY_GOODS: 'tradeNo',
-  JY_REISSUE_GOODS: 'tradeNo'
+  JY_REISSUE_GOODS: 'tradeNo',
+  KM_REISSUE_GOODS: 'sid',
+  JST_REISSUE_GOODS: 'oId',
+  GY_REISSUE_GOODS: 'code',
+  BS_E3_REISSUE_GOODS: 'orderSn',
+  WDT_REISSUE_GOODS: 'tradeNo'
 };
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
@@ -21834,14 +22208,19 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     onChangeSelectedKeys = _ref.onChangeSelectedKeys,
     _ref$uniqueKey = _ref.uniqueKey,
     uniqueKey = _ref$uniqueKey === void 0 ? 'uuid' : _ref$uniqueKey,
-    _ref$isGoods = _ref.isGoods,
-    isGoods = _ref$isGoods === void 0 ? false : _ref$isGoods,
+    _ref$isShowSelect = _ref.isShowSelect,
+    isShowSelect = _ref$isShowSelect === void 0 ? false : _ref$isShowSelect,
     _ref$systemOrders = _ref.systemOrders,
     systemOrders = _ref$systemOrders === void 0 ? [] : _ref$systemOrders,
     _ref$selectedSystemOr = _ref.selectedSystemOrders,
+    selectedSystemOrders = _ref$selectedSystemOr === void 0 ? [] : _ref$selectedSystemOr,
+    _ref$validSystemOrder = _ref.validSystemOrder,
+    validSystemOrder = _ref$validSystemOrder === void 0 ? false : _ref$validSystemOrder,
     _ref$type = _ref.type,
     type = _ref$type === void 0 ? '' : _ref$type,
-    width = _ref.width;
+    width = _ref.width,
+    _ref$isReissueType = _ref.isReissueType,
+    isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType;
   var _useState = React.useState(),
     _useState2 = _slicedToArray(_useState, 2),
     selectSystemNo = _useState2[0],
@@ -21851,6 +22230,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     tradeGoodsVisible = _useState4[0],
     setTradeGoodsVisible = _useState4[1];
   var openModal = function openModal() {
+    if (validSystemOrder) {
+      antd.message.warning('请选择补发系统单');
+      return;
+    }
     if (getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
       getDataSourceAsync().then(function () {
         setTradeGoodsVisible(true);
@@ -21858,15 +22241,11 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     } else {
       setTradeGoodsVisible(true);
     }
-    // 暂时先去掉带入系统自订单组件所选值作为默认筛选项
-    // if (isGoods) {
-    //   const codeList: string[] = selectedSystemOrders?.map(
-    //     (item) => item?.[systemOrderNoMap?.[type]],
-    //   );
-    //   setSelectSystemNo(codeList || []);
-    // }
+    // 补发直接传入的是systemNo
+    if (isShowSelect && isReissueType) {
+      setSelectSystemNo(selectedSystemOrders || []);
+    }
   };
-
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
@@ -21882,10 +22261,6 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     return item === null || item === void 0 ? void 0 : item[uniqueKey];
   }));
   var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
-    console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
-    console.log('filterDataSource', filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
-      return item === null || item === void 0 ? void 0 : item[uniqueKey];
-    }));
     onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
   };
   var rowSelection = {
@@ -21910,7 +22285,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     style: {
       maxWidth: '1000px'
     }
-  }, isGoods && /*#__PURE__*/React__default['default'].createElement(antd.Row, {
+  }, isShowSelect && /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     style: {
       marginBottom: '12px'
     }
@@ -22014,13 +22389,17 @@ var GoodItem$1 = function GoodItem(props) {
     systemOrders = props.systemOrders,
     selectedSystemOrders = props.selectedSystemOrders,
     _props$templateDetail = props.templateDetail,
-    templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail;
+    templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail,
+    _props$hasSelectedSys = props.hasSelectedSystemOrder,
+    hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys;
+  var canDelete = ['JST_AFTERSALE_GOODS'].includes(type);
   var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
   // 监听聚水潭退货商品
   var jstReturnGoods = antd.Form === null || antd.Form === void 0 ? void 0 : antd.Form.useWatch('3979edfd6d', form);
   var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
-  // 判断是否为商品信息组件
-  var isGoods = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
+  // 判断是否为是否展示系统单筛选项
+  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
+  var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
   var refModal = React.useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -22093,6 +22472,7 @@ var GoodItem$1 = function GoodItem(props) {
       var columns = [];
       switch (type) {
         case 'WDT_GOODS':
+        case 'WDT_AFTERSALE_GOODS':
         case 'WDT_RETURN_GOODS':
         case 'WDT_EXCHANGE_GOODS':
         case 'BS_E3_GOODS':
@@ -22103,6 +22483,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'JST_REISSUE_GOODS':
         case 'JST_EXCHANGE_GOODS':
         case 'JST_RETURN_GOODS':
+        case 'JST_AFTERSALE_GOODS':
         case 'GY_REISSUE_GOODS':
         case 'GY_RETURN_GOODS':
         case 'KM_GOODS':
@@ -22195,7 +22576,7 @@ var GoodItem$1 = function GoodItem(props) {
       render: function render(val, record, index) {
         return /*#__PURE__*/React__default['default'].createElement(HoverTableRowDeleteIcon, {
           index: index,
-          hoveredRowIndex: !disabled && record.canDelete ? hoveredRowIndex : null,
+          hoveredRowIndex: !disabled && (record.canDelete || canDelete) ? hoveredRowIndex : null,
           handleClick: function handleClick() {
             return handleDelete(record, index);
           }
@@ -22210,7 +22591,7 @@ var GoodItem$1 = function GoodItem(props) {
         ellipsis: true,
         width: 100,
         render: function render(val, record, index) {
-          return record.canDelete ? /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+          return record.canDelete || canDelete ? /*#__PURE__*/React__default['default'].createElement(antd.Button, {
             type: "link",
             onClick: function onClick() {
               return handleDelete(record, index);
@@ -22296,6 +22677,9 @@ var GoodItem$1 = function GoodItem(props) {
     return params;
   }, [tableSelect, selectedRowKeys, value]);
   var TheGoodsModal = GoodsModalMap[type || 'OTHER_GOODS'] || GoodsModalMap['OTHER_GOODS'];
+  var validSystemOrder = React.useMemo(function () {
+    return ['GY_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'KM_REISSUE_GOODS'].includes(type) && !hasSelectedSystemOrder;
+  }, [type, hasSelectedSystemOrder]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && (showChangeBtn ? /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       float: 'right'
@@ -22304,7 +22688,8 @@ var GoodItem$1 = function GoodItem(props) {
     checked: isStrict,
     onChange: handleCheckboxChange
   }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !lodash.isEmpty(tradeGoods) && isShowSelectTradeGoods && /*#__PURE__*/React__default['default'].createElement(SelectTradeGoods, {
-    isGoods: isGoods,
+    validSystemOrder: validSystemOrder,
+    isShowSelect: isShowSelect,
     uniqueKey: uniqueKey,
     type: type,
     columns: orderModalColumns,
@@ -22314,7 +22699,8 @@ var GoodItem$1 = function GoodItem(props) {
     onChangeSelectedKeys: tradeGoods.selectedGoodsChange,
     systemOrders: systemOrders,
     selectedSystemOrders: selectedSystemOrders,
-    width: width || 850
+    width: width || 850,
+    isReissueType: isReissueType
   }), showErpGoodsBtn && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: handleChangeGoods
@@ -23364,7 +23750,8 @@ var columnsMap = {
   BS_E3_SYSTEM_ORDER: kmkfUtils.BS_E3_SYSTEM_ORDER_CONFIG.columns,
   GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns,
   JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns,
-  JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns
+  JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns,
+  WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
 };
 var rowKeyMap = {
   BS_SYSTEM_ORDER: 'billNo',
@@ -23374,7 +23761,8 @@ var rowKeyMap = {
   BS_E3_SYSTEM_ORDER: 'orderSn',
   GY_SYSTEM_ORDER: 'billNo',
   JST_SYSTEM_ORDER: 'oId',
-  JY_SYSTEM_ORDER: 'tradeNo'
+  JY_SYSTEM_ORDER: 'tradeNo',
+  WDT_RETURN_BILL_NO: 'refundNo'
 };
 var index$2 = (function (props) {
   var value = props.value,
@@ -23388,6 +23776,7 @@ var index$2 = (function (props) {
   React.useEffect(function () {
     var _value$orders, _value$showOrderInfo;
     valueRef.current = value;
+    console.log('value77777777', value);
     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) && !onceRef.current) {
       onceRef.current = true;
       if (type === 'BS_SYSTEM_ORDER') {
@@ -24854,10 +25243,39 @@ var componentMap$2 = {
       exchangeDeleteGood: 'jyExchangeDeleteGood'
     },
     getOrderList: jyUtils.getJyOrderListSingleton
+  },
+  WDT_AFTERSALE_GOODS: {
+    type: 'wdtAftersale',
+    key: 'wdtAftersaleGoods',
+    name: '旺店通售后',
+    orderNo: 'srcTids',
+    goodDetailOrderNo: 'srcTids',
+    showChangeBtn: false,
+    eventNameMap: {
+      // pubsub 事件
+      type: 'wdtAftersaleType',
+      updateGoodsHandle: kmkfUtils.updateWdtAftersaleGoodsHandle,
+      reissueDeleteGood: 'wdtAftersaleReissueDeleteGood'
+    },
+    getOrderList: wdtUtils.getWdtOrderListSingleton
+  },
+  JST_AFTERSALE_GOODS: {
+    type: 'jstAftersale',
+    key: 'jstAftersaleGoods',
+    name: 'jst售后',
+    orderNo: 'asId',
+    goodDetailOrderNo: 'asId',
+    showChangeBtn: false,
+    eventNameMap: {
+      // pubsub 事件
+      type: 'jstAftersaleType',
+      deleteGood: 'jstAftersaleDeleteGood'
+    },
+    getOrderList: jstUtils.getJstOrderListSingleton
   }
 };
 var CommonGoods = function CommonGoods(props) {
-  var _componentMap$compTyp5, _withInfo$current3, _withInfo$current4;
+  var _componentMap$compTyp5, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7;
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange,
@@ -25014,6 +25432,7 @@ var CommonGoods = function CommonGoods(props) {
   var getGoodDetails = function getGoodDetails(_ref2) {
     var mode = _ref2.mode;
     var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
+    if (!updateHandle) return [];
     var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.orders) || [], {
       orderBackGoodsLevel: props.orderBackGoodsLevel
     });
@@ -25028,6 +25447,7 @@ var CommonGoods = function CommonGoods(props) {
     var mode = _ref3.mode;
     var updateHandle = componentMap$2[compType].eventNameMap['updateGoodsHandle'];
     console.log('value?.allOrders', value, (value === null || value === void 0 ? void 0 : value.allOrders) || []);
+    if (!updateHandle) return [];
     var goodDetails = updateHandle((value === null || value === void 0 ? void 0 : value.allOrders) || [], {
       orderBackGoodsLevel: props.orderBackGoodsLevel
     });
@@ -25088,6 +25508,7 @@ var CommonGoods = function CommonGoods(props) {
     isStrict: value === null || value === void 0 ? void 0 : value.isStrict,
     systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
     selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
+    showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
     tradeGoods: {
       originDataSource: getAllTradeGoodsDetails({
         mode: value === null || value === void 0 ? void 0 : value.isStrict
@@ -25436,11 +25857,12 @@ var typeMap$1 = {
       money: 'orderPrice',
       share: 'sharePrice'
     },
-    getOrderList: wdtUtils.getWdtOrderListSingleton
+    getOrderList: wdtUtils.getWdtOrderListSingleton,
+    isShowSelectTradeGoods: true
   }
 };
 var wdtReissue = function wdtReissue(props) {
-  var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type26, _typeMap$type27, _value$typeMap$type$s6, _typeMap$type28, _typeMap$type29, _typeMap$type30;
+  var _value$wdtSystemOrder, _typeMap$type24, _typeMap$type26, _typeMap$type27, _value$typeMap$type$s6, _typeMap$type28, _typeMap$type29, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s7, _typeMap$type32, _typeMap$type33, _typeMap$type34;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -25469,36 +25891,6 @@ var wdtReissue = function wdtReissue(props) {
     }
     return;
   }, [value]);
-  // useEffect(() => {
-  //   const systemOrderNo = value?.[typeMap[type]?.systemOrderNo];
-  //   if (systemOrderNo) {
-  //     if (['1'].includes(value?.[typeMap[type]?.typeName]?.[0])) {
-  //       onChange?.({
-  //         ...value,
-  //         [typeMap[type]?.key]: getGoodDetails({
-  //           mode: isStrict
-  //         })
-  //       })
-  //     }
-  //   }
-  //   return;
-  // }, [value?.[typeMap[type]?.systemOrderNo]]);
-  // const getWdtOrderList = async (orderNo: string) => {
-  //   wdtUtils.getWdtOrderListSingleton(orderNo).then(data => {
-  //     const orders = data?.trades || [];
-  //     const showOrderInfo = orders.map(({ billNo, billType, billTag }: any) => {
-  //       return { billNo, billType, billTag }
-  //     });
-  //     onChange({
-  //       ...value,
-  //       [typeMap[type]?.systemOrder]: {
-  //         ...value[typeMap[type]?.systemOrder],
-  //         showOrderInfo,
-  //         orders,
-  //       },
-  //     });
-  //   })
-  // };
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       var _typeMap$type5;
@@ -25558,17 +25950,24 @@ var wdtReissue = function wdtReissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref3) {
-    var _typeMap$type14, _typeMap$type15, _order$goodDetails;
+    var _typeMap$type14, _typeMap$type15;
     var mode = _ref3.mode,
-      sysOrderNo = _ref3.sysOrderNo;
+      sysOrderNo = _ref3.sysOrderNo,
+      _ref3$isAllOrders = _ref3.isAllOrders,
+      isAllOrders = _ref3$isAllOrders === void 0 ? false : _ref3$isAllOrders;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$1[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type15 = typeMap$1[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.tradeNo === systemOrderNo;
     });
-    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$goodDetails = order.goodDetails) === null || _order$goodDetails === void 0 ? void 0 : _order$goodDetails.length) ? kmkfUtils.updateWdtGoodsHandle([order]) : [];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
+      var _order$goodDetails;
+      return order === null || order === void 0 ? void 0 : (_order$goodDetails = order.goodDetails) === null || _order$goodDetails === void 0 ? void 0 : _order$goodDetails.length;
+    });
+    var goodDetails = hasGoodDetails ? kmkfUtils.updateWdtGoodsHandle([order]) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
+    return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem.srcTid === orderNo;
     }) : goodDetails;
   };
@@ -25671,7 +26070,8 @@ var wdtReissue = function wdtReissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
+    hasSelectedSystemOrder: showChangeBtn,
+    // showChangeBtn={showChangeBtn}
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type30 = typeMap$1[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)],
     onChange: function onChange(val) {
@@ -25680,9 +26080,13 @@ var wdtReissue = function wdtReissue(props) {
     onModeChange: handleModeChange,
     showModeBtn: showModeBtn,
     isStrict: isStrict,
+    isShowSelectTradeGoods: typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type31 = typeMap$1[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type32 = typeMap$1[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type33 = typeMap$1[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
-        mode: isStrict
+        mode: isStrict,
+        isAllOrders: typeMap$1 === null || typeMap$1 === void 0 ? void 0 : (_typeMap$type34 = typeMap$1[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.isShowSelectTradeGoods
       }),
       selectedGoodsChange: selectedGoodsChange
     }
@@ -25706,7 +26110,8 @@ var typeMap$2 = {
     outerOiIdKey: '',
     goodDetailsKey: 'items',
     mergeIdenticalGoods: kmkfUtils.jstMergeIdenticalGoods,
-    uniqueKey: 'uuid'
+    uniqueKey: 'uuid',
+    isShowSelectTradeGoods: true
   },
   JST_RETURN_GOODS: {
     compType: '退货',
@@ -25745,7 +26150,8 @@ var typeMap$2 = {
     oIdKey: 'billNo',
     outerOiIdKey: '',
     goodDetailsKey: 'subOrders',
-    uniqueKey: 'id'
+    uniqueKey: 'id',
+    isShowSelectTradeGoods: true
   },
   JY_REISSUE_GOODS: {
     compType: '补发',
@@ -25764,7 +26170,7 @@ var typeMap$2 = {
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55;
+  var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _value$typeMap$type$s9, _typeMap$type51, _typeMap$type52, _typeMap$type53, _typeMap$type54;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -26033,25 +26439,27 @@ var PublicReissue = function PublicReissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn || (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.isShowSelectTradeGoods),
-    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.alwaysShowChooseErpGoodsBtn,
-    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.showErpGoodsBtn,
+    hasSelectedSystemOrder: showChangeBtn,
+    // showChangeBtn={showChangeBtn || typeMap?.[type]?.isShowSelectTradeGoods}
+    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.alwaysShowChooseErpGoodsBtn,
+    // showErpGoodsBtn={typeMap?.[type]?.showErpGoodsBtn}
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     showModeBtn: false,
     isStrict: isStrict,
-    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
-    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
+    isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
         mode: isStrict,
-        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.isShowSelectTradeGoods
+        isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods
       }),
-      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.uniqueKey) || 'uuid',
+      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.uniqueKey) || 'uuid',
       selectedGoodsChange: selectedGoodsChange
     }
   })));
@@ -26794,7 +27202,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, kmkfUtils.msgTypeCh[key], item.ruleName);
+    }, kmkfUtils.msgTypeCh[key] || key, item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -26839,11 +27247,12 @@ var typeMap$3 = {
     typeName: 'bsE3ReissueType',
     systemOrder: 'bsE3SystemOrder',
     systemOrderNo: 'bsE3SystemOrderNo',
-    getOrderList: bsE3Utils.getBsE3OrderListSingleton
+    getOrderList: bsE3Utils.getBsE3OrderListSingleton,
+    isShowSelectTradeGoods: true
   }
 };
 var bsE3Reissue = function bsE3Reissue(props) {
-  var _typeMap$type22, _typeMap$type25, _typeMap$type26, _value$typeMap$type$s6, _typeMap$type27, _typeMap$type28, _typeMap$type29;
+  var _typeMap$type22, _typeMap$type25, _typeMap$type26, _value$typeMap$type$s6, _typeMap$type27, _typeMap$type28, _typeMap$type29, _typeMap$type30, _value$typeMap$type$s7, _typeMap$type31, _typeMap$type32, _typeMap$type33;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -26945,17 +27354,24 @@ var bsE3Reissue = function bsE3Reissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref4) {
-    var _typeMap$type13, _typeMap$type14, _order$orderDetailGet;
+    var _typeMap$type13, _typeMap$type14;
     var mode = _ref4.mode,
-      sysOrderNo = _ref4.sysOrderNo;
+      sysOrderNo = _ref4.sysOrderNo,
+      _ref4$isAllOrders = _ref4.isAllOrders,
+      isAllOrders = _ref4$isAllOrders === void 0 ? false : _ref4$isAllOrders;
     var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type13 = typeMap$3[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$3[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.orderSn === systemOrderNo;
     });
-    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$orderDetailGet = order.orderDetailGets) === null || _order$orderDetailGet === void 0 ? void 0 : _order$orderDetailGet.length) ? kmkfUtils.updateBsE3GoodsHandle([order], 'sharePrice') : [];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
+      var _order$orderDetailGet;
+      return order === null || order === void 0 ? void 0 : (_order$orderDetailGet = order.orderDetailGets) === null || _order$orderDetailGet === void 0 ? void 0 : _order$orderDetailGet.length;
+    });
+    var goodDetails = hasGoodDetails ? kmkfUtils.updateBsE3GoodsHandle([order], 'sharePrice') : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
+    return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem.originalOrderSn === orderNo;
     }) : goodDetails;
   };
@@ -27056,7 +27472,8 @@ var bsE3Reissue = function bsE3Reissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
+    hasSelectedSystemOrder: showChangeBtn,
+    // showChangeBtn={showChangeBtn}
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type29 = typeMap$3[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)],
     onChange: function onChange(val) {
@@ -27065,9 +27482,13 @@ var bsE3Reissue = function bsE3Reissue(props) {
     onModeChange: handleModeChange,
     showModeBtn: false,
     isStrict: isStrict,
+    isShowSelectTradeGoods: typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type30 = typeMap$3[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type31 = typeMap$3[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type32 = typeMap$3[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
-        mode: isStrict
+        mode: isStrict,
+        isAllOrders: typeMap$3 === null || typeMap$3 === void 0 ? void 0 : (_typeMap$type33 = typeMap$3[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.isShowSelectTradeGoods
       }),
       selectedGoodsChange: selectedGoodsChange
     }
@@ -27096,11 +27517,12 @@ var typeMap$4 = {
       money: 'orderPrice',
       share: 'sharePrice'
     },
-    getOrderList: gyUtils.getGyOrderListSingleton
+    getOrderList: gyUtils.getGyOrderListSingleton,
+    isShowSelectTradeGoods: true
   }
 };
 var GyReissue = function GyReissue(props) {
-  var _typeMap$type31, _typeMap$type32, _typeMap$type33, _systemOrder$orders, _typeMap$type34, _value$typeMap$type$s9, _typeMap$type35, _typeMap$type36, _typeMap$type37;
+  var _typeMap$type32, _typeMap$type33, _typeMap$type34, _systemOrder$orders, _typeMap$type35, _value$typeMap$type$s9, _typeMap$type36, _typeMap$type37, _typeMap$type38, _typeMap$type39, _value$typeMap$type$s10, _typeMap$type40, _typeMap$type41, _typeMap$type42;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -27246,17 +27668,24 @@ var GyReissue = function GyReissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref7) {
-    var _ref8, _typeMap$type19, _ref9, _typeMap$type20, _order$details;
+    var _ref8, _typeMap$type19, _ref9, _typeMap$type20;
     var mode = _ref7.mode,
-      sysOrderNo = _ref7.sysOrderNo;
+      sysOrderNo = _ref7.sysOrderNo,
+      _ref7$isAllOrders = _ref7.isAllOrders,
+      isAllOrders = _ref7$isAllOrders === void 0 ? false : _ref7$isAllOrders;
     var systemOrder = (_ref8 = valueRef.current || {}) === null || _ref8 === void 0 ? void 0 : _ref8[(_typeMap$type19 = typeMap$4[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : (_ref9 = valueRef.current || {}) === null || _ref9 === void 0 ? void 0 : _ref9[(_typeMap$type20 = typeMap$4[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.code === systemOrderNo;
     });
-    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length) ? kmkfUtils.updateGyGoodsHandle([order]) : [];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
+      var _order$details;
+      return order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length;
+    });
+    var goodDetails = hasGoodDetails ? kmkfUtils.updateGyGoodsHandle(orders) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    return mode ? goodDetails.filter(function (goodItem) {
+    return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || (orderNo || '').includes(goodItem.oid);
     }) : goodDetails;
   };
@@ -27293,25 +27722,26 @@ var GyReissue = function GyReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _ref12, _typeMap$type29, _typeMap$type30, _uniqBy;
+    var _typeMap$type29, _ref12, _typeMap$type30, _typeMap$type31, _uniqBy;
     kmkfUtils.pushGyLog('beforeSelectedGoodsChange', valueRef.current || {});
     var newValue = _objectSpread2({}, valueRef.current || {});
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
-      mode: isStrict
+      mode: isStrict,
+      isAllOrders: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.isShowSelectTradeGoods
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = ((_ref12 = valueRef.current || {}) === null || _ref12 === void 0 ? void 0 : _ref12["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.key)]) || [];
-    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+    var currentSelectGoodList = ((_ref12 = valueRef.current || {}) === null || _ref12 === void 0 ? void 0 : _ref12["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)]) || [];
+    newValue["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
       return skuList.includes(item.uuid);
     });
     // console.log('商品发生变化', newValue[`${typeMap?.[type]?.key}`]);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     kmkfUtils.pushGyLog('afterSelectedGoodsChange', newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type31 = typeMap$4[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)], isStrict]);
   //系统单选择后展示选择商品按钮，系统单未选择的时候不展示
-  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type32 = typeMap$4[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.systemOrder];
-  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrderNo]);
+  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type33 = typeMap$4[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrder];
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo]);
   var showErpGoodsBtn = showChangeBtn || type === 'GY_REISSUE_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
@@ -27331,12 +27761,12 @@ var GyReissue = function GyReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type35 = typeMap$4[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.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$s9 = value[(_typeMap$type35 = typeMap$4[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.showOrderInfo) || []).map(function (item) {
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type36 = typeMap$4[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       className: styles$6.systemNoDisabled,
       key: item.billNo,
@@ -27350,7 +27780,7 @@ var GyReissue = function GyReissue(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
@@ -27360,7 +27790,7 @@ var GyReissue = function GyReissue(props) {
     disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type36 = typeMap$4[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type37 = typeMap$4[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -27370,19 +27800,24 @@ var GyReissue = function GyReissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
-    showErpGoodsBtn: showErpGoodsBtn,
-    alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
+    // showChangeBtn={showChangeBtn}
+    // showErpGoodsBtn={showErpGoodsBtn}
+    alwaysShowChooseErpGoodsBtn: true,
+    hasSelectedSystemOrder: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type37 = typeMap$4[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type38 = typeMap$4[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     },
     onModeChange: handleModeChange,
     isStrict: isStrict,
+    isShowSelectTradeGoods: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type39 = typeMap$4[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.isShowSelectTradeGoods,
+    systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s10 = value[(_typeMap$type40 = typeMap$4[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.systemOrder]) === null || _value$typeMap$type$s10 === void 0 ? void 0 : _value$typeMap$type$s10.orders,
+    selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type41 = typeMap$4[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.systemOrderNo)]] : [],
     tradeGoods: {
       originDataSource: getGoodDetails({
-        mode: isStrict
+        mode: isStrict,
+        isAllOrders: typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type42 = typeMap$4[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.isShowSelectTradeGoods
       }),
       selectedGoodsChange: selectedGoodsChange
     }
@@ -27648,7 +28083,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
@@ -28320,7 +28755,8 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
   BS_E3_SYSTEM_ORDER: kmkfUtils.BS_E3_SYSTEM_ORDER_CONFIG.columns,
   GY_SYSTEM_ORDER: kmkfUtils.GY_SYSTEM_ORDER_CONFIG.columns,
   JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns,
-  JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns
+  JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns,
+  WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
 };
 
 exports.Address = ApaasAddress;