@kmkf-fe-packages/basic-components 1.17.8-beta.23 → 1.17.8-beta.26

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/dist/index.esm.js CHANGED
@@ -11684,9 +11684,11 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
11684
11684
  var GoodsModal$2 = /*#__PURE__*/forwardRef(GoodsModal$1);
11685
11685
 
11686
11686
  var getTableData = function getTableData(_ref, formData) {
11687
+ var _formData$brandIds;
11687
11688
  var current = _ref.current,
11688
11689
  pageSize = _ref.pageSize;
11689
11690
  var data = {
11691
+ brandIds: ((_formData$brandIds = formData.brandIds) === null || _formData$brandIds === void 0 ? void 0 : _formData$brandIds.length) ? formData.brandIds : null,
11690
11692
  skuCode: formData.skuCode || null,
11691
11693
  skuName: formData.skuName || null,
11692
11694
  goodName: formData.goodName || null,
@@ -11771,6 +11773,11 @@ var columns$1 = [{
11771
11773
  title: '商品ID',
11772
11774
  width: 200,
11773
11775
  ellipsis: true
11776
+ }, {
11777
+ dataIndex: 'brandName',
11778
+ title: '品牌名称',
11779
+ width: 200,
11780
+ ellipsis: true
11774
11781
  }, {
11775
11782
  dataIndex: 'marketPrice',
11776
11783
  title: '市场价',
@@ -11802,6 +11809,10 @@ var GoodList = function GoodList(props, ref) {
11802
11809
  _useState4 = _slicedToArray(_useState3, 2),
11803
11810
  selectIds = _useState4[0],
11804
11811
  setSelectIds = _useState4[1];
11812
+ var _useState5 = useState([]),
11813
+ _useState6 = _slicedToArray(_useState5, 2),
11814
+ brandList = _useState6[0],
11815
+ setBrandList = _useState6[1];
11805
11816
  useImperativeHandle(ref, function () {
11806
11817
  return {
11807
11818
  getSelectGoodList: function getSelectGoodList() {
@@ -11821,6 +11832,37 @@ var GoodList = function GoodList(props, ref) {
11821
11832
  params = _useAntdTable.params;
11822
11833
  var submit = search.submit,
11823
11834
  reset = search.reset;
11835
+ var setGoodBrandList = function setGoodBrandList() {
11836
+ var list = [];
11837
+ var pageNo = 0;
11838
+ var pageSize = 100;
11839
+ var getMore = function getMore() {
11840
+ extendRequest('/qy/gdfw/wdt/erp/goodBrand/list', {
11841
+ method: 'post',
11842
+ data: {
11843
+ pageSize: pageSize,
11844
+ pageNo: pageNo
11845
+ }
11846
+ }).then(function (res) {
11847
+ var _res$data2;
11848
+ if (res.success && (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.detailList)) {
11849
+ var _res$data3, _res$data4;
11850
+ list.push.apply(list, _toConsumableArray((res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.detailList) || []));
11851
+ if ((res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.detailList.length) === pageSize) {
11852
+ pageNo += 1;
11853
+ console.log('🚀 ~ getMore ~ pageNo:', pageNo);
11854
+ getMore();
11855
+ } else {
11856
+ setBrandList(list);
11857
+ }
11858
+ }
11859
+ }).catch(console.error);
11860
+ };
11861
+ getMore();
11862
+ };
11863
+ React.useEffect(function () {
11864
+ setGoodBrandList();
11865
+ }, []);
11824
11866
  var advanceSearchForm = /*#__PURE__*/React.createElement(Form, {
11825
11867
  layout: "inline",
11826
11868
  form: form
@@ -11868,6 +11910,29 @@ var GoodList = function GoodList(props, ref) {
11868
11910
  style: {
11869
11911
  width: 150
11870
11912
  }
11913
+ })), /*#__PURE__*/React.createElement(Form.Item, {
11914
+ name: "brandIds",
11915
+ style: {
11916
+ marginBottom: '12px'
11917
+ }
11918
+ }, /*#__PURE__*/React.createElement(Select, {
11919
+ mode: "multiple",
11920
+ showSearch: true,
11921
+ allowClear: true,
11922
+ style: {
11923
+ width: 150
11924
+ },
11925
+ placeholder: "\u54C1\u724C",
11926
+ options: brandList.filter(function (item) {
11927
+ return !item.isDisabled;
11928
+ }).map(function (_ref2) {
11929
+ var value = _ref2.brandId,
11930
+ label = _ref2.brandName;
11931
+ return {
11932
+ value: value,
11933
+ label: label
11934
+ };
11935
+ })
11871
11936
  })), /*#__PURE__*/React.createElement(Form.Item, {
11872
11937
  style: {
11873
11938
  marginBottom: '12px'
@@ -12029,7 +12094,7 @@ var getTableData$1 = function getTableData(_ref, formData) {
12029
12094
  pageSize = _ref.pageSize;
12030
12095
  var data = {
12031
12096
  goodsSn: formData.goodsSn || null,
12032
- goodsname: formData.goodsname || null,
12097
+ goodsName: formData.goodsName || null,
12033
12098
  sku: formData.sku || null,
12034
12099
  skuId: formData.skuId || null
12035
12100
  };
@@ -12069,23 +12134,29 @@ var columns$2 = [{
12069
12134
  },
12070
12135
  width: 100
12071
12136
  }, {
12072
- dataIndex: 'specName',
12073
- title: 'SKU名称',
12074
- width: 250,
12075
- ellipsis: true
12137
+ dataIndex: 'sku',
12138
+ title: "SKU",
12139
+ ellipsis: true,
12140
+ width: 70
12076
12141
  }, {
12077
- dataIndex: 'specNo',
12078
- title: 'SKU编码',
12079
- width: 200,
12080
- ellipsis: true
12142
+ dataIndex: 'skuId',
12143
+ title: "SKU ID",
12144
+ ellipsis: true,
12145
+ width: 70
12081
12146
  }, {
12082
- dataIndex: 'specId',
12083
- title: 'SKUID',
12084
- width: 200,
12085
- ellipsis: true
12147
+ dataIndex: 'goodsName',
12148
+ title: "\u5546\u54C1\u540D\u79F0",
12149
+ ellipsis: true,
12150
+ width: 70
12086
12151
  }, {
12087
- dataIndex: 'specImgUrl',
12088
- title: '商品图片',
12152
+ dataIndex: 'goodsSname',
12153
+ title: "\u5546\u54C1\u7B80\u79F0",
12154
+ ellipsis: true,
12155
+ width: 70
12156
+ }, {
12157
+ dataIndex: 'picPath',
12158
+ title: "\u5546\u54C1\u56FE\u7247",
12159
+ ellipsis: true,
12089
12160
  width: 100,
12090
12161
  render: function render(picUrl) {
12091
12162
  return /*#__PURE__*/React.createElement("img", {
@@ -12098,41 +12169,90 @@ var columns$2 = [{
12098
12169
  });
12099
12170
  }
12100
12171
  }, {
12101
- dataIndex: 'goodName',
12102
- title: '商品名称',
12103
- width: 250,
12104
- ellipsis: true
12172
+ dataIndex: 'goodsSn',
12173
+ title: "\u8D27\u53F7",
12174
+ ellipsis: true,
12175
+ width: 70
12105
12176
  }, {
12106
- dataIndex: 'goodNo',
12107
- title: '商品编码',
12108
- width: 200,
12109
- ellipsis: true
12177
+ dataIndex: 'goodsId',
12178
+ title: "\u8D27\u53F7ID",
12179
+ ellipsis: true,
12180
+ width: 70
12110
12181
  }, {
12111
- dataIndex: 'goodId',
12112
- title: '商品ID',
12113
- width: 200,
12114
- ellipsis: true
12182
+ dataIndex: 'colorName',
12183
+ title: "\u989C\u8272\u540D\u79F0",
12184
+ ellipsis: true,
12185
+ width: 70
12115
12186
  }, {
12116
- dataIndex: 'marketPrice',
12117
- title: '市场价',
12118
- width: 140,
12119
- render: function render(price) {
12120
- return Number(price).toFixed(2);
12121
- }
12187
+ dataIndex: 'colorCode',
12188
+ title: "\u989C\u8272\u4EE3\u7801",
12189
+ ellipsis: true,
12190
+ width: 70
12122
12191
  }, {
12123
- dataIndex: 'retailPrice',
12124
- title: '零售价',
12125
- width: 140,
12126
- render: function render(price) {
12127
- return Number(price).toFixed(2);
12128
- }
12192
+ dataIndex: 'sizeName',
12193
+ title: "\u5C3A\u7801\u540D\u79F0",
12194
+ ellipsis: true,
12195
+ width: 70
12129
12196
  }, {
12130
- dataIndex: 'memberPrice',
12131
- title: '会员价',
12132
- width: 140,
12133
- render: function render(price) {
12134
- return Number(price).toFixed(2);
12135
- }
12197
+ dataIndex: 'sizeCode',
12198
+ title: "\u5C3A\u7801\u4EE3\u7801",
12199
+ ellipsis: true,
12200
+ width: 70
12201
+ }, {
12202
+ dataIndex: 'brandName',
12203
+ title: "\u54C1\u724C\u540D\u79F0",
12204
+ ellipsis: true,
12205
+ width: 70
12206
+ }, {
12207
+ dataIndex: 'goodsNumber',
12208
+ title: "\u5546\u54C1\u6570\u91CF",
12209
+ ellipsis: true,
12210
+ width: 70
12211
+ }, {
12212
+ dataIndex: 'goodsPrice',
12213
+ title: "\u5546\u54C1\u5355\u4EF7",
12214
+ ellipsis: true,
12215
+ width: 70
12216
+ }, {
12217
+ dataIndex: 'shopPrice',
12218
+ title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
12219
+ ellipsis: true,
12220
+ width: 70
12221
+ }, {
12222
+ dataIndex: 'sharePrice',
12223
+ title: "\u5206\u644A\u4EF7",
12224
+ ellipsis: true,
12225
+ width: 70
12226
+ }, {
12227
+ dataIndex: 'sharePayment',
12228
+ title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
12229
+ ellipsis: true,
12230
+ width: 70
12231
+ }, {
12232
+ dataIndex: 'payment',
12233
+ title: "\u5B9E\u4ED8\u91D1\u989D",
12234
+ ellipsis: true,
12235
+ width: 70
12236
+ }, {
12237
+ dataIndex: 'tcSku',
12238
+ title: "\u5957\u9910SKU",
12239
+ ellipsis: true,
12240
+ width: 70
12241
+ }, {
12242
+ dataIndex: 'tcGoodsNumber',
12243
+ title: "\u5957\u9910\u5957\u6570",
12244
+ ellipsis: true,
12245
+ width: 70
12246
+ }, {
12247
+ dataIndex: 'taocanSingleSl',
12248
+ title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
12249
+ ellipsis: true,
12250
+ width: 70
12251
+ }, {
12252
+ dataIndex: 'isGift',
12253
+ title: "\u662F\u5426\u8D60\u54C1",
12254
+ ellipsis: true,
12255
+ width: 70
12136
12256
  }];
12137
12257
  var GoodList$1 = function GoodList(props, ref) {
12138
12258
  var _useState = useState([]),
@@ -12177,7 +12297,7 @@ var GoodList$1 = function GoodList(props, ref) {
12177
12297
  width: 150
12178
12298
  }
12179
12299
  })), /*#__PURE__*/React.createElement(Form.Item, {
12180
- name: "goodsname",
12300
+ name: "goodsName",
12181
12301
  style: {
12182
12302
  marginBottom: '12px'
12183
12303
  }
@@ -12305,7 +12425,7 @@ var GoodList$1 = function GoodList(props, ref) {
12305
12425
  }
12306
12426
  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
12307
12427
  rowSelection: rowSelection,
12308
- rowKey: "specNo",
12428
+ rowKey: "goodsId",
12309
12429
  columns: columns$2,
12310
12430
  scroll: {
12311
12431
  x: '100%',
@@ -12804,6 +12924,143 @@ var GoodItem$1 = function GoodItem(props) {
12804
12924
  }];
12805
12925
  }
12806
12926
  break;
12927
+ case 'BS_E3_GOODS':
12928
+ {
12929
+ columns = [{
12930
+ dataIndex: 'sku',
12931
+ title: "SKU",
12932
+ align: 'center',
12933
+ ellipsis: true,
12934
+ width: 70
12935
+ }, {
12936
+ dataIndex: 'skuId',
12937
+ title: "SKU ID",
12938
+ align: 'center',
12939
+ ellipsis: true,
12940
+ width: 70
12941
+ }, {
12942
+ dataIndex: 'goodsName',
12943
+ title: "\u5546\u54C1\u540D\u79F0",
12944
+ align: 'center',
12945
+ ellipsis: true,
12946
+ width: 70
12947
+ }, {
12948
+ dataIndex: 'goodsSname',
12949
+ title: "\u5546\u54C1\u7B80\u79F0",
12950
+ align: 'center',
12951
+ ellipsis: true,
12952
+ width: 70
12953
+ }, {
12954
+ dataIndex: 'picPath',
12955
+ title: "\u5546\u54C1\u56FE\u7247",
12956
+ align: 'center',
12957
+ ellipsis: true,
12958
+ width: 70
12959
+ }, {
12960
+ dataIndex: 'goodsSn',
12961
+ title: "\u8D27\u53F7",
12962
+ align: 'center',
12963
+ ellipsis: true,
12964
+ width: 70
12965
+ }, {
12966
+ dataIndex: 'goodsId',
12967
+ title: "\u8D27\u53F7ID",
12968
+ align: 'center',
12969
+ ellipsis: true,
12970
+ width: 70
12971
+ }, {
12972
+ dataIndex: 'colorName',
12973
+ title: "\u989C\u8272\u540D\u79F0",
12974
+ align: 'center',
12975
+ ellipsis: true,
12976
+ width: 70
12977
+ }, {
12978
+ dataIndex: 'colorCode',
12979
+ title: "\u989C\u8272\u4EE3\u7801",
12980
+ align: 'center',
12981
+ ellipsis: true,
12982
+ width: 70
12983
+ }, {
12984
+ dataIndex: 'sizeName',
12985
+ title: "\u5C3A\u7801\u540D\u79F0",
12986
+ align: 'center',
12987
+ ellipsis: true,
12988
+ width: 70
12989
+ }, {
12990
+ dataIndex: 'sizeCode',
12991
+ title: "\u5C3A\u7801\u4EE3\u7801",
12992
+ align: 'center',
12993
+ ellipsis: true,
12994
+ width: 70
12995
+ }, {
12996
+ dataIndex: 'brandName',
12997
+ title: "\u54C1\u724C\u540D\u79F0",
12998
+ align: 'center',
12999
+ ellipsis: true,
13000
+ width: 70
13001
+ }, {
13002
+ dataIndex: 'goodsNumber',
13003
+ title: "\u5546\u54C1\u6570\u91CF",
13004
+ align: 'center',
13005
+ ellipsis: true,
13006
+ width: 70
13007
+ }, {
13008
+ dataIndex: 'goodsPrice',
13009
+ title: "\u5546\u54C1\u5355\u4EF7",
13010
+ align: 'center',
13011
+ ellipsis: true,
13012
+ width: 70
13013
+ }, {
13014
+ dataIndex: 'shopPrice',
13015
+ title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
13016
+ align: 'center',
13017
+ ellipsis: true,
13018
+ width: 70
13019
+ }, {
13020
+ dataIndex: 'sharePrice',
13021
+ title: "\u5206\u644A\u4EF7",
13022
+ align: 'center',
13023
+ ellipsis: true,
13024
+ width: 70
13025
+ }, {
13026
+ dataIndex: 'sharePayment',
13027
+ title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
13028
+ align: 'center',
13029
+ ellipsis: true,
13030
+ width: 70
13031
+ }, {
13032
+ dataIndex: 'payment',
13033
+ title: "\u5B9E\u4ED8\u91D1\u989D",
13034
+ align: 'center',
13035
+ ellipsis: true,
13036
+ width: 70
13037
+ }, {
13038
+ dataIndex: 'tcSku',
13039
+ title: "\u5957\u9910SKU",
13040
+ align: 'center',
13041
+ ellipsis: true,
13042
+ width: 70
13043
+ }, {
13044
+ dataIndex: 'tcGoodsNumber',
13045
+ title: "\u5957\u9910\u5957\u6570",
13046
+ align: 'center',
13047
+ ellipsis: true,
13048
+ width: 70
13049
+ }, {
13050
+ dataIndex: 'taocanSingleSl',
13051
+ title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
13052
+ align: 'center',
13053
+ ellipsis: true,
13054
+ width: 70
13055
+ }, {
13056
+ dataIndex: 'isGift',
13057
+ title: "\u662F\u5426\u8D60\u54C1",
13058
+ align: 'center',
13059
+ ellipsis: true,
13060
+ width: 70
13061
+ }];
13062
+ }
13063
+ break;
12807
13064
  default:
12808
13065
  columns = [{
12809
13066
  dataIndex: 'mark',
@@ -14043,6 +14300,27 @@ var componentMap$1 = {
14043
14300
  returnDeleteGood: 'wdtReturnDeleteGood',
14044
14301
  exchangeDeleteGood: 'wdtExchangeDeleteGood'
14045
14302
  }
14303
+ },
14304
+ 'BS_E3_GOODS': {
14305
+ type: 'e3',
14306
+ key: 'bsE3Goods',
14307
+ name: '旺店通',
14308
+ eventNameMap: {
14309
+ type: 'bsE3Type',
14310
+ selectListReturn: 'bsE3SelectListReturn',
14311
+ selectList: 'bsE3SelectList',
14312
+ reissueSelectList: 'bsE3ReissueSelectList',
14313
+ reissueSelectListReturn: 'bsE3ReissueSelectListReturn',
14314
+ reissueDeleteGood: 'bsE3ReissueDeleteGood',
14315
+ changeShopCode: 'bsE3ChangeShopCode',
14316
+ reissueType: 'bsE3ReissueType',
14317
+ returnType: 'bsE3ReturnType',
14318
+ returnSelectListReturn: 'bsE3ReturnSelectListReturn',
14319
+ returnSelectList: 'bsE3ReturnSelectList',
14320
+ deleteGood: 'bsE3DeleteGood',
14321
+ returnDeleteGood: 'bsE3ReturnDeleteGood',
14322
+ exchangeDeleteGood: 'bsE3ExchangeDeleteGood'
14323
+ }
14046
14324
  }
14047
14325
  };
14048
14326
  var CommonGoods = function CommonGoods(props) {
package/dist/index.js CHANGED
@@ -11696,9 +11696,11 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
11696
11696
  var GoodsModal$2 = /*#__PURE__*/React.forwardRef(GoodsModal$1);
11697
11697
 
11698
11698
  var getTableData = function getTableData(_ref, formData) {
11699
+ var _formData$brandIds;
11699
11700
  var current = _ref.current,
11700
11701
  pageSize = _ref.pageSize;
11701
11702
  var data = {
11703
+ brandIds: ((_formData$brandIds = formData.brandIds) === null || _formData$brandIds === void 0 ? void 0 : _formData$brandIds.length) ? formData.brandIds : null,
11702
11704
  skuCode: formData.skuCode || null,
11703
11705
  skuName: formData.skuName || null,
11704
11706
  goodName: formData.goodName || null,
@@ -11783,6 +11785,11 @@ var columns$1 = [{
11783
11785
  title: '商品ID',
11784
11786
  width: 200,
11785
11787
  ellipsis: true
11788
+ }, {
11789
+ dataIndex: 'brandName',
11790
+ title: '品牌名称',
11791
+ width: 200,
11792
+ ellipsis: true
11786
11793
  }, {
11787
11794
  dataIndex: 'marketPrice',
11788
11795
  title: '市场价',
@@ -11814,6 +11821,10 @@ var GoodList = function GoodList(props, ref) {
11814
11821
  _useState4 = _slicedToArray(_useState3, 2),
11815
11822
  selectIds = _useState4[0],
11816
11823
  setSelectIds = _useState4[1];
11824
+ var _useState5 = React.useState([]),
11825
+ _useState6 = _slicedToArray(_useState5, 2),
11826
+ brandList = _useState6[0],
11827
+ setBrandList = _useState6[1];
11817
11828
  React.useImperativeHandle(ref, function () {
11818
11829
  return {
11819
11830
  getSelectGoodList: function getSelectGoodList() {
@@ -11833,6 +11844,37 @@ var GoodList = function GoodList(props, ref) {
11833
11844
  params = _useAntdTable.params;
11834
11845
  var submit = search.submit,
11835
11846
  reset = search.reset;
11847
+ var setGoodBrandList = function setGoodBrandList() {
11848
+ var list = [];
11849
+ var pageNo = 0;
11850
+ var pageSize = 100;
11851
+ var getMore = function getMore() {
11852
+ extendRequest('/qy/gdfw/wdt/erp/goodBrand/list', {
11853
+ method: 'post',
11854
+ data: {
11855
+ pageSize: pageSize,
11856
+ pageNo: pageNo
11857
+ }
11858
+ }).then(function (res) {
11859
+ var _res$data2;
11860
+ if (res.success && (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.detailList)) {
11861
+ var _res$data3, _res$data4;
11862
+ list.push.apply(list, _toConsumableArray((res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.detailList) || []));
11863
+ if ((res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.detailList.length) === pageSize) {
11864
+ pageNo += 1;
11865
+ console.log('🚀 ~ getMore ~ pageNo:', pageNo);
11866
+ getMore();
11867
+ } else {
11868
+ setBrandList(list);
11869
+ }
11870
+ }
11871
+ }).catch(console.error);
11872
+ };
11873
+ getMore();
11874
+ };
11875
+ React__default['default'].useEffect(function () {
11876
+ setGoodBrandList();
11877
+ }, []);
11836
11878
  var advanceSearchForm = /*#__PURE__*/React__default['default'].createElement(antd.Form, {
11837
11879
  layout: "inline",
11838
11880
  form: form
@@ -11880,6 +11922,29 @@ var GoodList = function GoodList(props, ref) {
11880
11922
  style: {
11881
11923
  width: 150
11882
11924
  }
11925
+ })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
11926
+ name: "brandIds",
11927
+ style: {
11928
+ marginBottom: '12px'
11929
+ }
11930
+ }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
11931
+ mode: "multiple",
11932
+ showSearch: true,
11933
+ allowClear: true,
11934
+ style: {
11935
+ width: 150
11936
+ },
11937
+ placeholder: "\u54C1\u724C",
11938
+ options: brandList.filter(function (item) {
11939
+ return !item.isDisabled;
11940
+ }).map(function (_ref2) {
11941
+ var value = _ref2.brandId,
11942
+ label = _ref2.brandName;
11943
+ return {
11944
+ value: value,
11945
+ label: label
11946
+ };
11947
+ })
11883
11948
  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
11884
11949
  style: {
11885
11950
  marginBottom: '12px'
@@ -12041,7 +12106,7 @@ var getTableData$1 = function getTableData(_ref, formData) {
12041
12106
  pageSize = _ref.pageSize;
12042
12107
  var data = {
12043
12108
  goodsSn: formData.goodsSn || null,
12044
- goodsname: formData.goodsname || null,
12109
+ goodsName: formData.goodsName || null,
12045
12110
  sku: formData.sku || null,
12046
12111
  skuId: formData.skuId || null
12047
12112
  };
@@ -12081,23 +12146,29 @@ var columns$2 = [{
12081
12146
  },
12082
12147
  width: 100
12083
12148
  }, {
12084
- dataIndex: 'specName',
12085
- title: 'SKU名称',
12086
- width: 250,
12087
- ellipsis: true
12149
+ dataIndex: 'sku',
12150
+ title: "SKU",
12151
+ ellipsis: true,
12152
+ width: 70
12088
12153
  }, {
12089
- dataIndex: 'specNo',
12090
- title: 'SKU编码',
12091
- width: 200,
12092
- ellipsis: true
12154
+ dataIndex: 'skuId',
12155
+ title: "SKU ID",
12156
+ ellipsis: true,
12157
+ width: 70
12093
12158
  }, {
12094
- dataIndex: 'specId',
12095
- title: 'SKUID',
12096
- width: 200,
12097
- ellipsis: true
12159
+ dataIndex: 'goodsName',
12160
+ title: "\u5546\u54C1\u540D\u79F0",
12161
+ ellipsis: true,
12162
+ width: 70
12098
12163
  }, {
12099
- dataIndex: 'specImgUrl',
12100
- title: '商品图片',
12164
+ dataIndex: 'goodsSname',
12165
+ title: "\u5546\u54C1\u7B80\u79F0",
12166
+ ellipsis: true,
12167
+ width: 70
12168
+ }, {
12169
+ dataIndex: 'picPath',
12170
+ title: "\u5546\u54C1\u56FE\u7247",
12171
+ ellipsis: true,
12101
12172
  width: 100,
12102
12173
  render: function render(picUrl) {
12103
12174
  return /*#__PURE__*/React__default['default'].createElement("img", {
@@ -12110,41 +12181,90 @@ var columns$2 = [{
12110
12181
  });
12111
12182
  }
12112
12183
  }, {
12113
- dataIndex: 'goodName',
12114
- title: '商品名称',
12115
- width: 250,
12116
- ellipsis: true
12184
+ dataIndex: 'goodsSn',
12185
+ title: "\u8D27\u53F7",
12186
+ ellipsis: true,
12187
+ width: 70
12117
12188
  }, {
12118
- dataIndex: 'goodNo',
12119
- title: '商品编码',
12120
- width: 200,
12121
- ellipsis: true
12189
+ dataIndex: 'goodsId',
12190
+ title: "\u8D27\u53F7ID",
12191
+ ellipsis: true,
12192
+ width: 70
12122
12193
  }, {
12123
- dataIndex: 'goodId',
12124
- title: '商品ID',
12125
- width: 200,
12126
- ellipsis: true
12194
+ dataIndex: 'colorName',
12195
+ title: "\u989C\u8272\u540D\u79F0",
12196
+ ellipsis: true,
12197
+ width: 70
12127
12198
  }, {
12128
- dataIndex: 'marketPrice',
12129
- title: '市场价',
12130
- width: 140,
12131
- render: function render(price) {
12132
- return Number(price).toFixed(2);
12133
- }
12199
+ dataIndex: 'colorCode',
12200
+ title: "\u989C\u8272\u4EE3\u7801",
12201
+ ellipsis: true,
12202
+ width: 70
12134
12203
  }, {
12135
- dataIndex: 'retailPrice',
12136
- title: '零售价',
12137
- width: 140,
12138
- render: function render(price) {
12139
- return Number(price).toFixed(2);
12140
- }
12204
+ dataIndex: 'sizeName',
12205
+ title: "\u5C3A\u7801\u540D\u79F0",
12206
+ ellipsis: true,
12207
+ width: 70
12141
12208
  }, {
12142
- dataIndex: 'memberPrice',
12143
- title: '会员价',
12144
- width: 140,
12145
- render: function render(price) {
12146
- return Number(price).toFixed(2);
12147
- }
12209
+ dataIndex: 'sizeCode',
12210
+ title: "\u5C3A\u7801\u4EE3\u7801",
12211
+ ellipsis: true,
12212
+ width: 70
12213
+ }, {
12214
+ dataIndex: 'brandName',
12215
+ title: "\u54C1\u724C\u540D\u79F0",
12216
+ ellipsis: true,
12217
+ width: 70
12218
+ }, {
12219
+ dataIndex: 'goodsNumber',
12220
+ title: "\u5546\u54C1\u6570\u91CF",
12221
+ ellipsis: true,
12222
+ width: 70
12223
+ }, {
12224
+ dataIndex: 'goodsPrice',
12225
+ title: "\u5546\u54C1\u5355\u4EF7",
12226
+ ellipsis: true,
12227
+ width: 70
12228
+ }, {
12229
+ dataIndex: 'shopPrice',
12230
+ title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
12231
+ ellipsis: true,
12232
+ width: 70
12233
+ }, {
12234
+ dataIndex: 'sharePrice',
12235
+ title: "\u5206\u644A\u4EF7",
12236
+ ellipsis: true,
12237
+ width: 70
12238
+ }, {
12239
+ dataIndex: 'sharePayment',
12240
+ title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
12241
+ ellipsis: true,
12242
+ width: 70
12243
+ }, {
12244
+ dataIndex: 'payment',
12245
+ title: "\u5B9E\u4ED8\u91D1\u989D",
12246
+ ellipsis: true,
12247
+ width: 70
12248
+ }, {
12249
+ dataIndex: 'tcSku',
12250
+ title: "\u5957\u9910SKU",
12251
+ ellipsis: true,
12252
+ width: 70
12253
+ }, {
12254
+ dataIndex: 'tcGoodsNumber',
12255
+ title: "\u5957\u9910\u5957\u6570",
12256
+ ellipsis: true,
12257
+ width: 70
12258
+ }, {
12259
+ dataIndex: 'taocanSingleSl',
12260
+ title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
12261
+ ellipsis: true,
12262
+ width: 70
12263
+ }, {
12264
+ dataIndex: 'isGift',
12265
+ title: "\u662F\u5426\u8D60\u54C1",
12266
+ ellipsis: true,
12267
+ width: 70
12148
12268
  }];
12149
12269
  var GoodList$1 = function GoodList(props, ref) {
12150
12270
  var _useState = React.useState([]),
@@ -12189,7 +12309,7 @@ var GoodList$1 = function GoodList(props, ref) {
12189
12309
  width: 150
12190
12310
  }
12191
12311
  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
12192
- name: "goodsname",
12312
+ name: "goodsName",
12193
12313
  style: {
12194
12314
  marginBottom: '12px'
12195
12315
  }
@@ -12317,7 +12437,7 @@ var GoodList$1 = function GoodList(props, ref) {
12317
12437
  }
12318
12438
  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
12319
12439
  rowSelection: rowSelection,
12320
- rowKey: "specNo",
12440
+ rowKey: "goodsId",
12321
12441
  columns: columns$2,
12322
12442
  scroll: {
12323
12443
  x: '100%',
@@ -12816,6 +12936,143 @@ var GoodItem$1 = function GoodItem(props) {
12816
12936
  }];
12817
12937
  }
12818
12938
  break;
12939
+ case 'BS_E3_GOODS':
12940
+ {
12941
+ columns = [{
12942
+ dataIndex: 'sku',
12943
+ title: "SKU",
12944
+ align: 'center',
12945
+ ellipsis: true,
12946
+ width: 70
12947
+ }, {
12948
+ dataIndex: 'skuId',
12949
+ title: "SKU ID",
12950
+ align: 'center',
12951
+ ellipsis: true,
12952
+ width: 70
12953
+ }, {
12954
+ dataIndex: 'goodsName',
12955
+ title: "\u5546\u54C1\u540D\u79F0",
12956
+ align: 'center',
12957
+ ellipsis: true,
12958
+ width: 70
12959
+ }, {
12960
+ dataIndex: 'goodsSname',
12961
+ title: "\u5546\u54C1\u7B80\u79F0",
12962
+ align: 'center',
12963
+ ellipsis: true,
12964
+ width: 70
12965
+ }, {
12966
+ dataIndex: 'picPath',
12967
+ title: "\u5546\u54C1\u56FE\u7247",
12968
+ align: 'center',
12969
+ ellipsis: true,
12970
+ width: 70
12971
+ }, {
12972
+ dataIndex: 'goodsSn',
12973
+ title: "\u8D27\u53F7",
12974
+ align: 'center',
12975
+ ellipsis: true,
12976
+ width: 70
12977
+ }, {
12978
+ dataIndex: 'goodsId',
12979
+ title: "\u8D27\u53F7ID",
12980
+ align: 'center',
12981
+ ellipsis: true,
12982
+ width: 70
12983
+ }, {
12984
+ dataIndex: 'colorName',
12985
+ title: "\u989C\u8272\u540D\u79F0",
12986
+ align: 'center',
12987
+ ellipsis: true,
12988
+ width: 70
12989
+ }, {
12990
+ dataIndex: 'colorCode',
12991
+ title: "\u989C\u8272\u4EE3\u7801",
12992
+ align: 'center',
12993
+ ellipsis: true,
12994
+ width: 70
12995
+ }, {
12996
+ dataIndex: 'sizeName',
12997
+ title: "\u5C3A\u7801\u540D\u79F0",
12998
+ align: 'center',
12999
+ ellipsis: true,
13000
+ width: 70
13001
+ }, {
13002
+ dataIndex: 'sizeCode',
13003
+ title: "\u5C3A\u7801\u4EE3\u7801",
13004
+ align: 'center',
13005
+ ellipsis: true,
13006
+ width: 70
13007
+ }, {
13008
+ dataIndex: 'brandName',
13009
+ title: "\u54C1\u724C\u540D\u79F0",
13010
+ align: 'center',
13011
+ ellipsis: true,
13012
+ width: 70
13013
+ }, {
13014
+ dataIndex: 'goodsNumber',
13015
+ title: "\u5546\u54C1\u6570\u91CF",
13016
+ align: 'center',
13017
+ ellipsis: true,
13018
+ width: 70
13019
+ }, {
13020
+ dataIndex: 'goodsPrice',
13021
+ title: "\u5546\u54C1\u5355\u4EF7",
13022
+ align: 'center',
13023
+ ellipsis: true,
13024
+ width: 70
13025
+ }, {
13026
+ dataIndex: 'shopPrice',
13027
+ title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
13028
+ align: 'center',
13029
+ ellipsis: true,
13030
+ width: 70
13031
+ }, {
13032
+ dataIndex: 'sharePrice',
13033
+ title: "\u5206\u644A\u4EF7",
13034
+ align: 'center',
13035
+ ellipsis: true,
13036
+ width: 70
13037
+ }, {
13038
+ dataIndex: 'sharePayment',
13039
+ title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
13040
+ align: 'center',
13041
+ ellipsis: true,
13042
+ width: 70
13043
+ }, {
13044
+ dataIndex: 'payment',
13045
+ title: "\u5B9E\u4ED8\u91D1\u989D",
13046
+ align: 'center',
13047
+ ellipsis: true,
13048
+ width: 70
13049
+ }, {
13050
+ dataIndex: 'tcSku',
13051
+ title: "\u5957\u9910SKU",
13052
+ align: 'center',
13053
+ ellipsis: true,
13054
+ width: 70
13055
+ }, {
13056
+ dataIndex: 'tcGoodsNumber',
13057
+ title: "\u5957\u9910\u5957\u6570",
13058
+ align: 'center',
13059
+ ellipsis: true,
13060
+ width: 70
13061
+ }, {
13062
+ dataIndex: 'taocanSingleSl',
13063
+ title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
13064
+ align: 'center',
13065
+ ellipsis: true,
13066
+ width: 70
13067
+ }, {
13068
+ dataIndex: 'isGift',
13069
+ title: "\u662F\u5426\u8D60\u54C1",
13070
+ align: 'center',
13071
+ ellipsis: true,
13072
+ width: 70
13073
+ }];
13074
+ }
13075
+ break;
12819
13076
  default:
12820
13077
  columns = [{
12821
13078
  dataIndex: 'mark',
@@ -14055,6 +14312,27 @@ var componentMap$1 = {
14055
14312
  returnDeleteGood: 'wdtReturnDeleteGood',
14056
14313
  exchangeDeleteGood: 'wdtExchangeDeleteGood'
14057
14314
  }
14315
+ },
14316
+ 'BS_E3_GOODS': {
14317
+ type: 'e3',
14318
+ key: 'bsE3Goods',
14319
+ name: '旺店通',
14320
+ eventNameMap: {
14321
+ type: 'bsE3Type',
14322
+ selectListReturn: 'bsE3SelectListReturn',
14323
+ selectList: 'bsE3SelectList',
14324
+ reissueSelectList: 'bsE3ReissueSelectList',
14325
+ reissueSelectListReturn: 'bsE3ReissueSelectListReturn',
14326
+ reissueDeleteGood: 'bsE3ReissueDeleteGood',
14327
+ changeShopCode: 'bsE3ChangeShopCode',
14328
+ reissueType: 'bsE3ReissueType',
14329
+ returnType: 'bsE3ReturnType',
14330
+ returnSelectListReturn: 'bsE3ReturnSelectListReturn',
14331
+ returnSelectList: 'bsE3ReturnSelectList',
14332
+ deleteGood: 'bsE3DeleteGood',
14333
+ returnDeleteGood: 'bsE3ReturnDeleteGood',
14334
+ exchangeDeleteGood: 'bsE3ExchangeDeleteGood'
14335
+ }
14058
14336
  }
14059
14337
  };
14060
14338
  var CommonGoods = function CommonGoods(props) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "1.17.8-beta.23",
3
+ "version": "1.17.8-beta.26",
4
4
  "description": "> TODO: description",
5
5
  "homepage": "",
6
6
  "license": "ISC",
@@ -65,5 +65,5 @@
65
65
  "publishConfig": {
66
66
  "access": "public"
67
67
  },
68
- "gitHead": "c50522eca1b1d48665a854ca4bad212c4805ff2c"
68
+ "gitHead": "9de0e2e79d9f3aeacd388c9ed1319a11a0ca96f8"
69
69
  }
@@ -1,8 +0,0 @@
1
- declare const store: import("@reduxjs/toolkit/dist/configureStore").ToolkitStore<{
2
- orderInfo: import("./orderInfo/type").OrderInfo;
3
- }, import("redux").AnyAction, [import("@reduxjs/toolkit").ThunkMiddleware<{
4
- orderInfo: import("./orderInfo/type").OrderInfo;
5
- }, import("redux").AnyAction, undefined>]>;
6
- export default store;
7
- export type RootState = ReturnType<typeof store.getState>;
8
- export type AppDispatch = typeof store.dispatch;
@@ -1,11 +0,0 @@
1
- import { OrderInfo, OrderItem } from './type';
2
- export declare const initialState: OrderInfo;
3
- /**
4
- * @description: 查询旺店通系统订单列表
5
- * @param {*} dispatch
6
- * @return {array}
7
- */
8
- export declare const getWdtOrderList: (orderNo: string) => Promise<void>;
9
- export declare const setOrders: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderItem[], "orderInfo/setOrders">, setShowOrderInfo: import("@reduxjs/toolkit").ActionCreatorWithPayload<OrderItem[], "orderInfo/setShowOrderInfo">;
10
- declare const _default: import("redux").Reducer<OrderInfo, import("redux").AnyAction>;
11
- export default _default;
@@ -1,21 +0,0 @@
1
- export declare const selectOrders: ((state: {
2
- orderInfo: import("./type").OrderInfo;
3
- }) => import("./type").OrderItem[]) & import("reselect").OutputSelectorFields<(args_0: import("./type").OrderInfo) => import("./type").OrderItem[], {
4
- clearCache: () => void;
5
- }> & {
6
- clearCache: () => void;
7
- };
8
- export declare const selectShowOrderInfo: ((state: {
9
- orderInfo: import("./type").OrderInfo;
10
- }) => import("./type").OrderItem[]) & import("reselect").OutputSelectorFields<(args_0: import("./type").OrderInfo) => import("./type").OrderItem[], {
11
- clearCache: () => void;
12
- }> & {
13
- clearCache: () => void;
14
- };
15
- export declare const selectOnceRef: ((state: {
16
- orderInfo: import("./type").OrderInfo;
17
- }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./type").OrderInfo) => boolean, {
18
- clearCache: () => void;
19
- }> & {
20
- clearCache: () => void;
21
- };
@@ -1,13 +0,0 @@
1
- export interface OrderItem {
2
- billNo: string;
3
- billTag: string;
4
- billType: string;
5
- [key: string]: any;
6
- }
7
- export interface OrderInfo {
8
- orders: OrderItem[];
9
- orderNo: string;
10
- showOrderInfo: OrderItem[];
11
- onceRef: boolean;
12
- [key: string]: any;
13
- }