@kmkf-fe-packages/basic-components 2.7.4 → 2.7.7-beta.0

package/dist/index.esm.js

@@ -8594,6 +8594,10 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
         status: 'erpAfterSaleStatusValue',
         reason: 'erpAfterSaleStatusReason'
       },
+      ERP_AFTER_SALES_ORDER_REVIEW_STATUS: {
+        status: 'erpAfterSalesOrderReviewStatusValue',
+        reason: 'erpAfterSalesOrderReviewStatusReason'
+      },
       RETURN_EXCHANGE_GOODS_REVIEW_STATUS: {
         status: 'returnExchangeGoodsReviewStatusValue',
         reason: 'returnExchangeGoodsReviewStatusReason'
@@ -8622,7 +8626,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
       BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
       MSG_STATUS: 'msgStatusValues',
       WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
-      JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
+      JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
+      WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList'
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
   };
@@ -9457,6 +9462,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       AGREE_REFUND_STATUS: processCallBackStatus,
       REJECT_REFUND_STATUS: processCallBackStatus,
       ERP_AFTER_SALE_STATUS: processCallBackStatus,
+      ERP_AFTER_SALES_ORDER_REVIEW_STATUS: processCallBackStatus,
       AGREE_RETURN_GOODS_STATUS: processCallBackStatus,
       REJECT_RETURN_GOODS_STATUS: processCallBackStatus,
       RETURN_EXCHANGE_GOODS_REVIEW_STATUS: processCallBackStatus,
@@ -9467,6 +9473,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_WAREHOUSING_STATUS: processSceneStatus,
       MSG_STATUS: processSceneStatus,
       WDT_WAREHOUSING_STATUS: processSceneStatus,
+      WLN_WAREHOUSING_STATUS: processSceneStatus,
       JKY_WAREHOUSING_STATUS: processSceneStatus,
       BS_LOGISTICS: processErpLogistics,
       WLN_LOGISTICS: processErpLogistics,
@@ -11648,7 +11655,7 @@ var GoodsModal = function GoodsModal(props) {
       key: item.value
     }, item.label);
   })), /*#__PURE__*/React.createElement(Search, {
-    placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝链接，标题' : '商品ID' : '宝贝标题',
+    placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝标题' : '商品ID' : '宝贝标题',
     // enterButton="搜索"
     className: "search",
     value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
@@ -13154,6 +13161,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     _props$required = props.required,
     required = _props$required === void 0 ? false : _props$required,
     onChange = props.onChange,
+    _onBlur = props.onBlur,
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
     _props$isEditing = props.isEditing,
@@ -13162,7 +13170,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
     platform = _props$platform === void 0 ? '' : _props$platform,
     onJumpPage = props.onJumpPage,
     _props$showReason = props.showReason,
-    showReason = _props$showReason === void 0 ? false : _props$showReason;
+    showReason = _props$showReason === void 0 ? false : _props$showReason,
+    _props$preCreateAndNo = props.preCreateAndNotModified,
+    preCreateAndNotModified = _props$preCreateAndNo === void 0 ? false : _props$preCreateAndNo;
   var _useState = useState(function () {
       return (value === null || value === void 0 ? void 0 : value.interceptCompany) || undefined;
     }),
@@ -13263,6 +13273,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
     });
     return isEditing && !!(company === null || company === void 0 ? void 0 : company.isInterface);
   }, [isEditing, initCompany]);
+  var canEditPreCreateBaseFields = preCreateAndNotModified;
+  var baseFieldDisabled = disabled || isEdit && !canEditPreCreateBaseFields;
   //退回地址列表
   var logisticsAddressOptions = useMemo(function () {
     return LogisticsAddressOptions === null || LogisticsAddressOptions === void 0 ? void 0 : LogisticsAddressOptions.filter(function (item) {
@@ -13367,7 +13379,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       }
     }
     console.log('newValue', newValue);
-    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue, type);
   };
   //智能识别回调
   var changeIdentify = function changeIdentify(val) {
@@ -13399,7 +13411,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'logistics'
   }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(ApaasLogistics, {
-    disabled: disabled || isEdit,
+    disabled: baseFieldDisabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '150px'
@@ -13413,12 +13425,16 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React.createElement(Input, {
-    disabled: disabled || isEdit,
+    disabled: baseFieldDisabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       var _e$target$value;
       return changeHandle((_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim(), 'interceptCode');
     },
+    onBlur: function onBlur(e) {
+      var _e$target$value2;
+      return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'interceptCode');
+    },
     value: value === null || value === void 0 ? void 0 : value.interceptCode
   }))), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Item, {
     label: /*#__PURE__*/React.createElement("span", null, "\u5BA2\u6237\u7F16\u7801\uFF08K\u7801\uFF09\uFF1A", platform === 'pc' ? /*#__PURE__*/React.createElement(Typography.Link, {
@@ -13434,7 +13450,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     key: 'interceptLogisticsUserKCode',
     hidden: !showKcode
   }, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || isEdit,
+    disabled: baseFieldDisabled,
     placeholder: "\u9009\u62E9K\u7801",
     showSearch: true,
     style: {
@@ -13468,7 +13484,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'interceptType'
   }, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || isEdit,
+    disabled: baseFieldDisabled,
     style: {
       width: '200px'
     },
@@ -13492,8 +13508,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
     disabled: disabled || isEdit,
     placeholder: senderMobileLabel,
     onChange: function onChange(e) {
-      var _e$target$value2;
-      return changeHandle((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'interceptSenderMobile');
+      var _e$target$value3;
+      return changeHandle((_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.trim(), 'interceptSenderMobile');
     }
   })), /*#__PURE__*/React.createElement(Item, {
     label: '退回地址',
@@ -13552,8 +13568,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
     },
     placeholder: "\u5176\u4ED6",
     onChange: function onChange(e) {
-      var _e$target$value3;
-      return changeHandle((_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.trim(), 'interceptLogisticsStatusOther');
+      var _e$target$value4;
+      return changeHandle((_e$target$value4 = e.target.value) === null || _e$target$value4 === void 0 ? void 0 : _e$target$value4.trim(), 'interceptLogisticsStatusOther');
     }
   })), /*#__PURE__*/React.createElement(Item, {
     label: '拦截状态',
@@ -13607,8 +13623,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
     disabled: true,
     placeholder: "\u63A5\u53E3\u72B6\u6001\u539F\u56E0",
     onChange: function onChange(e) {
-      var _e$target$value4;
-      return changeHandle((_e$target$value4 = e.target.value) === null || _e$target$value4 === void 0 ? void 0 : _e$target$value4.trim(), 'interceptLogisticsApiStatusReason');
+      var _e$target$value5;
+      return changeHandle((_e$target$value5 = e.target.value) === null || _e$target$value5 === void 0 ? void 0 : _e$target$value5.trim(), 'interceptLogisticsApiStatusReason');
     }
   })));
 };
