npm - @fle-ui/plus-choose-site-goods - Versions diffs - 1.1.7 → 1.1.10 - Mend

@fle-ui/plus-choose-site-goods 1.1.7 → 1.1.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/es/index.d.ts CHANGED Viewed

@@ -17,6 +17,7 @@ export interface ChooseSiteGoodsProps extends ModalProps {
     tabsConfig?: any;
     hiddenColumns?: Array<string>;
     hiddenSearchProps?: Array<string>;
+    needControl?: boolean;
 }
 declare const ChooseSiteGoods: FC<ChooseSiteGoodsProps>;
 export default ChooseSiteGoods;

package/es/index.js CHANGED Viewed

@@ -31,8 +31,9 @@ import "antd/es/input/style";
 import _Input from "antd/es/input";
 import "antd/es/tabs/style";
 import _Tabs from "antd/es/tabs";
-var _excluded = ["env", "token", "loginErrFn", "onClose", "siteId", "app", "multiple", "defaultSelectedGoodsIds", "onSelectOk", "showMore", "showMoreText", "tabsConfig", "hiddenColumns", "hiddenSearchProps"];
+var _excluded = ["env", "token", "loginErrFn", "onClose", "siteId", "app", "multiple", "defaultSelectedGoodsIds", "onSelectOk", "showMore", "showMoreText", "tabsConfig", "hiddenColumns", "hiddenSearchProps", "needControl"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -54,6 +55,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } } return target; }
 import React, { useEffect, useState, useRef } from 'react';
+import _ from 'lodash';
 import ProImage from '@fle-ui/plus-image';
 import ChooseMallGoods from '@fle-ui/plus-choose-mall-goods';
 import AddressSelection from '@fle-ui/plus-address-selection';
@@ -93,6 +95,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     hiddenColumns = _props$hiddenColumns === void 0 ? [] : _props$hiddenColumns,
     _props$hiddenSearchPr = props.hiddenSearchProps,
     hiddenSearchProps = _props$hiddenSearchPr === void 0 ? [] : _props$hiddenSearchPr,
+    _props$needControl = props.needControl,
+    needControl = _props$needControl === void 0 ? false : _props$needControl,
     otherProps = _objectWithoutProperties(props, _excluded);
   var showTabs = useRef(tabs.filter(function (tab) {
     return tabsConfig.includes(tab.key);
@@ -117,13 +121,11 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     flagCategory: undefined,
     saleableCity: undefined // dgss可售卖城市
   };
-  // http ------------ begin
   var $http = request({
     baseUrl: getApiHost(env),
     token: token,
     loginErrFn: loginErrFn
   });
-  // http ------------ end
   useEffect(function () {
     if (env) {
       window.localStorage.setItem('env', env);
@@ -215,7 +217,9 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
               orderName: searchParams.orderName,
               orderWay: searchParams.orderWay,
               flagScene: searchParams.flagScene,
-              flagTags: searchParams.flagTags,
+              flagTags: searchParams.flagTags ? searchParams.flagTags.map(function (item) {
+                return item[1];
+              }).join(',') : '',
               flagIndustry: searchParams.flagIndustry,
               flagCategory: ((_searchParams$flagCat = searchParams.flagCategory) === null || _searchParams$flagCat === void 0 ? void 0 : _searchParams$flagCat.length) ? searchParams.flagCategory[searchParams.flagCategory.length - 1] : undefined
             });
@@ -481,6 +485,17 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     _useState28 = _slicedToArray(_useState27, 2),
     flagCategoryOptions = _useState28[0],
     setFlagCategoryOptions = _useState28[1]; // 品类标签
+  var _useState29 = useState([]),
+    _useState30 = _slicedToArray(_useState29, 2),
+    cascaderOptions = _useState30[0],
+    setCascaderOptions = _useState30[1]; //商品标签组
+  var _useState31 = useState({
+      priceShow: true,
+      supplierShow: true
+    }),
+    _useState32 = _slicedToArray(_useState31, 2),
+    show = _useState32[0],
+    setShow = _useState32[1];
   // 获取自有商品标签 - 场景 商品 行业
   var getSelfGoodsFlag = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
@@ -532,39 +547,119 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       return _ref5.apply(this, arguments);
     };
   }();
+  // 获取商品标签组 - 商品
+  var getAllGoodTagList = /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var res, optionsObj;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            _context6.next = 2;
+            return $http.post(api['getGoodTagGroupList'], {});
+          case 2:
+            res = _context6.sent;
+            if (res === null || res === void 0 ? void 0 : res.success) {
+              optionsObj = [];
+              res.data.forEach(function (item) {
+                var childArr = [];
+                var _iterator = _createForOfIteratorHelper(item.tagList),
+                  _step;
+                try {
+                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                    var child = _step.value;
+                    childArr.push({
+                      value: child.id,
+                      label: child.flag
+                    });
+                  }
+                } catch (err) {
+                  _iterator.e(err);
+                } finally {
+                  _iterator.f();
+                }
+                var obj = {
+                  label: item.name,
+                  value: item.id,
+                  children: childArr
+                };
+                optionsObj.push(obj);
+              });
+              setCascaderOptions(optionsObj);
+            }
+          case 4:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    }));
+    return function getAllGoodTagList() {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  // 获取全局控制状态
+  var getGoodControlInfo = /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var res, _res$data3, _res$data4;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            _context7.next = 2;
+            return $http.post(api['getGoodControlInfo'], {});
+          case 2:
+            res = _context7.sent;
+            if (res === null || res === void 0 ? void 0 : res.success) {
+              setShow({
+                priceShow: ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.internal_mall_cost_price_show) == '1' ? true : false,
+                supplierShow: ((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.internal_mall_supplier_name_show) == '1' ? true : false
+              });
+            }
+          case 4:
+          case "end":
+            return _context7.stop();
+        }
+      }, _callee7);
+    }));
+    return function getGoodControlInfo() {
+      return _ref7.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    needControl && getGoodControlInfo();
+  }, []);
   useEffect(function () {
     if (searchParams.tab === 'zy') {
       getSelfGoodsFlag();
       getSelfGoodsFlagCategory();
+      getAllGoodTagList();
     }
   }, [searchParams.tab]);
   // 自有商品 标签 end
   // dgss 城市列表 begin
-  var _useState29 = useState([]),
-    _useState30 = _slicedToArray(_useState29, 2),
-    dgssCitys = _useState30[0],
-    setDgssCitys = _useState30[1];
+  var _useState33 = useState([]),
+    _useState34 = _slicedToArray(_useState33, 2),
+    dgssCitys = _useState34[0],
+    setDgssCitys = _useState34[1];
   var getDgssCitys = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
       var res;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            _context6.next = 2;
+            _context8.next = 2;
             return $http.post(api['getDgssCityAllList']);
           case 2:
-            res = _context6.sent;
+            res = _context8.sent;
             if (res === null || res === void 0 ? void 0 : res.success) {
               setDgssCitys((res === null || res === void 0 ? void 0 : res.data) || []);
             }
           case 4:
           case "end":
-            return _context6.stop();
+            return _context8.stop();
         }
