@kmkf-fe-packages/basic-components 2.2.13-beta.6 → 2.2.13-beta.62

package/dist/index.js

@@ -9574,7 +9574,7 @@ var renderMap = {
     return /*#__PURE__*/React__default['default'].createElement(FileRender, {
       id: "fileRender",
       fileList: value,
-      canDownload: !['ks', 'fxg'].includes(platform || '')
+      canDownload: !['ks', 'fxg', 'xiaozhi'].includes(platform || '')
     });
   },
   CHECKBOX: function CHECKBOX(value) {
@@ -9677,7 +9677,7 @@ var EditFileRender = function EditFileRender(_ref7) {
   })), /*#__PURE__*/React__default['default'].createElement(FileRender, {
     id: "fileEdit",
     fileList: val,
-    canDownload: !['ks', 'fxg'].includes(platform)
+    canDownload: !['ks', 'fxg', 'xiaozhi'].includes(platform)
   }));
 };
 var EditRenderMap = {
@@ -13845,7 +13845,7 @@ var jstGoods = function jstGoods(props) {
     onChange: function onChange(val) {
       changeInputHandle(val, 'logisticsCompany');
     },
-    value: platformType === 'gy' ? (expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompany'], false)) ? (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'] : (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4['logisticsCompanyName'] : (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5['logisticsCompany'],
+    value: ['gy', 'jy'].includes(platformType) ? (expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompany'], false)) ? (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'] : (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4['logisticsCompanyName'] : (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5['logisticsCompany'],
     showSearch: true,
     dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
@@ -14665,21 +14665,21 @@ var wdtColumns = [{
   title: '市场价',
   width: 140,
   render: function render(price) {
-    return Number(price).toFixed(2);
+    return price || price === 0 ? Number(price).toFixed(2) : '';
   }
 }, {
   dataIndex: 'retailPrice',
   title: '零售价',
   width: 140,
   render: function render(price) {
-    return Number(price).toFixed(2);
+    return price || price === 0 ? Number(price).toFixed(2) : '';
   }
 }, {
   dataIndex: 'memberPrice',
   title: '会员价',
   width: 140,
   render: function render(price) {
-    return Number(price).toFixed(2);
+    return price || price === 0 ? Number(price).toFixed(2) : '';
   }
 }];
 
@@ -14905,17 +14905,17 @@ var getYesOrNo$1 = function getYesOrNo(val) {
   return val ? '是' : '否';
 };
 var jyColumns = [{
-  dataIndex: 'productName',
+  dataIndex: 'goodName',
   title: '商品名称',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'productCode',
+  dataIndex: 'goodNo',
   title: '商品编码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'productId',
+  dataIndex: 'goodId',
   title: '商品ID',
   width: 150,
   ellipsis: true
@@ -14924,22 +14924,22 @@ var jyColumns = [{
   title: '商品图片',
   width: 100,
   render: function render(picUrl) {
-    return /*#__PURE__*/React__default['default'].createElement("img", {
+    return picUrl ? /*#__PURE__*/React__default['default'].createElement("img", {
       style: {
         width: '40px',
         height: '40px',
         objectFit: 'contain'
       },
       src: picUrl
-    });
+    }) : null;
   }
 }, {
-  dataIndex: 'productShortName',
+  dataIndex: 'goodShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
   width: 150
 }, {
-  dataIndex: 'productGroupName',
+  dataIndex: 'categoryName',
   title: "\u5546\u54C1\u7EC4",
   ellipsis: true,
   width: 150
@@ -14949,56 +14949,56 @@ var jyColumns = [{
   width: 200,
   ellipsis: true
 }, {
-  dataIndex: 'skuName',
+  dataIndex: 'specName',
   title: '规格名称',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'skuCode',
+  dataIndex: 'specNo',
   title: '规格编码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'skuId',
+  dataIndex: 'specId',
   title: '规格ID',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'barcode',
+  dataIndex: 'specBarcode',
   title: '规格条码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'skuImage',
+  dataIndex: 'specImgUrl',
   title: '规格图片',
   width: 100,
   render: function render(picUrl) {
-    return /*#__PURE__*/React__default['default'].createElement("img", {
+    return picUrl ? /*#__PURE__*/React__default['default'].createElement("img", {
       style: {
         width: '40px',
         height: '40px',
         objectFit: 'contain'
       },
       src: picUrl
-    });
+    }) : null;
   }
 }, {
-  dataIndex: 'color',
+  dataIndex: 'colorName',
   title: "\u989C\u8272",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'size',
+  dataIndex: 'sizeName',
   title: "\u5C3A\u7801",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'markedPrice',
+  dataIndex: 'marketPrice',
   title: "\u5E02\u573A\u4EF7",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'sellingPrice',
+  dataIndex: 'retailPrice',
   title: "\u96F6\u552E\u4EF7",
   ellipsis: true,
   width: 100
@@ -15008,7 +15008,7 @@ var jyColumns = [{
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'gift',
+  dataIndex: 'isGift',
   title: "\u662F\u5426\u8D60\u54C1",
   ellipsis: true,
   width: 150,
@@ -15016,12 +15016,12 @@ var jyColumns = [{
     return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
   }
 }, {
-  dataIndex: 'combination',
+  dataIndex: 'skuType',
   title: "\u662F\u5426\u7EC4\u5408\u88C5",
   ellipsis: true,
   width: 150,
   render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
+    return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val === 'combine'));
   }
 }];
 
@@ -17308,11 +17308,12 @@ var SearchHeader = function SearchHeader(_ref) {
     timeOptions = _ref.timeOptions,
     ShopList = _ref.ShopList,
     onSubmit = _ref.onSubmit;
+  console.log('allFields', allFields);
   // const fixedFieldsOptions = useMemo(() => {
   //   return allFields.filter(item => fixedFields?.includes(item.id));
   // }, [fixedFields, allFields]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
-    className: 'search-header-wrap'
+    className: "search-header-wrap"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "".concat(status ? 'is-open' : 'not-open')
   }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -17469,6 +17470,9 @@ var WorkorderList = function WorkorderList(props, ref) {
         return selectedList.map(function (workOrderData) {
           return goodsSourceFormat.workOrderDataToGoods(workOrderData, props.erp);
         });
+      },
+      setDefaultSearchValue: function setDefaultSearchValue(value) {
+        value && form.setFieldsValue(_objectSpread2({}, value));
       }
     };
   });
@@ -17747,21 +17751,116 @@ var WorkorderList = function WorkorderList(props, ref) {
 };
 var WorkorderList$1 = /*#__PURE__*/React.forwardRef(WorkorderList);
 
-// interface GoodModelProps {
-//   shopId: number | string;
-//   maxLength: number;
-//   shopList: any[];
-//   width?: string | number;
-//   shopCode?: string;
-//   companyKey: string;
-//   onSubmit: (...args: any[]) => any;
-// }
+var goodClassTransformValue = function goodClassTransformValue(value, config) {
+  var label = '';
+  var options = (config === null || config === void 0 ? void 0 : config.options) || [];
+  var labelList = kmkfUtils.findLabelBySelectValue(value, options);
+  var labelItem = labelList === null || labelList === void 0 ? void 0 : labelList.pop();
+  label = labelItem === null || labelItem === void 0 ? void 0 : labelItem.label;
+  return {
+    type: 'anylike',
+    keywords: label
+  };
+};
+var goodTypeTransformValue = function goodTypeTransformValue(value) {
+  return (value === null || value === void 0 ? void 0 : value.value) ? [value === null || value === void 0 ? void 0 : value.value] : '';
+};
+var relationComponentUniqueKeyMap = {
+  //小白熊自定义组件
+  PCE2Z5TXEVPL5D26I7KMBKMB: {
+    //补发类型
+    goodType: {
+      relationComponentKey: '6hldjQ9aMz',
+      reflectKey: 'C7M9rWJMjD_radio',
+      transformValue: function transformValue(value) {
+        return goodTypeTransformValue(value);
+      }
+    },
+    // 产品分类
+    goodClass: {
+      relationComponentKey: '8gozpyUFtA',
+      reflectKey: '2h8KRbxMjD_input',
+      transformValue: function transformValue(value, config) {
+        return goodClassTransformValue(value, config);
+      }
+    }
+  },
+  // 测马奔腾
+  SZF4ZGWZSNW6PYXMCIFEWBXT: {
+    goodType: {
+      relationComponentKey: 'abVTwFX34E',
+      reflectKey: 'ipOHnYquYB_radio',
+      transformValue: function transformValue(value) {
+        return goodTypeTransformValue(value);
+      }
+    },
+    goodClass: {
+      relationComponentKey: 'U0es1pIDaE',
+      reflectKey: 'K1puYheEaE_input',
+      transformValue: function transformValue(value, config) {
+        return goodClassTransformValue(value, config);
+      }
+    }
+  }
+};
+// 该方法只用于小白熊定制，当管易商品/管易补发/管易退换货组件的数据来源于关联工单数据，且其补发类型自定义组件选了值，根据该值填充到商品库弹框中类型筛选项
+var useDefaultSearchValue = (function (props) {
+  var _Object$entries;
+  var form = props.form,
+    _props$companyKey = props.companyKey,
+    companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
+    source = props.source,
+    erp = props.erp,
+    _props$templateDetail = props.templateDetail,
+    templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail;
+  if (source !== 'workOrder' || erp !== 'gy') {
+    return '';
+  }
+  var result = {};
+  var relationComponentKeyMap = relationComponentUniqueKeyMap === null || relationComponentUniqueKeyMap === void 0 ? void 0 : relationComponentUniqueKeyMap[companyKey];
+  if (!relationComponentKeyMap) {
+    return '';
+  }
+  (_Object$entries = Object.entries(relationComponentKeyMap || {})) === null || _Object$entries === void 0 ? void 0 : _Object$entries.forEach(function (_ref) {
+    var _templateDetail$compo;
+    var _ref2 = _slicedToArray(_ref, 2),
+      key = _ref2[0],
+      value = _ref2[1];
+    var matchComponent = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.find(function (item) {
+      return item.uniqueKey === value.relationComponentKey;
+    });
+    if (!matchComponent) {
+      return;
+    }
+    var relationComponentValue = form === null || form === void 0 ? void 0 : form.getFieldValue(value.relationComponentKey);
+    if (relationComponentValue) {
+      if ((value === null || value === void 0 ? void 0 : value.transformValue) && typeof (value === null || value === void 0 ? void 0 : value.transformValue) === 'function') {
+        var _value$transformValue;
+        var newValue = value === null || value === void 0 ? void 0 : (_value$transformValue = value.transformValue) === null || _value$transformValue === void 0 ? void 0 : _value$transformValue.call(value, relationComponentValue, (matchComponent === null || matchComponent === void 0 ? void 0 : matchComponent.componentConfig) || {});
+        if (newValue) {
+          result[value.reflectKey] = newValue;
+        }
+      } else {
+        result[value.reflectKey] = relationComponentValue;
+      }
+    }
+  });
+  return result;
+});
+
 var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
-  var _props$goodsSource;
+  var _props$goodsSource2;
   var _useState = React.useState(),
     _useState2 = _slicedToArray(_useState, 2),
     seletedGooods = _useState2[0],
     setSeletedGooods = _useState2[1];
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState3 = React.useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    visible = _useState4[0],
+    setVisible = _useState4[1];
+  var goodsListRef = React.useRef(null);
   React.useImperativeHandle(ref, function () {
     return {
       open: function open(shopCode, options) {
@@ -17770,19 +17869,28 @@ var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
       }
     };
   });
-  var onSubmit = props.onSubmit,
-    width = props.width;
-  var _useState3 = React.useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    visible = _useState4[0],
-    setVisible = _useState4[1];
-  var goodsListRef = React.useRef(null);
+  React.useEffect(function () {
+    if (visible && goodsListRef.current) {
+      var _props$goodsSource;
+      var defaultSearchValue = useDefaultSearchValue({
+        form: props === null || props === void 0 ? void 0 : props.form,
+        companyKey: props === null || props === void 0 ? void 0 : props.companyKey,
+        source: (_props$goodsSource = props.goodsSource) === null || _props$goodsSource === void 0 ? void 0 : _props$goodsSource.source,
+        erp: 'gy',
+        templateDetail: props === null || props === void 0 ? void 0 : props.templateDetail
+      });
+      if (defaultSearchValue) {
+        var _goodsListRef$current, _goodsListRef$current2;
+        (_goodsListRef$current = goodsListRef.current) === null || _goodsListRef$current === void 0 ? void 0 : (_goodsListRef$current2 = _goodsListRef$current.setDefaultSearchValue) === null || _goodsListRef$current2 === void 0 ? void 0 : _goodsListRef$current2.call(_goodsListRef$current, defaultSearchValue);
+      }
+    }
+  }, [visible]);
   var _onCancel = function onCancel() {
     setVisible(false);
   };
   var onOk = function onOk() {
-    var _goodsListRef$current;
-    var selectedList = ((_goodsListRef$current = goodsListRef.current) === null || _goodsListRef$current === void 0 ? void 0 : _goodsListRef$current.getSelectGoodList()) || [];
+    var _goodsListRef$current3;
+    var selectedList = ((_goodsListRef$current3 = goodsListRef.current) === null || _goodsListRef$current3 === void 0 ? void 0 : _goodsListRef$current3.getSelectGoodList()) || [];
     onSubmit(selectedList);
     _onCancel();
   };
@@ -17797,7 +17905,7 @@ var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, ((_props$goodsSource = props.goodsSource) === null || _props$goodsSource === void 0 ? void 0 : _props$goodsSource.source) === 'workOrder' ? /*#__PURE__*/React__default['default'].createElement(WorkorderList$1, {
+  }, ((_props$goodsSource2 = props.goodsSource) === null || _props$goodsSource2 === void 0 ? void 0 : _props$goodsSource2.source) === 'workOrder' ? /*#__PURE__*/React__default['default'].createElement(WorkorderList$1, {
     erp: "gy",
     goodsSource: props.goodsSource,
     seletedGooods: seletedGooods,
@@ -17836,10 +17944,12 @@ var getTableData$5 = function getTableData(_ref, formData) {
 };
 var searchFormData$4 = [{
   label: '规格名称',
-  name: 'specName'
+  name: 'skuName',
+  dataIndex: 'specName'
 }, {
   label: '规格编码',
-  name: 'specCode'
+  name: 'skuCode',
+  dataIndex: 'specNo'
 }, {
   label: '商品名称',
   name: 'goodName'
@@ -17885,29 +17995,29 @@ var GoodList$5 = function GoodList(props, ref) {
     fixed: true,
     onSelect: function onSelect(record, selected) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.goodNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.goodNo;
+          return t !== record.id;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.goodNo !== record.goodNo;
+          return t.id !== record.id;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
         setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.goodNo;
+          return t.id;
         }))));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
         setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
-          return t.goodNo;
+          return t.id;
         })));
         var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.goodNo !== othVal.goodNo;
+          return arrVal.id !== othVal.id;
         });
         setSelect(list);
       }
@@ -17915,9 +18025,9 @@ var GoodList$5 = function GoodList(props, ref) {
     getCheckboxProps: function getCheckboxProps(record) {
       var options = {
         disabled: (props.selectedRows || []).map(function (row) {
-          return row.goodNo || row.skuId;
-        }).includes(record.goodNo || record.skuId),
-        name: record.goodNo
+          return row.id || row.specId;
+        }).includes(record.id || record.specId),
+        name: record.id
       };
       return options;
     }
