@fle-ui/plus-choose-mall-goods 1.1.1 → 1.1.3

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.
@@ -1,97 +1,97 @@
1
- .change-price {
2
- .change-price-body {
3
- margin: 0 20px;
4
- .cpb-header {
5
- .cpb-header-title {
6
- color: #000;
7
- font-size: 16px;
8
- font-weight: 500;
9
- height: 22px;
10
- line-height: 22px;
11
- }
12
- .cpb-header-desc {
13
- color: #999;
14
- font-size: 12px;
15
- font-weight: 400;
16
- line-height: 17px;
17
- margin-top: 11px;
18
- width: 100%;
19
- }
20
- }
21
- .cpb-rules {
22
- margin-top: 20px;
23
- .rule-flex {
24
- display: flex;
25
- align-items: center;
26
- }
27
- .rule-tip {
28
- color: #2c68ff;
29
- font-size: 12px;
30
- font-weight: 400;
31
- height: 17px;
32
- line-height: 17px;
33
- margin-bottom: 10px;
34
- margin-top: 10px;
35
- }
36
- }
37
- .cpb-bot-tip {
38
- display: flex;
39
- margin-top: 20px;
40
- .cpb-bot-tip-left {
41
- color: #999;
42
- line-height: 20px;
43
- font-size: 12px;
44
- }
45
- .cpb-bot-tip-right {
46
- color: #999;
47
- line-height: 20px;
48
- font-size: 12px;
49
- margin-left: 8px;
50
- }
51
- }
52
- .cpb-save {
53
- margin: 0 auto;
54
- margin-top: 30px;
55
- }
56
- }
57
- .alter_price_content_wrapper {
58
- border: 1px solid #e2e2e2;
59
- display: flex;
60
- margin-bottom: 19px;
61
- margin-top: 12px;
62
- width: 100%;
63
- .alter_price_content_wrapper_item {
64
- display: inline-block;
65
- width: 50%;
66
- &:first-child {
67
- border-right: 1px solid #e2e2e2;
68
- }
69
- .alter_price_content_wrapper_item_title {
70
- background: #f0f0f0;
71
- border-bottom: 1px solid #e2e2e2;
72
- color: #4c4c4c;
73
- font-size: 14px;
74
- font-weight: 500;
75
- height: 44px;
76
- line-height: 44px;
77
- text-align: center;
78
- }
79
- .alter_price_content_wrapper_item_content {
80
- padding: 20px 15px;
81
- .rule-flex {
82
- display: flex;
83
- align-items: center;
84
- }
85
- .rule-tip {
86
- color: #2c68ff;
87
- font-size: 12px;
88
- font-weight: 400;
89
- height: 17px;
90
- line-height: 17px;
91
- margin-bottom: 10px;
92
- margin-top: 10px;
93
- }
94
- }
95
- }
96
- }
97
- }
1
+ .change-price {
2
+ .change-price-body {
3
+ margin: 0 20px;
4
+ .cpb-header {
5
+ .cpb-header-title {
6
+ color: #000;
7
+ font-size: 16px;
8
+ font-weight: 500;
9
+ height: 22px;
10
+ line-height: 22px;
11
+ }
12
+ .cpb-header-desc {
13
+ color: #999;
14
+ font-size: 12px;
15
+ font-weight: 400;
16
+ line-height: 17px;
17
+ margin-top: 11px;
18
+ width: 100%;
19
+ }
20
+ }
21
+ .cpb-rules {
22
+ margin-top: 20px;
23
+ .rule-flex {
24
+ display: flex;
25
+ align-items: center;
26
+ }
27
+ .rule-tip {
28
+ color: #2c68ff;
29
+ font-size: 12px;
30
+ font-weight: 400;
31
+ height: 17px;
32
+ line-height: 17px;
33
+ margin-bottom: 10px;
34
+ margin-top: 10px;
35
+ }
36
+ }
37
+ .cpb-bot-tip {
38
+ display: flex;
39
+ margin-top: 20px;
40
+ .cpb-bot-tip-left {
41
+ color: #999;
42
+ line-height: 20px;
43
+ font-size: 12px;
44
+ }
45
+ .cpb-bot-tip-right {
46
+ color: #999;
47
+ line-height: 20px;
48
+ font-size: 12px;
49
+ margin-left: 8px;
50
+ }
51
+ }
52
+ .cpb-save {
53
+ margin: 0 auto;
54
+ margin-top: 30px;
55
+ }
56
+ }
57
+ .alter_price_content_wrapper {
58
+ border: 1px solid #e2e2e2;
59
+ display: flex;
60
+ margin-bottom: 19px;
61
+ margin-top: 12px;
62
+ width: 100%;
63
+ .alter_price_content_wrapper_item {
64
+ display: inline-block;
65
+ width: 50%;
66
+ &:first-child {
67
+ border-right: 1px solid #e2e2e2;
68
+ }
69
+ .alter_price_content_wrapper_item_title {
70
+ background: #f0f0f0;
71
+ border-bottom: 1px solid #e2e2e2;
72
+ color: #4c4c4c;
73
+ font-size: 14px;
74
+ font-weight: 500;
75
+ height: 44px;
76
+ line-height: 44px;
77
+ text-align: center;
78
+ }
79
+ .alter_price_content_wrapper_item_content {
80
+ padding: 20px 15px;
81
+ .rule-flex {
82
+ display: flex;
83
+ align-items: center;
84
+ }
85
+ .rule-tip {
86
+ color: #2c68ff;
87
+ font-size: 12px;
88
+ font-weight: 400;
89
+ height: 17px;
90
+ line-height: 17px;
91
+ margin-bottom: 10px;
92
+ margin-top: 10px;
93
+ }
94
+ }
95
+ }
96
+ }
97
+ }
@@ -1,78 +1,78 @@
1
- .after-price-confirm-components {
2
- .ant-modal-body {
3
- padding: 0px;
4
- overflow: hidden;
5
- }
6
-
7
- .after-price-confirm-icon-wrap {
8
- text-align: center;
9
-
10
- .after-price-confirm-icon {
11
- color: #faad14;
12
- font-size: 38px;
13
- margin: 45px auto 0 auto;
14
- }
15
- }
16
-
17
- .main-tips {
18
- height: 28px;
19
- font-size: 20px;
20
- font-weight: 600;
21
- color: #494949;
22
- line-height: 28px;
23
- margin-top: 14px;
24
- text-align: center;
25
- }
26
-
27
- .sub-tips {
28
- margin-top: 20px;
29
- text-align: center;
30
- // height: 20px;
31
- font-size: 14px;
32
- font-weight: 400;
33
- color: #666666;
34
- line-height: 20px;
35
- padding: 0 44px;
36
- }
37
-
38
- .alter-buttons {
39
- margin-top: 28px;
40
- padding-bottom: 45px;
41
- display: flex;
42
- justify-content: center;
43
-
44
- .alter-button {
45
- width: 123px;
46
- height: 32px;
47
- }
48
- }
49
-
50
- .select {
51
- margin-top: 15px;
52
- }
53
-
54
- .radio_select {
55
- width: 480px;
56
- height: 25px;
57
- line-height: 20px;
58
- display: flex;
59
-
60
- .radio_label {
61
- width: 100px;
62
- font-size: 14px;
63
- float: left;
64
- text-align: right;
65
- margin-right: 15px;
66
- }
67
-
68
- .radio_bottom,
69
- .radio_top {
70
- flex: 1;
71
- margin-left: 14px;
72
-
73
- .ant-radio-wrapper:nth-child(2) {
74
- margin-left: 43px;
75
- }
76
- }
77
- }
78
- }
1
+ .after-price-confirm-components {
2
+ .ant-modal-body {
3
+ padding: 0px;
4
+ overflow: hidden;
5
+ }
6
+
7
+ .after-price-confirm-icon-wrap {
8
+ text-align: center;
9
+
10
+ .after-price-confirm-icon {
11
+ color: #faad14;
12
+ font-size: 38px;
13
+ margin: 45px auto 0 auto;
14
+ }
15
+ }
16
+
17
+ .main-tips {
18
+ height: 28px;
19
+ font-size: 20px;
20
+ font-weight: 600;
21
+ color: #494949;
22
+ line-height: 28px;
23
+ margin-top: 14px;
24
+ text-align: center;
25
+ }
26
+
27
+ .sub-tips {
28
+ margin-top: 20px;
29
+ text-align: center;
30
+ // height: 20px;
31
+ font-size: 14px;
32
+ font-weight: 400;
33
+ color: #666666;
34
+ line-height: 20px;
35
+ padding: 0 44px;
36
+ }
37
+
38
+ .alter-buttons {
39
+ margin-top: 28px;
40
+ padding-bottom: 45px;
41
+ display: flex;
42
+ justify-content: center;
43
+
44
+ .alter-button {
45
+ width: 123px;
46
+ height: 32px;
47
+ }
48
+ }
49
+
50
+ .select {
51
+ margin-top: 15px;
52
+ }
53
+
54
+ .radio_select {
55
+ width: 480px;
56
+ height: 25px;
57
+ line-height: 20px;
58
+ display: flex;
59
+
60
+ .radio_label {
61
+ width: 100px;
62
+ font-size: 14px;
63
+ float: left;
64
+ text-align: right;
65
+ margin-right: 15px;
66
+ }
67
+
68
+ .radio_bottom,
69
+ .radio_top {
70
+ flex: 1;
71
+ margin-left: 14px;
72
+
73
+ .ant-radio-wrapper:nth-child(2) {
74
+ margin-left: 43px;
75
+ }
76
+ }
77
+ }
78
+ }
package/lib/index.js CHANGED
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _antd = require("antd");
10
+ var _plusConfigProvider = _interopRequireDefault(require("@fle-ui/plus-config-provider"));
10
11
  var _plusAddressSelection = _interopRequireDefault(require("@fle-ui/plus-address-selection"));
