@kmkf-fe-packages/basic-components 2.0.53 → 2.0.54-beta.1

package/dist/index.esm.js

@@ -1,10 +1,10 @@
 import React, { useRef, useState, useEffect, forwardRef, useImperativeHandle, useMemo, useCallback } from 'react';
-import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate, Form, Popover, Table, Tabs, ConfigProvider, Pagination, Typography } from 'antd';
+import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate, Form, Popover, Table, Tabs, ConfigProvider, Pagination, Typography, Skeleton } from 'antd';
 import { EyeOutlined, DeleteOutlined, CloseOutlined, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, MinusCircleFilled } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, servers, filterJstOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
-import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
+import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, isEqual, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
 import pubsub from 'pubsub-js';
@@ -12191,53 +12191,145 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
 };
 var GoodsModal$2 = /*#__PURE__*/forwardRef(GoodsModal$1);
 
-var getTableData = function getTableData(_ref, formData) {
-  var _formData$brandIds;
-  var current = _ref.current,
-    pageSize = _ref.pageSize;
-  var data = {
-    brandIds: ((_formData$brandIds = formData.brandIds) === null || _formData$brandIds === void 0 ? void 0 : _formData$brandIds.length) ? formData.brandIds : null,
-    skuCode: formData.skuCode || null,
-    skuName: formData.skuName || null,
-    goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
-  };
-  return extendRequest('/qy/gdfw/product/product/page', {
-    method: 'post',
-    data: _objectSpread2({
-      pageSize: pageSize,
-      pageNo: current,
-      platform: 'WDT_ERP'
-    }, data)
-  }).then(function (res) {
-    var _res$data = res.data,
-      _res$data$productSkuL = _res$data.productSkuList,
-      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
-      _res$data$total = _res$data.total,
-      total = _res$data$total === void 0 ? 0 : _res$data$total;
-    var newProducts = productSkuList.map(function (item, index) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        index: index + 1
-      });
-    });
-    return {
-      total: total,
-      list: newProducts
-    };
-  });
-};
-var columns$1 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React.createElement("div", {
+var gyColumns = [{
+  dataIndex: 'specName',
+  title: 'SKU名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'specNo',
+  title: 'SKU编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 250
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodPicUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React.createElement("img", {
       style: {
-        width: 25
-      }
-    }, index + 1);
-  },
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'brandName',
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u6807\u51C6\u552E\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  ellipsis: true,
   width: 100
+}];
+
+var jstColumns = [{
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 200,
+  ellipsis: true
 }, {
+  dataIndex: 'styleCode',
+  title: '款式编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'propertiesValue',
+  title: '规格值',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodPicUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React.createElement("img", {
+      style: {
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 250
+}, {
+  dataIndex: 'brandName',
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u9500\u552E\u4EF7\u683C",
+  ellipsis: true,
+  width: 100,
+  render: function render(price) {
+    return price || price === 0 ? Number(price).toFixed(2) : '';
+  }
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 100,
+  render: function render(price) {
+    return price || price === 0 ? Number(price).toFixed(2) : '';
+  }
+}, {
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  ellipsis: true,
+  width: 100,
+  render: function render(price) {
+    return price || price === 0 ? Number(price).toFixed(2) : '';
+  }
+}, {
+  dataIndex: 'skuType',
+  title: "\u5546\u54C1\u7C7B\u578B",
+  ellipsis: true,
+  width: 100,
+  render: function render() {
+    var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'normal';
+    return {
+      combine: '组合装商品',
+      normal: '普通商品'
+    }[type] || type;
+  }
+}];
+
+var wdtColumns = [{
   dataIndex: 'specName',
   title: 'SKU名称',
   width: 250,
@@ -12308,6 +12400,323 @@ var columns$1 = [{
     return Number(price).toFixed(2);
   }
 }];
+
+var bse3Columns = [{
+  dataIndex: 'specNo',
+  title: "SKU",
+  ellipsis: true,
+  width: 200
+}, {
+  dataIndex: 'specId',
+  title: "SKU ID",
+  ellipsis: true,
+  width: 80
+}, {
+  dataIndex: 'goodName',
+  title: "\u5546\u54C1\u540D\u79F0",
+  ellipsis: true,
+  width: 250
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 250
+},
+// {
+//   dataIndex: 'goodPicUrl',
+//   title: `商品图片`,
+//   ellipsis: true,
+//   width: 100,
+//   render: (picUrl: string) => {
+//     return (
+//       <img
+//         style={{
+//           width: '40px',
+//           height: '40px',
+//           objectFit: 'contain',
+//         }}
+//         src={picUrl}
+//       ></img>
+//     );
+//   },
+// },
+{
+  dataIndex: 'goodNo',
+  title: "\u8D27\u53F7",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'goodId',
+  title: "\u8D27\u53F7ID",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'colorName',
+  title: "\u989C\u8272\u540D\u79F0",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'colorCode',
+  title: "\u989C\u8272\u4EE3\u7801",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'sizeName',
+  title: "\u5C3A\u7801\u540D\u79F0",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'sizeCode',
+  title: "\u5C3A\u7801\u4EE3\u7801",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'brandName',
+  title: "\u54C1\u724C\u540D\u79F0",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u552E\u4EF7",
+  ellipsis: true,
+  width: 100
+}];
+
+var getColumnsMap = function getColumnsMap() {
+  return cloneDeep({
+    gy: gyColumns,
+    jst: jstColumns,
+    wdt: wdtColumns,
+    bse3: bse3Columns
+  });
+};
+var getColumnsBaseInfo = function getColumnsBaseInfo() {
+  var clone_columnsMap = cloneDeep(getColumnsMap());
+  var newColumns = {};
+  Object.keys(clone_columnsMap).forEach(function (key) {
+    newColumns[key] = clone_columnsMap[key].map(function (col) {
+      return {
+        title: col.title,
+        dataIndex: col.dataIndex
+      };
+    });
+  });
+  return newColumns;
+};
+var index$2 = getColumnsBaseInfo();
+
+var initNo = {
+  dataIndex: 'index',
+  title: 'NO',
+  render: function render(val, record, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: 25
+      }
+    }, index + 1);
+  },
+  width: 80
+};
+var asyncGetData = function asyncGetData(type) {
+  return extendRequest('/qy/condition/list', {
+    method: 'get',
+    params: {
+      typeKey: "erp_select_modal_".concat(type),
+      configScope: 'company' //按企业查询
+    }
+  }).then(function (res) {
+    if (res && res.data && res.data[0] && res.data[0].queryInfo && res.data[0].queryInfo.length > 0) {
+      return JSON.parse(res.data[0].queryInfo);
+    } else {
+      return getColumnsMap()[type];
+    }
+  });
+};
+var useGetColumns = (function (type) {
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    columns = _useState2[0],
+    setColumns = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
+  var showColumnsDataIndexList = useMemo(function () {
+    return columns.filter(function (item) {
+      return Object.hasOwn(item, 'dataIndex');
+    }).map(function (item) {
+      return item.dataIndex;
+    });
+  }, [columns]);
+  useEffect(function () {
+    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var initColumns, requestSortColumns, list, initDataIndexList;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            initColumns = getColumnsMap()[type];
+            setLoading(true);
+            _context.next = 4;
+            return asyncGetData(type);
+          case 4:
+            requestSortColumns = _context.sent;
+            setLoading(false);
+            list = [initNo];
+            if (requestSortColumns && requestSortColumns.length > 0) {
+              initDataIndexList = initColumns.map(function (item) {
+                return item.dataIndex;
+              });
+              requestSortColumns.forEach(function (item) {
+                var dataIndex = item.dataIndex,
+                  show = item.show;
+                if (show !== false && initDataIndexList.includes(dataIndex)) {
+                  list.push(initColumns.find(function (item) {
+                    return item.dataIndex === dataIndex;
+                  }));
+                }
+              });
+            }
+            setColumns(list);
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }))();
+  }, []);
+  return [columns, showColumnsDataIndexList, loading];
+});
+
+function SearchForm(_ref) {
+  var searchFormData = _ref.searchFormData,
+    form = _ref.form,
+    showColumnsDataIndexList = _ref.showColumnsDataIndexList,
+    submit = _ref.submit,
+    reset = _ref.reset;
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    searchData = _useState2[0],
+    setSearchData = _useState2[1];
+  var submitForm = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(submitBtnClickFlag) {
+      var values;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return form.getFieldsValue();
+          case 2:
+            values = _context.sent;
+            if (submitBtnClickFlag || !isEqual(values, searchData)) {
+              setSearchData(values);
+              submit();
+            }
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function submitForm(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  return /*#__PURE__*/React.createElement(Form, {
+    layout: "inline",
+    form: form
+  }, searchFormData.map(function (item) {
+    var label = item.label,
+      name = item.name,
+      dataIndex = item.dataIndex,
+      type = item.type,
+      _item$formItemProps = item.formItemProps,
+      formItemProps = _item$formItemProps === void 0 ? {} : _item$formItemProps;
+    if (!showColumnsDataIndexList.includes(dataIndex || name)) return;
+    return /*#__PURE__*/React.createElement(Form.Item, {
+      name: name,
+      style: {
+        marginBottom: '12px'
+      }
+    }, type === 'select' ? /*#__PURE__*/React.createElement(Select, _objectSpread2({
+      placeholder: label,
+      showSearch: true,
+      allowClear: true,
+      style: {
+        width: 150
+      },
+      onBlur: function onBlur() {
+        return submitForm();
+      }
+    }, formItemProps)) : /*#__PURE__*/React.createElement(Input, _objectSpread2({
+      placeholder: label,
+      allowClear: true,
+      style: {
+        width: 150
+      },
+      onPressEnter: function onPressEnter() {
+        return submitForm();
+      },
+      onBlur: function onBlur() {
+        return submitForm();
+      }
+    }, formItemProps)));
+  }), /*#__PURE__*/React.createElement(Form.Item, {
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    style: {
+      marginRight: '8px'
+    },
+    onClick: function onClick() {
+      return submitForm(true);
+    }
+  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
+    onClick: reset
+  }, "\u91CD\u7F6E")));
+}
+
+var getTableData = function getTableData(_ref, formData) {
+  var _formData$brandIds;
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  var data = {
+    brandIds: ((_formData$brandIds = formData.brandIds) === null || _formData$brandIds === void 0 ? void 0 : _formData$brandIds.length) ? formData.brandIds : null,
+    skuCode: formData.skuCode || null,
+    skuName: formData.skuName || null,
+    goodName: formData.goodName || null,
+    goodNo: formData.goodNo || null
+  };
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'WDT_ERP'
+    }, data)
+  }).then(function (res) {
+    var _res$data = res.data,
+      _res$data$productSkuL = _res$data.productSkuList,
+      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
+      _res$data$total = _res$data.total,
+      total = _res$data$total === void 0 ? 0 : _res$data$total;
+    var newProducts = productSkuList.map(function (item, index) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        index: index + 1
+      });
+    });
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
 var GoodList = function GoodList(props, ref) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -12321,6 +12730,11 @@ var GoodList = function GoodList(props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     brandList = _useState6[0],
     setBrandList = _useState6[1];
+  var _useGetColumns = useGetColumns('wdt'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
   useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -12354,110 +12768,60 @@ var GoodList = function GoodList(props, ref) {
       }).then(function (res) {
         var _res$data2;
         if (res.success && (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.detailList)) {
-          var _res$data3, _res$data4;
-          list.push.apply(list, _toConsumableArray((res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.detailList) || []));
-          if ((res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.detailList.length) === pageSize) {
-            pageNo += 1;
-            getMore();
-          } else {
-            setBrandList(list);
-          }
-        } else {
-          reject(res);
-        }
-      }).catch(console.error);
-    };
-    getMore();
-  };
-  React.useEffect(function () {
-    setGoodBrandList();
-  }, []);
-  var advanceSearchForm = /*#__PURE__*/React.createElement(Form, {
-    layout: "inline",
-    form: form
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "SKU\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "SKU\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "brandIds",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Select, {
-    mode: "multiple",
-    showSearch: true,
-    allowClear: true,
-    filterOption: function filterOption(input, option) {
-      return option.label.includes(input);
-    },
-    style: {
-      width: 150
-    },
-    placeholder: "\u54C1\u724C",
-    options: brandList.filter(function (item) {
-      return !item.isDisabled;
-    }).map(function (_ref2) {
-      var value = _ref2.brandId,
-        label = _ref2.brandName;
-      return {
-        value: value,
-        label: label
-      };
-    })
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    style: {
-      marginBottom: '12px'
+          var _res$data3, _res$data4;
+          list.push.apply(list, _toConsumableArray((res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.detailList) || []));
+          if ((res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.detailList.length) === pageSize) {
+            pageNo += 1;
+            getMore();
+          } else {
+            setBrandList(list);
+          }
+        } else {
+          reject(res);
+        }
+      }).catch(console.error);
+    };
+    getMore();
+  };
+  React.useEffect(function () {
+    setGoodBrandList();
+  }, []);
+  var searchFormData = [{
+    label: 'SKU名称',
+    name: 'skuName',
+    dataIndex: 'specName'
+  }, {
+    label: 'SKU编码',
+    name: 'skuCode',
+    dataIndex: 'specNo'
+  }, {
+    label: '商品名称',
+    name: 'goodName'
+  }, {
+    label: '商品编码',
+    name: 'goodNo'
+  }, {
+    label: '品牌',
+    name: 'brandIds',
+    dataIndex: 'brandName',
+    type: 'select',
+    formItemProps: {
+      mode: 'multiple',
+      filterOption: function filterOption(input, option) {
+        return option.label.includes(input);
+      },
+      options: brandList.filter(function (item) {
+        return !item.isDisabled;
+      }).map(function (_ref2) {
+        var value = _ref2.brandId,
+          label = _ref2.brandName;
+        return {
+          value: value,
+          label: label
+        };
+      })
     }
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    style: {
-      marginRight: '8px'
-    },
-    onClick: submit
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
-    onClick: reset
-  }, "\u91CD\u7F6E")));
+  }];
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -12513,7 +12877,7 @@ var GoodList = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(takeRight(columns$1, columns$1.length - 1));
+    }].concat(takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React.createElement("div", {
       style: {
         width: '100%',
@@ -12535,14 +12899,23 @@ var GoodList = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, advanceSearchForm, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "specNo",
-    columns: columns$1,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -12626,97 +12999,15 @@ var getTableData$1 = function getTableData(_ref, formData) {
     };
   });
 };
-var columns$2 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        width: 25
-      }
-    }, index + 1);
-  },
-  width: 80
-}, {
-  dataIndex: 'goodName',
-  title: '商品名称',
-  width: 250,
-  ellipsis: true
-}, {
-  dataIndex: 'goodNo',
-  title: '商品编码',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'styleCode',
-  title: '款式编码',
-  width: 200,
-  ellipsis: true
+var searchFormData = [{
+  label: '商品名称',
+  name: 'goodName'
 }, {
-  dataIndex: 'propertiesValue',
-  title: '规格值',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'goodPicUrl',
-  title: '商品图片',
-  width: 100,
-  render: function render(picUrl) {
-    return /*#__PURE__*/React.createElement("img", {
-      style: {
-        width: '40px',
-        height: '40px',
-        objectFit: 'contain'
-      },
-      src: picUrl
-    });
-  }
-}, {
-  dataIndex: 'goodShortName',
-  title: "\u5546\u54C1\u7B80\u79F0",
-  ellipsis: true,
-  width: 250
-}, {
-  dataIndex: 'brandName',
-  title: '品牌名称',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'retailPrice',
-  title: "\u9500\u552E\u4EF7\u683C",
-  ellipsis: true,
-  width: 100,
-  render: function render(price) {
-    return price || price === 0 ? Number(price).toFixed(2) : '';
-  }
-}, {
-  dataIndex: 'marketPrice',
-  title: "\u5E02\u573A\u4EF7",
-  ellipsis: true,
-  width: 100,
-  render: function render(price) {
-    return price || price === 0 ? Number(price).toFixed(2) : '';
-  }
-}, {
-  dataIndex: 'costPrice',
-  title: "\u6210\u672C\u4EF7",
-  ellipsis: true,
-  width: 100,
-  render: function render(price) {
-    return price || price === 0 ? Number(price).toFixed(2) : '';
-  }
+  label: '商品编码',
+  name: 'goodNo'
 }, {
-  dataIndex: 'skuType',
-  title: "\u5546\u54C1\u7C7B\u578B",
-  ellipsis: true,
-  width: 100,
-  render: function render() {
-    var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'normal';
-    return {
-      'combine': '组合装商品',
-      'normal': '普通商品'
-    }[type] || type;
-  }
+  label: '款式编码',
+  name: 'styleCode'
 }];
 var GoodList$1 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -12727,6 +13018,11 @@ var GoodList$1 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('jst'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
   useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -12746,55 +13042,6 @@ var GoodList$1 = function GoodList(props, ref) {
     params = _useAntdTable.params;
   var submit = search.submit,
     reset = search.reset;
-  var advanceSearchForm = /*#__PURE__*/React.createElement(Form, {
-    layout: "inline",
-    form: form
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "styleCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u6B3E\u5F0F\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    style: {
-      marginRight: '8px'
-    },
-    onClick: submit
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
-    onClick: reset
-  }, "\u91CD\u7F6E")));
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -12859,7 +13106,7 @@ var GoodList$1 = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(takeRight(columns$2, columns$2.length - 1));
+    }].concat(takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React.createElement("div", {
       style: {
         width: '100%',
@@ -12881,14 +13128,23 @@ var GoodList$1 = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, advanceSearchForm, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "goodNo",
-    columns: columns$2,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -12958,6 +13214,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
+    goodShortName: formData.goodShortName || null,
     goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
     skuCode: formData.skuCode || null,
@@ -12981,107 +13238,26 @@ var getTableData$2 = function getTableData(_ref, formData) {
         index: index + 1
       });
     });
-    return {
-      total: total,
-      list: newProducts
-    };
-  });
-};
-var columns$3 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        width: 25
-      }
-    }, index + 1);
-  },
-  width: 80
-}, {
-  dataIndex: 'specNo',
-  title: "SKU",
-  ellipsis: true,
-  width: 200
-}, {
-  dataIndex: 'specId',
-  title: "SKU ID",
-  ellipsis: true,
-  width: 80
-}, {
-  dataIndex: 'goodName',
-  title: "\u5546\u54C1\u540D\u79F0",
-  ellipsis: true,
-  width: 250
-}, {
-  dataIndex: 'goodShortName',
-  title: "\u5546\u54C1\u7B80\u79F0",
-  ellipsis: true,
-  width: 250
-},
-// {
-//   dataIndex: 'goodPicUrl',
-//   title: `商品图片`,
-//   ellipsis: true,
-//   width: 100,
-//   render: (picUrl: string) => {
-//     return (
-//       <img
-//         style={{
-//           width: '40px',
-//           height: '40px',
-//           objectFit: 'contain',
-//         }}
-//         src={picUrl}
-//       ></img>
-//     );
-//   },
-// },
-{
-  dataIndex: 'goodNo',
-  title: "\u8D27\u53F7",
-  ellipsis: true,
-  width: 150
-}, {
-  dataIndex: 'goodId',
-  title: "\u8D27\u53F7ID",
-  ellipsis: true,
-  width: 100
-}, {
-  dataIndex: 'colorName',
-  title: "\u989C\u8272\u540D\u79F0",
-  ellipsis: true,
-  width: 100
-}, {
-  dataIndex: 'colorCode',
-  title: "\u989C\u8272\u4EE3\u7801",
-  ellipsis: true,
-  width: 100
-}, {
-  dataIndex: 'sizeName',
-  title: "\u5C3A\u7801\u540D\u79F0",
-  ellipsis: true,
-  width: 100
-}, {
-  dataIndex: 'sizeCode',
-  title: "\u5C3A\u7801\u4EE3\u7801",
-  ellipsis: true,
-  width: 100
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
+var searchFormData$1 = [{
+  label: '商品货号',
+  name: 'goodNo'
 }, {
-  dataIndex: 'brandName',
-  title: "\u54C1\u724C\u540D\u79F0",
-  ellipsis: true,
-  width: 100
+  label: '商品名称',
+  name: 'goodName'
 }, {
-  dataIndex: 'marketPrice',
-  title: "\u5E02\u573A\u4EF7",
-  ellipsis: true,
-  width: 100
+  label: 'SKU',
+  name: 'skuCode',
+  dataIndex: 'specNo'
 }, {
-  dataIndex: 'retailPrice',
-  title: "\u552E\u4EF7",
-  ellipsis: true,
-  width: 100
+  label: 'SKU ID',
+  name: 'skuId',
+  dataIndex: 'specId'
 }];
 var GoodList$2 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -13092,6 +13268,11 @@ var GoodList$2 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('bse3'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
   useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -13111,66 +13292,6 @@ var GoodList$2 = function GoodList(props, ref) {
     params = _useAntdTable.params;
   var submit = search.submit,
     reset = search.reset;
-  var advanceSearchForm = /*#__PURE__*/React.createElement(Form, {
-    layout: "inline",
-    form: form
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u8D27\u53F7",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "SKU",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuId",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "SKU ID",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    style: {
-      marginRight: '8px'
-    },
-    onClick: submit
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
-    onClick: reset
-  }, "\u91CD\u7F6E")));
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -13226,7 +13347,7 @@ var GoodList$2 = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(takeRight(columns$3, columns$3.length - 1));
+    }].concat(takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React.createElement("div", {
       style: {
         width: '100%',
@@ -13248,14 +13369,23 @@ var GoodList$2 = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, advanceSearchForm, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData$1,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "specNo",
-    columns: columns$3,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -13346,71 +13476,23 @@ var getTableData$3 = function getTableData(_ref, formData) {
     };
   });
 };
-var columns$4 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        width: 25
-      }
-    }, index + 1);
-  },
-  width: 80
-}, {
-  dataIndex: 'specName',
-  title: 'SKU名称',
-  width: 250,
-  ellipsis: true
-}, {
-  dataIndex: 'specNo',
-  title: 'SKU编码',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'goodName',
-  title: '商品名称',
-  width: 250,
-  ellipsis: true
+var searchFormData$2 = [{
+  label: '商品简称',
+  name: 'goodShortName'
 }, {
-  dataIndex: 'goodShortName',
-  title: "\u5546\u54C1\u7B80\u79F0",
-  ellipsis: true,
-  width: 250
-}, {
-  dataIndex: 'goodNo',
-  title: '商品编码',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'goodPicUrl',
-  title: '商品图片',
-  width: 100,
-  render: function render(picUrl) {
-    return /*#__PURE__*/React.createElement("img", {
-      style: {
-        width: '40px',
-        height: '40px',
-        objectFit: 'contain'
-      },
-      src: picUrl
-    });
-  }
+  label: '商品sku名称',
+  name: 'skuName',
+  dataIndex: 'specName'
 }, {
-  dataIndex: 'brandName',
-  title: '品牌名称',
-  width: 200,
-  ellipsis: true
+  label: '商品sku编码',
+  name: 'skuCode',
+  dataIndex: 'specNo'
 }, {
-  dataIndex: 'retailPrice',
-  title: "\u6807\u51C6\u552E\u4EF7",
-  ellipsis: true,
-  width: 100
+  label: '商品名称',
+  name: 'goodName'
 }, {
-  dataIndex: 'costPrice',
-  title: "\u6210\u672C\u4EF7",
-  ellipsis: true,
-  width: 100
+  label: '商品编码',
+  name: 'goodNo'
 }];
 var GoodList$3 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -13421,6 +13503,11 @@ var GoodList$3 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('gy'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
   useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -13440,77 +13527,6 @@ var GoodList$3 = function GoodList(props, ref) {
     params = _useAntdTable.params;
   var submit = search.submit,
     reset = search.reset;
-  var advanceSearchForm = /*#__PURE__*/React.createElement(Form, {
-    layout: "inline",
-    form: form
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodShortName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7B80\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1sku\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1sku\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    style: {
-      marginRight: '8px'
-    },
-    onClick: submit
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
-    onClick: reset
-  }, "\u91CD\u7F6E")));
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -13566,7 +13582,7 @@ var GoodList$3 = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(takeRight(columns$4, columns$4.length - 1));
+    }].concat(takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React.createElement("div", {
       style: {
         width: '100%',
@@ -13588,14 +13604,23 @@ var GoodList$3 = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, advanceSearchForm, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData$2,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "id",
-    columns: columns$4,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -14075,7 +14100,7 @@ var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
   var disabled = _ref2.disabled,
     updateHandle = _ref2.updateHandle,
     operate = _ref2.operate;
-  return getColumnsMap()['WDT_REISSUE_GOODS'].map(function (item) {
+  return getColumnsMap$1()['WDT_REISSUE_GOODS'].map(function (item) {
     var newItem = _objectSpread2({
       align: 'center',
       ellipsis: true
@@ -14102,15 +14127,20 @@ var getColumns$2 = function getColumns(_ref) {
     WDT_REISSUE_GOODS: [{
       dataIndex: 'goodId',
       title: "\u5546\u54C1ID",
-      width: 120
+      width: 120,
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
-      width: 200
+      align: 'center',
+      ellipsis: true,
+      width: 180
     }, {
       dataIndex: 'goodName',
       title: "\u5546\u54C1\u540D\u79F0",
       width: 200,
+      align: 'center',
       render: function render(text) {
         return /*#__PURE__*/React.createElement(CopyTextIcon, {
           val: text
@@ -14119,14 +14149,19 @@ var getColumns$2 = function getColumns(_ref) {
     }, {
       dataIndex: 'specId',
       title: "SKUID",
+      align: 'center',
+      ellipsis: true,
       width: 150
     }, {
       dataIndex: 'specNo',
       title: "\u5546\u54C1SKU\u7F16\u7801",
-      width: 200
+      align: 'center',
+      ellipsis: true,
+      width: 180
     }, {
       dataIndex: 'specName',
       title: "\u5546\u54C1SKU\u540D\u79F0",
+      align: 'center',
       width: 250,
       render: function render(text) {
         return /*#__PURE__*/React.createElement(CopyTextIcon, {
@@ -14239,18 +14274,7 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: function render(val) {
-        var giftTypeMap = {
-          0: '非赠品',
-          1: '自动赠送',
-          2: '手工赠送',
-          3: '回购自动送赠品',
-          4: '前N有礼送赠品',
-          6: '天猫优仓赠品',
-          7: '淘宝CRM会员送赠'
-        };
-        return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
-      }
+      render: renderGiftType
     }],
     //旺店通退货商品信息
     WDT_RETURN_GOODS: [{
@@ -14346,18 +14370,7 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: function render(val) {
-        var giftTypeMap = {
-          0: '非赠品',
-          1: '自动赠送',
-          2: '手工赠送',
-          3: '回购自动送赠品',
-          4: '前N有礼送赠品',
-          6: '天猫优仓赠品',
-          7: '淘宝CRM会员送赠'
-        };
-        return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
-      }
+      render: renderGiftType
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14478,18 +14491,7 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: function render(val) {
-        var giftTypeMap = {
-          0: '非赠品',
-          1: '自动赠送',
-          2: '手工赠送',
-          3: '回购自动送赠品',
-          4: '前N有礼送赠品',
-          6: '天猫优仓赠品',
-          7: '淘宝CRM会员送赠'
-        };
-        return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
-      }
+      render: renderGiftType
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14673,6 +14675,15 @@ var getYesOrNo$1 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
+function toNum(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
 var getColumns$4 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
@@ -14830,6 +14841,19 @@ var getColumns$4 = function getColumns(_ref) {
       dataIndex: 'qty',
       title: "\u6570\u91CF",
       width: 100,
+      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 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, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -14933,6 +14957,19 @@ var getColumns$4 = function getColumns(_ref) {
       dataIndex: 'qty',
       title: "\u6570\u91CF",
       width: 100,
+      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 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, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -15024,6 +15061,15 @@ var fillAttrs = function fillAttrs(item) {
   if (!item.align) item.align = 'center';
   return item;
 };
+function toNum$1(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
 var getColumns$5 = function getColumns() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     _ref$text = _ref.text,
@@ -15207,6 +15253,19 @@ 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"));
+        }
+      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -15226,6 +15285,19 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       width: 100,
+      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 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, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -15310,6 +15382,19 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'salePrice',
       title: '单价',
       width: 120,
+      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 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"));
+        }
+      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -15327,6 +15412,19 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'qty',
       title: '数量',
       width: 100,
+      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 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, "]") : '';
+          }
+          return res;
+        })) {
+          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+        }
+      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -15598,7 +15696,7 @@ var getColumns$6 = function getColumns(_ref) {
   };
 };
 
-var getColumnsMap = function getColumnsMap(args) {
+var getColumnsMap$1 = function getColumnsMap(args) {
   var _ref = args || {},
     _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
@@ -15638,20 +15736,22 @@ var getColumnsMap = function getColumnsMap(args) {
     })['default']
   });
 };
-var getColumnsBaseInfo = function getColumnsBaseInfo() {
-  var clone_columnsMap = cloneDeep(getColumnsMap());
+var erpColumnsMap = getColumnsMap$1();
+var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
+  var clone_columnsMap = cloneDeep(getColumnsMap$1());
   var newColumns = {};
   Object.keys(clone_columnsMap).forEach(function (key) {
     newColumns[key] = clone_columnsMap[key].map(function (col) {
       return {
         title: col.title,
-        dataIndex: col.dataIndex
+        dataIndex: col.dataIndex,
+        disabled: !!col.validator
       };
     });
   });
   return newColumns;
 };
-var columnsBaseInfoMap = getColumnsBaseInfo();
+var columnsBaseInfoMap = getColumnsBaseInfo$1();
 
 var renderFieldMap$1 = {
   goodsNumber: function goodsNumber(_ref) {
@@ -15718,7 +15818,7 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
   var disabled = _ref4.disabled,
     updateHandle = _ref4.updateHandle,
     operate = _ref4.operate;
-  return getColumnsMap()['BS_E3_REISSUE_GOODS'].map(function (item) {
+  return getColumnsMap$1()['BS_E3_REISSUE_GOODS'].map(function (item) {
     var newItem = _objectSpread2({
       align: 'center',
       ellipsis: true
@@ -15977,7 +16077,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'GY_REISSUE_GOODS':
         case 'GY_RETURN_GOODS':
           {
-            columns = getColumnsMap({
+            columns = getColumnsMap$1({
               text: text,
               disabled: disabled || columnsOptions.disabled,
               updateHandle: updateHandle,
@@ -16004,7 +16104,7 @@ var GoodItem$1 = function GoodItem(props) {
           }
           break;
         default:
-          columns = getColumnsMap({
+          columns = getColumnsMap$1({
             text: text,
             disabled: disabled || columnsOptions.disabled,
             updateHandle: updateHandle,
@@ -16027,16 +16127,18 @@ var GoodItem$1 = function GoodItem(props) {
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
     if (isStringArray) {
       baseInfoColumns = initBaseInfoColumns.filter(function (col) {
-        return showHeader.includes(col.dataIndex);
+        return showHeader.includes(col.dataIndex) || (col === null || col === void 0 ? void 0 : col.validator);
       });
     } else if (isObjectArray) {
-      baseInfoColumns = showHeader.filter(function (col) {
-        return col.show !== false;
-      }).map(function (col) {
+      baseInfoColumns = showHeader.map(function (col) {
         var currentCol = initBaseInfoColumns.find(function (item) {
           return item.dataIndex === col.dataIndex;
         });
-        return currentCol ? currentCol : undefined;
+        // 如果列应该显示（show不为false）或者有验证器，则返回对应的列配置
+        if (currentCol && (col.show !== false || (currentCol === null || currentCol === void 0 ? void 0 : currentCol.validator))) {
+          return currentCol;
+        }
+        return undefined;
       }).filter(Boolean);
     }
     var columnList = [{
@@ -17141,7 +17243,7 @@ var rowKeyMap = {
   GY_SYSTEM_ORDER: 'billNo',
   JST_SYSTEM_ORDER: 'oId'
 };
-var index$2 = (function (props) {
+var index$3 = (function (props) {
   var value = props.value,
     _onChange = props.onChange,
     disabled = props.disabled,
@@ -19146,7 +19248,7 @@ var Goods$1 = function Goods(props, ref) {
     userNick: userNick
   }));
 };
-var index$3 = /*#__PURE__*/forwardRef(Goods$1);
+var index$4 = /*#__PURE__*/forwardRef(Goods$1);
 
 var _excluded$k = ["onChange", "value", "failValue"];
 function CommonStatus(props) {
@@ -19407,7 +19509,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, msgTypeCh[key], item.ruleName);
+    }, msgTypeCh[key] || key, item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -20244,4 +20346,4 @@ var GyReturnGoods = function GyReturnGoods(props) {
   })));
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, getColumns$5 as getJstColumns, getColumns$3 as getWlnColumns };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$3 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$4 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, index$2 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns };