@fle-ui/plus-choose-goods 0.0.15 → 0.0.16-beta.0

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
  1. package/es/index.d.ts +1 -2
  2. package/es/index.js +20 -16
  3. package/es/utils/options.d.ts +4 -0
  4. package/es/utils/options.js +14 -0
  5. package/lib/index.d.ts +1 -2
  6. package/lib/index.js +19 -15
  7. package/lib/utils/options.d.ts +4 -0
  8. package/lib/utils/options.js +15 -1
  9. package/package.json +3 -3
package/es/index.d.ts CHANGED
@@ -8,9 +8,7 @@ export interface ChooseGoodsProps {
8
8
  /** 按钮文案 */
9
9
  actionText?: string;
10
10
  open: boolean;
11
- /** 接口环境，默认取localstorage中的env */
12
11
  env?: EnvType;
13
- /** 默认取Cookies中的token */
14
12
  token?: string;
15
13
  loginErrFn?: () => void;
16
14
  multiple?: boolean;
@@ -28,6 +26,7 @@ export interface ChooseGoodsProps {
28
26
  onOk?: (selectedGoodsId: React.Key[], selectedGoods: any[]) => void;
29
27
  onCancel?: () => void;
30
28
  needControl?: boolean;
29
+ muduleType?: string;
31
30
  }
32
31
  declare const ChooseSiteGoods: FC<ChooseGoodsProps>;
33
32
  export default ChooseSiteGoods;
package/es/index.js CHANGED
@@ -38,16 +38,19 @@ import React, { useEffect, useState, useRef, useMemo } from 'react';
38
38
  import lodash from 'lodash';
39
39
  import { useRequest } from 'ahooks';
40
40
  import PlusRangeInput from '@fle-ui/plus-range-input';
41
- import { ProTable, QueryFilter } from '@ant-design/pro-components';
42
41
  import PlusConfigProvider from '@fle-ui/plus-config-provider';
42
+ import { ProTable, QueryFilter } from '@ant-design/pro-components';
43
43
  import ProImage from '@fle-ui/plus-image';
44
- import { priceRangeForPurchase, sortOptions } from './utils/options';
44
+ import { priceRangeForPurchase, sortOptions, mallPriceRangeForPurchase } from './utils/options';
45
45
  import httpClient from './utils/request';
46
46
  import { getApiHost } from './utils/serviceEnv';
47
47
  import api from './utils/api';
48
48
  import Icon from './components/icon';
49
49
  import { showMoney, formartNum } from './utils/common';
50
50
  import './index.less';
51
+ var priceTypeOptionEnum = {
52
+ mall: mallPriceRangeForPurchase
53
+ };
51
54
  var ChooseSiteGoods = function ChooseSiteGoods(props) {
52
55
  var _props$title = props.title,
53
56
  title = _props$title === void 0 ? '挑选商品' : _props$title,
@@ -79,7 +82,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
79
82
  y: 400
80
83
  } : _props$scroll,
81
84
  _props$needControl = props.needControl,
82
- needControl = _props$needControl === void 0 ? false : _props$needControl;
85
+ needControl = _props$needControl === void 0 ? false : _props$needControl,
86
+ muduleType = props.muduleType;
83
87
  var formRef = useRef();
84
88
  var $http = httpClient({
85
89
  baseURL: getApiHost(env),
@@ -121,15 +125,20 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
121
125
  params['isPurchase'] = 1;
122
126
  }
123
127
  }
124
- _context.next = 4;
128
+ if (val.flagTags) {
129
+ params['flagTags'] = val.flagTags.map(function (item) {
130
+ return item[1];
131
+ }).join(',');
132
+ }
133
+ _context.next = 5;
125
134
  return $http.post(serviceUrl || api['getGoodsList'], params);
126
- case 4:
135
+ case 5:
127
136
  res = _context.sent;
128
137
  return _context.abrupt("return", {
129
138
  list: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [],
130
139
  total: (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total) || 0
131
140
  });
132
- case 6:
141
+ case 7:
133
142
  case "end":
134
143
  return _context.stop();
135
144
  }
@@ -322,7 +331,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
322
331
  (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.resetFields();
323
332
  }
324
333
  }, [open]);
325
- // 选择 begin
326
334
  var _useState17 = useState([]),
327
335
  _useState18 = _slicedToArray(_useState17, 2),
328
336
  selectedRowKeys = _useState18[0],
@@ -398,14 +406,14 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
398
406
  key: 'subSupplierName',
399
407
  align: 'center',
400
408
  width: 150,