-      }, _callee6);
+      }, _callee8);
     }));
     return function getDgssCitys() {
-      return _ref6.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   useEffect(function () {
@@ -601,24 +696,23 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
         },
         placeholder: "\u9009\u62E9\u573A\u666F\u6807\u7B7E",
         allowClear: true
-      }), /*#__PURE__*/React.createElement(_Select, {
+      }), /*#__PURE__*/React.createElement(_Cascader, {
+        showCheckedStrategy: _Cascader.SHOW_CHILD,
+        placeholder: "\u9009\u62E9\u5546\u54C1\u6807\u7B7E",
         style: {
           width: 170,
           marginRight: 8
         },
+        options: cascaderOptions,
         value: searchParams.flagTags,
         onChange: function onChange(v) {
           handleChangeParams({
             flagTags: v
           });
         },
-        options: flagTagsOptions,
-        fieldNames: {
-          label: 'flag',
-          value: 'id'
-        },
-        placeholder: "\u9009\u62E9\u5546\u54C1\u6807\u7B7E",
-        allowClear: true
+        multiple: true,
+        allowClear: true,
+        maxTagCount: "responsive"
       }), /*#__PURE__*/React.createElement(_Select, {
         style: {
           width: 170,
@@ -917,14 +1011,14 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
   };
   // search-2 end
   // 选择 begin
-  var _useState31 = useState([]),
-    _useState32 = _slicedToArray(_useState31, 2),
-    selectedRowKeys = _useState32[0],
-    setSelectedRowKeys = _useState32[1];
-  var _useState33 = useState([]),
-    _useState34 = _slicedToArray(_useState33, 2),
-    selectedRows = _useState34[0],
-    setSelectedRows = _useState34[1];
+  var _useState35 = useState([]),
+    _useState36 = _slicedToArray(_useState35, 2),
+    selectedRowKeys = _useState36[0],
+    setSelectedRowKeys = _useState36[1];
+  var _useState37 = useState([]),
+    _useState38 = _slicedToArray(_useState37, 2),
+    selectedRows = _useState38[0],
+    setSelectedRows = _useState38[1];
   var onSelectChange = function onSelectChange(newSelectedRowKeys, newSelectedRows) {
     setSelectedRowKeys(newSelectedRowKeys);
     setSelectedRows(newSelectedRows);
@@ -948,107 +1042,23 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
   // 选择 end
   // 营销云
   var columns1 = [{
-    title: '集采市场价',
-    dataIndex: 'marketPriceMin',
-    key: 'marketPriceMin',
-    align: 'center',
-    width: 120,
-    render: function render(text, record) {
-      var _record$purchaseInfo, _record$purchaseInfo2, _record$purchaseInfo4, _record$purchaseInfo5;
-      if (record.isPurchase === 0) return '-';
-      if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo = record.purchaseInfo) === null || _record$purchaseInfo === void 0 ? void 0 : _record$purchaseInfo.marketPriceMin) === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo2 = record.purchaseInfo) === null || _record$purchaseInfo2 === void 0 ? void 0 : _record$purchaseInfo2.marketPriceMax)) {
-        var _record$purchaseInfo3;
-        return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo3 = record.purchaseInfo) === null || _record$purchaseInfo3 === void 0 ? void 0 : _record$purchaseInfo3.marketPriceMin));
-      }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo4 = record.purchaseInfo) === null || _record$purchaseInfo4 === void 0 ? void 0 : _record$purchaseInfo4.marketPriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo5 = record.purchaseInfo) === null || _record$purchaseInfo5 === void 0 ? void 0 : _record$purchaseInfo5.marketPriceMax)));
-    }
-  }, {
-    title: '代发市场价',
-    dataIndex: 'marketPriceMin',
-    key: 'marketPriceMin',
-    align: 'center',
-    width: 120,
-    render: function render(text, record) {
-      var _record$onceInfo, _record$onceInfo2, _record$onceInfo4, _record$onceInfo5;
-      if (record.isOnce === 0) return '-';
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo = record.onceInfo) === null || _record$onceInfo === void 0 ? void 0 : _record$onceInfo.marketPriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo2 = record.onceInfo) === null || _record$onceInfo2 === void 0 ? void 0 : _record$onceInfo2.marketPriceMax)) {
-        var _record$onceInfo3;
-        return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo3 = record.onceInfo) === null || _record$onceInfo3 === void 0 ? void 0 : _record$onceInfo3.marketPriceMin));
-      }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo4 = record.onceInfo) === null || _record$onceInfo4 === void 0 ? void 0 : _record$onceInfo4.marketPriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo5 = record.onceInfo) === null || _record$onceInfo5 === void 0 ? void 0 : _record$onceInfo5.marketPriceMax)));
+    title: '一件代发价格',
+    width: 200,
+    render: function render(e, record) {
+      var _record$onceInfo, _record$onceInfo2, _record$onceInfo3, _record$onceInfo4, _record$onceInfo5, _record$onceInfo6, _record$onceInfo7, _record$onceInfo8, _record$onceInfo9, _record$onceInfo10, _record$onceInfo11, _record$onceInfo12, _record$onceInfo13, _record$onceInfo14, _record$onceInfo15, _record$onceInfo16, _record$onceInfo17, _record$onceInfo18, _record$onceInfo19;
+      return /*#__PURE__*/React.createElement(React.Fragment, null, !_.isNil(record === null || record === void 0 ? void 0 : (_record$onceInfo = record.onceInfo) === null || _record$onceInfo === void 0 ? void 0 : _record$onceInfo.purchasePriceMin) && show.priceShow && /*#__PURE__*/React.createElement("div", null, "\u91C7\u8D2D\u4EF7\uFF1A", ((record === null || record === void 0 ? void 0 : (_record$onceInfo2 = record.onceInfo) === null || _record$onceInfo2 === void 0 ? void 0 : _record$onceInfo2.purchasePriceMin) / 100).toFixed(2), (record === null || record === void 0 ? void 0 : (_record$onceInfo3 = record.onceInfo) === null || _record$onceInfo3 === void 0 ? void 0 : _record$onceInfo3.purchasePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo4 = record.onceInfo) === null || _record$onceInfo4 === void 0 ? void 0 : _record$onceInfo4.purchasePriceMin) ? "~".concat((record.onceInfo.purchasePriceMax / 100).toFixed(2)) : ''), !_.isNil(record === null || record === void 0 ? void 0 : (_record$onceInfo5 = record.onceInfo) === null || _record$onceInfo5 === void 0 ? void 0 : _record$onceInfo5.marketPriceMin) && /*#__PURE__*/React.createElement("div", null, "\u5E02\u573A\u4EF7\uFF1A", ((record === null || record === void 0 ? void 0 : (_record$onceInfo6 = record.onceInfo) === null || _record$onceInfo6 === void 0 ? void 0 : _record$onceInfo6.marketPriceMin) / 100).toFixed(2), (record === null || record === void 0 ? void 0 : (_record$onceInfo7 = record.onceInfo) === null || _record$onceInfo7 === void 0 ? void 0 : _record$onceInfo7.marketPriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo8 = record.onceInfo) === null || _record$onceInfo8 === void 0 ? void 0 : _record$onceInfo8.marketPriceMin) ? "~".concat((record.onceInfo.marketPriceMax / 100).toFixed(2)) : ''), !_.isNil(record === null || record === void 0 ? void 0 : (_record$onceInfo9 = record.onceInfo) === null || _record$onceInfo9 === void 0 ? void 0 : _record$onceInfo9.salePriceMin) && /*#__PURE__*/React.createElement("div", null, "\u9500\u552E\u4EF7\uFF1A", ((record === null || record === void 0 ? void 0 : (_record$onceInfo10 = record.onceInfo) === null || _record$onceInfo10 === void 0 ? void 0 : _record$onceInfo10.salePriceMin) / 100).toFixed(2), (record === null || record === void 0 ? void 0 : (_record$onceInfo11 = record.onceInfo) === null || _record$onceInfo11 === void 0 ? void 0 : _record$onceInfo11.salePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo12 = record.onceInfo) === null || _record$onceInfo12 === void 0 ? void 0 : _record$onceInfo12.salePriceMin) ? "~".concat((record.onceInfo.salePriceMax / 100).toFixed(2)) : ''), !_.isNil(record === null || record === void 0 ? void 0 : (_record$onceInfo13 = record.onceInfo) === null || _record$onceInfo13 === void 0 ? void 0 : _record$onceInfo13.sitePriceMin) && /*#__PURE__*/React.createElement("div", null, "\u5546\u57CE\u552E\u4EF7\uFF1A", ((record === null || record === void 0 ? void 0 : (_record$onceInfo14 = record.onceInfo) === null || _record$onceInfo14 === void 0 ? void 0 : _record$onceInfo14.sitePriceMin) / 100).toFixed(2), (record === null || record === void 0 ? void 0 : (_record$onceInfo15 = record.onceInfo) === null || _record$onceInfo15 === void 0 ? void 0 : _record$onceInfo15.salePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo16 = record.onceInfo) === null || _record$onceInfo16 === void 0 ? void 0 : _record$onceInfo16.salePriceMin) ? "~".concat((record.onceInfo.salePriceMax / 100).toFixed(2)) : ''), [record === null || record === void 0 ? void 0 : (_record$onceInfo17 = record.onceInfo) === null || _record$onceInfo17 === void 0 ? void 0 : _record$onceInfo17.purchasePriceMin, record === null || record === void 0 ? void 0 : (_record$onceInfo18 = record.onceInfo) === null || _record$onceInfo18 === void 0 ? void 0 : _record$onceInfo18.marketPriceMin, record === null || record === void 0 ? void 0 : (_record$onceInfo19 = record.onceInfo) === null || _record$onceInfo19 === void 0 ? void 0 : _record$onceInfo19.salePriceMin].every(function (num) {
+        return num == null;
+      }) && '-');
     }
   }, {
-    title: '集采价',
-    dataIndex: 'salePriceMin',
-    key: 'salePriceMin',
-    align: 'center',
-    render: function render(text, record) {
-      if ((record === null || record === void 0 ? void 0 : record.isPurchase) === 1) {
-        var _record$purchaseInfo6, _record$purchaseInfo12;
-        if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo6 = record.purchaseInfo) === null || _record$purchaseInfo6 === void 0 ? void 0 : _record$purchaseInfo6.salesType) === 2) {
-          var _record$purchaseInfo7, _record$purchaseInfo8, _record$purchaseInfo10, _record$purchaseInfo11;
-          if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo7 = record.purchaseInfo) === null || _record$purchaseInfo7 === void 0 ? void 0 : _record$purchaseInfo7.salePriceMin) === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo8 = record.purchaseInfo) === null || _record$purchaseInfo8 === void 0 ? void 0 : _record$purchaseInfo8.salePriceMax)) {
-            var _record$purchaseInfo9;
-            return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo9 = record.purchaseInfo) === null || _record$purchaseInfo9 === void 0 ? void 0 : _record$purchaseInfo9.salePriceMin));
-          }
-          return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo10 = record.purchaseInfo) === null || _record$purchaseInfo10 === void 0 ? void 0 : _record$purchaseInfo10.salePriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo11 = record.purchaseInfo) === null || _record$purchaseInfo11 === void 0 ? void 0 : _record$purchaseInfo11.salePriceMax)));
-        }
-        if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo12 = record.purchaseInfo) === null || _record$purchaseInfo12 === void 0 ? void 0 : _record$purchaseInfo12.salesType) === 1) {
-          var _record$purchaseInfo13;
-          return record === null || record === void 0 ? void 0 : (_record$purchaseInfo13 = record.purchaseInfo) === null || _record$purchaseInfo13 === void 0 ? void 0 : _record$purchaseInfo13.stairList.map(function (item, index) {
-            var _record$purchaseInfo14, _record$purchaseInfo15;
-            return /*#__PURE__*/React.createElement("div", {
-              key: index
-            }, "\xA5".concat(showMoney(item.salePrice), "\uFF08").concat(index === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo14 = record.purchaseInfo) === null || _record$purchaseInfo14 === void 0 ? void 0 : (_record$purchaseInfo15 = _record$purchaseInfo14.stairList) === null || _record$purchaseInfo15 === void 0 ? void 0 : _record$purchaseInfo15.length) - 1 ? "\u2265".concat(item === null || item === void 0 ? void 0 : item.minNum) : "".concat(item.minNum, "-").concat(item.maxNum), ")"));
-          });
-        }
-        return '-';
-      }
-      return '-';
-    }
-  }, {
-    title: '代发价',
-    dataIndex: 'supplyPriceMin',
-    key: 'supplyPriceMin',
-    align: 'center',
-    render: function render(text, record) {
-      if ((record === null || record === void 0 ? void 0 : record.isOnce) === 1) {
-        var _record$onceInfo6, _record$onceInfo7, _record$onceInfo9, _record$onceInfo10;
-        if ((record === null || record === void 0 ? void 0 : (_record$onceInfo6 = record.onceInfo) === null || _record$onceInfo6 === void 0 ? void 0 : _record$onceInfo6.salePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo7 = record.onceInfo) === null || _record$onceInfo7 === void 0 ? void 0 : _record$onceInfo7.salePriceMax)) {
-          var _record$onceInfo8;
-          return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo8 = record.onceInfo) === null || _record$onceInfo8 === void 0 ? void 0 : _record$onceInfo8.salePriceMin));
-        }
-        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo9 = record.onceInfo) === null || _record$onceInfo9 === void 0 ? void 0 : _record$onceInfo9.salePriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo10 = record.onceInfo) === null || _record$onceInfo10 === void 0 ? void 0 : _record$onceInfo10.salePriceMax)));
-      }
-      return '-';
-    }
-  }, {
-    title: '集采销售价',
-    dataIndex: 'sitePriceMaxPurchase',
-    key: 'sitePriceMaxPurchase',
-    align: 'center',
-    render: function render(text, record) {
-      var _record$purchaseInfo16, _record$purchaseInfo17, _record$purchaseInfo19, _record$purchaseInfo20;
-      if (record.isPurchase === 0) return '-';
-      if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo16 = record.purchaseInfo) === null || _record$purchaseInfo16 === void 0 ? void 0 : _record$purchaseInfo16.sitePriceMin) === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo17 = record.purchaseInfo) === null || _record$purchaseInfo17 === void 0 ? void 0 : _record$purchaseInfo17.sitePriceMax)) {
-        var _record$purchaseInfo18;
-        return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo18 = record.purchaseInfo) === null || _record$purchaseInfo18 === void 0 ? void 0 : _record$purchaseInfo18.sitePriceMax));
-      }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo19 = record.purchaseInfo) === null || _record$purchaseInfo19 === void 0 ? void 0 : _record$purchaseInfo19.sitePriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo20 = record.purchaseInfo) === null || _record$purchaseInfo20 === void 0 ? void 0 : _record$purchaseInfo20.sitePriceMax)));
-    }
-  }, {
-    title: '代发销售价',
-    dataIndex: 'sitePriceMaxOnce',
-    key: 'sitePriceMaxOnce',
-    align: 'center',
-    render: function render(text, record) {
-      var _record$onceInfo11, _record$onceInfo12, _record$onceInfo14, _record$onceInfo15;
-      if (record.isOnce === 0) return '-';
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo11 = record.onceInfo) === null || _record$onceInfo11 === void 0 ? void 0 : _record$onceInfo11.sitePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo12 = record.onceInfo) === null || _record$onceInfo12 === void 0 ? void 0 : _record$onceInfo12.sitePriceMax)) {
-        var _record$onceInfo13;
-        return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo13 = record.onceInfo) === null || _record$onceInfo13 === void 0 ? void 0 : _record$onceInfo13.sitePriceMax));
-      }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo14 = record.onceInfo) === null || _record$onceInfo14 === void 0 ? void 0 : _record$onceInfo14.sitePriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo15 = record.onceInfo) === null || _record$onceInfo15 === void 0 ? void 0 : _record$onceInfo15.sitePriceMax)));
+    title: '集采批发价格',
+    width: 200,
+    render: function render(e, record) {
+      var _record$purchaseInfo, _record$purchaseInfo2, _record$purchaseInfo3;
+      var purchaseInfo = record.purchaseInfo;
+      return /*#__PURE__*/React.createElement(React.Fragment, null, !_.isNil(purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.purchasePriceMin) && show.priceShow && /*#__PURE__*/React.createElement("div", null, "\u91C7\u8D2D\u4EF7\uFF1A", ((purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.purchasePriceMin) / 100).toFixed(2), (purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.purchasePriceMax) !== (purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.purchasePriceMin) ? "~".concat((purchaseInfo.purchasePriceMax / 100).toFixed(2)) : ''), !_.isNil(purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.marketPriceMin) && /*#__PURE__*/React.createElement("div", null, "\u5E02\u573A\u4EF7\uFF1A", ((purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.marketPriceMin) / 100).toFixed(2), ((_record$purchaseInfo = record.purchaseInfo) === null || _record$purchaseInfo === void 0 ? void 0 : _record$purchaseInfo.marketPriceMax) !== (purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.marketPriceMin) ? "~".concat((record.purchaseInfo.marketPriceMax / 100).toFixed(2)) : ''), !_.isNil(purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.salePriceMin) && /*#__PURE__*/React.createElement("div", null, "\u9500\u552E\u4EF7\uFF1A", ((purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.salePriceMin) / 100).toFixed(2), ((_record$purchaseInfo2 = record.purchaseInfo) === null || _record$purchaseInfo2 === void 0 ? void 0 : _record$purchaseInfo2.salePriceMax) !== (purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.salePriceMin) ? "~".concat((record.purchaseInfo.salePriceMax / 100).toFixed(2)) : ''), !_.isNil(purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.sitePriceMin) && /*#__PURE__*/React.createElement("div", null, "\u5546\u57CE\u552E\u4EF7\uFF1A", ((purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.sitePriceMin) / 100).toFixed(2), ((_record$purchaseInfo3 = record.purchaseInfo) === null || _record$purchaseInfo3 === void 0 ? void 0 : _record$purchaseInfo3.sitePriceMax) !== (purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.sitePriceMin) ? "~".concat((record.purchaseInfo.sitePriceMax / 100).toFixed(2)) : ''), [purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.purchasePriceMin, purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.marketPriceMin, purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.salePriceMin].every(function (num) {
+        return num == null;
+      }) && '-');
     }
   }, {
     title: function title() {
@@ -1064,12 +1074,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     width: 150,
     render: function render(text, record) {
       if ((record === null || record === void 0 ? void 0 : record.isPurchase) === 1) {
-        var _record$purchaseInfo21, _record$purchaseInfo22, _record$purchaseInfo24, _record$purchaseInfo25;
-        if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo21 = record.purchaseInfo) === null || _record$purchaseInfo21 === void 0 ? void 0 : _record$purchaseInfo21.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo22 = record.purchaseInfo) === null || _record$purchaseInfo22 === void 0 ? void 0 : _record$purchaseInfo22.siteProfitMax)) {
-          var _record$purchaseInfo23;
-          return /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo23 = record.purchaseInfo) === null || _record$purchaseInfo23 === void 0 ? void 0 : _record$purchaseInfo23.siteProfitMin, "%");
+        var _record$purchaseInfo4, _record$purchaseInfo5, _record$purchaseInfo7, _record$purchaseInfo8;
+        if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo4 = record.purchaseInfo) === null || _record$purchaseInfo4 === void 0 ? void 0 : _record$purchaseInfo4.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo5 = record.purchaseInfo) === null || _record$purchaseInfo5 === void 0 ? void 0 : _record$purchaseInfo5.siteProfitMax)) {
+          var _record$purchaseInfo6;
+          return /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo6 = record.purchaseInfo) === null || _record$purchaseInfo6 === void 0 ? void 0 : _record$purchaseInfo6.siteProfitMin, "%");
         }
