@kmkf-fe-packages/basic-components 2.0.19-beta.69 → 2.0.19-beta.70

package/dist/index.js

@@ -12190,6 +12190,497 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
 };
 var GoodsModal$2 = /*#__PURE__*/React.forwardRef(GoodsModal$1);
 
+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__default['default'].createElement("img", {
+      style: {
+        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__default['default'].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,
+  ellipsis: true
+}, {
+  dataIndex: 'specNo',
+  title: 'SKU编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'specId',
+  title: 'SKUID',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'specImgUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React__default['default'].createElement("img", {
+      style: {
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodId',
+  title: '商品ID',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'brandName',
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'marketPrice',
+  title: '市场价',
+  width: 140,
+  render: function render(price) {
+    return Number(price).toFixed(2);
+  }
+}, {
+  dataIndex: 'retailPrice',
+  title: '零售价',
+  width: 140,
+  render: function render(price) {
+    return Number(price).toFixed(2);
+  }
+}, {
+  dataIndex: 'memberPrice',
+  title: '会员价',
+  width: 140,
+  render: function render(price) {
+    return Number(price).toFixed(2);
+  }
+}];
+
+var 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 lodash.cloneDeep({
+    gy: gyColumns,
+    jst: jstColumns,
+    wdt: wdtColumns,
+    bse3: bse3Columns
+  });
+};
+var getColumnsBaseInfo = function getColumnsBaseInfo() {
+  var clone_columnsMap = lodash.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__default['default'].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 = React.useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    columns = _useState2[0],
+    setColumns = _useState2[1];
+  var _useState3 = React.useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
+  var showColumnsDataIndexList = React.useMemo(function () {
+    return columns.filter(function (item) {
+      return Object.hasOwn(item, 'dataIndex');
+    }).map(function (item) {
+      return item.dataIndex;
+    });
+  }, [columns]);
+  React.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 = React.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 || !lodash.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__default['default'].createElement(antd.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__default['default'].createElement(antd.Form.Item, {
+      name: name,
+      style: {
+        marginBottom: '12px'
+      }
+    }, type === 'select' ? /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2({
+      placeholder: label,
+      showSearch: true,
+      allowClear: true,
+      style: {
+        width: 150
+      },
+      onBlur: function onBlur() {
+        return submitForm();
+      }
+    }, formItemProps)) : /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2({
+      placeholder: label,
+      allowClear: true,
+      style: {
+        width: 150
+      },
+      onPressEnter: function onPressEnter() {
+        return submitForm();
+      },
+      onBlur: function onBlur() {
+        return submitForm();
+      }
+    }, formItemProps)));
+  }), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    type: "primary",
+    style: {
+      marginRight: '8px'
+    },
+    onClick: function onClick() {
+      return submitForm(true);
+    }
+  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    onClick: reset
+  }, "\u91CD\u7F6E")));
+}
+
 var getTableData = function getTableData(_ref, formData) {
   var _formData$brandIds;
   var current = _ref.current,
@@ -12225,88 +12716,6 @@ var getTableData = function getTableData(_ref, formData) {
     };
   });
 };