401
- hidden: !show.supplierShow
409
+ hidden: !show.supplierShow || muduleType === 'mall'
402
410
  }, {
403
411
  title: '一件代发价格',
404
412
  key: 'oncePrice',
405
413
  align: 'center',
406
414
  render: function render(_, record) {
407
415
  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, _record$onceInfo20;
408
- return /*#__PURE__*/React.createElement(React.Fragment, null, !lodash.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", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo2 = record.onceInfo) === null || _record$onceInfo2 === void 0 ? void 0 : _record$onceInfo2.purchasePriceMin), (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(showMoney(record.onceInfo.purchasePriceMax)) : ''), !lodash.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", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo6 = record.onceInfo) === null || _record$onceInfo6 === void 0 ? void 0 : _record$onceInfo6.marketPriceMin), (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(showMoney(record.onceInfo.marketPriceMax)) : ''), !lodash.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", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo10 = record.onceInfo) === null || _record$onceInfo10 === void 0 ? void 0 : _record$onceInfo10.salePriceMin), (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(showMoney(record.onceInfo.salePriceMax)) : ''), !lodash.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, "\u5206\u9500\u4EF7\uFF1A", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo14 = record.onceInfo) === null || _record$onceInfo14 === void 0 ? void 0 : _record$onceInfo14.sitePriceMin), (record === null || record === void 0 ? void 0 : (_record$onceInfo15 = record.onceInfo) === null || _record$onceInfo15 === void 0 ? void 0 : _record$onceInfo15.sitePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo16 = record.onceInfo) === null || _record$onceInfo16 === void 0 ? void 0 : _record$onceInfo16.sitePriceMin) ? "~".concat(showMoney(record.onceInfo.sitePriceMax)) : ''), [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, record === null || record === void 0 ? void 0 : (_record$onceInfo20 = record.onceInfo) === null || _record$onceInfo20 === void 0 ? void 0 : _record$onceInfo20.sitePriceMin].every(function (num) {
416
+ return /*#__PURE__*/React.createElement(React.Fragment, null, !lodash.isNil(record === null || record === void 0 ? void 0 : (_record$onceInfo = record.onceInfo) === null || _record$onceInfo === void 0 ? void 0 : _record$onceInfo.purchasePriceMin) && show.priceShow && muduleType !== 'mall' && /*#__PURE__*/React.createElement("div", null, "\u91C7\u8D2D\u4EF7\uFF1A", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo2 = record.onceInfo) === null || _record$onceInfo2 === void 0 ? void 0 : _record$onceInfo2.purchasePriceMin), (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(showMoney(record.onceInfo.purchasePriceMax)) : ''), !lodash.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", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo6 = record.onceInfo) === null || _record$onceInfo6 === void 0 ? void 0 : _record$onceInfo6.marketPriceMin), (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(showMoney(record.onceInfo.marketPriceMax)) : ''), !lodash.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", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo10 = record.onceInfo) === null || _record$onceInfo10 === void 0 ? void 0 : _record$onceInfo10.salePriceMin), (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(showMoney(record.onceInfo.salePriceMax)) : ''), !lodash.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, "\u5206\u9500\u4EF7\uFF1A", showMoney(record === null || record === void 0 ? void 0 : (_record$onceInfo14 = record.onceInfo) === null || _record$onceInfo14 === void 0 ? void 0 : _record$onceInfo14.sitePriceMin), (record === null || record === void 0 ? void 0 : (_record$onceInfo15 = record.onceInfo) === null || _record$onceInfo15 === void 0 ? void 0 : _record$onceInfo15.sitePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo16 = record.onceInfo) === null || _record$onceInfo16 === void 0 ? void 0 : _record$onceInfo16.sitePriceMin) ? "~".concat(showMoney(record.onceInfo.sitePriceMax)) : ''), [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, record === null || record === void 0 ? void 0 : (_record$onceInfo20 = record.onceInfo) === null || _record$onceInfo20 === void 0 ? void 0 : _record$onceInfo20.sitePriceMin].every(function (num) {
409
417
  return num == null;
410
418
  }) && '-');
411
419
  }
@@ -415,7 +423,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
415
423
  align: 'center',