@@ -17925,10 +18035,10 @@ var GoodList$5 = function GoodList(props, ref) {
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.goodNo;
+        return t !== record.id;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.goodNo !== record.goodNo;
+        return t.id !== record.id;
       }));
     };
     var showColumns = [{
@@ -17952,7 +18062,7 @@ var GoodList$5 = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
       columns: showColumns,
-      rowKey: 'goodNo',
+      rowKey: 'id',
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -17981,7 +18091,7 @@ var GoodList$5 = function GoodList(props, ref) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
     rowSelection: rowSelection,
-    rowKey: "goodNo",
+    rowKey: "id",
     columns: columns,
     scroll: {
       x: '100%',
@@ -18405,10 +18515,10 @@ var getColumns$1 = function getColumns(_ref) {
       }
     }, {
       dataIndex: 'share',
-      title: "\u5206\u644A\u4EF7",
+      title: "\u5747\u644A\u5355\u4EF7",
       align: 'center',
       ellipsis: true,
-      width: 70
+      width: 120
     }, {
       dataIndex: 'type',
       title: "\u8D60\u54C1\u7C7B\u578B",
@@ -18463,12 +18573,29 @@ var renderFieldMap = {
   },
   giftType: function giftType() {
     return renderGiftType;
+  },
+  orderPrice: function orderPrice(_ref2) {
+    var disabled = _ref2.disabled,
+      updateHandle = _ref2.updateHandle;
+    return function (val, record, index) {
+      return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+        style: {
+          width: 70
+        },
+        value: val,
+        min: 1,
+        precision: 0,
+        onChange: function onChange(num) {
+          return updateHandle(num, index, 'orderPrice');
+        }
+      }) : /*#__PURE__*/React__default['default'].createElement("span", null, (record.num || record.num === 0) && (val || val === 0) ? Number(val * record.num).toFixed(2) : null);
+    };
   }
 };