@@ -14110,9 +14126,9 @@ var jstGoods = function jstGoods(props) {
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
-  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky'].includes(platformType);
+  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln'].includes(platformType);
   var expressDateInstance = ExpressData.getInstance(platformType);
-  var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
+  var isSendGoodSavedId = isSelectName && !['jst', 'wln'].includes(platformType);
   useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -15713,6 +15729,122 @@ var jkyColumns = [{
   }
 }];
 
+var getYesOrNo$3 = function getYesOrNo(val) {
+  if (!isBoolean(val)) return null;
+  return val ? '是' : '否';
+};
+var wlnColumns = [{
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 150,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodId',
+  title: '商品ID',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodPicUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React.createElement("img", {
+      style: {
+        width: '30px',
+        height: '30px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'goodBarcode',
+  title: '商品条码',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'propertiesValue',
+  title: '规格值',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specNo',
+  title: "SKU\u7F16\u7801",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specId',
+  title: "SKU ID",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specImgUrl',
+  title: "SKU \u56FE\u7247",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement(Image, {
+      width: 30,
+      src: val
+    });
+  }
+}, {
+  dataIndex: 'specBarcode',
+  title: '规格条码',
+  width: 150,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'brandName',
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u96F6\u552E\u4EF7",
+  ellipsis: true,
+  width: 100,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'unitName',
+  title: '基本单位',
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'skuType',
+  title: "\u662F\u5426\u7EC4\u5408\u88C5",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return renderTextEllipsis(getYesOrNo$3(val === 'combine'));
+  }
+}];
+
 var getColumnsMap = function getColumnsMap() {
   return cloneDeep({
     gy: gyColumns,
@@ -15721,7 +15853,8 @@ var getColumnsMap = function getColumnsMap() {
     bse3: bse3Columns,
     km: kmColumns,
     jy: jyColumns,
-    jky: jkyColumns
+    jky: jkyColumns,
+    wln: wlnColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -16153,30 +16286,33 @@ var GoodList = function GoodList(props, ref) {
     selectedRowKeys: selectIds,
     fixed: true,
     onSelect: function onSelect(record, selected) {
+      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.specNo;
+          return t !== uniqueKey;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.specNo !== record.specNo;
+          return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.specNo;
-        }))));
+        var changeKeys = changeRows.map(function (t) {
+          return "".concat(t.goodNo, "-").concat(t.specNo);
+        });
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
-        setSelectIds(difference(selectIds, changeRows.map(function (t) {
-          return t.specNo;
-        })));
+        var _changeKeys = changeRows.map(function (t) {
+          return "".concat(t.goodNo, "-").concat(t.specNo);
+        });
+        setSelectIds(difference(selectIds, _changeKeys));
         var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.specNo !== othVal.specNo;
+          return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
         });
         setSelect(list);
       }