11
12
  var _plusImage = _interopRequireDefault(require("@fle-ui/plus-image"));
12
13
  var _icons = require("@ant-design/icons");
@@ -42,7 +43,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
42
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; } }
43
44
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
44
45
  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; }
45
- function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
46
+ 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; }
46
47
  var ChooseMallGoods = function ChooseMallGoods(props) {
47
48
  var _props$env = props.env,
48
49
  env = _props$env === void 0 ? 'prod' : _props$env,
@@ -181,7 +182,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
181
182
  setLoading = _useState14[1];
182
183
  var getGoodsList = /*#__PURE__*/function () {
183
184
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
184
- var _searchParams$flagCat, _searchParams$saleabl, params, text, apiKey, res, _res$data, _res$data2, list, jdGoods;
185
+ var _searchParams$flagCat, _searchParams$priceTy, _searchParams$priceTy2, _searchParams$saleabl, params, text, apiKey, res, _res$data, _res$data2, list, jdGoods;
185
186
  return _regeneratorRuntime().wrap(function _callee$(_context) {
186
187
  while (1) switch (_context.prev = _context.next) {
187
188
  case 0:
@@ -201,7 +202,14 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
201
202
  flagTags: searchParams.flagTags,
202
203
  flagIndustry: searchParams.flagIndustry,
203
204
  flagCategory: ((_searchParams$flagCat = searchParams.flagCategory) === null || _searchParams$flagCat === void 0 ? void 0 : _searchParams$flagCat.length) ? searchParams.flagCategory[searchParams.flagCategory.length - 1] : undefined
204
- }); // 价格区间
205
+ });
206
+ if ((_searchParams$priceTy = searchParams.priceType) === null || _searchParams$priceTy === void 0 ? void 0 : _searchParams$priceTy.includes('once')) {
207
+ params['isOnce'] = 1;
208
+ }
209
+ if ((_searchParams$priceTy2 = searchParams.priceType) === null || _searchParams$priceTy2 === void 0 ? void 0 : _searchParams$priceTy2.includes('purchase')) {
210
+ params['isPurchase'] = 1;
211
+ }
212
+ // 价格区间
205
213
  if (searchParams.priceRangeMin !== undefined) {
206
214
  params[searchParams.priceType + 'Min'] = Number(searchParams.priceRangeMin * 100);
207
215
  }
@@ -237,9 +245,9 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
237
245
  apiKey = '';
238
246
  if (mode === 1) apiKey = 'getGoodsList';
239
247
  if (mode === 2) apiKey = 'getGoodsListForTemplate';
240
- _context.next = 14;
248
+ _context.next = 16;
241
249
  return $http.post(_api.default[apiKey], params);
242
- case 14:
250
+ case 16:
243
251
  res = _context.sent;
244
252
  if (res === null || res === void 0 ? void 0 : res.success) {
245
253
  list = (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
@@ -255,15 +263,15 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
255
263
  getJdStock(list, jdGoods);
256
264
  }
257
265
  }
258
- case 16:
259
- _context.prev = 16;
266
+ case 18:
267
+ _context.prev = 18;
260
268
  setLoading(false);
261
- return _context.finish(16);
262
- case 19:
269
+ return _context.finish(18);
270
+ case 21:
263
271
  case "end":
264
272
  return _context.stop();
265
273
  }