-var columns$1 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React__default['default'].createElement("div", {
-      style: {
-        width: 25
-      }
-    }, index + 1);
-  },
-  width: 100
-}, {
-  dataIndex: 'specName',
-  title: 'SKU名称',
-  width: 250,
-  ellipsis: true
-}, {
-  dataIndex: 'specNo',
-  title: 'SKU编码',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'specId',
-  title: 'SKUID',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'specImgUrl',
-  title: '商品图片',
-  width: 100,
-  render: function render(picUrl) {
-    return /*#__PURE__*/React__default['default'].createElement("img", {
-      style: {
-        width: '40px',
-        height: '40px',
-        objectFit: 'contain'
-      },
-      src: picUrl
-    });
-  }
-}, {
-  dataIndex: 'goodName',
-  title: '商品名称',
-  width: 250,
-  ellipsis: true
-}, {
-  dataIndex: 'goodNo',
-  title: '商品编码',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'goodId',
-  title: '商品ID',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'brandName',
-  title: '品牌名称',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'marketPrice',
-  title: '市场价',
-  width: 140,
-  render: function render(price) {
-    return Number(price).toFixed(2);
-  }
-}, {
-  dataIndex: 'retailPrice',
-  title: '零售价',
-  width: 140,
-  render: function render(price) {
-    return Number(price).toFixed(2);
-  }
-}, {
-  dataIndex: 'memberPrice',
-  title: '会员价',
-  width: 140,
-  render: function render(price) {
-    return Number(price).toFixed(2);
-  }
-}];
 var GoodList = function GoodList(props, ref) {
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -12320,6 +12729,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];
   React.useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -12371,92 +12785,42 @@ var GoodList = function GoodList(props, ref) {
   React__default['default'].useEffect(function () {
     setGoodBrandList();
   }, []);
-  var advanceSearchForm = /*#__PURE__*/React__default['default'].createElement(antd.Form, {
-    layout: "inline",
-    form: form
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "skuName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "SKU\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "skuCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "SKU\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "brandIds",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.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__default['default'].createElement(antd.Form.Item, {
-    style: {
-      marginBottom: '12px'
+  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__default['default'].createElement(antd.Button, {
-    type: "primary",
-    style: {
-      marginRight: '8px'
-    },
-    onClick: submit
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    onClick: reset
-  }, "\u91CD\u7F6E")));
+  }];
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -12512,7 +12876,7 @@ var GoodList = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(lodash.takeRight(columns$1, columns$1.length - 1));
+    }].concat(lodash.takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         width: '100%',
@@ -12534,14 +12898,23 @@ var GoodList = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, advanceSearchForm, /*#__PURE__*/React__default['default'].createElement("div", {
+  return /*#__PURE__*/React__default['default'].createElement(antd.Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React__default['default'].createElement(SearchForm, {
+    searchFormData: searchFormData,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "specNo",
-    columns: columns$1,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -12590,132 +12963,50 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     visible: visible,
     width: width || 850,
     onCancel: function onCancel() {
-      _onCancel();
-    },
-    onOk: onOk,
-    wrapClassName: "goodModal"
-  }, /*#__PURE__*/React__default['default'].createElement(WdtGoodList, {
-    ref: wdtGoodListRef
-  })));
-};
-var WdtGoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$3);
-
-var getTableData$1 = function getTableData(_ref, formData) {
-  var current = _ref.current,
-    pageSize = _ref.pageSize;
-  return extendRequest('/qy/gdfw/product/product/page', {
-    method: 'post',
-    data: _objectSpread2({
-      pageSize: pageSize,
-      pageNo: current,
-      platform: 'JST_ERP'
-    }, formData)
-  }).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 columns$2 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React__default['default'].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
-}, {
-  dataIndex: 'propertiesValue',
-  title: '规格值',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'goodPicUrl',
-  title: '商品图片',
-  width: 100,
-  render: function render(picUrl) {
-    return /*#__PURE__*/React__default['default'].createElement("img", {
-      style: {
-        width: '40px',
-        height: '40px',
-        objectFit: 'contain'
-      },
-      src: picUrl
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React__default['default'].createElement(WdtGoodList, {
+    ref: wdtGoodListRef
+  })));
+};
+var WdtGoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$3);
+
+var getTableData$1 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'JST_ERP'
+    }, formData)
+  }).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);
     });