416
424
  render: function render(_, record) {
417
425
  var _record$purchaseInfo, _record$purchaseInfo2, _record$purchaseInfo3, _record$purchaseInfo4, _record$purchaseInfo5, _record$purchaseInfo6, _record$purchaseInfo7, _record$purchaseInfo8, _record$purchaseInfo9, _record$purchaseInfo10, _record$purchaseInfo11, _record$purchaseInfo12, _record$purchaseInfo13, _record$purchaseInfo14, _record$purchaseInfo15, _record$purchaseInfo16, _record$purchaseInfo17, _record$purchaseInfo18, _record$purchaseInfo19, _record$purchaseInfo20;
418
- return /*#__PURE__*/React.createElement(React.Fragment, null, !lodash.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo = record.purchaseInfo) === null || _record$purchaseInfo === void 0 ? void 0 : _record$purchaseInfo.purchasePriceMin) && show.priceShow && /*#__PURE__*/React.createElement("div", null, "\u91C7\u8D2D\u4EF7\uFF1A", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo2 = record.purchaseInfo) === null || _record$purchaseInfo2 === void 0 ? void 0 : _record$purchaseInfo2.purchasePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo3 = record.purchaseInfo) === null || _record$purchaseInfo3 === void 0 ? void 0 : _record$purchaseInfo3.purchasePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo4 = record.purchaseInfo) === null || _record$purchaseInfo4 === void 0 ? void 0 : _record$purchaseInfo4.purchasePriceMin) ? "~".concat(showMoney(record.purchaseInfo.purchasePriceMax)) : ''), !lodash.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo5 = record.purchaseInfo) === null || _record$purchaseInfo5 === void 0 ? void 0 : _record$purchaseInfo5.marketPriceMin) && /*#__PURE__*/React.createElement("div", null, "\u5E02\u573A\u4EF7\uFF1A", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo6 = record.purchaseInfo) === null || _record$purchaseInfo6 === void 0 ? void 0 : _record$purchaseInfo6.marketPriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo7 = record.purchaseInfo) === null || _record$purchaseInfo7 === void 0 ? void 0 : _record$purchaseInfo7.marketPriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo8 = record.purchaseInfo) === null || _record$purchaseInfo8 === void 0 ? void 0 : _record$purchaseInfo8.marketPriceMin) ? "~".concat(showMoney(record.purchaseInfo.marketPriceMax)) : ''), !lodash.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo9 = record.purchaseInfo) === null || _record$purchaseInfo9 === void 0 ? void 0 : _record$purchaseInfo9.salePriceMin) && /*#__PURE__*/React.createElement("div", null, "\u9500\u552E\u4EF7\uFF1A", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo10 = record.purchaseInfo) === null || _record$purchaseInfo10 === void 0 ? void 0 : _record$purchaseInfo10.salePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo11 = record.purchaseInfo) === null || _record$purchaseInfo11 === void 0 ? void 0 : _record$purchaseInfo11.salePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo12 = record.purchaseInfo) === null || _record$purchaseInfo12 === void 0 ? void 0 : _record$purchaseInfo12.salePriceMin) ? "~".concat(showMoney(record.purchaseInfo.salePriceMax)) : ''), !lodash.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo13 = record.purchaseInfo) === null || _record$purchaseInfo13 === void 0 ? void 0 : _record$purchaseInfo13.sitePriceMin) && /*#__PURE__*/React.createElement("div", null, "\u5206\u9500\u4EF7\uFF1A", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo14 = record.purchaseInfo) === null || _record$purchaseInfo14 === void 0 ? void 0 : _record$purchaseInfo14.sitePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo15 = record.purchaseInfo) === null || _record$purchaseInfo15 === void 0 ? void 0 : _record$purchaseInfo15.sitePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo16 = record.purchaseInfo) === null || _record$purchaseInfo16 === void 0 ? void 0 : _record$purchaseInfo16.sitePriceMin) ? "~".concat(showMoney(record.purchaseInfo.sitePriceMax / 100)) : ''), [record === null || record === void 0 ? void 0 : (_record$purchaseInfo17 = record.purchaseInfo) === null || _record$purchaseInfo17 === void 0 ? void 0 : _record$purchaseInfo17.purchasePriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo18 = record.purchaseInfo) === null || _record$purchaseInfo18 === void 0 ? void 0 : _record$purchaseInfo18.marketPriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo19 = record.purchaseInfo) === null || _record$purchaseInfo19 === void 0 ? void 0 : _record$purchaseInfo19.salePriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo20 = record.purchaseInfo) === null || _record$purchaseInfo20 === void 0 ? void 0 : _record$purchaseInfo20.sitePriceMin].every(function (num) {
426
+ return /*#__PURE__*/React.createElement(React.Fragment, null, !lodash.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo = record.purchaseInfo) === null || _record$purchaseInfo === void 0 ? void 0 : _record$purchaseInfo.purchasePriceMin) && show.priceShow && muduleType !== 'mall' && /*#__PURE__*/React.createElement("div", null, "\u91C7\u8D2D\u4EF7\uFF1A", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo2 = record.purchaseInfo) === null || _record$purchaseInfo2 === void 0 ? void 0 : _record$purchaseInfo2.purchasePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo3 = record.purchaseInfo) === null || _record$purchaseInfo3 === void 0 ? void 0 : _record$purchaseInfo3.purchasePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo4 = record.purchaseInfo) === null || _record$purchaseInfo4 === void 0 ? void 0 : _record$purchaseInfo4.purchasePriceMin) ? "~".concat(showMoney(record.purchaseInfo.purchasePriceMax)) : ''), !lodash.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo5 = record.purchaseInfo) === null || _record$purchaseInfo5 === void 0 ? void 0 : _record$purchaseInfo5.marketPriceMin) && /*#__PURE__*/React.createElement("div", null, "\u5E02\u573A\u4EF7\uFF1A", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo6 = record.purchaseInfo) === null || _record$purchaseInfo6 === void 0 ? void 0 : _record$purchaseInfo6.marketPriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo7 = record.purchaseInfo) === null || _record$purchaseInfo7 === void 0 ? void 0 : _record$purchaseInfo7.marketPriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo8 = record.purchaseInfo) === null || _record$purchaseInfo8 === void 0 ? void 0 : _record$purchaseInfo8.marketPriceMin) ? "~".concat(showMoney(record.purchaseInfo.marketPriceMax)) : ''), !lodash.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo9 = record.purchaseInfo) === null || _record$purchaseInfo9 === void 0 ? void 0 : _record$purchaseInfo9.salePriceMin) && /*#__PURE__*/React.createElement("div", null, "\u9500\u552E\u4EF7\uFF1A", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo10 = record.purchaseInfo) === null || _record$purchaseInfo10 === void 0 ? void 0 : _record$purchaseInfo10.salePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo11 = record.purchaseInfo) === null || _record$purchaseInfo11 === void 0 ? void 0 : _record$purchaseInfo11.salePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo12 = record.purchaseInfo) === null || _record$purchaseInfo12 === void 0 ? void 0 : _record$purchaseInfo12.salePriceMin) ? "~".concat(showMoney(record.purchaseInfo.salePriceMax)) : ''), !lodash.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo13 = record.purchaseInfo) === null || _record$purchaseInfo13 === void 0 ? void 0 : _record$purchaseInfo13.sitePriceMin) && /*#__PURE__*/React.createElement("div", null, "\u5206\u9500\u4EF7\uFF1A", showMoney(record === null || record === void 0 ? void 0 : (_record$purchaseInfo14 = record.purchaseInfo) === null || _record$purchaseInfo14 === void 0 ? void 0 : _record$purchaseInfo14.sitePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo15 = record.purchaseInfo) === null || _record$purchaseInfo15 === void 0 ? void 0 : _record$purchaseInfo15.sitePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo16 = record.purchaseInfo) === null || _record$purchaseInfo16 === void 0 ? void 0 : _record$purchaseInfo16.sitePriceMin) ? "~".concat(showMoney(record.purchaseInfo.sitePriceMax / 100)) : ''), [record === null || record === void 0 ? void 0 : (_record$purchaseInfo17 = record.purchaseInfo) === null || _record$purchaseInfo17 === void 0 ? void 0 : _record$purchaseInfo17.purchasePriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo18 = record.purchaseInfo) === null || _record$purchaseInfo18 === void 0 ? void 0 : _record$purchaseInfo18.marketPriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo19 = record.purchaseInfo) === null || _record$purchaseInfo19 === void 0 ? void 0 : _record$purchaseInfo19.salePriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo20 = record.purchaseInfo) === null || _record$purchaseInfo20 === void 0 ? void 0 : _record$purchaseInfo20.sitePriceMin].every(function (num) {
419
427
  return num == null;
420
428
  }) && '-');