-        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo24 = record.purchaseInfo) === null || _record$purchaseInfo24 === void 0 ? void 0 : _record$purchaseInfo24.siteProfitMin, "%"), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo25 = record.purchaseInfo) === null || _record$purchaseInfo25 === void 0 ? void 0 : _record$purchaseInfo25.siteProfitMax, "%"));
+        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo7 = record.purchaseInfo) === null || _record$purchaseInfo7 === void 0 ? void 0 : _record$purchaseInfo7.siteProfitMin, "%"), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo8 = record.purchaseInfo) === null || _record$purchaseInfo8 === void 0 ? void 0 : _record$purchaseInfo8.siteProfitMax, "%"));
       }
       return '-';
     }
@@ -1087,12 +1097,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     width: 150,
     render: function render(text, record) {
       if ((record === null || record === void 0 ? void 0 : record.isOnce) === 1) {
-        var _record$onceInfo16, _record$onceInfo17, _record$onceInfo19, _record$onceInfo20;
-        if ((record === null || record === void 0 ? void 0 : (_record$onceInfo16 = record.onceInfo) === null || _record$onceInfo16 === void 0 ? void 0 : _record$onceInfo16.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo17 = record.onceInfo) === null || _record$onceInfo17 === void 0 ? void 0 : _record$onceInfo17.siteProfitMax)) {
-          var _record$onceInfo18;
-          return /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo18 = record.onceInfo) === null || _record$onceInfo18 === void 0 ? void 0 : _record$onceInfo18.siteProfitMin, "%");
+        var _record$onceInfo20, _record$onceInfo21, _record$onceInfo23, _record$onceInfo24;
+        if ((record === null || record === void 0 ? void 0 : (_record$onceInfo20 = record.onceInfo) === null || _record$onceInfo20 === void 0 ? void 0 : _record$onceInfo20.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo21 = record.onceInfo) === null || _record$onceInfo21 === void 0 ? void 0 : _record$onceInfo21.siteProfitMax)) {
+          var _record$onceInfo22;
+          return /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo22 = record.onceInfo) === null || _record$onceInfo22 === void 0 ? void 0 : _record$onceInfo22.siteProfitMin, "%");
         }