-var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
-  var disabled = _ref2.disabled,
-    updateHandle = _ref2.updateHandle,
-    operate = _ref2.operate;
+var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref3) {
+  var disabled = _ref3.disabled,
+    updateHandle = _ref3.updateHandle,
+    operate = _ref3.operate;
   return getColumnsMap$1()['WDT_REISSUE_GOODS'].map(function (item) {
     var newItem = _objectSpread2({
       align: 'center',
@@ -18486,6 +18613,15 @@ var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
   });
 };
 
+function toNum(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
 var getColumns$2 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
@@ -18496,7 +18632,7 @@ var getColumns$2 = function getColumns(_ref) {
     WDT_REISSUE_GOODS: [{
       dataIndex: 'goodId',
       title: "\u5546\u54C1ID",
-      width: 120,
+      width: 250,
       align: 'center',
       ellipsis: true
     }, {
@@ -18519,12 +18655,14 @@ var getColumns$2 = function getColumns(_ref) {
       dataIndex: 'apiGoodsName',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 200,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'platformGoodsId',
       title: "\u5E73\u53F0\u5546\u54C1ID",
       width: 180,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'specId',
       title: "SKUID",
@@ -18551,23 +18689,47 @@ var getColumns$2 = function getColumns(_ref) {
       dataIndex: 'apiSpecName',
       title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
       width: 200,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'platformSpecId',
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C\u540D\u79F0",
+      width: 180,
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'orderPrice',
-      title: "\u6210\u4EA4\u603B\u91D1\u989D",
-      render: function render(val, record) {
-        return (record.num || record.num === 0) && (val || val === 0) ? Number(val * record.num).toFixed(2) : null;
-      },
+      title: "\u8865\u53D1\u91D1\u989D",
+      align: 'center',
+      // render: (val: number, record: any) => {
+      //   return (record.num || record.num === 0) && (val || val === 0)
+      //     ? Number(val * record.num).toFixed(2)
+      //     : null;
+      // },
       width: 200
     }, {
       dataIndex: 'num',
       title: "\u6570\u91CF",
-      width: 100
+      width: 100,
+      validator: function validator(_rule, value) {
+        var goodsName = '';
+        if (((value === null || value === void 0 ? void 0 : value.wdtReissueGoods) || []).some(function (goods) {
+          var num = toNum(goods === null || goods === void 0 ? void 0 : goods.num);
+          var res = typeof num === 'number' ? num < 1 : true;
+          if (res) {
+            goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      }
     }, {
       dataIndex: 'sharePrice',
       title: "\u5206\u644A\u4EF7",
@@ -18584,7 +18746,7 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
-      width: 70
+      width: 250
     }, {
       dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
@@ -18605,12 +18767,14 @@ var getColumns$2 = function getColumns(_ref) {
       dataIndex: 'apiGoodsName',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 200,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'platformGoodsId',
       title: "\u5E73\u53F0\u5546\u54C1ID",
       width: 180,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'specId',
       title: "".concat(text, "SKUID"),
@@ -18637,12 +18801,20 @@ var getColumns$2 = function getColumns(_ref) {
       dataIndex: 'apiSpecName',
       title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
       width: 200,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'platformSpecId',
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C\u540D\u79F0",
+      width: 180,
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'orderPrice',
       title: "\u6210\u4EA4\u603B\u91D1\u989D",
@@ -18691,7 +18863,7 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
-      width: 70
+      width: 250
     }, {
       dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
@@ -18712,12 +18884,14 @@ var getColumns$2 = function getColumns(_ref) {
       dataIndex: 'apiGoodsName',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 200,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'platformGoodsId',
       title: "\u5E73\u53F0\u5546\u54C1ID",
       width: 180,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'specId',
       title: "".concat(text, "SKUID"),
@@ -18744,12 +18918,20 @@ var getColumns$2 = function getColumns(_ref) {
       dataIndex: 'apiSpecName',
       title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
       width: 200,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'platformSpecId',
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C\u540D\u79F0",
+      width: 180,
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'num',
       title: "".concat(text, "\u9000\u8D27\u6570\u91CF"),
@@ -18836,7 +19018,7 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5546\u54C1ID",
       align: 'center',
       ellipsis: true,
-      width: 70
+      width: 250
     }, {
       dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
@@ -18857,12 +19039,14 @@ var getColumns$2 = function getColumns(_ref) {
       dataIndex: 'apiGoodsName',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 200,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'platformGoodsId',
       title: "\u5E73\u53F0\u5546\u54C1ID",
       width: 180,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'specId',
       title: "".concat(text, "SKUID"),
@@ -18889,12 +19073,20 @@ var getColumns$2 = function getColumns(_ref) {
       dataIndex: 'apiSpecName',
       title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
       width: 200,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'platformSpecId',
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
-      align: 'center'
+      align: 'center',
+      ellipsis: true
+    }, {
+      dataIndex: 'brandName',
+      title: "\u54C1\u724C\u540D\u79F0",
+      width: 180,
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'num',
       title: "".concat(text, "\u6362\u51FA\u6570\u91CF"),
@@ -19132,7 +19324,7 @@ var getYesOrNo$3 = function getYesOrNo(val) {
   if (kmkfUtils.isNull(val)) return null;
   return val ? '是' : '否';
 };
-function toNum(value) {
+function toNum$1(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -19301,7 +19493,7 @@ var getColumns$4 = function getColumns(_ref) {
       validator: function validator(_rule, value) {
         var goodsName = '';
         if (((value === null || value === void 0 ? void 0 : value.gyReissueGoods) || []).some(function (goods) {
-          var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
+          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
           var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
             goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -19417,7 +19609,7 @@ var getColumns$4 = function getColumns(_ref) {
       validator: function validator(_rule, value) {
         var goodsName = '';
         if (((value === null || value === void 0 ? void 0 : value.gyReturnGoods) || []).some(function (goods) {
-          var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
+          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
           var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
             goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -19518,7 +19710,7 @@ var fillAttrs = function fillAttrs(item) {
   if (!item.align) item.align = 'center';
   return item;
 };
-function toNum$1(value) {
+function toNum$2(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -19710,19 +19902,21 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       width: 120,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
-          var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-          var res = typeof v === 'number' ? v < 0 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
-        }
-      },
+      // validator: (_rule: any, value: any) => {
+      //   let goodsName = '';
+      //   if (
+      //     (value?.jstReissueGoods || []).some((goods: any) => {
+      //       const v = toNum(goods?.salePrice);
+      //       const res = typeof v === 'number' ? v < 0 : true;
+      //       if (res) {
+      //         goodsName = goods?.name ? `[${goods?.name}]` : '';
+      //       }
+      //       return res;
+      //     })
+      //   ) {
+      //     return Promise.reject(`${goodsName}单价为大于等于0的数`);
+      //   }
+      // },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -19745,7 +19939,7 @@ var getColumns$5 = function getColumns() {
       validator: function validator(_rule, value) {
         var goodsName = '';
         if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
-          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
+          var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
           var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
             goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -19842,7 +20036,7 @@ var getColumns$5 = function getColumns() {
       validator: function validator(_rule, value) {
         var goodsName = '';
         if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
+          var v = toNum$2(goods === null || goods === void 0 ? void 0 : goods.salePrice);
           var res = typeof v === 'number' ? v < 0 : true;
           if (res) {
             goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -19872,7 +20066,7 @@ var getColumns$5 = function getColumns() {
       validator: function validator(_rule, value) {
         var goodsName = '';
         if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
+          var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
           var res = typeof qty === 'number' ? qty < 1 : true;
           if (res) {
             goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -20047,7 +20241,7 @@ var getColumns$5 = function getColumns() {
   };
 };
 
-function toNum$2(value) {
+function toNum$3(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
   }
@@ -20193,7 +20387,7 @@ var getColumns$6 = function getColumns(_ref) {
       validator: function validator(_rule, value) {
         var title = '';
         if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
-          var realNum = toNum$2(goods === null || goods === void 0 ? void 0 : goods.realNum);
+          var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
           var res = typeof realNum === 'number' ? realNum < 1 : true;
           if (res) {
             title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -20234,15 +20428,201 @@ var getColumns$6 = function getColumns(_ref) {
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'price',
-      title: "\u5546\u54C1\u9500\u552E\u4EF7",
-      width: 150,
-      render: function render(val) {
-        return val || val === 0 ? Number(val).toFixed(2) : '';
-      }
-    }, {
-      dataIndex: 'payment',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'price',
+      title: "\u5546\u54C1\u9500\u552E\u4EF7",
+      width: 150,
+      render: function render(val) {
+        return val || val === 0 ? Number(val).toFixed(2) : '';
+      }
+    }, {
+      dataIndex: 'payment',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 130
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+      }
+    }, {
+      dataIndex: 'type',
+      title: "\u5546\u54C1\u7C7B\u578B",
+      width: 150
+    }, {
+      dataIndex: 'sysPicPath',
+      title: "\u5546\u54C1\u56FE\u7247",
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+
+var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
+  if (typeof value === 'number') return true;
+  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
+  return false;
+};
+function toNum$4(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
+var getColumns$7 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
+  return {
+    //巨益商品信息
+    JY_GOODS: [{
+      dataIndex: 'productName',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'productCode',
+      title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'productId',
+      title: "\u7CFB\u7EDF\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'skuName',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'skuCode',
+      title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    },
+    // {
+    //   dataIndex: 'goodsName',
+    //   title: `货品名称`,
+    //   width: 250,
+    // },
+    // {
+    //   dataIndex: 'goodsCode',
+    //   title: `货品编号`,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'goodsId',
+    //   title: `货品ID`,
+    //   width: 150,
+    // },
+    {
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      width: 150
+    }, {
+      dataIndex: 'code',
+      title: "\u6761\u7801",
+      width: 150
+    },
+    // {
+    //   dataIndex: 'specName',
+    //   title: `规格名称`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'specCode',
+    //   title: `规格编号`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 150,
+    // },
+    {
+      dataIndex: 'mallProductName',
+      title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'mallProductOutCode',
+      title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'mallProductId',
+      title: "\u5E73\u53F0\u5546\u54C1ID",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'mallSkuName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'mallSkuId',
+      title: "\u5E73\u53F0\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'sellCount',
+      title: "\u6570\u91CF",
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            updateDataHandle({
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
+            }, index);
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'sellPrice',
+      title: "\u5355\u4EF7",
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
@@ -20253,88 +20633,95 @@ var getColumns$6 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
+            updateDataHandle({
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
+            }, index);
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
-      dataIndex: 'type',
-      title: "\u5546\u54C1\u7C7B\u578B",
-      width: 150
-    }, {
-      dataIndex: 'sysPicPath',
-      title: "\u5546\u54C1\u56FE\u7247",
-      width: 100,
-      render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
-          width: 60,
-          src: val
-        });
-      }
-    }].map(function (item) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        align: 'center',
-        ellipsis: true
-      });
-    })
-  };
-};
-
-var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
-  if (typeof value === 'number') return true;
-  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
-  return false;
-};
-var getYesOrNo$4 = function getYesOrNo(val) {
-  if (kmkfUtils.isNull(val)) return null;
-  return val ? '是' : '否';
-};
-var getColumns$7 = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle,
-    updateDataHandle = _ref.updateDataHandle;
-  return {
-    //巨益商品信息
-    JY_GOODS: [{
-      dataIndex: 'goodsName',
-      title: "\u8D27\u54C1\u540D\u79F0",
+      dataIndex: 'mallSellingPrice',
+      title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
       width: 150
     }, {
-      dataIndex: 'goodsCode',
-      title: "\u8D27\u54C1\u7F16\u53F7",
-      width: 200
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u54C1ID",
+      dataIndex: 'sellTotal',
+      title: "\u91D1\u989D",
       width: 150
     }, {
-      dataIndex: 'goodsClass',
-      title: "\u8D27\u54C1\u7C7B\u522B",
+      dataIndex: 'settlementPrice',
+      title: "\u7ED3\u7B97\u4EF7",
       width: 150
     }, {
-      dataIndex: 'code',
-      title: "\u6761\u7801",
+      dataIndex: 'divideOrderFee',
+      title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
       width: 150
     }, {
-      dataIndex: 'specName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 200
+      dataIndex: 'bfit',
+      title: "\u662F\u5426\u7EC4\u5408\u88C5",
+      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');
+          },
+          options: [{
+            label: '是',
+            value: 'True'
+          }, {
+            label: '否',
+            value: 'False'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
+      }
     }, {
-      dataIndex: 'specCode',
-      title: "\u89C4\u683C\u7F16\u53F7",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'combinationName',
+      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
       width: 150
     }, {
-      dataIndex: 'specId',
-      title: "\u89C4\u683CID",
-      align: 'center',
-      ellipsis: true,
+      dataIndex: 'combinationCode',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
       width: 150
     }, {
+      dataIndex: 'gift',
+      title: "\u662F\u5426\u8D60\u54C1",
+      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');
+          },
+          options: [{
+            label: '是',
+            value: '1'
+          }, {
+            label: '否',
+            value: '0'
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
+      }
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
+    // 巨益补发商品信息
+    JY_REISSUE_GOODS: [{
       dataIndex: 'productName',
       title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
       align: 'center',
@@ -20364,6 +20751,20 @@ var getColumns$7 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 150
+    }, {
+      dataIndex: 'specId',
+      title: "\u89C4\u683CID",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'goodsClass',
+      title: "\u8D27\u54C1\u7C7B\u522B",
+      width: 150
+    }, {
+      dataIndex: 'code',
+      title: "\u6761\u7801",
+      width: 150
     }, {
       dataIndex: 'mallProductName',
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
@@ -20398,6 +20799,19 @@ var getColumns$7 = function getColumns(_ref) {
       dataIndex: 'sellCount',
       title: "\u6570\u91CF",
       width: 100,
+      validator: function validator(_rule, value) {
+        var productName = '';
+        if (((value === null || value === void 0 ? void 0 : value.jyReissueGoods) || []).some(function (goods) {
+          var qty = toNum$4(goods === null || goods === void 0 ? void 0 : goods.sellCount);
+          var res = typeof qty === 'number' ? qty < 1 : true;
+          if (res) {
+            productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -20408,9 +20822,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 0,
           onChange: function onChange(num) {
             updateDataHandle({
-              qty: num,
-              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
-              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -20429,8 +20842,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 2,
           onChange: function onChange(num) {
             updateDataHandle({
-              price: num,
-              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -20443,32 +20856,30 @@ var getColumns$7 = function getColumns(_ref) {
       dataIndex: 'sellTotal',
       title: "\u91D1\u989D",
       width: 150
-    }, {
-      dataIndex: 'settlementPrice',
-      title: "\u7ED3\u7B97\u4EF7",
-      width: 150
-    }, {
-      dataIndex: 'divideOrderFee',
-      title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
-      width: 150
     }, {
       dataIndex: 'bfit',
       title: "\u662F\u5426\u7EC4\u5408\u88C5",
       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');
           },
           options: [{
             label: '是',
-            value: 1
+            value: 'True'
           }, {
             label: '否',
-            value: 0
+            value: 'False'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
       }
     }, {
       dataIndex: 'combinationName',
@@ -20484,18 +20895,24 @@ 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');
           },
           options: [{
             label: '是',
-            value: 1
+            value: '1'
           }, {
             label: '否',
-            value: 0
+            value: '0'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -20503,300 +20920,6 @@ var getColumns$7 = function getColumns(_ref) {
         ellipsis: true
       });
     })
-    //巨益补发商品信息
-    // JY_REISSUE_GOODS: [
-    //   {
-    //     dataIndex: 'goodName',
-    //     title: `商品名称`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'goodShortName',
-    //     title: `商品简称`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'goodNo',
-    //     title: `商品编码`,
-    //     width: 200,
-    //   },
-    //   {
-    //     dataIndex: 'specName',
-    //     title: `SKU名称`,
-    //     align: 'center',
-    //     ellipsis: true,
-    //     width: 250,
-    //   },
-    //   {
-    //     dataIndex: 'specNo',
-    //     title: `SKU编码`,
-    //     align: 'center',
-    //     ellipsis: true,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'qty',
-    //     title: `数量`,
-    //     width: 100,
-    //     validator: (_rule: any, value: any) => {
-    //       let goodsName = '';
-    //       if (
-    //         (value?.gyReissueGoods || []).some((goods: any) => {
-    //           const qty = toNum(goods?.qty);
-    //           const res = typeof qty === 'number' ? qty < 1 : true;
-    //           if (res) {
-    //             goodsName = goods?.goodName ? `[${goods?.goodName}]` : '';
-    //           }
-    //           return res;
-    //         })
-    //       ) {
-    //         return Promise.reject(`${goodsName}数量必须大于0`);
-    //       }
-    //     },
-    //     render: (val: any, record: any, index: number) =>
-    //       !disabled ? (
-    //         <InputNumber
-    //           style={{ width: 70 }}
-    //           value={val}
-    //           min={1}
-    //           precision={0}
-    //           onChange={(num) => {
-    //             updateDataHandle(
-    //               {
-    //                 qty: num,
-    //                 amount:
-    //                   num && isNumberOrNumberString(record.price)
-    //                     ? num * record.price
-    //                     : null,
-    //                 originAmount:
-    //                   num && isNumberOrNumberString(record.originPrice)
-    //                     ? num * record.originPrice
-    //                     : null,
-    //               },
-    //               index,
-    //             );
-    //           }}
-    //         ></InputNumber>
-    //       ) : (
-    //         <span>{val}</span>
-    //       ),
-    //   },
-    //   {
-    //     dataIndex: 'price',
-    //     title: `实际单价`,
-    //     width: 150,
-    //     render: (val: any, record: any, index: number) =>
-    //       !disabled ? (
-    //         <InputNumber
-    //           style={{ width: 130 }}
-    //           value={val}
-    //           min={0}
-    //           precision={2}
-    //           onChange={(num) => {
-    //             updateDataHandle(
-    //               {
-    //                 price: num,
-    //                 amount:
-    //                   num && isNumberOrNumberString(record.qty)
-    //                     ? num * record.qty
-    //                     : null,
-    //               },
-    //               index,
-    //             );
-    //           }}
-    //         ></InputNumber>
-    //       ) : (
-    //         <span>{val}</span>
-    //       ),
-    //   },
-    //   {
-    //     dataIndex: 'amount',
-    //     title: `实际金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'originPrice',
-    //     title: `标准单价`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'originAmount',
-    //     title: `标准金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'isGift',
-    //     title: `是否赠品`,
-    //     width: 150,
-    //     render: (val: number, record: any, index: number) =>
-    //       record.canEdit && !disabled ? (
-    //         <Select
-    //           value={val}
-    //           onChange={(value) => {
-    //             updateHandle(value, index, 'isGift');
-    //           }}
-    //           options={[
-    //             { label: '是', value: 1 },
-    //             { label: '否', value: 0 },
-    //           ]}
-    //         />
-    //       ) : (
-    //         <span>{getYesOrNo(val)}</span>
-    //       ),
-    //   },
-    // ].map((item) => ({ ...item, align: 'center', ellipsis: true })),
-    // //巨益退货商品信息
-    // JY_RETURN_GOODS: [
-    //   {
-    //     dataIndex: 'goodName',
-    //     title: `商品名称`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'goodShortName',
-    //     title: `商品简称`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'goodNo',
-    //     title: `商品编码`,
-    //     width: 200,
-    //   },
-    //   {
-    //     dataIndex: 'specName',
-    //     title: `SKU名称`,
-    //     align: 'center',
-    //     ellipsis: true,
-    //     width: 250,
-    //   },
-    //   {
-    //     dataIndex: 'specNo',
-    //     title: `SKU编码`,
-    //     align: 'center',
-    //     ellipsis: true,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'qty',
-    //     title: `数量`,
-    //     width: 100,
-    //     validator: (_rule: any, value: any) => {
-    //       let goodsName = '';
-    //       if (
-    //         (value?.gyReturnGoods || []).some((goods: any) => {
-    //           const qty = toNum(goods?.qty);
-    //           const res = typeof qty === 'number' ? qty < 1 : true;
-    //           if (res) {
-    //             goodsName = goods?.goodName ? `[${goods?.goodName}]` : '';
-    //           }
-    //           return res;
-    //         })
-    //       ) {
-    //         return Promise.reject(`${goodsName}数量必须大于0`);
-    //       }
-    //     },
-    //     render: (val: any, record: any, index: number) =>
-    //       !disabled ? (
-    //         <InputNumber
-    //           style={{ width: 70 }}
-    //           value={val}
-    //           min={1}
-    //           precision={0}
-    //           onChange={(num) => {
-    //             updateDataHandle(
-    //               {
-    //                 qty: num,
-    //                 amount:
-    //                   num && isNumberOrNumberString(record.price)
-    //                     ? num * record.price
-    //                     : null,
-    //                 originAmount:
-    //                   num && isNumberOrNumberString(record.originPrice)
-    //                     ? num * record.originPrice
-    //                     : null,
-    //               },
-    //               index,
-    //             );
-    //           }}
-    //         ></InputNumber>
-    //       ) : (
-    //         <span>{val}</span>
-    //       ),
-    //   },
-    //   {
-    //     dataIndex: 'price',
-    //     title: `实际单价`,
-    //     width: 150,
-    //     render: (val: any, record: any, index: number) =>
-    //       !disabled ? (
-    //         <InputNumber
-    //           style={{ width: 130 }}
-    //           value={val}
-    //           min={0}
-    //           precision={2}
-    //           onChange={(num) => {
-    //             updateDataHandle(
-    //               {
-    //                 price: num,
-    //                 amount:
-    //                   num && isNumberOrNumberString(record.qty)
-    //                     ? num * record.qty
-    //                     : null,
-    //               },
-    //               index,
-    //             );
-    //           }}
-    //         ></InputNumber>
-    //       ) : (
-    //         <span>{val}</span>
-    //       ),
-    //   },
-    //   {
-    //     dataIndex: 'amount',
-    //     title: `实际金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'originPrice',
-    //     title: `标准单价`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'originAmount',
-    //     title: `标准金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'discountFee',
-    //     title: `让利金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'amountAfter',
-    //     title: `让利后金额`,
-    //     width: 150,
-    //   },
-    //   {
-    //     dataIndex: 'isGift',
-    //     title: `是否赠品`,
-    //     width: 150,
-    //     render: (val: number, record: any, index: number) =>
-    //       record.canEdit && !disabled ? (
-    //         <Select
-    //           value={val}
-    //           onChange={(value) => {
-    //             updateHandle(value, index, 'isGift');
-    //           }}
-    //           options={[
-    //             { label: '是', value: 1 },
-    //             { label: '否', value: 0 },
-    //           ]}
-    //         />
-    //       ) : (
-    //         <span>{getYesOrNo(val)}</span>
-    //       ),
-    //   },
-    // ].map((item) => ({ ...item, align: 'center', ellipsis: true })),
   };
 };
 
@@ -20987,7 +21110,8 @@ var getColumnsMap$1 = function getColumnsMap(args) {
   })), getColumns$7({
     text: text,
     disabled: disabled,
-    updateHandle: updateHandle
+    updateHandle: updateHandle,
+    updateDataHandle: updateDataHandle
   })), getColumns$8({
     text: text,
     disabled: disabled,
@@ -21206,12 +21330,35 @@ var processJyGoods = function processJyGoods(_ref2) {
   var list = _ref2.list,
     canUpdateNumber = _ref2.canUpdateNumber;
   return list.map(function (item) {
+    var goodName = item.goodName,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      specName = item.specName,
+      specNo = item.specNo,
+      specBarcode = item.specBarcode,
+      retailPrice = item.retailPrice,
+      isGift = item.isGift,
+      skuType = item.skuType;
     return _objectSpread2(_objectSpread2({}, item), {}, {
+      goodsName: goodName,
+      goodsCode: goodNo,
+      goodsId: goodId,
+      code: specBarcode,
+      specCode: specNo,
+      productName: goodName,
+      productCode: goodNo,
+      productId: goodId,
+      skuName: specName,
+      skuCode: specNo,
+      combinationName: goodName,
+      combinationCode: goodNo,
+      gift: isGift ? '1' : '0',
+      bfit: skuType === 'combine' ? 'True' : 'False',
       uuid: kmkfUtils.uuid(),
       canDelete: true,
       sellCount: 1,
-      sellPrice: 0,
-      sellTotal: 0,
+      sellPrice: retailPrice,
+      sellTotal: (retailPrice * 1).toFixed(2),
       canEdit: true,
       canUpdateNumber: canUpdateNumber
     });
@@ -21402,6 +21549,7 @@ var GoodsModalMap = {
   KM_GOODS: KmGoodsModal,
   KM_REISSUE_GOODS: KmGoodsModal,
   JY_GOODS: JyGoodsModal$1,
+  JY_REISSUE_GOODS: JyGoodsModal$1,
   OTHER_GOODS: GoodsModal$2
 };
 var systemOrderNoMap = {
@@ -21411,7 +21559,8 @@ var systemOrderNoMap = {
   BS_E3_GOODS: 'orderSn',
   JST_GOODS: 'oId',
   WLN_GOODS: 'tradeNo',
-  JY_GOODS: 'tradeNo'
+  JY_GOODS: 'tradeNo',
+  JY_REISSUE_GOODS: 'tradeNo'
 };
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
@@ -21469,6 +21618,12 @@ 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];
+    }));
+    console.log('selectedRowKeys', selectedRowKeys);
+    console.log('currentTradeOriginGoods', currentTradeOriginGoods);
     onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
   };
   var rowSelection = {
@@ -21592,13 +21747,15 @@ var GoodItem$1 = function GoodItem(props) {
     tradeGoods = props.tradeGoods,
     form = props.form,
     systemOrders = props.systemOrders,
-    selectedSystemOrders = props.selectedSystemOrders;
+    selectedSystemOrders = props.selectedSystemOrders,
+    _props$templateDetail = props.templateDetail,
+    templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail;
   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'].includes(type) || false;
+  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 refModal = React.useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -21686,6 +21843,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'KM_GOODS':
         case 'KM_REISSUE_GOODS':
         case 'JY_GOODS':
+        case 'JY_REISSUE_GOODS':
         case 'SKX_GOODS':
         case 'SKX_RETURN_GOODS':
           {
@@ -21732,8 +21890,9 @@ var GoodItem$1 = function GoodItem(props) {
     var COLUMNS_INFO = COLUMNS_MAP(text);
     return COLUMNS_INFO(type);
   };
-  var newColumns = React.useMemo(function () {
-    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+  var getShowFilterColumns = React.useCallback(function (_ref2) {
+    var showHeader = _ref2.showHeader,
+      initBaseInfoColumns = _ref2.initBaseInfoColumns;
     var baseInfoColumns = [];
     var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
@@ -21753,6 +21912,14 @@ var GoodItem$1 = function GoodItem(props) {
         return undefined;
       }).filter(Boolean);
     }
+    return baseInfoColumns;
+  }, [showHeader]);
+  var newColumns = React.useMemo(function () {
+    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
     var columnList = [{
       dataIndex: '',
       title: '序号',
@@ -21789,8 +21956,16 @@ var GoodItem$1 = function GoodItem(props) {
     return columnList;
   }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderModalColumns = React.useMemo(function () {
-    var list = newColumns.filter(function (col) {
-      return !['操作', '序号'].includes(col.title);
+    var initBaseInfoColumns = COLUMNS_MAP('', {
+      operate: false,
+      disabled: true
+    })(type);
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
+    var list = baseInfoColumns.filter(function (col) {
+      return !['操作'].includes(col.title);
     });
     return [{
       dataIndex: '',
@@ -21802,7 +21977,7 @@ var GoodItem$1 = function GoodItem(props) {
         return /*#__PURE__*/React__default['default'].createElement("span", null, index + 1);
       }
     }].concat(_toConsumableArray(list));
-  }, [newColumns]);
+  }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderColumns = React.useMemo(function () {
     var columns = COLUMNS_MAP('', {
       operate: false,
@@ -21915,7 +22090,9 @@ var GoodItem$1 = function GoodItem(props) {
     maxLength: maxLength,
     companyKey: companyKey,
     goodsSource: goodsSource,
-    useGoodsSourceFormat: useGoodsSourceFormat
+    useGoodsSourceFormat: useGoodsSourceFormat,
+    form: form,
+    templateDetail: templateDetail
   }));
 };
 
@@ -22550,7 +22727,7 @@ var getWdtOrderListSingleton = function getWdtOrderListSingleton(orderNo) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 billNo: item.tradeNo,
                 billType: kmkfUtils.WDT_ORDER_TYPE_MAP[item.tradeType],
-                billTag: item.tagName,
+                billTag: item.tagName || item.tags,
                 tradeStatusValue: kmkfUtils.tradeStatusMap === null || kmkfUtils.tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$data$ = kmkfUtils.tradeStatusMap[data.data.version]) === null || _tradeStatusMap$data$ === void 0 ? void 0 : _tradeStatusMap$data$[item.tradeStatus]
               });
             });
@@ -22794,13 +22971,19 @@ var getJyOrderListSingleton = function getJyOrderListSingleton(orderNo) {
       extendRequest('/qy/gdfw/order/jyOrderDetail', {
         method: 'post',
         data: {
-          tid: orderNo
+          billNo: orderNo
         }
       }).then(function (res) {
         if (res === null || res === void 0 ? void 0 : res.success) {
-          var _res$data;
-          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
-            res.data.trades = kmkfUtils.filterJyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo);
+          var _res$data, _res$data$tradeOrderD;
+          if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$tradeOrderD = _res$data.tradeOrderDetails) === null || _res$data$tradeOrderD === void 0 ? void 0 : _res$data$tradeOrderD.length) {
+            var _filterJyOrders, _res$data2;
+            res.data.trades = (_filterJyOrders = kmkfUtils.filterJyOrders(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.tradeOrderDetails, orderNo)) === null || _filterJyOrders === void 0 ? void 0 : _filterJyOrders.map(function (item) {
+              return _objectSpread2(_objectSpread2({}, item), {}, {
+                tradeType: kmkfUtils.JY_ORDER_TYPE_MAP[item.tradeType],
+                tradeStatus: kmkfUtils.JY_ORDER_STATUS_MAP[item.tradeStatus]
+              });
+            });
           }
           resolve(res.data);
           // 延迟10秒清除,保证订单的时效性
@@ -22893,7 +23076,9 @@ var index$2 = (function (props) {
   var value = props.value,
     _onChange = props.onChange,
     disabled = props.disabled,
-    type = props.type;
+    type = props.type,
+    _props$showHeader = props.showHeader,
+    showHeader = _props$showHeader === void 0 ? [] : _props$showHeader;
   var onceRef = React.useRef(false);
   var valueRef = React.useRef(null);
   React.useEffect(function () {
@@ -22921,8 +23106,12 @@ var index$2 = (function (props) {
     }
   }, [value, type]);
   var columns = React.useMemo(function () {
-    return columnsMap[type] || [];
-  }, [type]);
+    var baseInfoColumns = kmkfUtils.getSystemShowHead({
+      columns: columnsMap[type] || [],
+      showHeader: showHeader
+    });
+    return baseInfoColumns || [];
+  }, [type, showHeader]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -23002,17 +23191,8 @@ var index$2 = (function (props) {
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
                 orders: trades,
-                showOrderInfo: trades.map(function (_ref4) {
-                  var billNo = _ref4.billNo,
-                    billType = _ref4.billType,
-                    billTag = _ref4.billTag,
-                    tradeStatusValue = _ref4.tradeStatusValue;
-                  return {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag,
-                    tradeStatusValue: tradeStatusValue
-                  };
+                showOrderInfo: trades.map(function (item) {
+                  return _objectSpread2({}, item);
                 })
               }));
             });
@@ -23028,7 +23208,7 @@ var index$2 = (function (props) {
     };
   }();
   var getBsE3OrderList = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(orderNo) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(orderNo) {
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -23049,11 +23229,11 @@ var index$2 = (function (props) {
       }, _callee4);
     }));
     return function getBsE3OrderList(_x4) {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var getJstOrderList = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderNo) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderNo) {
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -23072,21 +23252,21 @@ var index$2 = (function (props) {
       }, _callee5);
     }));
     return function getJstOrderList(_x5) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   var getKmOrderList = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(orderNo) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(orderNo) {
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             kmUtils.getOrderListSingleton(orderNo).then(function (trades) {
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
                 orders: trades,
-                showOrderInfo: trades.map(function (_ref8) {
-                  var billNo = _ref8.billNo,
-                    billType = _ref8.billType,
-                    billTag = _ref8.billTag;
+                showOrderInfo: trades.map(function (_ref7) {
+                  var billNo = _ref7.billNo,
+                    billType = _ref7.billType,
+                    billTag = _ref7.billTag;
                   return {
                     billNo: billNo,
                     billType: billType,
@@ -23103,11 +23283,11 @@ var index$2 = (function (props) {
       }, _callee6);
     }));
     return function getKmOrderList(_x6) {
-      return _ref7.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var getGyOrderList = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(orderNo) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(orderNo) {
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -23117,16 +23297,16 @@ var index$2 = (function (props) {
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
                 orders: trades,
-                showOrderInfo: trades.map(function (_ref10) {
-                  var billNo = _ref10.billNo,
-                    billType = _ref10.billType,
-                    billTag = _ref10.billTag,
-                    tradeTagName = _ref10.tradeTagName,
-                    deliveryState = _ref10.deliveryState,
-                    vipCode = _ref10.vipCode,
-                    shopCode = _ref10.shopCode,
-                    cancel = _ref10.cancel,
-                    rest = _objectWithoutProperties(_ref10, _excluded$k);
+                showOrderInfo: trades.map(function (_ref9) {
+                  var billNo = _ref9.billNo,
+                    billType = _ref9.billType,
+                    billTag = _ref9.billTag,
+                    tradeTagName = _ref9.tradeTagName,
+                    deliveryState = _ref9.deliveryState,
+                    vipCode = _ref9.vipCode,
+                    shopCode = _ref9.shopCode,
+                    cancel = _ref9.cancel,
+                    rest = _objectWithoutProperties(_ref9, _excluded$k);
                   return _objectSpread2(_objectSpread2({}, rest), {}, {
                     billNo: billNo,
                     billType: billType,
@@ -23149,11 +23329,11 @@ var index$2 = (function (props) {
       }, _callee7);
     }));
     return function getGyOrderList(_x7) {
-      return _ref9.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   var getJyOrderList = /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(orderNo) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(orderNo) {
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
@@ -23163,9 +23343,9 @@ var index$2 = (function (props) {
               });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
                 orders: trades,
-                showOrderInfo: trades.map(function (_ref12) {
-                  var shopCode = _ref12.shopCode,
-                    rest = _objectWithoutProperties(_ref12, _excluded2);
+                showOrderInfo: trades.map(function (_ref11) {
+                  var shopCode = _ref11.shopCode,
+                    rest = _objectWithoutProperties(_ref11, _excluded2);
                   return _objectSpread2(_objectSpread2({}, rest), {}, {
                     shopCode: shopCode
                   });
@@ -23180,7 +23360,7 @@ var index$2 = (function (props) {
       }, _callee8);
     }));
     return function getJyOrderList(_x8) {
-      return _ref11.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
   var rowSelection = {
@@ -23224,7 +23404,8 @@ var index$2 = (function (props) {
     size: "small",
     pagination: false,
     scroll: {
-      x: 'max-content'
+      x: '100%',
+      y: 500
     },
     locale: {
       emptyText: '暂无数据'
@@ -25021,21 +25202,12 @@ var wdtReissue = function wdtReissue(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             (_typeMap$type5 = typeMap$1[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.getOrderList(orderNo).then(function (data) {
-              var _typeMap$type6, _ref3, _typeMap$type7;
+              var _typeMap$type6, _ref2, _typeMap$type7;
               var orders = (data === null || data === void 0 ? void 0 : data.trades) || [];
-              var showOrderInfo = orders.map(function (_ref2) {
-                var billNo = _ref2.billNo,
-                  billType = _ref2.billType,
-                  billTag = _ref2.billTag,
-                  tradeStatusValue = _ref2.tradeStatusValue;
-                return {
-                  billNo: billNo,
-                  billType: billType,
-                  billTag: billTag,
-                  tradeStatusValue: tradeStatusValue
-                };
+              var showOrderInfo = orders.map(function (item) {
+                return _objectSpread2({}, item);
               });
-              var newValue = _objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, _defineProperty({}, (_typeMap$type6 = typeMap$1[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder, _objectSpread2(_objectSpread2({}, ((_ref3 = valueRef.current || {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type7 = typeMap$1[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrder]) || {}), {}, {
+              var newValue = _objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, _defineProperty({}, (_typeMap$type6 = typeMap$1[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder, _objectSpread2(_objectSpread2({}, ((_ref2 = valueRef.current || {}) === null || _ref2 === void 0 ? void 0 : _ref2[(_typeMap$type7 = typeMap$1[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrder]) || {}), {}, {
                 showOrderInfo: showOrderInfo,
                 orders: orders
               })));
@@ -25081,10 +25253,10 @@ var wdtReissue = function wdtReissue(props) {
       mode: mode
     }))));
   };
-  var getGoodDetails = function getGoodDetails(_ref4) {
+  var getGoodDetails = function getGoodDetails(_ref3) {
     var _typeMap$type14, _typeMap$type15, _order$goodDetails;
-    var mode = _ref4.mode,
-      sysOrderNo = _ref4.sysOrderNo;
+    var mode = _ref3.mode,
+      sysOrderNo = _ref3.sysOrderNo;
     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) {
@@ -25138,6 +25310,9 @@ var wdtReissue = function wdtReissue(props) {
     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__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
+    style: {
+      width: '100%'
+    },
     gutter: 8,
     wrap: true
   }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
@@ -25267,10 +25442,25 @@ var typeMap$2 = {
     outerOiIdKey: '',
     goodDetailsKey: 'subOrders',
     uniqueKey: 'id'
+  },
+  JY_REISSUE_GOODS: {
+    compType: '补发',
+    key: 'jyReissueGoods',
+    typeName: 'jyReissueType',
+    systemOrder: 'jySystemOrder',
+    systemOrderNo: 'jySystemOrderNo',
+    getOrderList: jyUtils.getJyOrderListSingleton,
+    updateGoodsHandle: kmkfUtils.updateJyGoodsHandle,
+    alwaysShowChooseErpGoodsBtn: true,
+    orderTypeKey: 'orderType',
+    oIdKey: 'tradeNo',
+    outerOiIdKey: '',
+    goodDetailsKey: 'subOrderDetails',
+    isShowSelectTradeGoods: true
   }
 };
 var PublicReissue = function PublicReissue(props) {
-  var _typeMap$type33, _typeMap$type38, _typeMap$type39, _typeMap$type40, _typeMap$type41, _value$typeMap$type$s7, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49;
+  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 value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -25387,9 +25577,11 @@ var PublicReissue = function PublicReissue(props) {
     }))));
   };
   var getGoodDetails = function getGoodDetails(_ref4) {
-    var _typeMap$type18, _typeMap$type19, _order$typeMap$type$g, _typeMap$type20, _typeMap$type21;
+    var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22;
     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$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrder];
     var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrderNo];
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
@@ -25403,39 +25595,48 @@ var PublicReissue = function PublicReissue(props) {
         orderBackGoodsLevel: props.orderBackGoodsLevel,
         canEdit: true
       };
+    } else if (['JY_REISSUE_GOODS', 'JY_RETURN_GOODS'].includes(type)) {
+      orderRest = {
+        canEdit: true
+      };
     }
-    var goodDetails = (order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length) ? typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.updateGoodsHandle([order], orderRest)) : (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle([order], orderRest) : [];
+    var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : [order];
+    var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
+      var _order$typeMap$type$g;
+      return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
+    });
+    var goodDetails = hasGoodDetails ? typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest)) : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.updateGoodsHandle(orders, orderRest) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
-    var list = mode ? goodDetails.filter(function (goodItem) {
+    var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
     }) : goodDetails;
     return list;
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type22;
+    var _typeMap$type23;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = val || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)] = val || [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
-    var _typeMap$type23, _typeMap$type24, _value$typeMap$type$t2, _typeMap$type29, _value$typeMap$type$t3, _typeMap$type31;
+    var _typeMap$type24, _typeMap$type25, _value$typeMap$type$t2, _typeMap$type30, _value$typeMap$type$t3, _typeMap$type32;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo)] = val;
-    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderBillType) {
-      var _value$typeMap$type$s6, _typeMap$type25, _typeMap$type27, _typeMap$type28;
-      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo)] = val;
+    if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderBillType) {
+      var _value$typeMap$type$s7, _typeMap$type26, _typeMap$type28, _typeMap$type29;
+      var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
       var targetOrder = val && orders.find(function (oItem) {
-        var _typeMap$type26;
-        return oItem[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.oIdKey] === val;
+        var _typeMap$type27;
+        return oItem[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.oIdKey] === val;
       });
-      newValue[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.orderTypeKey];
-    }
-    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
-      var _typeMap$type30;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)] = [];
-    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
-      var _typeMap$type32;
-      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)] = getGoodDetails({
+      newValue[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.orderTypeKey];
+    }
+    if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
+      var _typeMap$type31;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)] = [];
+    } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
+      var _typeMap$type33;
+      newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = getGoodDetails({
         mode: isStrict,
         sysOrderNo: val
       });
@@ -25443,26 +25644,27 @@ var PublicReissue = function PublicReissue(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue, 'systemOrder');
   };
   //显示选择商品按钮
-  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrderNo]);
+  var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo]);
   var selectedGoodsChange = React.useCallback(function (skuList) {
-    var _typeMap$type34, _typeMap$type35, _uniqBy, _typeMap$type36;
+    var _typeMap$type35, _typeMap$type36, _typeMap$type37, _uniqBy, _typeMap$type38;
     var newValue = _objectSpread2({}, value);
     // 原订单商品
     var originTradeGoodList = getGoodDetails({
-      mode: isStrict
+      mode: isStrict,
+      isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.isShowSelectTradeGoods
     }) || [];
     // 当前选中的所有商品【包含了原订单+商品库】
-    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)]) || [];
-    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
-      var _typeMap$type37;
-      return skuList.includes(item[typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.uniqueKey]);
+    var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.key)]) || [];
+    newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)] = (_uniqBy = lodash.uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
+      var _typeMap$type39;
+      return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.uniqueKey) || 'uuid']);
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)], isStrict]);
+  }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.key)], isStrict]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     gutter: 8,
     wrap: true,
-    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.key) || "".concat(Date.now())
+    id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.key) || "".concat(Date.now())
   }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
@@ -25478,12 +25680,12 @@ var PublicReissue = function PublicReissue(props) {
     },
     disabled: disabled,
     allowClear: false,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.systemOrderNo)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.systemOrderNo)],
     onChange: function onChange(val) {
       return changeSystemOrderHandle(val);
     },
-    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.compType) || '', "\u7CFB\u7EDF\u5355")
-  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.showOrderInfo) || []).map(function (item) {
+    placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.compType) || '', "\u7CFB\u7EDF\u5355")
+  }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: item[typeMap$2[type].oIdKey],
       value: item[typeMap$2[type].oIdKey],
@@ -25505,11 +25707,11 @@ var PublicReissue = function PublicReissue(props) {
     disabled: isSettingConfig ? !isSettingConfig : disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
-  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
+  })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     className: "gutter-row",
     xs: {
       span: 11
@@ -25518,7 +25720,7 @@ var PublicReissue = function PublicReissue(props) {
       span: 6
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.systemOrderBillType)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.systemOrderBillType)],
     disabled: disabled,
     readOnly: true
   }))), /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -25527,22 +25729,25 @@ var PublicReissue = function PublicReissue(props) {
     type: type,
     disabled: disabled,
     canUpdateNumber: showChangeBtn,
-    showChangeBtn: showChangeBtn,
-    alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.alwaysShowChooseErpGoodsBtn,
-    showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.showErpGoodsBtn,
+    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,
     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$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.key)],
+    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)],
     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,
     tradeGoods: {
       originDataSource: getGoodDetails({
-        mode: isStrict
+        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
       }),
-      uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.uniqueKey) || 'uuid',
+      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',
       selectedGoodsChange: selectedGoodsChange
     }
   })));
@@ -27803,6 +28008,17 @@ var SkxGoods = function SkxGoods(props) {
   }));
 };
 
+var SYSTEM_ORDER_COLUMNS_MAP = {
+  BS_SYSTEM_ORDER: kmkfUtils.BS_SYSTEM_ORDER_CONFIG.columns,
+  KM_SYSTEM_ORDER: kmkfUtils.KM_SYSTEM_ORDER_CONFIG.columns,
+  WLN_SYSTEM_ORDER: kmkfUtils.WLN_SYSTEM_ORDER_CONFIG.columns,
+  WDT_SYSTEM_ORDER: kmkfUtils.WDT_SYSTEM_ORDER_CONFIG.columns,
+  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
+};
+
 exports.Address = ApaasAddress;
 exports.AliPay = AliPay;
 exports.ApaasAddress = Province;
@@ -27863,6 +28079,7 @@ exports.Payment = Payment;
 exports.PublicReissue = PublicReissue;
 exports.Remark = RemarkInput;
 exports.ReturnLogistics = ExpressLogistics;
+exports.SYSTEM_ORDER_COLUMNS_MAP = SYSTEM_ORDER_COLUMNS_MAP;
 exports.ShopName = ShopNameSelect;
 exports.SkxGoods = SkxGoods;
 exports.SkxIdInputSelect = IdInputSelect;