421
429
  }
@@ -468,11 +476,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
468
476
  orderWay: 'desc'
469
477
  },
470
478
  onFinish: function onFinish(values) {
471
- var params = _objectSpread(_objectSpread(_objectSpread({}, DefaultParams), values), {}, {
472
- flagTags: values.flagTags.map(function (item) {
473
- return item[1];
474
- }).join(',')
475
- });
479
+ var params = _objectSpread(_objectSpread({}, DefaultParams), values);
476
480
  setSearchParams(params);
477
481
  getGoodsList(params);
478
482
  },
@@ -510,7 +514,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
510
514
  },
511
515
  className: "price-type",
512
516
  placeholder: "\u4EF7\u683C\u7C7B\u578B",
513
- options: priceRangeForPurchase,
517
+ options: muduleType ? priceTypeOptionEnum === null || priceTypeOptionEnum === void 0 ? void 0 : priceTypeOptionEnum[muduleType !== null && muduleType !== void 0 ? muduleType : ''] : priceRangeForPurchase,
514
518
  variant: "borderless"
515
519
  }))
516
520
  }, /*#__PURE__*/React.createElement(_Form.Item, {
package/es/utils/options.d.ts CHANGED
@@ -11,6 +11,10 @@ export declare const priceRangeForPurchase: {
11
11
  label: string;
12
12
  value: string;
13
13
  }[];
14
+ export declare const mallPriceRangeForPurchase: {
15
+ label: string;
16
+ value: string;
17
+ }[];
14
18
  export declare const profitRangeForOnce: {
15
19
  label: string;
16
20
  value: string;
package/es/utils/options.js CHANGED
@@ -66,6 +66,20 @@ export var priceRangeForPurchase = [{
66
66
  label: '代发销售价',
67
67
  value: 'onceSalePrice'
68
68
  }];
69
+ // 集采价格筛选配置 - 妙货
70
+ export var mallPriceRangeForPurchase = [{
71
+ label: '集采市场价',
72
+ value: 'purchaseMarketPrice'
73
+ }, {
74
+ label: '代发市场价',
75
+ value: 'onceMarketPrice'
76
+ }, {
77
+ label: '集采销售价',
78
+ value: 'purchaseSalePrice'
79
+ }, {
80
+ label: '代发销售价',
81
+ value: 'onceSalePrice'
82
+ }];
69
83
  // 一件代发利润率筛选配置 - 非营销云
70
84
  export var profitRangeForOnce = [{
71
85
  label: '利润率',
package/lib/index.d.ts CHANGED
@@ -8,9 +8,7 @@ export interface ChooseGoodsProps {
8
8
  /** 按钮文案 */
9
9
  actionText?: string;
10
10
  open: boolean;
11
- /** 接口环境，默认取localstorage中的env */
12
11
  env?: EnvType;
13
- /** 默认取Cookies中的token */
14
12
  token?: string;
15
13
  loginErrFn?: () => void;
16
14
  multiple?: boolean;
@@ -28,6 +26,7 @@ export interface ChooseGoodsProps {
28
26
  onOk?: (selectedGoodsId: React.Key[], selectedGoods: any[]) => void;
29
27
  onCancel?: () => void;
30
28
  needControl?: boolean;
29
+ muduleType?: string;
31
30
  }
32
31
  declare const ChooseSiteGoods: FC<ChooseGoodsProps>;
33
32
  export default ChooseSiteGoods;
package/lib/index.js CHANGED
@@ -10,8 +10,8 @@ var _antd = require("antd");
10
10
  var _lodash = _interopRequireDefault(require("lodash"));
11
11
  var _ahooks = require("ahooks");
12
12
  var _plusRangeInput = _interopRequireDefault(require("@fle-ui/plus-range-input"));
13
- var _proComponents = require("@ant-design/pro-components");
14
13
  var _plusConfigProvider = _interopRequireDefault(require("@fle-ui/plus-config-provider"));
14
+ var _proComponents = require("@ant-design/pro-components");
15
15
  var _plusImage = _interopRequireDefault(require("@fle-ui/plus-image"));
16
16
  var _options = require("./utils/options");
17
17
  var _request = _interopRequireDefault(require("./utils/request"));
@@ -42,6 +42,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
42
42
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
43
43
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
44
44
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
45
+ var priceTypeOptionEnum = {
46
+ mall: _options.mallPriceRangeForPurchase
47
+ };
45
48
  var ChooseSiteGoods = function ChooseSiteGoods(props) {
46
49
  var _props$title = props.title,
47
50
  title = _props$title === void 0 ? '挑选商品' : _props$title,
@@ -73,7 +76,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
73
76
  y: 400
74
77
  } : _props$scroll,
75
78
  _props$needControl = props.needControl,
76
- needControl = _props$needControl === void 0 ? false : _props$needControl;
79
+ needControl = _props$needControl === void 0 ? false : _props$needControl,
80
+ muduleType = props.muduleType;
77
81
  var formRef = (0, _react.useRef)();
78
82
  var $http = (0, _request.default)({
79
83
  baseURL: (0, _serviceEnv.getApiHost)(env),
@@ -115,15 +119,20 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
115
119
  params['isPurchase'] = 1;
116
120
  }
117
121
  }
118
- _context.next = 4;
122
+ if (val.flagTags) {
123
+ params['flagTags'] = val.flagTags.map(function (item) {
124
+ return item[1];
125
+ }).join(',');
126
+ }
127
+ _context.next = 5;
119
128
  return $http.post(serviceUrl || _api.default['getGoodsList'], params);
120
- case 4:
129
+ case 5:
121
130
  res = _context.sent;
122
131
  return _context.abrupt("return", {
123
132
  list: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [],
124
133
  total: (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total) || 0
125
134
  });
126
- case 6:
135
+ case 7:
127
136
  case "end":
128
137
  return _context.stop();
129
138
  }
@@ -316,7 +325,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
316
325
  (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.resetFields();
317
326
  }
318
327
  }, [open]);
319
- // 选择 begin
320
328
  var _useState17 = (0, _react.useState)([]),
321
329
  _useState18 = _slicedToArray(_useState17, 2),
322
330
  selectedRowKeys = _useState18[0],
@@ -392,14 +400,14 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
392
400
  key: 'subSupplierName',
393
401
  align: 'center',
394
402
  width: 150,
395
- hidden: !show.supplierShow
403
+ hidden: !show.supplierShow || muduleType === 'mall'
396
404
  }, {
397
405
  title: '一件代发价格',
398
406
  key: 'oncePrice',
399
407
  align: 'center',
400
408
  render: function render(_, record) {
401
409
  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, _record$onceInfo20;
402
- 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", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo2 = record.onceInfo) === null || _record$onceInfo2 === void 0 ? void 0 : _record$onceInfo2.purchasePriceMin), (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((0, _common.showMoney)(record.onceInfo.purchasePriceMax)) : ''), !_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", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo6 = record.onceInfo) === null || _record$onceInfo6 === void 0 ? void 0 : _record$onceInfo6.marketPriceMin), (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((0, _common.showMoney)(record.onceInfo.marketPriceMax)) : ''), !_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", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo10 = record.onceInfo) === null || _record$onceInfo10 === void 0 ? void 0 : _record$onceInfo10.salePriceMin), (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((0, _common.showMoney)(record.onceInfo.salePriceMax)) : ''), !_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, "\u5206\u9500\u4EF7\uFF1A", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo14 = record.onceInfo) === null || _record$onceInfo14 === void 0 ? void 0 : _record$onceInfo14.sitePriceMin), (record === null || record === void 0 ? void 0 : (_record$onceInfo15 = record.onceInfo) === null || _record$onceInfo15 === void 0 ? void 0 : _record$onceInfo15.sitePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo16 = record.onceInfo) === null || _record$onceInfo16 === void 0 ? void 0 : _record$onceInfo16.sitePriceMin) ? "~".concat((0, _common.showMoney)(record.onceInfo.sitePriceMax)) : ''), [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, record === null || record === void 0 ? void 0 : (_record$onceInfo20 = record.onceInfo) === null || _record$onceInfo20 === void 0 ? void 0 : _record$onceInfo20.sitePriceMin].every(function (num) {
410
+ 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 && muduleType !== 'mall' && /*#__PURE__*/_react.default.createElement("div", null, "\u91C7\u8D2D\u4EF7\uFF1A", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo2 = record.onceInfo) === null || _record$onceInfo2 === void 0 ? void 0 : _record$onceInfo2.purchasePriceMin), (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((0, _common.showMoney)(record.onceInfo.purchasePriceMax)) : ''), !_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", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo6 = record.onceInfo) === null || _record$onceInfo6 === void 0 ? void 0 : _record$onceInfo6.marketPriceMin), (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((0, _common.showMoney)(record.onceInfo.marketPriceMax)) : ''), !_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", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo10 = record.onceInfo) === null || _record$onceInfo10 === void 0 ? void 0 : _record$onceInfo10.salePriceMin), (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((0, _common.showMoney)(record.onceInfo.salePriceMax)) : ''), !_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, "\u5206\u9500\u4EF7\uFF1A", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$onceInfo14 = record.onceInfo) === null || _record$onceInfo14 === void 0 ? void 0 : _record$onceInfo14.sitePriceMin), (record === null || record === void 0 ? void 0 : (_record$onceInfo15 = record.onceInfo) === null || _record$onceInfo15 === void 0 ? void 0 : _record$onceInfo15.sitePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$onceInfo16 = record.onceInfo) === null || _record$onceInfo16 === void 0 ? void 0 : _record$onceInfo16.sitePriceMin) ? "~".concat((0, _common.showMoney)(record.onceInfo.sitePriceMax)) : ''), [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, record === null || record === void 0 ? void 0 : (_record$onceInfo20 = record.onceInfo) === null || _record$onceInfo20 === void 0 ? void 0 : _record$onceInfo20.sitePriceMin].every(function (num) {
403
411
  return num == null;
404
412
  }) && '-');