-        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo19 = record.onceInfo) === null || _record$onceInfo19 === void 0 ? void 0 : _record$onceInfo19.siteProfitMin, "%"), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo20 = record.onceInfo) === null || _record$onceInfo20 === void 0 ? void 0 : _record$onceInfo20.siteProfitMax, "%"));
+        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo23 = record.onceInfo) === null || _record$onceInfo23 === void 0 ? void 0 : _record$onceInfo23.siteProfitMin, "%"), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo24 = record.onceInfo) === null || _record$onceInfo24 === void 0 ? void 0 : _record$onceInfo24.siteProfitMax, "%"));
       }
       return null;
     }
@@ -1104,12 +1114,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     key: 'marketPriceMax',
     align: 'center',
     render: function render(text, record) {
-      var _record$onceInfo21, _record$onceInfo22, _record$onceInfo24, _record$onceInfo25;
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo21 = record.onceInfo) === null || _record$onceInfo21 === void 0 ? void 0 : _record$onceInfo21.marketPriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo22 = record.onceInfo) === null || _record$onceInfo22 === void 0 ? void 0 : _record$onceInfo22.marketPriceMax)) {
-        var _record$onceInfo23;
-        return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo23 = record.onceInfo) === null || _record$onceInfo23 === void 0 ? void 0 : _record$onceInfo23.marketPriceMax));
+      var _record$onceInfo25, _record$onceInfo26, _record$onceInfo28, _record$onceInfo29;
+      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo25 = record.onceInfo) === null || _record$onceInfo25 === void 0 ? void 0 : _record$onceInfo25.marketPriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo26 = record.onceInfo) === null || _record$onceInfo26 === void 0 ? void 0 : _record$onceInfo26.marketPriceMax)) {
+        var _record$onceInfo27;
+        return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo27 = record.onceInfo) === null || _record$onceInfo27 === void 0 ? void 0 : _record$onceInfo27.marketPriceMax));
       }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo24 = record.onceInfo) === null || _record$onceInfo24 === void 0 ? void 0 : _record$onceInfo24.marketPriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo25 = record.onceInfo) === null || _record$onceInfo25 === void 0 ? void 0 : _record$onceInfo25.marketPriceMax)));
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo28 = record.onceInfo) === null || _record$onceInfo28 === void 0 ? void 0 : _record$onceInfo28.marketPriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo29 = record.onceInfo) === null || _record$onceInfo29 === void 0 ? void 0 : _record$onceInfo29.marketPriceMax)));
     }
   }, {
     title: '会员价',
@@ -1117,12 +1127,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     key: 'salePriceMax',
     align: 'center',
     render: function render(text, record) {
-      var _record$onceInfo26, _record$onceInfo27, _record$onceInfo29, _record$onceInfo30;
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo26 = record.onceInfo) === null || _record$onceInfo26 === void 0 ? void 0 : _record$onceInfo26.salePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo27 = record.onceInfo) === null || _record$onceInfo27 === void 0 ? void 0 : _record$onceInfo27.salePriceMax)) {
-        var _record$onceInfo28;
-        return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo28 = record.onceInfo) === null || _record$onceInfo28 === void 0 ? void 0 : _record$onceInfo28.salePriceMax));
+      var _record$onceInfo30, _record$onceInfo31, _record$onceInfo33, _record$onceInfo34;
+      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo30 = record.onceInfo) === null || _record$onceInfo30 === void 0 ? void 0 : _record$onceInfo30.salePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo31 = record.onceInfo) === null || _record$onceInfo31 === void 0 ? void 0 : _record$onceInfo31.salePriceMax)) {
+        var _record$onceInfo32;
+        return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo32 = record.onceInfo) === null || _record$onceInfo32 === void 0 ? void 0 : _record$onceInfo32.salePriceMax));
       }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo29 = record.onceInfo) === null || _record$onceInfo29 === void 0 ? void 0 : _record$onceInfo29.salePriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo30 = record.onceInfo) === null || _record$onceInfo30 === void 0 ? void 0 : _record$onceInfo30.salePriceMax)));
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo33 = record.onceInfo) === null || _record$onceInfo33 === void 0 ? void 0 : _record$onceInfo33.salePriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo34 = record.onceInfo) === null || _record$onceInfo34 === void 0 ? void 0 : _record$onceInfo34.salePriceMax)));
     }
   }, {
     title: '销售价',
@@ -1130,12 +1140,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     key: 'sitePriceMax',
     align: 'center',
     render: function render(text, record) {
-      var _record$onceInfo31, _record$onceInfo32, _record$onceInfo34, _record$onceInfo35;
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo31 = record.onceInfo) === null || _record$onceInfo31 === void 0 ? void 0 : _record$onceInfo31.sitePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo32 = record.onceInfo) === null || _record$onceInfo32 === void 0 ? void 0 : _record$onceInfo32.sitePriceMax)) {
-        var _record$onceInfo33;
-        return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo33 = record.onceInfo) === null || _record$onceInfo33 === void 0 ? void 0 : _record$onceInfo33.sitePriceMin));
+      var _record$onceInfo35, _record$onceInfo36, _record$onceInfo38, _record$onceInfo39;
+      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo35 = record.onceInfo) === null || _record$onceInfo35 === void 0 ? void 0 : _record$onceInfo35.sitePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo36 = record.onceInfo) === null || _record$onceInfo36 === void 0 ? void 0 : _record$onceInfo36.sitePriceMax)) {
+        var _record$onceInfo37;
+        return /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo37 = record.onceInfo) === null || _record$onceInfo37 === void 0 ? void 0 : _record$onceInfo37.sitePriceMin));
       }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo34 = record.onceInfo) === null || _record$onceInfo34 === void 0 ? void 0 : _record$onceInfo34.sitePriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo35 = record.onceInfo) === null || _record$onceInfo35 === void 0 ? void 0 : _record$onceInfo35.sitePriceMax)));
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo38 = record.onceInfo) === null || _record$onceInfo38 === void 0 ? void 0 : _record$onceInfo38.sitePriceMin)), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, "\uFFE5", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo39 = record.onceInfo) === null || _record$onceInfo39 === void 0 ? void 0 : _record$onceInfo39.sitePriceMax)));
     }
   }, {
     title: function title() {
@@ -1150,12 +1160,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     align: 'center',
     width: 100,
     render: function render(text, record) {
-      var _record$onceInfo36, _record$onceInfo37, _record$onceInfo39, _record$onceInfo40;
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo36 = record.onceInfo) === null || _record$onceInfo36 === void 0 ? void 0 : _record$onceInfo36.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo37 = record.onceInfo) === null || _record$onceInfo37 === void 0 ? void 0 : _record$onceInfo37.siteProfitMax)) {
-        var _record$onceInfo38;
-        return /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo38 = record.onceInfo) === null || _record$onceInfo38 === void 0 ? void 0 : _record$onceInfo38.siteProfitMax, "%");
+      var _record$onceInfo40, _record$onceInfo41, _record$onceInfo43, _record$onceInfo44;
+      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo40 = record.onceInfo) === null || _record$onceInfo40 === void 0 ? void 0 : _record$onceInfo40.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo41 = record.onceInfo) === null || _record$onceInfo41 === void 0 ? void 0 : _record$onceInfo41.siteProfitMax)) {
+        var _record$onceInfo42;
+        return /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo42 = record.onceInfo) === null || _record$onceInfo42 === void 0 ? void 0 : _record$onceInfo42.siteProfitMax, "%");
       }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo39 = record.onceInfo) === null || _record$onceInfo39 === void 0 ? void 0 : _record$onceInfo39.siteProfitMin, "%"), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo40 = record.onceInfo) === null || _record$onceInfo40 === void 0 ? void 0 : _record$onceInfo40.siteProfitMax, "%"));
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo43 = record.onceInfo) === null || _record$onceInfo43 === void 0 ? void 0 : _record$onceInfo43.siteProfitMin, "%"), /*#__PURE__*/React.createElement("div", null, "~"), /*#__PURE__*/React.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo44 = record.onceInfo) === null || _record$onceInfo44 === void 0 ? void 0 : _record$onceInfo44.siteProfitMax, "%"));
     }
   }];
   // 蛋糕叔叔