@@ -16184,11 +16320,12 @@ var GoodList = function GoodList(props, ref) {
   };
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
+      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.specNo;
+        return t !== uniqueKey;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.specNo !== record.specNo;
+        return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
       }));
     };
     var showColumns = [{
@@ -16212,7 +16349,9 @@ var GoodList = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React.createElement(Table, {
       columns: showColumns,
-      rowKey: 'specNo',
+      rowKey: function rowKey(record) {
+        return "".concat(record.goodNo, "-").concat(record.specNo);
+      },
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -16242,7 +16381,9 @@ var GoodList = function GoodList(props, ref) {
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
     className: "GoodModalColumns",
     rowSelection: rowSelection,
-    rowKey: "specNo",
+    rowKey: function rowKey(record) {
+      return "".concat(record.goodNo, "-").concat(record.specNo);
+    },
     columns: columns,
     scroll: {
       x: '100%',
@@ -17792,6 +17933,27 @@ var componentMap$1 = {
       onChange: props.handleChange
     }));
   },
+  TagsSelect: function TagsSelect(props) {
+    return "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name).length > 10 ? /*#__PURE__*/React.createElement(Tooltip, {
+      title: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name)
+    }, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
+      mode: "tags",
+      placeholder: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name),
+      optionFilterProp: "label",
+      allowClear: true,
+      maxTagCount: "responsive"
+    }, props), {}, {
+      onChange: props.handleChange
+    }))) : /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
+      mode: "tags",
+      placeholder: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name),
+      optionFilterProp: "label",
+      allowClear: true,
+      maxTagCount: "responsive"
+    }, props), {}, {
+      onChange: props.handleChange
+    }));
+  },
   Date: function Date(props) {
     return /*#__PURE__*/React.createElement(RangePicker, _objectSpread2(_objectSpread2({
       placeholder: ["".concat(props.name, "\u5F00\u59CB\u65F6\u95F4"), "".concat(props.name, "\u7ED3\u675F\u65F6\u95F4")],
@@ -18734,7 +18896,7 @@ var getTableData$5 = function getTableData(_ref, formData) {
     data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JY_ERP',
+      platform: 'WLN_ERP',
       conditionList: conditionList
     }
   }).then(function (res) {
@@ -18753,13 +18915,11 @@ var getTableData$5 = function getTableData(_ref, formData) {
   });
 };
 var searchFormData$4 = [{
-  label: '规格名称',
-  name: 'skuName',
-  dataIndex: 'specName'
+  label: '规格值',
+  name: 'propertiesValue'
 }, {
-  label: '规格编码',
-  name: 'skuCode',
-  dataIndex: 'specNo',
+  label: 'SKU编码',
+  name: 'specNo',
   type: 'optionalInput'
 }, {
   label: '商品名称',
@@ -18768,6 +18928,23 @@ var searchFormData$4 = [{
   label: '商品编码',
   name: 'goodNo',
   type: 'optionalInput'
+}, {
+  label: '是否组合装',
+  name: 'skuType',
+  type: 'select',
+  formItemProps: {
+    mode: 'multiple',
+    filterOption: function filterOption(input, option) {
+      return option.label.includes(input);
+    },
+    options: [{
+      label: '普通商品',
+      value: 'normal'
+    }, {
+      label: '组合装商品',
+      value: 'combine'
+    }]
+  }
 }];
 var GoodList$5 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -18778,7 +18955,7 @@ var GoodList$5 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
-  var _useGetColumns = useGetColumns('jy'),
+  var _useGetColumns = useGetColumns('wln'),
     _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
     columns = _useGetColumns2[0],
     showColumnsDataIndexList = _useGetColumns2[1],
@@ -18837,8 +19014,8 @@ var GoodList$5 = function GoodList(props, ref) {
     getCheckboxProps: function getCheckboxProps(record) {
       var options = {
         disabled: (props.selectedRows || []).map(function (row) {
-          return row.id || row.specId;
-        }).includes(record.id || record.specId),
+          return row.specId || record.id;
+        }).includes(record.specId || record.id),
         name: record.id
       };
       return options;
@@ -18922,9 +19099,9 @@ var GoodList$5 = function GoodList(props, ref) {
     type: "text"
   }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
 };
-var JyGoodsList = /*#__PURE__*/forwardRef(GoodList$5);
+var WlnGoodsList = /*#__PURE__*/forwardRef(GoodList$5);
 
-var JyGoodsModal = function JyGoodsModal(props, ref) {
+var WlnGoodsModal = function WlnGoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       open: function open(shopCode) {
@@ -18944,13 +19121,13 @@ var JyGoodsModal = function JyGoodsModal(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectedRows = _useState4[0],
     setSelectedRows = _useState4[1];
-  var jyGoodsListRef = useRef(null);
+  var jkyGoodsListRef = useRef(null);
   var _onCancel = function onCancel() {
     setVisible(false);
   };
   var onOk = function onOk() {
-    var _jyGoodsListRef$curre;
-    var selectedList = ((_jyGoodsListRef$curre = jyGoodsListRef.current) === null || _jyGoodsListRef$curre === void 0 ? void 0 : _jyGoodsListRef$curre.getSelectGoodList()) || [];
+    var _jkyGoodsListRef$curr;
+    var selectedList = ((_jkyGoodsListRef$curr = jkyGoodsListRef.current) === null || _jkyGoodsListRef$curr === void 0 ? void 0 : _jkyGoodsListRef$curr.getSelectGoodList()) || [];
     onSubmit(selectedList);
     _onCancel();
   };
@@ -18965,12 +19142,12 @@ var JyGoodsModal = function JyGoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, /*#__PURE__*/React.createElement(JyGoodsList, {
-    ref: jyGoodsListRef,
+  }, /*#__PURE__*/React.createElement(WlnGoodsList, {
+    ref: jkyGoodsListRef,
     selectedRows: selectedRows
   })));
 };
-var JyGoodsModal$1 = /*#__PURE__*/forwardRef(JyGoodsModal);
+var WlnGoodsModal$1 = /*#__PURE__*/forwardRef(WlnGoodsModal);
 
 var getTableData$6 = function getTableData(_ref, formData) {
   var current = _ref.current,
@@ -18981,7 +19158,7 @@ var getTableData$6 = function getTableData(_ref, formData) {
     data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JKY_ERP',
+      platform: 'JY_ERP',
       conditionList: conditionList
     }
   }).then(function (res) {
@@ -19009,10 +19186,10 @@ var searchFormData$5 = [{
   dataIndex: 'specNo',
   type: 'optionalInput'
 }, {
-  label: '货品名称',
+  label: '商品名称',
   name: 'goodName'
 }, {
-  label: '货品编码',
+  label: '商品编码',
   name: 'goodNo',
   type: 'optionalInput'
 }];
@@ -19025,7 +19202,7 @@ var GoodList$6 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
-  var _useGetColumns = useGetColumns('jky'),
+  var _useGetColumns = useGetColumns('jy'),
     _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
     columns = _useGetColumns2[0],
     showColumnsDataIndexList = _useGetColumns2[1],
@@ -19084,8 +19261,8 @@ var GoodList$6 = function GoodList(props, ref) {
     getCheckboxProps: function getCheckboxProps(record) {
       var options = {
         disabled: (props.selectedRows || []).map(function (row) {
-          return row.specId || record.id;
-        }).includes(record.specId || record.id),
+          return row.id || row.specId;
+        }).includes(record.id || record.specId),
         name: record.id
       };
       return options;
@@ -19169,9 +19346,9 @@ var GoodList$6 = function GoodList(props, ref) {
     type: "text"
   }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
 };
-var JkyGoodsList = /*#__PURE__*/forwardRef(GoodList$6);
+var JyGoodsList = /*#__PURE__*/forwardRef(GoodList$6);
 
-var JkyGoodsModal = function JkyGoodsModal(props, ref) {
+var JyGoodsModal = function JyGoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       open: function open(shopCode) {
@@ -19191,13 +19368,13 @@ var JkyGoodsModal = function JkyGoodsModal(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectedRows = _useState4[0],
     setSelectedRows = _useState4[1];
-  var jkyGoodsListRef = useRef(null);
+  var jyGoodsListRef = useRef(null);
   var _onCancel = function onCancel() {
     setVisible(false);
   };
   var onOk = function onOk() {
-    var _jkyGoodsListRef$curr;
-    var selectedList = ((_jkyGoodsListRef$curr = jkyGoodsListRef.current) === null || _jkyGoodsListRef$curr === void 0 ? void 0 : _jkyGoodsListRef$curr.getSelectGoodList()) || [];
+    var _jyGoodsListRef$curre;
+    var selectedList = ((_jyGoodsListRef$curre = jyGoodsListRef.current) === null || _jyGoodsListRef$curre === void 0 ? void 0 : _jyGoodsListRef$curre.getSelectGoodList()) || [];
     onSubmit(selectedList);
     _onCancel();
   };
@@ -19212,38 +19389,285 @@ var JkyGoodsModal = function JkyGoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, /*#__PURE__*/React.createElement(JkyGoodsList, {
-    ref: jkyGoodsListRef,
+  }, /*#__PURE__*/React.createElement(JyGoodsList, {
+    ref: jyGoodsListRef,
     selectedRows: selectedRows
   })));
 };
-var JkyGoodsModal$1 = /*#__PURE__*/forwardRef(JkyGoodsModal);
+var JyGoodsModal$1 = /*#__PURE__*/forwardRef(JyGoodsModal);
 
-var getColumns = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
-  return {
-    //百胜E3补发商品
-    BS_E3_REISSUE_GOODS: [{
-      dataIndex: 'sku',
-      title: "SKU",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'skuId',
-      title: "SKU ID",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsName',
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 150,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'goodsShortName',
-      title: "\u5546\u54C1\u7B80\u79F0",
-      width: 150,
+var getTableData$7 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: {
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'JKY_ERP',
+      conditionList: conditionList
+    }
+  }).then(function (res) {
+    var _res$data = res.data,
+      _res$data$productSkuL = _res$data.productSkuList,
+      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
+      _res$data$total = _res$data.total,
+      total = _res$data$total === void 0 ? 0 : _res$data$total;
+    var newProducts = productSkuList.map(function (item, index) {
+      return _objectSpread2({}, item);
+    });
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
+var searchFormData$6 = [{
+  label: '规格名称',
+  name: 'skuName',
+  dataIndex: 'specName'
+}, {
+  label: '规格编码',
+  name: 'skuCode',
+  dataIndex: 'specNo',
+  type: 'optionalInput'
+}, {
+  label: '货品名称',
+  name: 'goodName'
+}, {
+  label: '货品编码',
+  name: 'goodNo',
+  type: 'optionalInput'
+}];
+var GoodList$7 = function GoodList(props, ref) {
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectIds = _useState4[0],
+    setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('jky'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
+  useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = useAntdTable(getTableData$7, {
+      defaultPageSize: 10,
+      form: form
+    }),
+    tableProps = _useAntdTable.tableProps,
+    search = _useAntdTable.search,
+    params = _useAntdTable.params;
+  var submit = search.submit,
+    reset = search.reset;
+  var rowSelection = {
+    selectedRowKeys: selectIds,
+    fixed: true,
+    onSelect: function onSelect(record, selected) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
+        setSelect([].concat(_toConsumableArray(selectList), [record]));
+      } else {
+        setSelectIds(selectIds.filter(function (t) {
+          return t !== record.id;
+        }));
+        setSelect(selectList.filter(function (t) {
+          return t.id !== record.id;
+        }));
+      }
+    },
+    onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
+      if (selected) {
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.id;
+        }))));
+        setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
+      } else {
+        setSelectIds(difference(selectIds, changeRows.map(function (t) {
+          return t.id;
+        })));
+        var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
+          return arrVal.id !== othVal.id;
+        });
+        setSelect(list);
+      }
+    },
+    getCheckboxProps: function getCheckboxProps(record) {
+      var options = {
+        disabled: (props.selectedRows || []).map(function (row) {
+          return row.specId || record.id;
+        }).includes(record.specId || record.id),
+        name: record.id
+      };
+      return options;
+    }
+  };
+  var showTable = function showTable() {
+    var handleDelete = function handleDelete(record) {
+      setSelectIds(selectIds.filter(function (t) {
+        return t !== record.id;
+      }));
+      setSelect(selectList.filter(function (t) {
+        return t.id !== record.id;
+      }));
+    };
+    var showColumns = [{
+      dataIndex: '',
+      title: "\u64CD\u4F5C",
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record) {
+        return /*#__PURE__*/React.createElement(Button, {
+          type: "link",
+          onClick: function onClick() {
+            return handleDelete(record);
+          }
+        }, "\u5220\u9664");
+      }
+    }].concat(takeRight(columns, columns.length - 1));
+    return selectList.length ? /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '100%',
+        maxWidth: '387px'
+      }
+    }, /*#__PURE__*/React.createElement(Table, {
+      columns: showColumns,
+      rowKey: 'id',
+      dataSource: selectList,
+      scroll: {
+        x: '100%',
+        y: 250
+      },
+      pagination: {
+        size: 'small',
+        total: selectIds.length,
+        pageSize: 10,
+        showSizeChanger: false
+      }
+    })) : null;
+  };
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData$6,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '4px'
+    }
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
+    className: "GoodModalColumns",
+    rowSelection: rowSelection,
+    rowKey: "id",
+    columns: columns,
+    scroll: {
+      x: '100%',
+      y: 250
+    },
+    size: "small"
+  }, tableProps))), /*#__PURE__*/React.createElement(Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
+    content: showTable(),
+    title: "\u5DF2\u9009\u62E9".concat(selectList.length, "\u4E2A\u5546\u54C1")
+  }, /*#__PURE__*/React.createElement(Button, {
+    danger: true,
+    type: "text"
+  }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
+};
+var JkyGoodsList = /*#__PURE__*/forwardRef(GoodList$7);
+
+var JkyGoodsModal = function JkyGoodsModal(props, ref) {
+  useImperativeHandle(ref, function () {
+    return {
+      open: function open(shopCode) {
+        var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+        setVisible(true);
+        setSelectedRows(options.value || []);
+      }
+    };
+  });
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
+  var jkyGoodsListRef = useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _jkyGoodsListRef$curr;
+    var selectedList = ((_jkyGoodsListRef$curr = jkyGoodsListRef.current) === null || _jkyGoodsListRef$curr === void 0 ? void 0 : _jkyGoodsListRef$curr.getSelectGoodList()) || [];
+    onSubmit(selectedList);
+    _onCancel();
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React.createElement(JkyGoodsList, {
+    ref: jkyGoodsListRef,
+    selectedRows: selectedRows
+  })));
+};
+var JkyGoodsModal$1 = /*#__PURE__*/forwardRef(JkyGoodsModal);
+
+var getColumns = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    //百胜E3补发商品
+    BS_E3_REISSUE_GOODS: [{
+      dataIndex: 'sku',
+      title: "SKU",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuId',
+      title: "SKU ID",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsShortName',
+      title: "\u5546\u54C1\u7B80\u79F0",
+      width: 150,
       render: renderTextEllipsis
     }, {
       dataIndex: 'picPath',
@@ -20426,120 +20850,348 @@ var getColumns$2 = function getColumns(_ref) {
         });
       }
     }, {
-      dataIndex: 'apiSpecName',
-      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
-      width: 250,
+      dataIndex: 'apiSpecName',
+      title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
+      width: 250,
+      align: 'center',
+      ellipsis: true,
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(CopyTextIcon, {
+          val: text
+        });
+      }
+    }, {
+      dataIndex: 'suiteName',
+      title: "\u7EC4\u5408\u88C5\u540D\u79F0",
+      width: 250,
+      align: 'center',
+      ellipsis: true,
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(CopyTextIcon, {
+          val: text
+        });
+      }
+    }, {
+      dataIndex: 'suiteNo',
+      title: "\u7EC4\u5408\u88C5\u7F16\u53F7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'stockinNum',
+      title: "\u5165\u5E93\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'refundNum',
+      title: "\u9000\u6B3E\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'totalAmount',
+      title: "\u9000\u8D27\u603B\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'refundAmount',
+      title: "\u5DF2\u9000\u6B3E\u91D1\u989D",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'num',
+      title: "\u5B9E\u9645\u53D1\u51FA\u6570\u91CF",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'price',
+      title: "\u4EF7\u683C",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'originalPrice',
+      title: "\u539F\u4EF7",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'giftTypeDesc',
+      title: "\u8D60\u54C1\u7C7B\u578B",
+      width: 150,
+      align: 'center',
+      ellipsis: true,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }]
+  };
+};
+
+var getYesOrNo$4 = function getYesOrNo(val) {
+  if (isNull(val)) return null;
+  return val ? '是' : '否';
+};
+var getColumns$3 = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    text = _ref$text === void 0 ? '' : _ref$text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
+  return {
+    //万里牛商品信息
+    WLN_GOODS: [{
+      dataIndex: 'wlnItemName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'goodsCode',
+      title: "\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'wlnSkuName',
+      title: "sku\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuCode',
+      title: "sku\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuName',
+      title: "\u7EBF\u4E0Asku\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'olnSkuCode',
+      title: "\u7EBF\u4E0Asku\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sku',
+      title: "\u7EBF\u4E0Asku id",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'name',
+      title: "\u7EBF\u4E0A\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pic',
+      title: "\u7EBF\u4E0A\u56FE\u7247",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 30,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'olnItemCOde',
+      title: "\u7EBF\u4E0A\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'code',
+      title: "\u7EBF\u4E0A\u5546\u54C1id",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'barCode',
+      title: "\u5546\u54C1\u6761\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'money',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
       align: 'center',
       ellipsis: true,
-      render: function render(text) {
-        return /*#__PURE__*/React.createElement(CopyTextIcon, {
-          val: text
-        });
-      }
+      width: 100,
+      render: renderTextEllipsis
     }, {
-      dataIndex: 'suiteName',
-      title: "\u7EC4\u5408\u88C5\u540D\u79F0",
-      width: 250,
+      dataIndex: 'number',
+      title: "".concat(text, "\u6570\u91CF"),
       align: 'center',
       ellipsis: true,
-      render: function render(text) {
-        return /*#__PURE__*/React.createElement(CopyTextIcon, {
-          val: text
-        });
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'number');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'suiteNo',
-      title: "\u7EC4\u5408\u88C5\u7F16\u53F7",
-      width: 150,
+      dataIndex: 'share',
+      title: "\u5E94\u6536\u6B3E",
       align: 'center',
       ellipsis: true,
+      width: 70,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'stockinNum',
-      title: "\u5165\u5E93\u6570\u91CF",
-      width: 150,
+      dataIndex: 'discountedUnitPrice',
+      title: "\u6298\u540E\u5355\u4EF7",
       align: 'center',
       ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'refundNum',
-      title: "\u9000\u6B3E\u6570\u91CF",
-      width: 150,
+      dataIndex: 'originPrice',
+      title: "\u539F\u4EF7",
       align: 'center',
       ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'totalAmount',
-      title: "\u9000\u8D27\u603B\u989D",
-      width: 150,
+      dataIndex: 'price',
+      title: "\u5355\u4EF7",
       align: 'center',
       ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'refundAmount',
-      title: "\u5DF2\u9000\u6B3E\u91D1\u989D",
-      width: 150,
+      dataIndex: 'receivable',
+      title: "\u9500\u552E\u91D1\u989D",
       align: 'center',
       ellipsis: true,
+      width: 250,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'num',
-      title: "\u5B9E\u9645\u53D1\u51FA\u6570\u91CF",
-      width: 150,
+      dataIndex: 'type',
+      title: "\u8D60\u54C1\u7C7B\u578B",
       align: 'center',
       ellipsis: true,
+      width: 100,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'price',
-      title: "\u4EF7\u683C",
-      width: 150,
+      dataIndex: 'isPackage',
+      title: "\u662F\u5426\u7EC4\u5408\u5546\u54C1",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: true
+          }, {
+            label: '否',
+            value: false
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+      },
+      width: 200
     }, {
-      dataIndex: 'originalPrice',
-      title: "\u539F\u4EF7",
-      width: 150,
+      dataIndex: 'hasRefund',
+      title: "\u662F\u5426\u9000\u6B3E",
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: 1
+          }, {
+            label: '否',
+            value: 0
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+      }
     }, {
-      dataIndex: 'giftTypeDesc',
-      title: "\u8D60\u54C1\u7C7B\u578B",
-      width: 150,
+      dataIndex: 'unit',
+      title: "\u5355\u4F4D",
       align: 'center',
       ellipsis: true,
+      width: 100,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'unitName',
-      title: "\u57FA\u672C\u5355\u4F4D",
-      ellipsis: true,
-      width: 150,
+      dataIndex: 'pkgGoodsName',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
       align: 'center',
+      ellipsis: true,
+      width: 200,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'auxUnitName',
-      title: "\u8F85\u52A9\u5355\u4F4D",
+      dataIndex: 'pkgGoodsCode',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      align: 'center',
       ellipsis: true,
-      width: 150,
+      width: 200,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pkgGoodsId',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1id",
       align: 'center',
+      ellipsis: true,
+      width: 200,
       render: renderTextEllipsis
-    }]
-  };
-};
-
-var getYesOrNo$3 = function getYesOrNo(val) {
-  if (isNull(val)) return null;
-  return val ? '是' : '否';
-};
-var getColumns$3 = function getColumns(_ref) {
-  var _ref$text = _ref.text,
-    text = _ref$text === void 0 ? '' : _ref$text,
-    disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
-  return {
-    //万里牛商品信息
-    WLN_GOODS: [{
+    }],
+    WLN_REISSUE_GOODS: [{
       dataIndex: 'wlnItemName',
       title: "\u5546\u54C1\u540D\u79F0",
       align: 'center',
@@ -20553,6 +21205,13 @@ var getColumns$3 = function getColumns(_ref) {
       ellipsis: true,
       width: 250,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'wlnSkuName',
+      title: "sku\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'skuCode',
       title: "sku\u7F16\u7801",
@@ -20622,11 +21281,11 @@ var getColumns$3 = function getColumns(_ref) {
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'money',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'price',
+      title: "\u5355\u4EF7",
       align: 'center',
       ellipsis: true,
-      width: 100,
+      width: 250,
       render: renderTextEllipsis
     }, {
       dataIndex: 'number',
@@ -20648,12 +21307,29 @@ var getColumns$3 = function getColumns(_ref) {
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'share',
-      title: "\u5E94\u6536\u6B3E",
-      align: 'center',
-      ellipsis: true,
-      width: 70,
-      render: renderTextEllipsis
+      dataIndex: 'outPrice',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
+      render: function render(_, record, index) {
+        var value;
+        if ((typeof record.number === 'number' || record.number) && (typeof record.price === 'number' || record.price)) {
+          value = +(record.number * record.price).toFixed(2);
+        }
+        if (record.canUpdateNumber && !disabled) {
+          return /*#__PURE__*/React.createElement(InputNumber, {
+            style: {
+              width: 70
+            },
+            value: value,
+            min: 1,
+            precision: 0,
+            onChange: function onChange(num) {
+              return updateHandle(num, index, 'total');
+            }
+          });
+        }
+        return value || value === 0 ? value : '';
+      }
     }, {
       dataIndex: 'type',
       title: "\u8D60\u54C1\u7C7B\u578B",
@@ -20679,9 +21355,37 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       },
       width: 100
+    }, {
+      dataIndex: 'unit',
+      title: "\u5355\u4F4D",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pkgGoodsName',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 200,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pkgGoodsCode',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 200,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'pkgGoodsId',
+      title: "\u539F\u7EC4\u5408\u5546\u54C1id",
+      align: 'center',
+      ellipsis: true,
+      width: 200,
+      render: renderTextEllipsis
     }]
   };
 };
@@ -20691,7 +21395,7 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$4 = function getYesOrNo(val) {
+var getYesOrNo$5 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -20806,7 +21510,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -20825,7 +21529,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -20951,7 +21655,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21080,7 +21784,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -23800,6 +24504,9 @@ var isErpType = {
   },
   isJky: function isJky(type) {
     return ['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type);
+  },
+  isWln: function isWln(type) {
+    return ['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(type);
   }
 };
 var processGoods$1 = function processGoods(_ref) {
@@ -23859,6 +24566,13 @@ var processGoods$1 = function processGoods(_ref) {
       canUpdateNumber: canUpdateNumber,
       source: source
     });
+  } else if (isErpType.isWln(type)) {
+    newList = processWlnGoods$1({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber,
+      source: source
+    });
   } else {
     newList = processDefaultGoods({
       list: list,
@@ -23941,11 +24655,63 @@ var processJkyGoods$1 = function processJkyGoods(_ref3) {
     });
   });
 };
-// 处理不同类型的商品数据
-var processWdtGoods$1 = function processWdtGoods(_ref4) {
+var processWlnGoods$1 = function processWlnGoods(_ref4) {
   var list = _ref4.list,
-    type = _ref4.type,
     canUpdateNumber = _ref4.canUpdateNumber;
+  return list.map(function (item) {
+    var goodName = item.goodName,
+      goodShortName = item.goodShortName,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      goodBarcode = item.goodBarcode,
+      propertiesValue = item.propertiesValue,
+      specNo = item.specNo,
+      specId = item.specId,
+      specImgUrl = item.specImgUrl,
+      specBarcode = item.specBarcode,
+      brandName = item.brandName,
+      retailPrice = item.retailPrice,
+      marketPrice = item.marketPrice,
+      unitName = item.unitName,
+      skuType = item.skuType;
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      wlnItemName: goodName,
+      goodsCode: goodNo,
+      wlnSkuName: propertiesValue,
+      skuCode: specNo,
+      // skuName: '', // "线上sku名称",
+      // olnSkuCode: '', // "线上sku编码",
+      // sku: '', // "线上sku id",
+      // name: '', // "线上商品名称",
+      // pic: '', // "线上图片",
+      // olnItemCOde: '', // "线上商品编码",
+      // code: '', // "线上商品id",
+      barCode: goodBarcode,
+      // money: '', // "实付金额",
+      number: 1,
+      share: '',
+      // discountedUnitPrice: '', // "折后单价",
+      originPrice: marketPrice,
+      price: retailPrice,
+      receivable: +((marketPrice || 0) * (retailPrice || 0)).toFixed(2),
+      // type: '', // "赠品类型",
+      isPackage: skuType === 'combine',
+      // hasRefund: '', // 是否退款,
+      unit: unitName,
+      // pkgGoodsName: '', // "原组合商品名称",
+      // pkgGoodsCode: '', // "原组合商品编码",
+      // pkgGoodsId: '', // "原组合商品id",
+      uuid: uuid(),
+      canDelete: true,
+      canEdit: true
+    });
+  });
+};
+// 处理不同类型的商品数据
+var processWdtGoods$1 = function processWdtGoods(_ref5) {
+  var list = _ref5.list,
+    type = _ref5.type,
+    canUpdateNumber = _ref5.canUpdateNumber;
   return list.map(function (item) {
     var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
       uuid: uuid(),
@@ -23963,9 +24729,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref4) {
     return processedItem;
   });
 };
-var processBsE3Goods$1 = function processBsE3Goods(_ref5) {
-  var list = _ref5.list,
-    canUpdateNumber = _ref5.canUpdateNumber;
+var processBsE3Goods$1 = function processBsE3Goods(_ref6) {
+  var list = _ref6.list,
+    canUpdateNumber = _ref6.canUpdateNumber;
   return list.map(function (item) {
     var specNo = item.specNo,
       specId = item.specId,
@@ -24000,9 +24766,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref5) {
     });
   });
 };