405
413
  }
@@ -409,7 +417,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
409
417
  align: 'center',
410
418
  render: function render(_, record) {
411
419
  var _record$purchaseInfo, _record$purchaseInfo2, _record$purchaseInfo3, _record$purchaseInfo4, _record$purchaseInfo5, _record$purchaseInfo6, _record$purchaseInfo7, _record$purchaseInfo8, _record$purchaseInfo9, _record$purchaseInfo10, _record$purchaseInfo11, _record$purchaseInfo12, _record$purchaseInfo13, _record$purchaseInfo14, _record$purchaseInfo15, _record$purchaseInfo16, _record$purchaseInfo17, _record$purchaseInfo18, _record$purchaseInfo19, _record$purchaseInfo20;
412
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo = record.purchaseInfo) === null || _record$purchaseInfo === void 0 ? void 0 : _record$purchaseInfo.purchasePriceMin) && show.priceShow && /*#__PURE__*/_react.default.createElement("div", null, "\u91C7\u8D2D\u4EF7\uFF1A", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo2 = record.purchaseInfo) === null || _record$purchaseInfo2 === void 0 ? void 0 : _record$purchaseInfo2.purchasePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo3 = record.purchaseInfo) === null || _record$purchaseInfo3 === void 0 ? void 0 : _record$purchaseInfo3.purchasePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo4 = record.purchaseInfo) === null || _record$purchaseInfo4 === void 0 ? void 0 : _record$purchaseInfo4.purchasePriceMin) ? "~".concat((0, _common.showMoney)(record.purchaseInfo.purchasePriceMax)) : ''), !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo5 = record.purchaseInfo) === null || _record$purchaseInfo5 === void 0 ? void 0 : _record$purchaseInfo5.marketPriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u5E02\u573A\u4EF7\uFF1A", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo6 = record.purchaseInfo) === null || _record$purchaseInfo6 === void 0 ? void 0 : _record$purchaseInfo6.marketPriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo7 = record.purchaseInfo) === null || _record$purchaseInfo7 === void 0 ? void 0 : _record$purchaseInfo7.marketPriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo8 = record.purchaseInfo) === null || _record$purchaseInfo8 === void 0 ? void 0 : _record$purchaseInfo8.marketPriceMin) ? "~".concat((0, _common.showMoney)(record.purchaseInfo.marketPriceMax)) : ''), !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo9 = record.purchaseInfo) === null || _record$purchaseInfo9 === void 0 ? void 0 : _record$purchaseInfo9.salePriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u9500\u552E\u4EF7\uFF1A", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo10 = record.purchaseInfo) === null || _record$purchaseInfo10 === void 0 ? void 0 : _record$purchaseInfo10.salePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo11 = record.purchaseInfo) === null || _record$purchaseInfo11 === void 0 ? void 0 : _record$purchaseInfo11.salePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo12 = record.purchaseInfo) === null || _record$purchaseInfo12 === void 0 ? void 0 : _record$purchaseInfo12.salePriceMin) ? "~".concat((0, _common.showMoney)(record.purchaseInfo.salePriceMax)) : ''), !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo13 = record.purchaseInfo) === null || _record$purchaseInfo13 === void 0 ? void 0 : _record$purchaseInfo13.sitePriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u5206\u9500\u4EF7\uFF1A", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo14 = record.purchaseInfo) === null || _record$purchaseInfo14 === void 0 ? void 0 : _record$purchaseInfo14.sitePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo15 = record.purchaseInfo) === null || _record$purchaseInfo15 === void 0 ? void 0 : _record$purchaseInfo15.sitePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo16 = record.purchaseInfo) === null || _record$purchaseInfo16 === void 0 ? void 0 : _record$purchaseInfo16.sitePriceMin) ? "~".concat((0, _common.showMoney)(record.purchaseInfo.sitePriceMax / 100)) : ''), [record === null || record === void 0 ? void 0 : (_record$purchaseInfo17 = record.purchaseInfo) === null || _record$purchaseInfo17 === void 0 ? void 0 : _record$purchaseInfo17.purchasePriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo18 = record.purchaseInfo) === null || _record$purchaseInfo18 === void 0 ? void 0 : _record$purchaseInfo18.marketPriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo19 = record.purchaseInfo) === null || _record$purchaseInfo19 === void 0 ? void 0 : _record$purchaseInfo19.salePriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo20 = record.purchaseInfo) === null || _record$purchaseInfo20 === void 0 ? void 0 : _record$purchaseInfo20.sitePriceMin].every(function (num) {
420
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo = record.purchaseInfo) === null || _record$purchaseInfo === void 0 ? void 0 : _record$purchaseInfo.purchasePriceMin) && show.priceShow && muduleType !== 'mall' && /*#__PURE__*/_react.default.createElement("div", null, "\u91C7\u8D2D\u4EF7\uFF1A", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo2 = record.purchaseInfo) === null || _record$purchaseInfo2 === void 0 ? void 0 : _record$purchaseInfo2.purchasePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo3 = record.purchaseInfo) === null || _record$purchaseInfo3 === void 0 ? void 0 : _record$purchaseInfo3.purchasePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo4 = record.purchaseInfo) === null || _record$purchaseInfo4 === void 0 ? void 0 : _record$purchaseInfo4.purchasePriceMin) ? "~".concat((0, _common.showMoney)(record.purchaseInfo.purchasePriceMax)) : ''), !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo5 = record.purchaseInfo) === null || _record$purchaseInfo5 === void 0 ? void 0 : _record$purchaseInfo5.marketPriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u5E02\u573A\u4EF7\uFF1A", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo6 = record.purchaseInfo) === null || _record$purchaseInfo6 === void 0 ? void 0 : _record$purchaseInfo6.marketPriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo7 = record.purchaseInfo) === null || _record$purchaseInfo7 === void 0 ? void 0 : _record$purchaseInfo7.marketPriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo8 = record.purchaseInfo) === null || _record$purchaseInfo8 === void 0 ? void 0 : _record$purchaseInfo8.marketPriceMin) ? "~".concat((0, _common.showMoney)(record.purchaseInfo.marketPriceMax)) : ''), !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo9 = record.purchaseInfo) === null || _record$purchaseInfo9 === void 0 ? void 0 : _record$purchaseInfo9.salePriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u9500\u552E\u4EF7\uFF1A", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo10 = record.purchaseInfo) === null || _record$purchaseInfo10 === void 0 ? void 0 : _record$purchaseInfo10.salePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo11 = record.purchaseInfo) === null || _record$purchaseInfo11 === void 0 ? void 0 : _record$purchaseInfo11.salePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo12 = record.purchaseInfo) === null || _record$purchaseInfo12 === void 0 ? void 0 : _record$purchaseInfo12.salePriceMin) ? "~".concat((0, _common.showMoney)(record.purchaseInfo.salePriceMax)) : ''), !_lodash.default.isNil(record === null || record === void 0 ? void 0 : (_record$purchaseInfo13 = record.purchaseInfo) === null || _record$purchaseInfo13 === void 0 ? void 0 : _record$purchaseInfo13.sitePriceMin) && /*#__PURE__*/_react.default.createElement("div", null, "\u5206\u9500\u4EF7\uFF1A", (0, _common.showMoney)(record === null || record === void 0 ? void 0 : (_record$purchaseInfo14 = record.purchaseInfo) === null || _record$purchaseInfo14 === void 0 ? void 0 : _record$purchaseInfo14.sitePriceMin), (record === null || record === void 0 ? void 0 : (_record$purchaseInfo15 = record.purchaseInfo) === null || _record$purchaseInfo15 === void 0 ? void 0 : _record$purchaseInfo15.sitePriceMax) !== (record === null || record === void 0 ? void 0 : (_record$purchaseInfo16 = record.purchaseInfo) === null || _record$purchaseInfo16 === void 0 ? void 0 : _record$purchaseInfo16.sitePriceMin) ? "~".concat((0, _common.showMoney)(record.purchaseInfo.sitePriceMax / 100)) : ''), [record === null || record === void 0 ? void 0 : (_record$purchaseInfo17 = record.purchaseInfo) === null || _record$purchaseInfo17 === void 0 ? void 0 : _record$purchaseInfo17.purchasePriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo18 = record.purchaseInfo) === null || _record$purchaseInfo18 === void 0 ? void 0 : _record$purchaseInfo18.marketPriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo19 = record.purchaseInfo) === null || _record$purchaseInfo19 === void 0 ? void 0 : _record$purchaseInfo19.salePriceMin, record === null || record === void 0 ? void 0 : (_record$purchaseInfo20 = record.purchaseInfo) === null || _record$purchaseInfo20 === void 0 ? void 0 : _record$purchaseInfo20.sitePriceMin].every(function (num) {
413
421
  return num == null;
414
422
  }) && '-');