@@ -1191,8 +1201,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     align: 'center',
     width: 150,
     render: function render(_, record) {
-      var _record$flagCategoryI;
-      return (record === null || record === void 0 ? void 0 : (_record$flagCategoryI = record.flagCategoryInfo) === null || _record$flagCategoryI === void 0 ? void 0 : _record$flagCategoryI.treeName) || '-';
+      return (record === null || record === void 0 ? void 0 : record.goodsCategoryTreeName) || '-';
     }
   }];
   var columns = function columns() {

package/es/utils/api.d.ts CHANGED Viewed

@@ -5,5 +5,7 @@ declare const _default: {
     getSelfGoodsFlag: string;
     getSelfGoodsFlagCategory: string;
     getDgssCityAllList: string;
+    getGoodTagGroupList: string;
+    getGoodControlInfo: string;
 };
 export default _default;

package/es/utils/api.js CHANGED Viewed

@@ -4,5 +4,7 @@ export default {
   getCategoryAllList: '/fleshopy/category/getTreeList',
   getSelfGoodsFlag: '/fleshopy/goods/flag/allList',
   getSelfGoodsFlagCategory: '/elebuys/goodsCategory/tree',
-  getDgssCityAllList: '/supplier/dgss/city/allList' // 获取蛋糕叔叔可售卖城市
+  getDgssCityAllList: '/supplier/dgss/city/allList',
+  getGoodTagGroupList: '/bestgift/goods/goods-flag-group/getList',
+  getGoodControlInfo: '/bestgift/goods/goods-config/getDict' // 获取全局控制状态
 };

package/lib/index.d.ts CHANGED Viewed

@@ -17,6 +17,7 @@ export interface ChooseSiteGoodsProps extends ModalProps {
     tabsConfig?: any;
     hiddenColumns?: Array<string>;
     hiddenSearchProps?: Array<string>;
+    needControl?: boolean;
 }
 declare const ChooseSiteGoods: FC<ChooseSiteGoodsProps>;
 export default ChooseSiteGoods;

package/lib/index.js CHANGED Viewed

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
+var _lodash = _interopRequireDefault(require("lodash"));
 var _plusImage = _interopRequireDefault(require("@fle-ui/plus-image"));
 var _plusChooseMallGoods = _interopRequireDefault(require("@fle-ui/plus-choose-mall-goods"));
 var _plusAddressSelection = _interopRequireDefault(require("@fle-ui/plus-address-selection"));
@@ -19,11 +20,12 @@ var _request = _interopRequireDefault(require("./utils/request"));
 var _serviceEnv = require("./utils/serviceEnv");
 var _common = require("./utils/common");
 require("./index.less");
-var _excluded = ["env", "token", "loginErrFn", "onClose", "siteId", "app", "multiple", "defaultSelectedGoodsIds", "onSelectOk", "showMore", "showMoreText", "tabsConfig", "hiddenColumns", "hiddenSearchProps"];
+var _excluded = ["env", "token", "loginErrFn", "onClose", "siteId", "app", "multiple", "defaultSelectedGoodsIds", "onSelectOk", "showMore", "showMoreText", "tabsConfig", "hiddenColumns", "hiddenSearchProps", "needControl"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -71,6 +73,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     hiddenColumns = _props$hiddenColumns === void 0 ? [] : _props$hiddenColumns,
     _props$hiddenSearchPr = props.hiddenSearchProps,
     hiddenSearchProps = _props$hiddenSearchPr === void 0 ? [] : _props$hiddenSearchPr,
+    _props$needControl = props.needControl,
+    needControl = _props$needControl === void 0 ? false : _props$needControl,
     otherProps = _objectWithoutProperties(props, _excluded);
   var showTabs = (0, _react.useRef)(_options.tabs.filter(function (tab) {
     return tabsConfig.includes(tab.key);
@@ -95,13 +99,11 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     flagCategory: undefined,
     saleableCity: undefined // dgss可售卖城市
   };
-  // http ------------ begin
   var $http = (0, _request.default)({
     baseUrl: (0, _serviceEnv.getApiHost)(env),
     token: token,
     loginErrFn: loginErrFn
   });
-  // http ------------ end
   (0, _react.useEffect)(function () {
     if (env) {
       window.localStorage.setItem('env', env);
@@ -193,7 +195,9 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
               orderName: searchParams.orderName,
               orderWay: searchParams.orderWay,
               flagScene: searchParams.flagScene,
-              flagTags: searchParams.flagTags,
+              flagTags: searchParams.flagTags ? searchParams.flagTags.map(function (item) {
+                return item[1];
+              }).join(',') : '',
               flagIndustry: searchParams.flagIndustry,
               flagCategory: ((_searchParams$flagCat = searchParams.flagCategory) === null || _searchParams$flagCat === void 0 ? void 0 : _searchParams$flagCat.length) ? searchParams.flagCategory[searchParams.flagCategory.length - 1] : undefined
             });
@@ -459,6 +463,17 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     _useState28 = _slicedToArray(_useState27, 2),
     flagCategoryOptions = _useState28[0],
     setFlagCategoryOptions = _useState28[1]; // 品类标签
+  var _useState29 = (0, _react.useState)([]),
+    _useState30 = _slicedToArray(_useState29, 2),
+    cascaderOptions = _useState30[0],
+    setCascaderOptions = _useState30[1]; //商品标签组
+  var _useState31 = (0, _react.useState)({
+      priceShow: true,
+      supplierShow: true
+    }),
+    _useState32 = _slicedToArray(_useState31, 2),
+    show = _useState32[0],
+    setShow = _useState32[1];
   // 获取自有商品标签 - 场景 商品 行业
   var getSelfGoodsFlag = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
@@ -510,39 +525,119 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       return _ref5.apply(this, arguments);
     };
   }();
+  // 获取商品标签组 - 商品
+  var getAllGoodTagList = /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var res, optionsObj;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            _context6.next = 2;
+            return $http.post(_api.default['getGoodTagGroupList'], {});
+          case 2:
+            res = _context6.sent;
+            if (res === null || res === void 0 ? void 0 : res.success) {
+              optionsObj = [];
+              res.data.forEach(function (item) {
+                var childArr = [];
+                var _iterator = _createForOfIteratorHelper(item.tagList),
+                  _step;
+                try {
+                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                    var child = _step.value;
+                    childArr.push({
+                      value: child.id,
+                      label: child.flag
+                    });
+                  }
+                } catch (err) {
+                  _iterator.e(err);
+                } finally {
+                  _iterator.f();
+                }
+                var obj = {
+                  label: item.name,
+                  value: item.id,
+                  children: childArr
+                };
+                optionsObj.push(obj);
+              });
+              setCascaderOptions(optionsObj);
+            }
+          case 4:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    }));
+    return function getAllGoodTagList() {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  // 获取全局控制状态
+  var getGoodControlInfo = /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var res, _res$data3, _res$data4;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            _context7.next = 2;
+            return $http.post(_api.default['getGoodControlInfo'], {});
+          case 2:
+            res = _context7.sent;
+            if (res === null || res === void 0 ? void 0 : res.success) {
+              setShow({
+                priceShow: ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.internal_mall_cost_price_show) == '1' ? true : false,
+                supplierShow: ((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.internal_mall_supplier_name_show) == '1' ? true : false
+              });
+            }
+          case 4:
+          case "end":
+            return _context7.stop();
+        }
+      }, _callee7);
+    }));
+    return function getGoodControlInfo() {
+      return _ref7.apply(this, arguments);
+    };
+  }();
+  (0, _react.useEffect)(function () {
+    needControl && getGoodControlInfo();
+  }, []);
   (0, _react.useEffect)(function () {
     if (searchParams.tab === 'zy') {
       getSelfGoodsFlag();
       getSelfGoodsFlagCategory();
+      getAllGoodTagList();
     }
   }, [searchParams.tab]);
   // 自有商品 标签 end
   // dgss 城市列表 begin
-  var _useState29 = (0, _react.useState)([]),
-    _useState30 = _slicedToArray(_useState29, 2),
-    dgssCitys = _useState30[0],
-    setDgssCitys = _useState30[1];
+  var _useState33 = (0, _react.useState)([]),
+    _useState34 = _slicedToArray(_useState33, 2),
+    dgssCitys = _useState34[0],
+    setDgssCitys = _useState34[1];
   var getDgssCitys = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
       var res;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            _context6.next = 2;
+            _context8.next = 2;
             return $http.post(_api.default['getDgssCityAllList']);
           case 2:
-            res = _context6.sent;
+            res = _context8.sent;
             if (res === null || res === void 0 ? void 0 : res.success) {
               setDgssCitys((res === null || res === void 0 ? void 0 : res.data) || []);
             }
           case 4:
           case "end":
-            return _context6.stop();
+            return _context8.stop();
         }