-var processGyGoods$1 = function processGyGoods(_ref6) {
-  var list = _ref6.list,
-    source = _ref6.source;
+var processGyGoods$1 = function processGyGoods(_ref7) {
+  var list = _ref7.list,
+    source = _ref7.source;
   var isFormWorkOrder = source === 'workOrder';
   return list.map(function (item) {
     var goodName = item.goodName,
@@ -24029,8 +24795,8 @@ var processGyGoods$1 = function processGyGoods(_ref6) {
     });
   });
 };
-var processJstGoods$1 = function processJstGoods(_ref7) {
-  var list = _ref7.list;
+var processJstGoods$1 = function processJstGoods(_ref8) {
+  var list = _ref8.list;
   return list.map(function (item) {
     return {
       name: item.goodName,
@@ -24048,9 +24814,9 @@ var processJstGoods$1 = function processJstGoods(_ref7) {
     };
   });
 };
-var processKmGoods$1 = function processKmGoods(_ref8) {
-  var list = _ref8.list,
-    type = _ref8.type;
+var processKmGoods$1 = function processKmGoods(_ref9) {
+  var list = _ref9.list,
+    type = _ref9.type;
   var initParamsMap = {
     KM_GOODS: {
       num: 1
@@ -24089,9 +24855,9 @@ var processKmGoods$1 = function processKmGoods(_ref8) {
     }, initParamsMap[type] || {});
   });
 };
-var processDefaultGoods = function processDefaultGoods(_ref9) {
-  var list = _ref9.list,
-    canUpdateNumber = _ref9.canUpdateNumber;
+var processDefaultGoods = function processDefaultGoods(_ref10) {
+  var list = _ref10.list,
+    canUpdateNumber = _ref10.canUpdateNumber;
   return list.map(function (item) {
     var goodsId = item.goodsId,
       name = item.name,
@@ -24140,6 +24906,8 @@ var GoodsModalMap = {
   JY_REISSUE_GOODS: JyGoodsModal$1,
   JKY_GOODS: JkyGoodsModal$1,
   JKY_REISSUE_GOODS: JkyGoodsModal$1,
+  WLN_REISSUE_GOODS: WlnGoodsModal$1,
+  WLN_GOODS: WlnGoodsModal$1,
   OTHER_GOODS: GoodsModal$2
 };
 var systemOrderNoMap = {
@@ -24154,6 +24922,7 @@ var systemOrderNoMap = {
   JY_REISSUE_GOODS: 'tradeNo',
   JKY_GOODS: 'tradeNo',
   JKY_REISSUE_GOODS: 'tradeNo',
+  WLN_REISSUE_GOODS: 'tradeNo',
   KM_REISSUE_GOODS: 'sid',
   KM_RETURN_GOODS: 'sid',
   KM_EXCHANGE_GOODS: 'sid',
@@ -24411,6 +25180,9 @@ var getButtonText = function getButtonText() {
   if (['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type)) {
     return '选择吉客云ERP商品';
   }
+  if (['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(type)) {
+    return '选择万里牛ERP商品';
+  }
   return '选择商品';
 };
 var GoodItem$1 = function GoodItem(props) {
@@ -24470,8 +25242,8 @@ var GoodItem$1 = function GoodItem(props) {
   var jstReturnGoods = Form === null || Form === void 0 ? void 0 : Form.useWatch('3979edfd6d', form);
   var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
   // 判断是否为是否展示系统单筛选项
-  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
-  var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS'].includes(type) || false;
+  var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
+  var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS'].includes(type) || false;
   var refModal = useRef();
   console.debug('表格数据', value);
   var handleDelete = function handleDelete(record, index) {
@@ -24566,6 +25338,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'JY_REISSUE_GOODS':
         case 'JKY_GOODS':
         case 'JKY_REISSUE_GOODS':
+        case 'WLN_REISSUE_GOODS':
         case 'SKX_GOODS':
         case 'SKX_RETURN_GOODS':
           {
@@ -24825,6 +25598,7 @@ var GoodItem$1 = function GoodItem(props) {
     templateDetail: templateDetail
   }));
 };
+GoodItem$1.displayName = 'GoodItem';
 
 var BsGoods = function BsGoods(props) {
   var _withInfo$current3, _withInfo$current4;
@@ -25676,6 +26450,10 @@ var getOrderListSingleton = function getOrderListSingleton(orderNo) {
         }
       }).then(function (data) {
         if (data === null || data === void 0 ? void 0 : data.success) {
+          var _data$data;
+          if ((_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.tradeNo) {
+            data.data.tradeNo = orderNo;
+          }
           resolve(data.data);
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
@@ -27661,6 +28439,32 @@ var componentMap$2 = {
     },
     getOrderList: jkyUtils.getJkyOrderListSingleton
   },
+  WLN_GOODS: {
+    type: 'jky',
+    key: 'wlnGoods',
+    name: '吉客云',
+    orderNo: 'tradeNo',
+    goodDetailOrderNo: 'tradeNo',
+    eventNameMap: {
+      // pubsub 事件
+      type: 'wlnType',
+      updateGoodsHandle: updateWlnGoodsHandle,
+      selectListReturn: 'wlnSelectListReturn',
+      selectList: 'wlnSelectList',
+      reissueSelectList: 'wlnReissueSelectList',
+      reissueSelectListReturn: 'wlnReissueSelectListReturn',
+      reissueDeleteGood: 'wlnReissueDeleteGood',
+      changeShopCode: 'wlnChangeShopCode',
+      reissueType: 'wlnReissueType',
+      returnType: 'wlnReturnType',
+      returnSelectListReturn: 'wlnReturnSelectListReturn',
+      returnSelectList: 'wlnReturnSelectList',
+      deleteGood: 'wlnDeleteGood',
+      returnDeleteGood: 'wlnReturnDeleteGood',
+      exchangeDeleteGood: 'wlnExchangeDeleteGood'
+    },
+    getOrderList: wlnUtils.getOrderListSingleton
+  },
   WDT_AFTERSALE_GOODS: {
     type: 'wdtAftersale',
     key: 'wdtAftersaleGoods',
@@ -28845,6 +29649,22 @@ var typeMap$2 = {
     goodDetailsKey: 'goodsDetail',
     isShowSelectTradeGoods: true,
     showModeBtn: true
+  },
+  WLN_REISSUE_GOODS: {
+    compType: '补发',
+    key: 'wlnReissueGoods',
+    typeName: 'wlnReissueType',
+    systemOrder: 'wlnSystemOrder',
+    systemOrderNo: 'wlnSystemOrderNo',
+    getOrderList: wlnUtils.getOrderListSingleton,
+    updateGoodsHandle: updateWlnGoodsHandle,
+    alwaysShowChooseErpGoodsBtn: true,
+    orderTypeKey: 'orderType',
+    oIdKey: 'billNo',
+    outerOiIdKey: 'tpTid',
+    goodDetailsKey: 'items',
+    isShowSelectTradeGoods: true,
+    showModeBtn: true
   }
 };
 var PublicReissue = function PublicReissue(props) {
@@ -28904,7 +29724,7 @@ var PublicReissue = function PublicReissue(props) {
           case 0:
             (_typeMap$type5 = typeMap$2[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.getOrderList(orderNo).then(function (data) {
               var _valueRef$current3, _typeMap$type6, _typeMap$type7, _typeMap$type11, _ref3, _typeMap$type12;
-              var orders = data || [];
+              var orders = (type === 'WLN_REISSUE_GOODS' ? data === null || data === void 0 ? void 0 : data.orders : data) || [];
               var showOrderInfo = orders === null || orders === void 0 ? void 0 : orders.map(function (orderItem) {
                 return _defineProperty({}, typeMap$2[type].oIdKey, orderItem[typeMap$2[type].oIdKey]);
               });
@@ -28953,6 +29773,7 @@ var PublicReissue = function PublicReissue(props) {
       // 切换到非原单，清空列表
       newValue[(_typeMap$type15 = typeMap$2[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.key] = [];
     }
+    console.log('**** changeTypeHandle', newValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var handleModeChange = function handleModeChange(mode) {
@@ -29077,6 +29898,10 @@ var PublicReissue = function PublicReissue(props) {
       orderRest = {
         canEdit: true
       };
+    } else if (['WLN_REISSUE_GOODS'].includes(type)) {
+      orderRest = {
+        canEdit: true
+      };
     }
     var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
@@ -29595,7 +30420,7 @@ var GoodsModal$5 = function GoodsModal(props) {
       key: item.value
     }, item.label);
   })), /*#__PURE__*/React.createElement(Search$1, {
-    placeholder: "\u5B9D\u8D1D\u94FE\u63A5\uFF0C\u6807\u9898",
+    placeholder: "\u5B9D\u8D1D\u6807\u9898",
     allowClear: true,
     enterButton: "\u641C\u7D22",
     style: {