-  }
-}, {
-  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) : '';
-  }
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
+var searchFormData = [{
+  label: '商品名称',
+  name: 'goodName'
 }, {
-  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 = React.useState([]),
@@ -12726,6 +13017,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];
   React.useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -12745,55 +13041,6 @@ var GoodList$1 = function GoodList(props, ref) {
     params = _useAntdTable.params;
   var submit = search.submit,
     reset = search.reset;
-  var advanceSearchForm = /*#__PURE__*/React__default['default'].createElement(antd.Form, {
-    layout: "inline",
-    form: form
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "styleCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u6B3E\u5F0F\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    type: "primary",
-    style: {
-      marginRight: '8px'
-    },
-    onClick: submit
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    onClick: reset
-  }, "\u91CD\u7F6E")));
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -12858,7 +13105,7 @@ var GoodList$1 = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(lodash.takeRight(columns$2, columns$2.length - 1));
+    }].concat(lodash.takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         width: '100%',
@@ -12880,14 +13127,23 @@ var GoodList$1 = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, advanceSearchForm, /*#__PURE__*/React__default['default'].createElement("div", {
+  return /*#__PURE__*/React__default['default'].createElement(antd.Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React__default['default'].createElement(SearchForm, {
+    searchFormData: searchFormData,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "goodNo",
-    columns: columns$2,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -12932,156 +13188,75 @@ var GyGoodsModal = function GyGoodsModal(props, ref) {
   var onOk = function onOk() {
     var _gyGoodsListRef$curre;
     var selectedList = ((_gyGoodsListRef$curre = gyGoodsListRef.current) === null || _gyGoodsListRef$curre === void 0 ? void 0 : _gyGoodsListRef$curre.getSelectGoodList()) || [];
-    onSubmit(selectedList);
-    _onCancel();
-  };
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, visible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
-    title: '选择商品',
-    okText: '确认',
-    cancelText: '取消',
-    visible: visible,
-    width: width || 850,
-    onCancel: function onCancel() {
-      _onCancel();
-    },
-    onOk: onOk,
-    wrapClassName: "goodModal"
-  }, /*#__PURE__*/React__default['default'].createElement(GyGoodsList, {
-    ref: gyGoodsListRef,
-    selectedRows: selectedRows
-  })));
-};
-var JstGoodsModal = /*#__PURE__*/React.forwardRef(GyGoodsModal);
-
-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,
-    skuId: formData.skuId || null
-  };
-  return extendRequest('/qy/gdfw/product/product/page', {
-    method: 'post',
-    data: _objectSpread2({
-      pageSize: pageSize,
-      pageNo: current,
-      platform: 'BS_E3_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$3 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React__default['default'].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
+    onSubmit(selectedList);
+    _onCancel();
+  };
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, visible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React__default['default'].createElement(GyGoodsList, {
+    ref: gyGoodsListRef,
+    selectedRows: selectedRows
+  })));
+};
+var JstGoodsModal = /*#__PURE__*/React.forwardRef(GyGoodsModal);
+
+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,
+    skuId: formData.skuId || null
+  };
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'BS_E3_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 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 = React.useState([]),
@@ -13092,6 +13267,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];
   React.useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -13111,77 +13291,6 @@ var GoodList$2 = function GoodList(props, ref) {
     params = _useAntdTable.params;
   var submit = search.submit,
     reset = search.reset;
-  var advanceSearchForm = /*#__PURE__*/React__default['default'].createElement(antd.Form, {
-    layout: "inline",
-    form: form
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodShortName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u7B80\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u8D27\u53F7",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "skuCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "SKU",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "skuId",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "SKU ID",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    type: "primary",
-    style: {
-      marginRight: '8px'
-    },
-    onClick: submit
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    onClick: reset
-  }, "\u91CD\u7F6E")));
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -13237,7 +13346,7 @@ var GoodList$2 = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(lodash.takeRight(columns$3, columns$3.length - 1));
+    }].concat(lodash.takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         width: '100%',
@@ -13259,14 +13368,23 @@ var GoodList$2 = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, advanceSearchForm, /*#__PURE__*/React__default['default'].createElement("div", {
+  return /*#__PURE__*/React__default['default'].createElement(antd.Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React__default['default'].createElement(SearchForm, {
+    searchFormData: searchFormData$1,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "specNo",
-    columns: columns$3,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -13357,71 +13475,23 @@ var getTableData$3 = function getTableData(_ref, formData) {
     };
   });
 };
-var columns$4 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React__default['default'].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
-}, {
-  dataIndex: 'goodShortName',
-  title: "\u5546\u54C1\u7B80\u79F0",
-  ellipsis: true,
-  width: 250
-}, {
-  dataIndex: 'goodNo',
-  title: '商品编码',
-  width: 200,
-  ellipsis: true
+var searchFormData$2 = [{
+  label: '商品简称',
+  name: 'goodShortName'
 }, {
-  dataIndex: 'goodPicUrl',
-  title: '商品图片',
-  width: 100,
-  render: function render(picUrl) {
-    return /*#__PURE__*/React__default['default'].createElement("img", {
-      style: {
-        width: '40px',
-        height: '40px',
-        objectFit: 'contain'
-      },
-      src: picUrl
-    });
-  }
+  label: '商品简称',
+  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 = React.useState([]),
@@ -13432,6 +13502,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];
   React.useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -13451,77 +13526,6 @@ var GoodList$3 = function GoodList(props, ref) {
     params = _useAntdTable.params;
   var submit = search.submit,
     reset = search.reset;
-  var advanceSearchForm = /*#__PURE__*/React__default['default'].createElement(antd.Form, {
-    layout: "inline",
-    form: form
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodShortName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u7B80\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "skuName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1sku\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "skuCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1sku\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    type: "primary",
-    style: {
-      marginRight: '8px'
-    },
-    onClick: submit
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
-    onClick: reset
-  }, "\u91CD\u7F6E")));
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -13577,7 +13581,7 @@ var GoodList$3 = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(lodash.takeRight(columns$4, columns$4.length - 1));
+    }].concat(lodash.takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         width: '100%',
@@ -13599,14 +13603,23 @@ var GoodList$3 = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, advanceSearchForm, /*#__PURE__*/React__default['default'].createElement("div", {
+  return /*#__PURE__*/React__default['default'].createElement(antd.Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React__default['default'].createElement(SearchForm, {
+    searchFormData: searchFormData$2,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "id",
-    columns: columns$4,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -14086,7 +14099,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
@@ -15609,7 +15622,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,
@@ -15649,8 +15662,8 @@ var getColumnsMap = function getColumnsMap(args) {
     })['default']
   });
 };
-var getColumnsBaseInfo = function getColumnsBaseInfo() {
-  var clone_columnsMap = lodash.cloneDeep(getColumnsMap());
+var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
+  var clone_columnsMap = lodash.cloneDeep(getColumnsMap$1());
   var newColumns = {};
   Object.keys(clone_columnsMap).forEach(function (key) {
     newColumns[key] = clone_columnsMap[key].map(function (col) {
@@ -15662,7 +15675,7 @@ var getColumnsBaseInfo = function getColumnsBaseInfo() {
   });
   return newColumns;
 };
-var columnsBaseInfoMap = getColumnsBaseInfo();
+var columnsBaseInfoMap = getColumnsBaseInfo$1();
 
 var renderFieldMap$1 = {
   goodsNumber: function goodsNumber(_ref) {
@@ -15729,7 +15742,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
@@ -15988,7 +16001,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,
@@ -16015,7 +16028,7 @@ var GoodItem$1 = function GoodItem(props) {
           }
           break;
         default:
-          columns = getColumnsMap({
+          columns = getColumnsMap$1({
             text: text,
             disabled: disabled || columnsOptions.disabled,
             updateHandle: updateHandle,
@@ -17152,7 +17165,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,
@@ -19157,7 +19170,7 @@ var Goods$1 = function Goods(props, ref) {
     userNick: userNick
   }));
 };
-var index$3 = /*#__PURE__*/React.forwardRef(Goods$1);
+var index$4 = /*#__PURE__*/React.forwardRef(Goods$1);
 
 var _excluded$k = ["onChange", "value", "failValue"];
 function CommonStatus(props) {
@@ -20281,7 +20294,7 @@ exports.BsExchange = BsExchange;
 exports.BsGoods = BsGoods;
 exports.BsReissue = BsReissue;
 exports.BsReturn = BsReturnGoods;
-exports.BsSystemOrder = index$2;
+exports.BsSystemOrder = index$3;
 exports.BuyerNick = BuyerNick;
 exports.CalculationInput = CalculationInput;
 exports.ChooseBaby = ChooseBaby;
@@ -20294,7 +20307,7 @@ exports.CommonSystemOrder = CommonSystemOrder;
 exports.CopyTextIcon = CopyTextIcon;
 exports.ExpressLogistics = ExpressLogistics;
 exports.Goods = Goods;
-exports.GoodsTable = index$3;
+exports.GoodsTable = index$4;
 exports.GyReissue = GyReissue;
 exports.GyReturn = GyReturnGoods;
 exports.IdentifyAddress = IdentifyAddress;
@@ -20322,5 +20335,6 @@ exports.WdtGoodList = WdtGoodList;
 exports.WdtReissue = wdtReissue;
 exports.WlnGoods = WlnGoods;
 exports.columnsBaseInfoMap = columnsBaseInfoMap;
+exports.erpModalColumnsMap = index$2;
 exports.getJstColumns = getColumns$5;
 exports.getWlnColumns = getColumns$3;