-      }, _callee6);
+      }, _callee8);
     }));
     return function getDgssCitys() {
-      return _ref6.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   (0, _react.useEffect)(function () {
@@ -579,24 +674,23 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
         },
         placeholder: "\u9009\u62E9\u573A\u666F\u6807\u7B7E",
         allowClear: true
-      }), /*#__PURE__*/_react.default.createElement(_antd.Select, {
+      }), /*#__PURE__*/_react.default.createElement(_antd.Cascader, {
+        showCheckedStrategy: _antd.Cascader.SHOW_CHILD,
+        placeholder: "\u9009\u62E9\u5546\u54C1\u6807\u7B7E",
         style: {
           width: 170,
           marginRight: 8
         },
+        options: cascaderOptions,
         value: searchParams.flagTags,
         onChange: function onChange(v) {
           handleChangeParams({
             flagTags: v
           });
         },
-        options: flagTagsOptions,
-        fieldNames: {
-          label: 'flag',
-          value: 'id'
-        },
-        placeholder: "\u9009\u62E9\u5546\u54C1\u6807\u7B7E",
-        allowClear: true
+        multiple: true,
+        allowClear: true,
+        maxTagCount: "responsive"
       }), /*#__PURE__*/_react.default.createElement(_antd.Select, {
         style: {
           width: 170,
@@ -895,14 +989,14 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
   };
   // search-2 end
   // 选择 begin
-  var _useState31 = (0, _react.useState)([]),
-    _useState32 = _slicedToArray(_useState31, 2),
-    selectedRowKeys = _useState32[0],
-    setSelectedRowKeys = _useState32[1];
-  var _useState33 = (0, _react.useState)([]),
-    _useState34 = _slicedToArray(_useState33, 2),
-    selectedRows = _useState34[0],
-    setSelectedRows = _useState34[1];
+  var _useState35 = (0, _react.useState)([]),
+    _useState36 = _slicedToArray(_useState35, 2),
+    selectedRowKeys = _useState36[0],
+    setSelectedRowKeys = _useState36[1];
+  var _useState37 = (0, _react.useState)([]),
+    _useState38 = _slicedToArray(_useState37, 2),
+    selectedRows = _useState38[0],
+    setSelectedRows = _useState38[1];
   var onSelectChange = function onSelectChange(newSelectedRowKeys, newSelectedRows) {
     setSelectedRowKeys(newSelectedRowKeys);
     setSelectedRows(newSelectedRows);
@@ -926,107 +1020,23 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
   // 选择 end
   // 营销云
   var columns1 = [{
-    title: '集采市场价',
-    dataIndex: 'marketPriceMin',
-    key: 'marketPriceMin',
-    align: 'center',
-    width: 120,
-    render: function render(text, record) {
-      var _record$purchaseInfo, _record$purchaseInfo2, _record$purchaseInfo4, _record$purchaseInfo5;
-      if (record.isPurchase === 0) return '-';
-      if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo = record.purchaseInfo) === null || _record$purchaseInfo === void 0 ? void 0 : _record$purchaseInfo.marketPriceMin) === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo2 = record.purchaseInfo) === null || _record$purchaseInfo2 === void 0 ? void 0 : _record$purchaseInfo2.marketPriceMax)) {
-        var _record$purchaseInfo3;
-        return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo3 = record.purchaseInfo) === null || _record$purchaseInfo3 === void 0 ? void 0 : _record$purchaseInfo3.marketPriceMin));
-      }
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo4 = record.purchaseInfo) === null || _record$purchaseInfo4 === void 0 ? void 0 : _record$purchaseInfo4.marketPriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo5 = record.purchaseInfo) === null || _record$purchaseInfo5 === void 0 ? void 0 : _record$purchaseInfo5.marketPriceMax)));
-    }
-  }, {
-    title: '代发市场价',
-    dataIndex: 'marketPriceMin',
-    key: 'marketPriceMin',
-    align: 'center',
-    width: 120,
-    render: function render(text, record) {
-      var _record$onceInfo, _record$onceInfo2, _record$onceInfo4, _record$onceInfo5;
-      if (record.isOnce === 0) return '-';
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo = record.onceInfo) === null || _record$onceInfo === void 0 ? void 0 : _record$onceInfo.marketPriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo2 = record.onceInfo) === null || _record$onceInfo2 === void 0 ? void 0 : _record$onceInfo2.marketPriceMax)) {
-        var _record$onceInfo3;
-        return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo3 = record.onceInfo) === null || _record$onceInfo3 === void 0 ? void 0 : _record$onceInfo3.marketPriceMin));
-      }
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo4 = record.onceInfo) === null || _record$onceInfo4 === void 0 ? void 0 : _record$onceInfo4.marketPriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo5 = record.onceInfo) === null || _record$onceInfo5 === void 0 ? void 0 : _record$onceInfo5.marketPriceMax)));
+    title: '一件代发价格',
+    width: 200,
+    render: function render(e, record) {
+      var _record$onceInfo, _record$onceInfo2, _record$onceInfo3, _record$onceInfo4, _record$onceInfo5, _record$onceInfo6, _record$onceInfo7, _record$onceInfo8, _record$onceInfo9, _record$onceInfo10, _record$onceInfo11, _record$onceInfo12, _record$onceInfo13, _record$onceInfo14, _record$onceInfo15, _record$onceInfo16, _record$onceInfo17, _record$onceInfo18, _record$onceInfo19;
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$onceInfo = record.onceInfo) === null || _record$onceInfo === void 0 ? void 0 : _record$onceInfo.purchasePriceMin) && show.priceShow && /*#__PURE__*/_react.default.createElement("div", null, "\u91C7\u8D2D\u4EF7\uFF1A", ((record === null || record === void 0 ? void 0 : (_record$onceInfo2 = record.onceInfo) === null || _record$onceInfo2 === void 0 ? void 0 : _record$onceInfo2.purchasePriceMin) / 100).toFixed(2), (record === null || record === void 0 ? void 0 : (_record$onceInfo3 = record.onceInfo) === null || _record$onceInfo3 === void 0 ? void 0 : _record$onceInfo3.purchasePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo4 = record.onceInfo) === null || _record$onceInfo4 === void 0 ? void 0 : _record$onceInfo4.purchasePriceMin) ? "~".concat((record.onceInfo.purchasePriceMax / 100).toFixed(2)) : ''), !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$onceInfo5 = record.onceInfo) === null || _record$onceInfo5 === void 0 ? void 0 : _record$onceInfo5.marketPriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u5E02\u573A\u4EF7\uFF1A", ((record === null || record === void 0 ? void 0 : (_record$onceInfo6 = record.onceInfo) === null || _record$onceInfo6 === void 0 ? void 0 : _record$onceInfo6.marketPriceMin) / 100).toFixed(2), (record === null || record === void 0 ? void 0 : (_record$onceInfo7 = record.onceInfo) === null || _record$onceInfo7 === void 0 ? void 0 : _record$onceInfo7.marketPriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo8 = record.onceInfo) === null || _record$onceInfo8 === void 0 ? void 0 : _record$onceInfo8.marketPriceMin) ? "~".concat((record.onceInfo.marketPriceMax / 100).toFixed(2)) : ''), !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$onceInfo9 = record.onceInfo) === null || _record$onceInfo9 === void 0 ? void 0 : _record$onceInfo9.salePriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u9500\u552E\u4EF7\uFF1A", ((record === null || record === void 0 ? void 0 : (_record$onceInfo10 = record.onceInfo) === null || _record$onceInfo10 === void 0 ? void 0 : _record$onceInfo10.salePriceMin) / 100).toFixed(2), (record === null || record === void 0 ? void 0 : (_record$onceInfo11 = record.onceInfo) === null || _record$onceInfo11 === void 0 ? void 0 : _record$onceInfo11.salePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo12 = record.onceInfo) === null || _record$onceInfo12 === void 0 ? void 0 : _record$onceInfo12.salePriceMin) ? "~".concat((record.onceInfo.salePriceMax / 100).toFixed(2)) : ''), !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$onceInfo13 = record.onceInfo) === null || _record$onceInfo13 === void 0 ? void 0 : _record$onceInfo13.sitePriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u5546\u57CE\u552E\u4EF7\uFF1A", ((record === null || record === void 0 ? void 0 : (_record$onceInfo14 = record.onceInfo) === null || _record$onceInfo14 === void 0 ? void 0 : _record$onceInfo14.sitePriceMin) / 100).toFixed(2), (record === null || record === void 0 ? void 0 : (_record$onceInfo15 = record.onceInfo) === null || _record$onceInfo15 === void 0 ? void 0 : _record$onceInfo15.salePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo16 = record.onceInfo) === null || _record$onceInfo16 === void 0 ? void 0 : _record$onceInfo16.salePriceMin) ? "~".concat((record.onceInfo.salePriceMax / 100).toFixed(2)) : ''), [record === null || record === void 0 ? void 0 : (_record$onceInfo17 = record.onceInfo) === null || _record$onceInfo17 === void 0 ? void 0 : _record$onceInfo17.purchasePriceMin, record === null || record === void 0 ? void 0 : (_record$onceInfo18 = record.onceInfo) === null || _record$onceInfo18 === void 0 ? void 0 : _record$onceInfo18.marketPriceMin, record === null || record === void 0 ? void 0 : (_record$onceInfo19 = record.onceInfo) === null || _record$onceInfo19 === void 0 ? void 0 : _record$onceInfo19.salePriceMin].every(function (num) {
+        return num == null;
+      }) && '-');
     }
   }, {
-    title: '集采价',
-    dataIndex: 'salePriceMin',
-    key: 'salePriceMin',
-    align: 'center',
-    render: function render(text, record) {
-      if ((record === null || record === void 0 ? void 0 : record.isPurchase) === 1) {
-        var _record$purchaseInfo6, _record$purchaseInfo12;
-        if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo6 = record.purchaseInfo) === null || _record$purchaseInfo6 === void 0 ? void 0 : _record$purchaseInfo6.salesType) === 2) {
-          var _record$purchaseInfo7, _record$purchaseInfo8, _record$purchaseInfo10, _record$purchaseInfo11;
-          if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo7 = record.purchaseInfo) === null || _record$purchaseInfo7 === void 0 ? void 0 : _record$purchaseInfo7.salePriceMin) === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo8 = record.purchaseInfo) === null || _record$purchaseInfo8 === void 0 ? void 0 : _record$purchaseInfo8.salePriceMax)) {
-            var _record$purchaseInfo9;
-            return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo9 = record.purchaseInfo) === null || _record$purchaseInfo9 === void 0 ? void 0 : _record$purchaseInfo9.salePriceMin));
-          }
-          return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo10 = record.purchaseInfo) === null || _record$purchaseInfo10 === void 0 ? void 0 : _record$purchaseInfo10.salePriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo11 = record.purchaseInfo) === null || _record$purchaseInfo11 === void 0 ? void 0 : _record$purchaseInfo11.salePriceMax)));
-        }
-        if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo12 = record.purchaseInfo) === null || _record$purchaseInfo12 === void 0 ? void 0 : _record$purchaseInfo12.salesType) === 1) {
-          var _record$purchaseInfo13;
-          return record === null || record === void 0 ? void 0 : (_record$purchaseInfo13 = record.purchaseInfo) === null || _record$purchaseInfo13 === void 0 ? void 0 : _record$purchaseInfo13.stairList.map(function (item, index) {
-            var _record$purchaseInfo14, _record$purchaseInfo15;
-            return /*#__PURE__*/_react.default.createElement("div", {
-              key: index
-            }, "\xA5".concat((0, _common.showMoney)(item.salePrice), "\uFF08").concat(index === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo14 = record.purchaseInfo) === null || _record$purchaseInfo14 === void 0 ? void 0 : (_record$purchaseInfo15 = _record$purchaseInfo14.stairList) === null || _record$purchaseInfo15 === void 0 ? void 0 : _record$purchaseInfo15.length) - 1 ? "\u2265".concat(item === null || item === void 0 ? void 0 : item.minNum) : "".concat(item.minNum, "-").concat(item.maxNum), ")"));
-          });
-        }
-        return '-';
-      }
-      return '-';
-    }
-  }, {
-    title: '代发价',
-    dataIndex: 'supplyPriceMin',
-    key: 'supplyPriceMin',
-    align: 'center',
-    render: function render(text, record) {
-      if ((record === null || record === void 0 ? void 0 : record.isOnce) === 1) {
-        var _record$onceInfo6, _record$onceInfo7, _record$onceInfo9, _record$onceInfo10;
-        if ((record === null || record === void 0 ? void 0 : (_record$onceInfo6 = record.onceInfo) === null || _record$onceInfo6 === void 0 ? void 0 : _record$onceInfo6.salePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo7 = record.onceInfo) === null || _record$onceInfo7 === void 0 ? void 0 : _record$onceInfo7.salePriceMax)) {
-          var _record$onceInfo8;
-          return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo8 = record.onceInfo) === null || _record$onceInfo8 === void 0 ? void 0 : _record$onceInfo8.salePriceMin));
-        }
-        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo9 = record.onceInfo) === null || _record$onceInfo9 === void 0 ? void 0 : _record$onceInfo9.salePriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo10 = record.onceInfo) === null || _record$onceInfo10 === void 0 ? void 0 : _record$onceInfo10.salePriceMax)));
-      }
-      return '-';
-    }
-  }, {
-    title: '集采销售价',
-    dataIndex: 'sitePriceMaxPurchase',
-    key: 'sitePriceMaxPurchase',
-    align: 'center',
-    render: function render(text, record) {
-      var _record$purchaseInfo16, _record$purchaseInfo17, _record$purchaseInfo19, _record$purchaseInfo20;
-      if (record.isPurchase === 0) return '-';
-      if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo16 = record.purchaseInfo) === null || _record$purchaseInfo16 === void 0 ? void 0 : _record$purchaseInfo16.sitePriceMin) === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo17 = record.purchaseInfo) === null || _record$purchaseInfo17 === void 0 ? void 0 : _record$purchaseInfo17.sitePriceMax)) {
-        var _record$purchaseInfo18;
-        return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo18 = record.purchaseInfo) === null || _record$purchaseInfo18 === void 0 ? void 0 : _record$purchaseInfo18.sitePriceMax));
-      }
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo19 = record.purchaseInfo) === null || _record$purchaseInfo19 === void 0 ? void 0 : _record$purchaseInfo19.sitePriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo20 = record.purchaseInfo) === null || _record$purchaseInfo20 === void 0 ? void 0 : _record$purchaseInfo20.sitePriceMax)));
-    }
-  }, {
-    title: '代发销售价',
-    dataIndex: 'sitePriceMaxOnce',
-    key: 'sitePriceMaxOnce',
-    align: 'center',
-    render: function render(text, record) {
-      var _record$onceInfo11, _record$onceInfo12, _record$onceInfo14, _record$onceInfo15;
-      if (record.isOnce === 0) return '-';
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo11 = record.onceInfo) === null || _record$onceInfo11 === void 0 ? void 0 : _record$onceInfo11.sitePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo12 = record.onceInfo) === null || _record$onceInfo12 === void 0 ? void 0 : _record$onceInfo12.sitePriceMax)) {
-        var _record$onceInfo13;
-        return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo13 = record.onceInfo) === null || _record$onceInfo13 === void 0 ? void 0 : _record$onceInfo13.sitePriceMax));
-      }
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo14 = record.onceInfo) === null || _record$onceInfo14 === void 0 ? void 0 : _record$onceInfo14.sitePriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo15 = record.onceInfo) === null || _record$onceInfo15 === void 0 ? void 0 : _record$onceInfo15.sitePriceMax)));
+    title: '集采批发价格',
+    width: 200,
+    render: function render(e, record) {
+      var _record$purchaseInfo, _record$purchaseInfo2, _record$purchaseInfo3;
+      var purchaseInfo = record.purchaseInfo;
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !_lodash.default.isNil(purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.purchasePriceMin) && show.priceShow && /*#__PURE__*/_react.default.createElement("div", null, "\u91C7\u8D2D\u4EF7\uFF1A", ((purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.purchasePriceMin) / 100).toFixed(2), (purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.purchasePriceMax) !== (purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.purchasePriceMin) ? "~".concat((purchaseInfo.purchasePriceMax / 100).toFixed(2)) : ''), !_lodash.default.isNil(purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.marketPriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u5E02\u573A\u4EF7\uFF1A", ((purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.marketPriceMin) / 100).toFixed(2), ((_record$purchaseInfo = record.purchaseInfo) === null || _record$purchaseInfo === void 0 ? void 0 : _record$purchaseInfo.marketPriceMax) !== (purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.marketPriceMin) ? "~".concat((record.purchaseInfo.marketPriceMax / 100).toFixed(2)) : ''), !_lodash.default.isNil(purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.salePriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u9500\u552E\u4EF7\uFF1A", ((purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.salePriceMin) / 100).toFixed(2), ((_record$purchaseInfo2 = record.purchaseInfo) === null || _record$purchaseInfo2 === void 0 ? void 0 : _record$purchaseInfo2.salePriceMax) !== (purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.salePriceMin) ? "~".concat((record.purchaseInfo.salePriceMax / 100).toFixed(2)) : ''), !_lodash.default.isNil(purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.sitePriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u5546\u57CE\u552E\u4EF7\uFF1A", ((purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.sitePriceMin) / 100).toFixed(2), ((_record$purchaseInfo3 = record.purchaseInfo) === null || _record$purchaseInfo3 === void 0 ? void 0 : _record$purchaseInfo3.sitePriceMax) !== (purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.sitePriceMin) ? "~".concat((record.purchaseInfo.sitePriceMax / 100).toFixed(2)) : ''), [purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.purchasePriceMin, purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.marketPriceMin, purchaseInfo === null || purchaseInfo === void 0 ? void 0 : purchaseInfo.salePriceMin].every(function (num) {
+        return num == null;
+      }) && '-');
     }
   }, {
     title: function title() {
@@ -1042,12 +1052,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     width: 150,
     render: function render(text, record) {
       if ((record === null || record === void 0 ? void 0 : record.isPurchase) === 1) {
-        var _record$purchaseInfo21, _record$purchaseInfo22, _record$purchaseInfo24, _record$purchaseInfo25;
-        if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo21 = record.purchaseInfo) === null || _record$purchaseInfo21 === void 0 ? void 0 : _record$purchaseInfo21.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo22 = record.purchaseInfo) === null || _record$purchaseInfo22 === void 0 ? void 0 : _record$purchaseInfo22.siteProfitMax)) {
-          var _record$purchaseInfo23;
-          return /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo23 = record.purchaseInfo) === null || _record$purchaseInfo23 === void 0 ? void 0 : _record$purchaseInfo23.siteProfitMin, "%");
+        var _record$purchaseInfo4, _record$purchaseInfo5, _record$purchaseInfo7, _record$purchaseInfo8;
+        if ((record === null || record === void 0 ? void 0 : (_record$purchaseInfo4 = record.purchaseInfo) === null || _record$purchaseInfo4 === void 0 ? void 0 : _record$purchaseInfo4.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$purchaseInfo5 = record.purchaseInfo) === null || _record$purchaseInfo5 === void 0 ? void 0 : _record$purchaseInfo5.siteProfitMax)) {
+          var _record$purchaseInfo6;
+          return /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo6 = record.purchaseInfo) === null || _record$purchaseInfo6 === void 0 ? void 0 : _record$purchaseInfo6.siteProfitMin, "%");
         }