415
423
  }
@@ -462,11 +470,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
462
470
  orderWay: 'desc'
463
471
  },
464
472
  onFinish: function onFinish(values) {
465
- var params = _objectSpread(_objectSpread(_objectSpread({}, DefaultParams), values), {}, {
466
- flagTags: values.flagTags.map(function (item) {
467
- return item[1];
468
- }).join(',')
469
- });
473
+ var params = _objectSpread(_objectSpread({}, DefaultParams), values);
470
474
  setSearchParams(params);
471
475
  getGoodsList(params);
472
476
  },
@@ -504,7 +508,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
504
508
  },
505
509
  className: "price-type",
506
510
  placeholder: "\u4EF7\u683C\u7C7B\u578B",
507
- options: _options.priceRangeForPurchase,
511
+ options: muduleType ? priceTypeOptionEnum === null || priceTypeOptionEnum === void 0 ? void 0 : priceTypeOptionEnum[muduleType !== null && muduleType !== void 0 ? muduleType : ''] : _options.priceRangeForPurchase,
508
512
  variant: "borderless"
509
513
  }))
510
514
  }, /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
package/lib/utils/options.d.ts CHANGED
@@ -11,6 +11,10 @@ export declare const priceRangeForPurchase: {
11
11
  label: string;
12
12
  value: string;
13
13
  }[];