266
- }, _callee, null, [[0,, 16, 19]]);
274
+ }, _callee, null, [[0,, 18, 21]]);
267
275
  }));
268
276
  return function getGoodsList() {
269
277
  return _ref.apply(this, arguments);
@@ -610,7 +618,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
610
618
  placeholder: "\u9009\u62E9\u884C\u4E1A\u6807\u7B7E",
611
619
  allowClear: true
612
620
  }), /*#__PURE__*/_react.default.createElement(_antd.Cascader, {
613
- placeholder: "\u9009\u62E9\u5546\u54C1\u54C1\u7C7B",
621
+ placeholder: "\u9009\u62E9\u5546\u54C1\u5206\u7C7B",
614
622
  fieldNames: {
615
623
  label: 'name',
616
624
  value: 'id'
@@ -631,13 +639,13 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
631
639
  })))
632
640
  }, {
633
641
  name: 'categoryTree',
634
- show: !(hiddenSearchProps === null || hiddenSearchProps === void 0 ? void 0 : hiddenSearchProps.includes('categoryTree')),
642
+ show: !(hiddenSearchProps === null || hiddenSearchProps === void 0 ? void 0 : hiddenSearchProps.includes('categoryTree')) && searchParams.tab !== 'zy',
635
643
  span: 8,
636
644
  node: /*#__PURE__*/_react.default.createElement(_antd.Col, {
637
645
  span: 8
638
646
  }, /*#__PURE__*/_react.default.createElement("div", {
639
647
  className: "ww-search-flex"
640
- }, "\u5546\u54C1\u7C7B\u76EE\uFF1A", /*#__PURE__*/_react.default.createElement(_antd.TreeSelect, {
648
+ }, /*#__PURE__*/_react.default.createElement(_antd.TreeSelect, {
641
649
  style: {
642
650
  flex: 1
643
651
  },
@@ -646,7 +654,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
646
654
  maxHeight: 400,
647
655
  overflow: 'auto'
648
656
  },
649
- placeholder: "\u9009\u62E9\u5546\u54C1\u7C7B\u76EE",
657
+ placeholder: "\u9009\u62E9\u7CFB\u7EDF\u7C7B\u76EE",
650
658
  allowClear: true,
651
659
  onChange: function onChange(e) {
652
660
  handleChangeParams({
@@ -778,11 +786,11 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
778
786
  span: 8
779
787
  }, /*#__PURE__*/_react.default.createElement("div", {
780
788
  className: "ww-search-flex"
781
- }, "\u53EF\u552E\u5356\u57CE\u5E02\uFF1A", /*#__PURE__*/_react.default.createElement(_antd.Select, {
789
+ }, /*#__PURE__*/_react.default.createElement(_antd.Select, {
782
790
  showSearch: true,
783
791
  mode: "multiple",
784
792
  allowClear: true,
785
- placeholder: "\u5168\u90E8",
793
+ placeholder: "\u8BF7\u9009\u62E9\u53EF\u552E\u5356\u57CE\u5E02",
786
794
  onChange: function onChange(v) {
787
795
  handleChangeParams({
788
796
  saleableCity: v
@@ -803,20 +811,20 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
803
811
  }))))
804
812
  }, {
805
813
  name: 'addressCodes',
806
- show: !(hiddenSearchProps === null || hiddenSearchProps === void 0 ? void 0 : hiddenSearchProps.includes('addressCodes')),
814
+ show: !(hiddenSearchProps === null || hiddenSearchProps === void 0 ? void 0 : hiddenSearchProps.includes('addressCodes')) && searchParams.tab !== 'zy',
807
815
  span: 8,
808
816
  node: /*#__PURE__*/_react.default.createElement(_antd.Col, {
809
817
  span: 8
810
818
  }, /*#__PURE__*/_react.default.createElement("div", {
811
819
  className: "ww-search-flex"
812
- }, "\u53D1\u8D27\u5730\uFF1A", /*#__PURE__*/_react.default.createElement(_plusAddressSelection.default, {
820
+ }, /*#__PURE__*/_react.default.createElement(_plusAddressSelection.default, {
813
821
  value: searchParams.addressCodes,
814
822
  onChange: function onChange(v) {
815
823
  handleChangeParams({
816
824
  addressCodes: v
817
825
  });
818
826
  },
819
- placeholder: "\u8BF7\u9009\u62E9\u5730\u5740",
827
+ placeholder: "\u8BF7\u9009\u62E9\u53D1\u8D27\u5730",
820
828
  level: 2,
821
829
  style: {
822
830
  flex: 1
@@ -830,7 +838,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
830
838
  span: 8
831
839
  }, /*#__PURE__*/_react.default.createElement("div", {
832
840
  className: "ww-search-flex"
833
- }, "\u6392\u5E8F\uFF1A", /*#__PURE__*/_react.default.createElement(_antd.Radio.Group, {
841
+ }, /*#__PURE__*/_react.default.createElement(_antd.Radio.Group, {
834
842
  onChange: handleSortChange,
835
843
  value: searchParams.orderName,
836
844
  optionType: "button",
@@ -973,7 +981,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
973
981
  dataIndex: 'marketPriceMin',
974
982
  key: 'marketPriceMin',
975
983
  align: 'center',
976
- width: 120,
977
984
  render: function render(text, record) {
978
985
  var _record$purchaseInfo, _record$purchaseInfo2, _record$purchaseInfo4, _record$purchaseInfo5;
979
986
  if (record.isPurchase === 0) return '-';
@@ -988,7 +995,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
988
995
  dataIndex: 'marketPriceMin',
989
996
  key: 'marketPriceMin',
990
997
  align: 'center',
991
- width: 120,
992
998
  render: function render(text, record) {
993
999
  var _record$onceInfo, _record$onceInfo2, _record$onceInfo4, _record$onceInfo5;
994
1000
  if (record.isOnce === 0) return '-';
@@ -1003,7 +1009,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1003
1009
  dataIndex: 'salePriceMin',
1004
1010
  key: 'salePriceMin',
1005
1011
  align: 'center',
1006
- width: 150,
1007
1012
  render: function render(text, record) {
1008
1013
  if ((record === null || record === void 0 ? void 0 : record.isPurchase) === 1) {
1009
1014
  var _record$purchaseInfo6, _record$purchaseInfo12;
@@ -1033,7 +1038,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1033
1038
  dataIndex: 'supplyPriceMin',
1034
1039
  key: 'supplyPriceMin',
1035
1040
  align: 'center',
1036
- width: 120,
1037
1041
  render: function render(text, record) {
1038
1042
  if ((record === null || record === void 0 ? void 0 : record.isOnce) === 1) {
1039
1043
  var _record$onceInfo6, _record$onceInfo7, _record$onceInfo9, _record$onceInfo10;
@@ -1110,7 +1114,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1110
1114
  dataIndex: 'marketPriceMax',
1111
1115
  key: 'marketPriceMax',
1112
1116
  align: 'center',
1113
- width: 98,
1114
1117
  render: function render(text, record) {
1115
1118
  var _record$onceInfo16, _record$onceInfo17, _record$onceInfo19, _record$onceInfo20;
1116
1119
  if ((record === null || record === void 0 ? void 0 : (_record$onceInfo16 = record.onceInfo) === null || _record$onceInfo16 === void 0 ? void 0 : _record$onceInfo16.marketPriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo17 = record.onceInfo) === null || _record$onceInfo17 === void 0 ? void 0 : _record$onceInfo17.marketPriceMax)) {
@@ -1124,7 +1127,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1124
1127
  dataIndex: 'salePriceMax',
1125
1128
  key: 'salePriceMax',
1126
1129
  align: 'center',
1127
- width: 86,
1128
1130
  render: function render(text, record) {
1129
1131
  var _record$onceInfo21, _record$onceInfo22, _record$onceInfo24, _record$onceInfo25;
1130
1132
  if ((record === null || record === void 0 ? void 0 : (_record$onceInfo21 = record.onceInfo) === null || _record$onceInfo21 === void 0 ? void 0 : _record$onceInfo21.salePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo22 = record.onceInfo) === null || _record$onceInfo22 === void 0 ? void 0 : _record$onceInfo22.salePriceMax)) {
@@ -1175,9 +1177,32 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1175
1177
  }, v === null || v === void 0 ? void 0 : v.slice(0, 50)));
1176
1178
  }
1177
1179
  }];
1180
+ // 系统类目
1181
+ var categoryTree = [{
1182
+ title: '系统类目',
1183
+ dataIndex: 'categoryId',
1184
+ key: 'categoryId',
1185
+ align: 'center',
1186
+ width: 170,
1187
+ render: function render(text, record) {
1188
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, record.isEntity ? '实物商品' : '虚拟商品'), /*#__PURE__*/_react.default.createElement("div", null, record.categoryTreeName));
1189
+ }
1190
+ }];
1191
+ // 商品分类
1192
+ var flagCategoryInfo = [{
1193
+ title: '商品分类',
1194
+ key: 'flagCategoryInfo',
1195
+ align: 'center',
1196
+ width: 150,
1197
+ render: function render(_, record) {
1198
+ var _record$flagCategoryI;
1199
+ return (record === null || record === void 0 ? void 0 : (_record$flagCategoryI = record.flagCategoryInfo) === null || _record$flagCategoryI === void 0 ? void 0 : _record$flagCategoryI.treeName) || '-';
1200
+ }
1201
+ }];
1178
1202
  var columns = function columns() {
1179
1203
  var list = app === 1 ? columns1 : columns2;
1180
1204
  var list2 = searchParams.tab === 'xhdg' && mode === 1 ? dgssColumns : [];
1205
+ var list3 = searchParams.tab === 'zy' ? flagCategoryInfo : categoryTree;
1181
1206
  var _columns = [{
1182
1207
  title: '商品',
1183
1208
  dataIndex: 'goodsId',
@@ -1197,8 +1222,12 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1197
1222
  needOssProcess: false
1198
1223
  })), /*#__PURE__*/_react.default.createElement("div", {
1199
1224
  className: 'table-goods-content'
1200
- }, /*#__PURE__*/_react.default.createElement("div", {
1201
- className: 'table-goods-content-title'
1225
+ }, /*#__PURE__*/_react.default.createElement(_antd.Typography.Paragraph, {
1226
+ ellipsis: {
1227
+ rows: 2,
1228
+ tooltip: true
1229
+ },
1230
+ className: "table-goods-content-title"
1202
1231
  }, record.name), /*#__PURE__*/_react.default.createElement("div", {
1203
1232
  title: record.goodsId,
1204
1233
  className: 'table-goods-content-sub-title'
@@ -1209,17 +1238,11 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1209
1238
  dataIndex: 'brandName',
1210
1239
  key: 'brandName',
1211
1240
  align: 'center',
1212
- width: 140
1213
- }, {
1214
- title: '商品类目',
1215
- dataIndex: 'categoryId',
1216
- key: 'categoryId',
1217
- align: 'center',
1218
- width: 170,
1219
- render: function render(text, record) {
1220
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, record.isEntity ? '实物商品' : '虚拟商品'), /*#__PURE__*/_react.default.createElement("div", null, record.categoryTreeName));
1241
+ width: 140,
1242
+ render: function render(_, record) {
1243
+ return record.brandName || '-';
1221
1244
  }
1222
- }].concat(list, [{
1245
+ }].concat(list3, list, [{
1223
1246
  title: '库存',
1224
1247
  dataIndex: 'stock',
1225
1248
  key: 'stock',
@@ -1241,7 +1264,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1241
1264
  key: 'action',
1242
1265
  align: 'center',
1243
1266
  fixed: 'right',
1244
- width: 100,
1267
+ width: 80,
1245
1268
  render: function render(text, record) {
1246
1269
  if (defaultSelectedGoodsIds.includes(record.goodsId)) {
1247
1270
  return /*#__PURE__*/_react.default.createElement(_antd.Button, {
@@ -1316,12 +1339,19 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1316
1339
  onSelectOk(changePriceGoodsIds, changePriceGoodss);
1317
1340
  };
1318
1341
  // 改价逻辑 end ----------
1319
- return /*#__PURE__*/_react.default.createElement(_antd.Modal, _extends({
1320
- title: "\u6311\u9009\u66F4\u591A\u5546\u54C1",
1342
+ return /*#__PURE__*/_react.default.createElement(_plusConfigProvider.default, {
1343
+ prefixCls: "ant"
1344
+ }, /*#__PURE__*/_react.default.createElement(_antd.Modal, _extends({
1345
+ title: "\u6311\u9009\u5546\u54C1",
1321
1346
  open: true,
1322
1347
  footer: null,
1323
1348
  width: 1366,
1324
1349
  onCancel: onClose,
1350
+ styles: {
1351
+ body: {
1352
+ padding: '0 16px'
1353
+ }
1354
+ },
1325
1355
  className: "choose-mall-goods-modal",
1326
1356
  centered: true
1327
1357
  }, otherProps), renderTabs(), renderMainSearch(), renderSearch2(), /*#__PURE__*/_react.default.createElement(_antd.Table, {
@@ -1333,7 +1363,8 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1333
1363
  current: pageNo,
1334
1364
  position: ['bottomRight'],
1335
1365
  total: total,
1336
- showQuickJumper: true,
1366
+ size: 'default',
1367
+ showQuickJumper: false,
1337
1368
  showSizeChanger: true,
1338
1369
  defaultPageSize: pageSize || 10,
1339
1370
  onChange: function onChange(page, size) {
@@ -1352,7 +1383,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1352
1383
  marginTop: '20px'
1353
1384
  },
1354
1385
  scroll: {
1355
- x: 1500,
1386
+ x: 1800,
1356
1387
  y: 500
1357
1388
  },
1358
1389
  rowSelection: multiple ? rowSelection : undefined
@@ -1367,6 +1398,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
1367
1398
  changePriceGoodsIds: changePriceGoodsIds,
1368
1399
  isAllSelf: searchParams.tab === 'zy',
1369
1400
  onSuccess: onChangePriceSuccess
1370
- }));
1401
+ })));
1371
1402
  };
1372
1403
  var _default = exports.default = ChooseMallGoods;