-        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo24 = record.purchaseInfo) === null || _record$purchaseInfo24 === void 0 ? void 0 : _record$purchaseInfo24.siteProfitMin, "%"), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo25 = record.purchaseInfo) === null || _record$purchaseInfo25 === void 0 ? void 0 : _record$purchaseInfo25.siteProfitMax, "%"));
+        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo7 = record.purchaseInfo) === null || _record$purchaseInfo7 === void 0 ? void 0 : _record$purchaseInfo7.siteProfitMin, "%"), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$purchaseInfo8 = record.purchaseInfo) === null || _record$purchaseInfo8 === void 0 ? void 0 : _record$purchaseInfo8.siteProfitMax, "%"));
       }
       return '-';
     }
@@ -1065,12 +1075,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     width: 150,
     render: function render(text, record) {
       if ((record === null || record === void 0 ? void 0 : record.isOnce) === 1) {
-        var _record$onceInfo16, _record$onceInfo17, _record$onceInfo19, _record$onceInfo20;
-        if ((record === null || record === void 0 ? void 0 : (_record$onceInfo16 = record.onceInfo) === null || _record$onceInfo16 === void 0 ? void 0 : _record$onceInfo16.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo17 = record.onceInfo) === null || _record$onceInfo17 === void 0 ? void 0 : _record$onceInfo17.siteProfitMax)) {
-          var _record$onceInfo18;
-          return /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo18 = record.onceInfo) === null || _record$onceInfo18 === void 0 ? void 0 : _record$onceInfo18.siteProfitMin, "%");
+        var _record$onceInfo20, _record$onceInfo21, _record$onceInfo23, _record$onceInfo24;
+        if ((record === null || record === void 0 ? void 0 : (_record$onceInfo20 = record.onceInfo) === null || _record$onceInfo20 === void 0 ? void 0 : _record$onceInfo20.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo21 = record.onceInfo) === null || _record$onceInfo21 === void 0 ? void 0 : _record$onceInfo21.siteProfitMax)) {
+          var _record$onceInfo22;
+          return /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo22 = record.onceInfo) === null || _record$onceInfo22 === void 0 ? void 0 : _record$onceInfo22.siteProfitMin, "%");
         }
-        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo19 = record.onceInfo) === null || _record$onceInfo19 === void 0 ? void 0 : _record$onceInfo19.siteProfitMin, "%"), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo20 = record.onceInfo) === null || _record$onceInfo20 === void 0 ? void 0 : _record$onceInfo20.siteProfitMax, "%"));
+        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo23 = record.onceInfo) === null || _record$onceInfo23 === void 0 ? void 0 : _record$onceInfo23.siteProfitMin, "%"), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo24 = record.onceInfo) === null || _record$onceInfo24 === void 0 ? void 0 : _record$onceInfo24.siteProfitMax, "%"));
       }
       return null;
     }
