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

package/dist/index.js

@@ -12203,53 +12203,145 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
 };
 var GoodsModal$2 = /*#__PURE__*/React.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__default['default'].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__default['default'].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__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,
@@ -12320,6 +12412,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 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,
+    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 = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -12333,6 +12742,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() {
@@ -12366,110 +12780,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 {
-          lodash.reject(res);
-        }
-      }).catch(console.error);
-    };
-    getMore();
-  };
-  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 _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 {
+          lodash.reject(res);
+        }
+      }).catch(console.error);
+    };
+    getMore();
+  };
+  React__default['default'].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__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,
@@ -12525,7 +12889,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%',
@@ -12547,14 +12911,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
@@ -12638,97 +13011,15 @@ var getTableData$1 = function getTableData(_ref, formData) {
     };
   });
 };
-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
+var searchFormData = [{
+  label: '商品名称',
+  name: 'goodName'
 }, {
-  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) : '';
-  }
+  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([]),
@@ -12739,6 +13030,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() {
@@ -12758,55 +13054,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,
@@ -12871,7 +13118,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%',
@@ -12893,14 +13140,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
@@ -12970,6 +13226,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,
@@ -12993,107 +13250,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__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
+    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([]),
@@ -13104,6 +13280,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() {
@@ -13123,66 +13304,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: "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,
@@ -13238,7 +13359,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%',
@@ -13260,14 +13381,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
@@ -13358,71 +13488,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
+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__default['default'].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 = React.useState([]),
@@ -13433,6 +13515,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() {
@@ -13452,77 +13539,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,
@@ -13578,7 +13594,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%',
@@ -13600,14 +13616,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
@@ -14087,7 +14112,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
@@ -14114,15 +14139,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__default['default'].createElement(CopyTextIcon, {
           val: text
@@ -14131,14 +14161,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__default['default'].createElement(CopyTextIcon, {
@@ -14251,18 +14286,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__default['default'].createElement("span", null, giftTypeMap[val]);
-      }
+      render: renderGiftType
     }],
     //旺店通退货商品信息
     WDT_RETURN_GOODS: [{
@@ -14358,18 +14382,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__default['default'].createElement("span", null, giftTypeMap[val]);
-      }
+      render: renderGiftType
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14490,18 +14503,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__default['default'].createElement("span", null, giftTypeMap[val]);
-      }
+      render: renderGiftType
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14685,6 +14687,15 @@ var getYesOrNo$1 = function getYesOrNo(val) {
   if (kmkfUtils.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,
@@ -14842,6 +14853,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__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -14945,6 +14969,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__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -15036,6 +15073,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,
@@ -15219,6 +15265,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__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -15238,6 +15297,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__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -15322,6 +15394,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__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -15339,6 +15424,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__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -15610,7 +15708,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,
@@ -15650,20 +15748,22 @@ var getColumnsMap = function getColumnsMap(args) {
     })['default']
   });
 };
-var getColumnsBaseInfo = function getColumnsBaseInfo() {
-  var clone_columnsMap = lodash.cloneDeep(getColumnsMap());
+var erpColumnsMap = getColumnsMap$1();
+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) {
       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) {
@@ -15730,7 +15830,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
@@ -15989,7 +16089,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,
@@ -16016,7 +16116,7 @@ var GoodItem$1 = function GoodItem(props) {
           }
           break;
         default:
-          columns = getColumnsMap({
+          columns = getColumnsMap$1({
             text: text,
             disabled: disabled || columnsOptions.disabled,
             updateHandle: updateHandle,
@@ -16039,16 +16139,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 = [{
@@ -17153,7 +17255,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,
@@ -19158,7 +19260,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) {
@@ -19419,7 +19521,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, kmkfUtils.msgTypeCh[key], item.ruleName);
+    }, kmkfUtils.msgTypeCh[key] || key, item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -20282,7 +20384,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;
@@ -20295,7 +20397,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;
@@ -20323,5 +20425,9 @@ exports.WdtGoodList = WdtGoodList;
 exports.WdtReissue = wdtReissue;
 exports.WlnGoods = WlnGoods;
 exports.columnsBaseInfoMap = columnsBaseInfoMap;
+exports.erpColumnsMap = erpColumnsMap;
+exports.erpModalColumnsMap = index$2;
+exports.getGyColumns = getColumns$4;
 exports.getJstColumns = getColumns$5;
+exports.getWdtColumns = getColumns$2;
 exports.getWlnColumns = getColumns$3;