14
+ export declare const mallPriceRangeForPurchase: {
15
+ label: string;
16
+ value: string;
17
+ }[];
14
18
  export declare const profitRangeForOnce: {
15
19
  label: string;
16
20
  value: string;
package/lib/utils/options.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.tabsSearchParamsMap = exports.tabs = exports.sortOptions = exports.profitRangeForPurchase = exports.profitRangeForOnce = exports.priceRangeForPurchase = exports.priceRangeForOnce = void 0;
6
+ exports.tabsSearchParamsMap = exports.tabs = exports.sortOptions = exports.profitRangeForPurchase = exports.profitRangeForOnce = exports.priceRangeForPurchase = exports.priceRangeForOnce = exports.mallPriceRangeForPurchase = void 0;
7
7
  var tabs = exports.tabs = [{
8
8
  label: '京东商品',
9
9
  key: 'jd'
@@ -72,6 +72,20 @@ var priceRangeForPurchase = exports.priceRangeForPurchase = [{
72
72
  label: '代发销售价',
73
73
  value: 'onceSalePrice'
74
74
  }];
75
+ // 集采价格筛选配置 - 妙货
76
+ var mallPriceRangeForPurchase = exports.mallPriceRangeForPurchase = [{
77
+ label: '集采市场价',
78
+ value: 'purchaseMarketPrice'
79
+ }, {
80
+ label: '代发市场价',
81
+ value: 'onceMarketPrice'
82
+ }, {
83
+ label: '集采销售价',
84
+ value: 'purchaseSalePrice'
85
+ }, {
86
+ label: '代发销售价',
87
+ value: 'onceSalePrice'
88
+ }];
75
89
  // 一件代发利润率筛选配置 - 非营销云
76
90
  var profitRangeForOnce = exports.profitRangeForOnce = [{
77
91
  label: '利润率',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fle-ui/plus-choose-goods",
3
- "version": "0.0.15",
3
+ "version": "0.0.16-beta.0",
4
4
  "description": "@fle-ui/plus-choose-goods",
5
5
  "keywords": [
6
6
  "fle-ui",
@@ -24,7 +24,7 @@
24
24
  "@ant-design/icons": "^5.3.0",
25
25
  "@fle-tools/env": "^1.0.3",
26
26
  "@fle-ui/plus-address-selection": "^1.0.14",
27
- "@fle-ui/plus-choose-mall-goods": "^1.1.11",
27
+ "@fle-ui/plus-choose-mall-goods": "^1.1.11-alpha.1",
28
28
  "@fle-ui/plus-config-provider": "~1.0.15",
29
29
  "ahooks": "^3.8.0",
30
30
  "lodash": "^4.17.21"
@@ -45,5 +45,5 @@
45
45
  "publishConfig": {
46
46
  "access": "public"
47
47
  },
48
- "gitHead": "f5a34365f0ab189629c08301c00018edb7243bc2"
48
+ "gitHead": "d967f4c8ef202a3fe565ca3766aa4b242892af3c"
49
49
  }