@@ -1082,12 +1092,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     key: 'marketPriceMax',
     align: 'center',
     render: function render(text, record) {
-      var _record$onceInfo21, _record$onceInfo22, _record$onceInfo24, _record$onceInfo25;
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo21 = record.onceInfo) === null || _record$onceInfo21 === void 0 ? void 0 : _record$onceInfo21.marketPriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo22 = record.onceInfo) === null || _record$onceInfo22 === void 0 ? void 0 : _record$onceInfo22.marketPriceMax)) {
-        var _record$onceInfo23;
-        return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo23 = record.onceInfo) === null || _record$onceInfo23 === void 0 ? void 0 : _record$onceInfo23.marketPriceMax));
+      var _record$onceInfo25, _record$onceInfo26, _record$onceInfo28, _record$onceInfo29;
+      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo25 = record.onceInfo) === null || _record$onceInfo25 === void 0 ? void 0 : _record$onceInfo25.marketPriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo26 = record.onceInfo) === null || _record$onceInfo26 === void 0 ? void 0 : _record$onceInfo26.marketPriceMax)) {
+        var _record$onceInfo27;
+        return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo27 = record.onceInfo) === null || _record$onceInfo27 === void 0 ? void 0 : _record$onceInfo27.marketPriceMax));
       }
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo24 = record.onceInfo) === null || _record$onceInfo24 === void 0 ? void 0 : _record$onceInfo24.marketPriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo25 = record.onceInfo) === null || _record$onceInfo25 === void 0 ? void 0 : _record$onceInfo25.marketPriceMax)));
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo28 = record.onceInfo) === null || _record$onceInfo28 === void 0 ? void 0 : _record$onceInfo28.marketPriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo29 = record.onceInfo) === null || _record$onceInfo29 === void 0 ? void 0 : _record$onceInfo29.marketPriceMax)));
     }
   }, {
     title: '会员价',
@@ -1095,12 +1105,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     key: 'salePriceMax',
     align: 'center',
     render: function render(text, record) {
-      var _record$onceInfo26, _record$onceInfo27, _record$onceInfo29, _record$onceInfo30;
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo26 = record.onceInfo) === null || _record$onceInfo26 === void 0 ? void 0 : _record$onceInfo26.salePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo27 = record.onceInfo) === null || _record$onceInfo27 === void 0 ? void 0 : _record$onceInfo27.salePriceMax)) {
-        var _record$onceInfo28;
-        return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo28 = record.onceInfo) === null || _record$onceInfo28 === void 0 ? void 0 : _record$onceInfo28.salePriceMax));
+      var _record$onceInfo30, _record$onceInfo31, _record$onceInfo33, _record$onceInfo34;
+      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo30 = record.onceInfo) === null || _record$onceInfo30 === void 0 ? void 0 : _record$onceInfo30.salePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo31 = record.onceInfo) === null || _record$onceInfo31 === void 0 ? void 0 : _record$onceInfo31.salePriceMax)) {
+        var _record$onceInfo32;
+        return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo32 = record.onceInfo) === null || _record$onceInfo32 === void 0 ? void 0 : _record$onceInfo32.salePriceMax));
       }
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo29 = record.onceInfo) === null || _record$onceInfo29 === void 0 ? void 0 : _record$onceInfo29.salePriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo30 = record.onceInfo) === null || _record$onceInfo30 === void 0 ? void 0 : _record$onceInfo30.salePriceMax)));
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo33 = record.onceInfo) === null || _record$onceInfo33 === void 0 ? void 0 : _record$onceInfo33.salePriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo34 = record.onceInfo) === null || _record$onceInfo34 === void 0 ? void 0 : _record$onceInfo34.salePriceMax)));
     }
   }, {
     title: '销售价',
@@ -1108,12 +1118,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     key: 'sitePriceMax',
     align: 'center',
     render: function render(text, record) {
-      var _record$onceInfo31, _record$onceInfo32, _record$onceInfo34, _record$onceInfo35;
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo31 = record.onceInfo) === null || _record$onceInfo31 === void 0 ? void 0 : _record$onceInfo31.sitePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo32 = record.onceInfo) === null || _record$onceInfo32 === void 0 ? void 0 : _record$onceInfo32.sitePriceMax)) {
-        var _record$onceInfo33;
-        return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo33 = record.onceInfo) === null || _record$onceInfo33 === void 0 ? void 0 : _record$onceInfo33.sitePriceMin));
+      var _record$onceInfo35, _record$onceInfo36, _record$onceInfo38, _record$onceInfo39;
+      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo35 = record.onceInfo) === null || _record$onceInfo35 === void 0 ? void 0 : _record$onceInfo35.sitePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo36 = record.onceInfo) === null || _record$onceInfo36 === void 0 ? void 0 : _record$onceInfo36.sitePriceMax)) {
+        var _record$onceInfo37;
+        return /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo37 = record.onceInfo) === null || _record$onceInfo37 === void 0 ? void 0 : _record$onceInfo37.sitePriceMin));
       }
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo34 = record.onceInfo) === null || _record$onceInfo34 === void 0 ? void 0 : _record$onceInfo34.sitePriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo35 = record.onceInfo) === null || _record$onceInfo35 === void 0 ? void 0 : _record$onceInfo35.sitePriceMax)));
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo38 = record.onceInfo) === null || _record$onceInfo38 === void 0 ? void 0 : _record$onceInfo38.sitePriceMin)), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, "\uFFE5", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo39 = record.onceInfo) === null || _record$onceInfo39 === void 0 ? void 0 : _record$onceInfo39.sitePriceMax)));
     }
   }, {
     title: function title() {
@@ -1128,12 +1138,12 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     align: 'center',
     width: 100,
     render: function render(text, record) {
-      var _record$onceInfo36, _record$onceInfo37, _record$onceInfo39, _record$onceInfo40;
-      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo36 = record.onceInfo) === null || _record$onceInfo36 === void 0 ? void 0 : _record$onceInfo36.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo37 = record.onceInfo) === null || _record$onceInfo37 === void 0 ? void 0 : _record$onceInfo37.siteProfitMax)) {
-        var _record$onceInfo38;
-        return /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo38 = record.onceInfo) === null || _record$onceInfo38 === void 0 ? void 0 : _record$onceInfo38.siteProfitMax, "%");
+      var _record$onceInfo40, _record$onceInfo41, _record$onceInfo43, _record$onceInfo44;
+      if ((record === null || record === void 0 ? void 0 : (_record$onceInfo40 = record.onceInfo) === null || _record$onceInfo40 === void 0 ? void 0 : _record$onceInfo40.siteProfitMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo41 = record.onceInfo) === null || _record$onceInfo41 === void 0 ? void 0 : _record$onceInfo41.siteProfitMax)) {
+        var _record$onceInfo42;
+        return /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo42 = record.onceInfo) === null || _record$onceInfo42 === void 0 ? void 0 : _record$onceInfo42.siteProfitMax, "%");
       }
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo39 = record.onceInfo) === null || _record$onceInfo39 === void 0 ? void 0 : _record$onceInfo39.siteProfitMin, "%"), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo40 = record.onceInfo) === null || _record$onceInfo40 === void 0 ? void 0 : _record$onceInfo40.siteProfitMax, "%"));
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo43 = record.onceInfo) === null || _record$onceInfo43 === void 0 ? void 0 : _record$onceInfo43.siteProfitMin, "%"), /*#__PURE__*/_react.default.createElement("div", null, "~"), /*#__PURE__*/_react.default.createElement("div", null, record === null || record === void 0 ? void 0 : (_record$onceInfo44 = record.onceInfo) === null || _record$onceInfo44 === void 0 ? void 0 : _record$onceInfo44.siteProfitMax, "%"));
     }
   }];
   // 蛋糕叔叔
@@ -1169,8 +1179,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     align: 'center',
     width: 150,
     render: function render(_, record) {
-      var _record$flagCategoryI;
-      return (record === null || record === void 0 ? void 0 : (_record$flagCategoryI = record.flagCategoryInfo) === null || _record$flagCategoryI === void 0 ? void 0 : _record$flagCategoryI.treeName) || '-';
+      return (record === null || record === void 0 ? void 0 : record.goodsCategoryTreeName) || '-';
     }
   }];
   var columns = function columns() {

package/lib/utils/api.d.ts CHANGED Viewed

@@ -5,5 +5,7 @@ declare const _default: {
     getSelfGoodsFlag: string;
     getSelfGoodsFlagCategory: string;
     getDgssCityAllList: string;
+    getGoodTagGroupList: string;
+    getGoodControlInfo: string;
 };
 export default _default;

package/lib/utils/api.js CHANGED Viewed

@@ -10,5 +10,7 @@ var _default = exports.default = {
   getCategoryAllList: '/fleshopy/category/getTreeList',
   getSelfGoodsFlag: '/fleshopy/goods/flag/allList',
   getSelfGoodsFlagCategory: '/elebuys/goodsCategory/tree',
-  getDgssCityAllList: '/supplier/dgss/city/allList' // 获取蛋糕叔叔可售卖城市
+  getDgssCityAllList: '/supplier/dgss/city/allList',
+  getGoodTagGroupList: '/bestgift/goods/goods-flag-group/getList',
+  getGoodControlInfo: '/bestgift/goods/goods-config/getDict' // 获取全局控制状态
 };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-choose-site-goods",
-  "version": "1.1.7",
+  "version": "1.1.10",
   "description": "@fle-ui/plus-choose-site-goods",
   "keywords": [
     "fle-ui",
@@ -28,7 +28,7 @@
     "@ant-design/icons": "^5.3.0",
     "@fle-tools/env": "^1.0.3",
     "@fle-ui/plus-address-selection": "^1.0.14",
-    "@fle-ui/plus-choose-mall-goods": "^1.1.7"
+    "@fle-ui/plus-choose-mall-goods": "^1.1.11-alpha.1"
   },
   "peerDependencies": {
     "antd": ">=4.23.0 || >=5.0.0",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2c212687f40c44697c835063ca68fc46ebde730a"
+  "gitHead": "0c631954240d64433307f9b73b617ecc96a843a2"
 }