@fle-ui/plus-choose-goods 0.0.17-beta.0 → 0.0.18-alpha.1
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.
- package/es/index.d.ts +0 -1
- package/es/index.js +16 -21
- package/es/utils/options.d.ts +0 -4
- package/es/utils/options.js +0 -14
- package/lib/index.d.ts +0 -1
- package/lib/index.js +15 -20
- package/lib/utils/options.d.ts +0 -4
- package/lib/utils/options.js +1 -15
- package/package.json +4 -4
package/es/index.d.ts
CHANGED
|
@@ -26,7 +26,6 @@ export interface ChooseGoodsProps {
|
|
|
26
26
|
onOk?: (selectedGoodsId: React.Key[], selectedGoods: any[]) => void;
|
|
27
27
|
onCancel?: () => void;
|
|
28
28
|
needControl?: boolean;
|
|
29
|
-
muduleType?: string;
|
|
30
29
|
}
|
|
31
30
|
declare const ChooseSiteGoods: FC<ChooseGoodsProps>;
|
|
32
31
|
export default ChooseSiteGoods;
|
package/es/index.js
CHANGED
|
@@ -41,16 +41,13 @@ import PlusRangeInput from '@fle-ui/plus-range-input';
|
|
|
41
41
|
import PlusConfigProvider from '@fle-ui/plus-config-provider';
|
|
42
42
|
import { ProTable, QueryFilter } from '@ant-design/pro-components';
|
|
43
43
|
import ProImage from '@fle-ui/plus-image';
|
|
44
|
-
import { priceRangeForPurchase, sortOptions
|
|
44
|
+
import { priceRangeForPurchase, sortOptions } 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
|
-
};
|
|
54
51
|
var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
55
52
|
var _props$title = props.title,
|
|
56
53
|
title = _props$title === void 0 ? '挑选商品' : _props$title,
|
|
@@ -82,8 +79,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
82
79
|
y: 400
|
|
83
80
|
} : _props$scroll,
|
|
84
81
|
_props$needControl = props.needControl,
|
|
85
|
-
needControl = _props$needControl === void 0 ? false : _props$needControl
|
|
86
|
-
muduleType = props.muduleType;
|
|
82
|
+
needControl = _props$needControl === void 0 ? false : _props$needControl;
|
|
87
83
|
var formRef = useRef();
|
|
88
84
|
var $http = httpClient({
|
|
89
85
|
baseURL: getApiHost(env),
|
|
@@ -125,20 +121,15 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
125
121
|
params['isPurchase'] = 1;
|
|
126
122
|
}
|
|
127
123
|
}
|
|
128
|
-
|
|
129
|
-
params['flagTags'] = val.flagTags.map(function (item) {
|
|
130
|
-
return item[1];
|
|
131
|
-
}).join(',');
|
|
132
|
-
}
|
|
133
|
-
_context.next = 5;
|
|
124
|
+
_context.next = 4;
|
|
134
125
|
return $http.post(serviceUrl || api['getGoodsList'], params);
|
|
135
|
-
case
|
|
126
|
+
case 4:
|
|
136
127
|
res = _context.sent;
|
|
137
128
|
return _context.abrupt("return", {
|
|
138
129
|
list: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [],
|
|
139
130
|
total: (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total) || 0
|
|
140
131
|
});
|
|
141
|
-
case
|
|
132
|
+
case 6:
|
|
142
133
|
case "end":
|
|
143
134
|
return _context.stop();
|
|
144
135
|
}
|
|
@@ -388,8 +379,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
388
379
|
}
|
|
389
380
|
}, {
|
|
390
381
|
title: '商品品牌',
|
|
391
|
-
dataIndex: '
|
|
392
|
-
key: '
|
|
382
|
+
dataIndex: 'brandName',
|
|
383
|
+
key: 'brandName',
|
|
393
384
|
align: 'center',
|
|
394
385
|
width: 120
|
|
395
386
|
}, {
|
|
@@ -406,14 +397,14 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
406
397
|
key: 'subSupplierName',
|
|
407
398
|
align: 'center',
|
|
408
399
|
width: 150,
|
|
409
|
-
hidden: !show.supplierShow
|
|
400
|
+
hidden: !show.supplierShow
|
|
410
401
|
}, {
|
|
411
402
|
title: '一件代发价格',
|
|
412
403
|
key: 'oncePrice',
|
|
413
404
|
align: 'center',
|
|
414
405
|
render: function render(_, record) {
|
|
415
406
|
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;
|
|
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 &&
|
|
407
|
+
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) {
|
|
417
408
|
return num == null;
|
|
418
409
|
}) && '-');
|
|
419
410
|
}
|
|
@@ -423,7 +414,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
423
414
|
align: 'center',
|
|
424
415
|
render: function render(_, record) {
|
|
425
416
|
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;
|
|
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 &&
|
|
417
|
+
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) {
|
|
427
418
|
return num == null;
|
|
428
419
|
}) && '-');
|
|
429
420
|
}
|
|
@@ -476,7 +467,11 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
476
467
|
orderWay: 'desc'
|
|
477
468
|
},
|
|
478
469
|
onFinish: function onFinish(values) {
|
|
479
|
-
var params = _objectSpread(_objectSpread({}, DefaultParams), values)
|
|
470
|
+
var params = _objectSpread(_objectSpread(_objectSpread({}, DefaultParams), values), {}, {
|
|
471
|
+
flagTags: values.flagTags.map(function (item) {
|
|
472
|
+
return item[1];
|
|
473
|
+
}).join(',')
|
|
474
|
+
});
|
|
480
475
|
setSearchParams(params);
|
|
481
476
|
getGoodsList(params);
|
|
482
477
|
},
|
|
@@ -514,7 +509,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
514
509
|
},
|
|
515
510
|
className: "price-type",
|
|
516
511
|
placeholder: "\u4EF7\u683C\u7C7B\u578B",
|
|
517
|
-
options:
|
|
512
|
+
options: priceRangeForPurchase,
|
|
518
513
|
variant: "borderless"
|
|
519
514
|
}))
|
|
520
515
|
}, /*#__PURE__*/React.createElement(_Form.Item, {
|
package/es/utils/options.d.ts
CHANGED
|
@@ -11,10 +11,6 @@ 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
|
-
}[];
|
|
18
14
|
export declare const profitRangeForOnce: {
|
|
19
15
|
label: string;
|
|
20
16
|
value: string;
|
package/es/utils/options.js
CHANGED
|
@@ -66,20 +66,6 @@ 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
|
-
}];
|
|
83
69
|
// 一件代发利润率筛选配置 - 非营销云
|
|
84
70
|
export var profitRangeForOnce = [{
|
|
85
71
|
label: '利润率',
|
package/lib/index.d.ts
CHANGED
|
@@ -26,7 +26,6 @@ export interface ChooseGoodsProps {
|
|
|
26
26
|
onOk?: (selectedGoodsId: React.Key[], selectedGoods: any[]) => void;
|
|
27
27
|
onCancel?: () => void;
|
|
28
28
|
needControl?: boolean;
|
|
29
|
-
muduleType?: string;
|
|
30
29
|
}
|
|
31
30
|
declare const ChooseSiteGoods: FC<ChooseGoodsProps>;
|
|
32
31
|
export default ChooseSiteGoods;
|
package/lib/index.js
CHANGED
|
@@ -42,9 +42,6 @@ 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
|
-
};
|
|
48
45
|
var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
49
46
|
var _props$title = props.title,
|
|
50
47
|
title = _props$title === void 0 ? '挑选商品' : _props$title,
|
|
@@ -76,8 +73,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
76
73
|
y: 400
|
|
77
74
|
} : _props$scroll,
|
|
78
75
|
_props$needControl = props.needControl,
|
|
79
|
-
needControl = _props$needControl === void 0 ? false : _props$needControl
|
|
80
|
-
muduleType = props.muduleType;
|
|
76
|
+
needControl = _props$needControl === void 0 ? false : _props$needControl;
|
|
81
77
|
var formRef = (0, _react.useRef)();
|
|
82
78
|
var $http = (0, _request.default)({
|
|
83
79
|
baseURL: (0, _serviceEnv.getApiHost)(env),
|
|
@@ -119,20 +115,15 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
119
115
|
params['isPurchase'] = 1;
|
|
120
116
|
}
|
|
121
117
|
}
|
|
122
|
-
|
|
123
|
-
params['flagTags'] = val.flagTags.map(function (item) {
|
|
124
|
-
return item[1];
|
|
125
|
-
}).join(',');
|
|
126
|
-
}
|
|
127
|
-
_context.next = 5;
|
|
118
|
+
_context.next = 4;
|
|
128
119
|
return $http.post(serviceUrl || _api.default['getGoodsList'], params);
|
|
129
|
-
case
|
|
120
|
+
case 4:
|
|
130
121
|
res = _context.sent;
|
|
131
122
|
return _context.abrupt("return", {
|
|
132
123
|
list: (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [],
|
|
133
124
|
total: (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total) || 0
|
|
134
125
|
});
|
|
135
|
-
case
|
|
126
|
+
case 6:
|
|
136
127
|
case "end":
|
|
137
128
|
return _context.stop();
|
|
138
129
|
}
|
|
@@ -382,8 +373,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
382
373
|
}
|
|
383
374
|
}, {
|
|
384
375
|
title: '商品品牌',
|
|
385
|
-
dataIndex: '
|
|
386
|
-
key: '
|
|
376
|
+
dataIndex: 'brandName',
|
|
377
|
+
key: 'brandName',
|
|
387
378
|
align: 'center',
|
|
388
379
|
width: 120
|
|
389
380
|
}, {
|
|
@@ -400,14 +391,14 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
400
391
|
key: 'subSupplierName',
|
|
401
392
|
align: 'center',
|
|
402
393
|
width: 150,
|
|
403
|
-
hidden: !show.supplierShow
|
|
394
|
+
hidden: !show.supplierShow
|
|
404
395
|
}, {
|
|
405
396
|
title: '一件代发价格',
|
|
406
397
|
key: 'oncePrice',
|
|
407
398
|
align: 'center',
|
|
408
399
|
render: function render(_, record) {
|
|
409
400
|
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;
|
|
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 &&
|
|
401
|
+
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) {
|
|
411
402
|
return num == null;
|
|
412
403
|
}) && '-');
|
|
413
404
|
}
|
|
@@ -417,7 +408,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
417
408
|
align: 'center',
|
|
418
409
|
render: function render(_, record) {
|
|
419
410
|
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;
|
|
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 &&
|
|
411
|
+
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) {
|
|
421
412
|
return num == null;
|
|
422
413
|
}) && '-');
|
|
423
414
|
}
|
|
@@ -470,7 +461,11 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
470
461
|
orderWay: 'desc'
|
|
471
462
|
},
|
|
472
463
|
onFinish: function onFinish(values) {
|
|
473
|
-
var params = _objectSpread(_objectSpread({}, DefaultParams), values)
|
|
464
|
+
var params = _objectSpread(_objectSpread(_objectSpread({}, DefaultParams), values), {}, {
|
|
465
|
+
flagTags: values.flagTags.map(function (item) {
|
|
466
|
+
return item[1];
|
|
467
|
+
}).join(',')
|
|
468
|
+
});
|
|
474
469
|
setSearchParams(params);
|
|
475
470
|
getGoodsList(params);
|
|
476
471
|
},
|
|
@@ -508,7 +503,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
|
|
|
508
503
|
},
|
|
509
504
|
className: "price-type",
|
|
510
505
|
placeholder: "\u4EF7\u683C\u7C7B\u578B",
|
|
511
|
-
options:
|
|
506
|
+
options: _options.priceRangeForPurchase,
|
|
512
507
|
variant: "borderless"
|
|
513
508
|
}))
|
|
514
509
|
}, /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
|
package/lib/utils/options.d.ts
CHANGED
|
@@ -11,10 +11,6 @@ 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
|
-
}[];
|
|
18
14
|
export declare const profitRangeForOnce: {
|
|
19
15
|
label: string;
|
|
20
16
|
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 =
|
|
6
|
+
exports.tabsSearchParamsMap = exports.tabs = exports.sortOptions = exports.profitRangeForPurchase = exports.profitRangeForOnce = exports.priceRangeForPurchase = exports.priceRangeForOnce = void 0;
|
|
7
7
|
var tabs = exports.tabs = [{
|
|
8
8
|
label: '京东商品',
|
|
9
9
|
key: 'jd'
|
|
@@ -72,20 +72,6 @@ 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
|
-
}];
|
|
89
75
|
// 一件代发利润率筛选配置 - 非营销云
|
|
90
76
|
var profitRangeForOnce = exports.profitRangeForOnce = [{
|
|
91
77
|
label: '利润率',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fle-ui/plus-choose-goods",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.18-alpha.1",
|
|
4
4
|
"description": "@fle-ui/plus-choose-goods",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"fle-ui",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@ant-design/icons": "^5.3.0",
|
|
25
25
|
"@fle-tools/env": "^1.0.3",
|
|
26
|
-
"@fle-ui/plus-address-selection": "^1.0.
|
|
27
|
-
"@fle-ui/plus-choose-mall-goods": "^1.1.
|
|
26
|
+
"@fle-ui/plus-address-selection": "^1.0.15",
|
|
27
|
+
"@fle-ui/plus-choose-mall-goods": "^1.1.15-alpha.0",
|
|
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": "
|
|
48
|
+
"gitHead": "7a7bd43ac08bdf95ee9040639078b87d121df077"
|
|
49
49
|
}
|