@kmkf-fe-packages/basic-components 2.7.3-beta.4 → 2.7.4

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
@@ -8594,10 +8594,6 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
8594
8594
  status: 'erpAfterSaleStatusValue',
8595
8595
  reason: 'erpAfterSaleStatusReason'
8596
8596
  },
8597
- ERP_AFTER_SALES_ORDER_REVIEW_STATUS: {
8598
- status: 'erpAfterSalesOrderReviewStatusValue',
8599
- reason: 'erpAfterSalesOrderReviewStatusReason'
8600
- },
8601
8597
  RETURN_EXCHANGE_GOODS_REVIEW_STATUS: {
8602
8598
  status: 'returnExchangeGoodsReviewStatusValue',
8603
8599
  reason: 'returnExchangeGoodsReviewStatusReason'
@@ -8626,8 +8622,7 @@ var processSceneStatus = function processSceneStatus(getValue) {
8626
8622
  BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
8627
8623
  MSG_STATUS: 'msgStatusValues',
8628
8624
  WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
8629
- JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
8630
- WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList'
8625
+ JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
8631
8626
  };
8632
8627
  return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
8633
8628
  };
@@ -9462,7 +9457,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9462
9457
  AGREE_REFUND_STATUS: processCallBackStatus,
9463
9458
  REJECT_REFUND_STATUS: processCallBackStatus,
9464
9459
  ERP_AFTER_SALE_STATUS: processCallBackStatus,
9465
- ERP_AFTER_SALES_ORDER_REVIEW_STATUS: processCallBackStatus,
9466
9460
  AGREE_RETURN_GOODS_STATUS: processCallBackStatus,
9467
9461
  REJECT_RETURN_GOODS_STATUS: processCallBackStatus,
9468
9462
  RETURN_EXCHANGE_GOODS_REVIEW_STATUS: processCallBackStatus,
@@ -9473,7 +9467,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9473
9467
  BS_E3_WAREHOUSING_STATUS: processSceneStatus,
9474
9468
  MSG_STATUS: processSceneStatus,
9475
9469
  WDT_WAREHOUSING_STATUS: processSceneStatus,
9476
- WLN_WAREHOUSING_STATUS: processSceneStatus,
9477
9470
  JKY_WAREHOUSING_STATUS: processSceneStatus,
9478
9471
  BS_LOGISTICS: processErpLogistics,
9479
9472
  WLN_LOGISTICS: processErpLogistics,
@@ -11655,7 +11648,7 @@ var GoodsModal = function GoodsModal(props) {
11655
11648
  key: item.value
11656
11649
  }, item.label);
11657
11650
  })), /*#__PURE__*/React.createElement(Search, {
11658
- placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝标题' : '商品ID' : '宝贝标题',
11651
+ placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝链接,标题' : '商品ID' : '宝贝标题',
11659
11652
  // enterButton="搜索"
11660
11653
  className: "search",
11661
11654
  value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
@@ -13161,7 +13154,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
13161
13154
  _props$required = props.required,
13162
13155
  required = _props$required === void 0 ? false : _props$required,
13163
13156
  onChange = props.onChange,
13164
- _onBlur = props.onBlur,
13165
13157
  _props$disabled = props.disabled,
13166
13158
  disabled = _props$disabled === void 0 ? false : _props$disabled,
13167
13159
  _props$isEditing = props.isEditing,
@@ -13375,7 +13367,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
13375
13367
  }
13376
13368
  }
13377
13369
  console.log('newValue', newValue);
13378
- onChange === null || onChange === void 0 ? void 0 : onChange(newValue, type);
13370
+ onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
13379
13371
  };
13380
13372
  //智能识别回调
13381
13373
  var changeIdentify = function changeIdentify(val) {
@@ -13427,10 +13419,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
13427
13419
  var _e$target$value;
13428
13420
  return changeHandle((_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.trim(), 'interceptCode');
13429
13421
  },
13430
- onBlur: function onBlur(e) {
13431
- var _e$target$value2;
13432
- return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'interceptCode');
13433
- },
13434
13422
  value: value === null || value === void 0 ? void 0 : value.interceptCode
13435
13423
  }))), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Item, {
13436
13424
  label: /*#__PURE__*/React.createElement("span", null, "\u5BA2\u6237\u7F16\u7801\uFF08K\u7801\uFF09\uFF1A", platform === 'pc' ? /*#__PURE__*/React.createElement(Typography.Link, {
@@ -13504,8 +13492,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
13504
13492
  disabled: disabled || isEdit,
13505
13493
  placeholder: senderMobileLabel,
13506
13494
  onChange: function onChange(e) {
13507
- var _e$target$value3;
13508
- return changeHandle((_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.trim(), 'interceptSenderMobile');
13495
+ var _e$target$value2;
13496
+ return changeHandle((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'interceptSenderMobile');
13509
13497
  }
13510
13498
  })), /*#__PURE__*/React.createElement(Item, {
13511
13499
  label: '退回地址',
@@ -13564,8 +13552,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
13564
13552
  },
13565
13553
  placeholder: "\u5176\u4ED6",
13566
13554
  onChange: function onChange(e) {
13567
- var _e$target$value4;
13568
- return changeHandle((_e$target$value4 = e.target.value) === null || _e$target$value4 === void 0 ? void 0 : _e$target$value4.trim(), 'interceptLogisticsStatusOther');
13555
+ var _e$target$value3;
13556
+ return changeHandle((_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.trim(), 'interceptLogisticsStatusOther');
13569
13557
  }
13570
13558
  })), /*#__PURE__*/React.createElement(Item, {
13571
13559
  label: '拦截状态',
@@ -13619,8 +13607,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
13619
13607
  disabled: true,
13620
13608
  placeholder: "\u63A5\u53E3\u72B6\u6001\u539F\u56E0",
13621
13609
  onChange: function onChange(e) {
13622
- var _e$target$value5;
13623
- return changeHandle((_e$target$value5 = e.target.value) === null || _e$target$value5 === void 0 ? void 0 : _e$target$value5.trim(), 'interceptLogisticsApiStatusReason');
13610
+ var _e$target$value4;
13611
+ return changeHandle((_e$target$value4 = e.target.value) === null || _e$target$value4 === void 0 ? void 0 : _e$target$value4.trim(), 'interceptLogisticsApiStatusReason');
13624
13612
  }
13625
13613
  })));
13626
13614
  };
@@ -14122,9 +14110,9 @@ var jstGoods = function jstGoods(props) {
14122
14110
  changeIndex = _useState2[0],
14123
14111
  setChangeIndex = _useState2[1]; //选中的包裹
14124
14112
  var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
14125
- var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln'].includes(platformType);
14113
+ var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky'].includes(platformType);
14126
14114
  var expressDateInstance = ExpressData.getInstance(platformType);
14127
- var isSendGoodSavedId = isSelectName && !['jst', 'wln'].includes(platformType);
14115
+ var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
14128
14116
  useEffect(function () {
14129
14117
  //没有值塞个默认值
14130
14118
  if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -15725,122 +15713,6 @@ var jkyColumns = [{
15725
15713
  }
15726
15714
  }];
15727
15715
 
15728
- var getYesOrNo$3 = function getYesOrNo(val) {
15729
- if (!isBoolean(val)) return null;
15730
- return val ? '是' : '否';
15731
- };
15732
- var wlnColumns = [{
15733
- dataIndex: 'goodName',
15734
- title: '商品名称',
15735
- width: 250,
15736
- ellipsis: true,
15737
- render: renderTextEllipsis
15738
- }, {
15739
- dataIndex: 'goodShortName',
15740
- title: "\u5546\u54C1\u7B80\u79F0",
15741
- ellipsis: true,
15742
- width: 150,
15743
- render: renderTextEllipsis
15744
- }, {
15745
- dataIndex: 'goodNo',
15746
- title: '商品编码',
15747
- width: 150,
15748
- ellipsis: true,
15749
- render: renderTextEllipsis
15750
- }, {
15751
- dataIndex: 'goodId',
15752
- title: '商品ID',
15753
- width: 200,
15754
- ellipsis: true,
15755
- render: renderTextEllipsis
15756
- }, {
15757
- dataIndex: 'goodPicUrl',
15758
- title: '商品图片',
15759
- width: 100,
15760
- render: function render(picUrl) {
15761
- return /*#__PURE__*/React.createElement("img", {
15762
- style: {
15763
- width: '30px',
15764
- height: '30px',
15765
- objectFit: 'contain'
15766
- },
15767
- src: picUrl
15768
- });
15769
- }
15770
- }, {
15771
- dataIndex: 'goodBarcode',
15772
- title: '商品条码',
15773
- width: 200,
15774
- ellipsis: true,
15775
- render: renderTextEllipsis
15776
- }, {
15777
- dataIndex: 'propertiesValue',
15778
- title: '规格值',
15779
- width: 200,
15780
- ellipsis: true,
15781
- render: renderTextEllipsis
15782
- }, {
15783
- dataIndex: 'specNo',
15784
- title: "SKU\u7F16\u7801",
15785
- ellipsis: true,
15786
- width: 150,
15787
- render: renderTextEllipsis
15788
- }, {
15789
- dataIndex: 'specId',
15790
- title: "SKU ID",
15791
- ellipsis: true,
15792
- width: 150,
15793
- render: renderTextEllipsis
15794
- }, {
15795
- dataIndex: 'specImgUrl',
15796
- title: "SKU \u56FE\u7247",
15797
- ellipsis: true,
15798
- width: 150,
15799
- render: function render(val) {
15800
- return /*#__PURE__*/React.createElement(Image, {
15801
- width: 30,
15802
- src: val
15803
- });
15804
- }
15805
- }, {
15806
- dataIndex: 'specBarcode',
15807
- title: '规格条码',
15808
- width: 150,
15809
- ellipsis: true,
15810
- render: renderTextEllipsis
15811
- }, {
15812
- dataIndex: 'brandName',
15813
- title: '品牌名称',
15814
- width: 200,
15815
- ellipsis: true,
15816
- render: renderTextEllipsis
15817
- }, {
15818
- dataIndex: 'retailPrice',
15819
- title: "\u96F6\u552E\u4EF7",
15820
- ellipsis: true,
15821
- width: 100,
15822
- render: renderTextEllipsis
15823
- }, {
15824
- dataIndex: 'marketPrice',
15825
- title: "\u5E02\u573A\u4EF7",
15826
- ellipsis: true,
15827
- width: 150,
15828
- render: renderTextEllipsis
15829
- }, {
15830
- dataIndex: 'unitName',
15831
- title: '基本单位',
15832
- width: 150,
15833
- render: renderTextEllipsis
15834
- }, {
15835
- dataIndex: 'skuType',
15836
- title: "\u662F\u5426\u7EC4\u5408\u88C5",
15837
- ellipsis: true,
15838
- width: 150,
15839
- render: function render(val) {
15840
- return renderTextEllipsis(getYesOrNo$3(val === 'combine'));
15841
- }
15842
- }];
15843
-
15844
15716
  var getColumnsMap = function getColumnsMap() {
15845
15717
  return cloneDeep({
15846
15718
  gy: gyColumns,
@@ -15849,8 +15721,7 @@ var getColumnsMap = function getColumnsMap() {
15849
15721
  bse3: bse3Columns,
15850
15722
  km: kmColumns,
15851
15723
  jy: jyColumns,
15852
- jky: jkyColumns,
15853
- wln: wlnColumns
15724
+ jky: jkyColumns
15854
15725
  });
15855
15726
  };
15856
15727
  var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -16282,33 +16153,30 @@ var GoodList = function GoodList(props, ref) {
16282
16153
  selectedRowKeys: selectIds,
16283
16154
  fixed: true,
16284
16155
  onSelect: function onSelect(record, selected) {
16285
- var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
16286
16156
  if (selected) {
16287
- setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
16157
+ setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
16288
16158
  setSelect([].concat(_toConsumableArray(selectList), [record]));
16289
16159
  } else {
16290
16160
  setSelectIds(selectIds.filter(function (t) {
16291
- return t !== uniqueKey;
16161
+ return t !== record.specNo;
16292
16162
  }));
16293
16163
  setSelect(selectList.filter(function (t) {
16294
- return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
16164
+ return t.specNo !== record.specNo;
16295
16165
  }));
16296
16166
  }
16297
16167
  },
16298
16168
  onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
16299
16169
  if (selected) {
16300
- var changeKeys = changeRows.map(function (t) {
16301
- return "".concat(t.goodNo, "-").concat(t.specNo);
16302
- });
16303
- setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
16170
+ setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
16171
+ return t.specNo;
16172
+ }))));
16304
16173
  setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
16305
16174
  } else {
16306
- var _changeKeys = changeRows.map(function (t) {
16307
- return "".concat(t.goodNo, "-").concat(t.specNo);
16308
- });
16309
- setSelectIds(difference(selectIds, _changeKeys));
16175
+ setSelectIds(difference(selectIds, changeRows.map(function (t) {
16176
+ return t.specNo;
16177
+ })));
16310
16178
  var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
16311
- return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
16179
+ return arrVal.specNo !== othVal.specNo;
16312
16180
  });
16313
16181
  setSelect(list);
16314
16182
  }
@@ -16316,12 +16184,11 @@ var GoodList = function GoodList(props, ref) {
16316
16184
  };
16317
16185
  var showTable = function showTable() {
16318
16186
  var handleDelete = function handleDelete(record) {
16319
- var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
16320
16187
  setSelectIds(selectIds.filter(function (t) {
16321
- return t !== uniqueKey;
16188
+ return t !== record.specNo;
16322
16189
  }));
16323
16190
  setSelect(selectList.filter(function (t) {
16324
- return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
16191
+ return t.specNo !== record.specNo;
16325
16192
  }));
16326
16193
  };
16327
16194
  var showColumns = [{
@@ -16345,9 +16212,7 @@ var GoodList = function GoodList(props, ref) {
16345
16212
  }
16346
16213
  }, /*#__PURE__*/React.createElement(Table, {
16347
16214
  columns: showColumns,
16348
- rowKey: function rowKey(record) {
16349
- return "".concat(record.goodNo, "-").concat(record.specNo);
16350
- },
16215
+ rowKey: 'specNo',
16351
16216
  dataSource: selectList,
16352
16217
  scroll: {
16353
16218
  x: '100%',
@@ -16377,9 +16242,7 @@ var GoodList = function GoodList(props, ref) {
16377
16242
  }, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
16378
16243
  className: "GoodModalColumns",
16379
16244
  rowSelection: rowSelection,
16380
- rowKey: function rowKey(record) {
16381
- return "".concat(record.goodNo, "-").concat(record.specNo);
16382
- },
16245
+ rowKey: "specNo",
16383
16246
  columns: columns,
16384
16247
  scroll: {
16385
16248
  x: '100%',
@@ -17929,27 +17792,6 @@ var componentMap$1 = {
17929
17792
  onChange: props.handleChange
17930
17793
  }));
17931
17794
  },
17932
- TagsSelect: function TagsSelect(props) {
17933
- return "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name).length > 10 ? /*#__PURE__*/React.createElement(Tooltip, {
17934
- title: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name)
17935
- }, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
17936
- mode: "tags",
17937
- placeholder: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name),
17938
- optionFilterProp: "label",
17939
- allowClear: true,
17940
- maxTagCount: "responsive"
17941
- }, props), {}, {
17942
- onChange: props.handleChange
17943
- }))) : /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
17944
- mode: "tags",
17945
- placeholder: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name),
17946
- optionFilterProp: "label",
17947
- allowClear: true,
17948
- maxTagCount: "responsive"
17949
- }, props), {}, {
17950
- onChange: props.handleChange
17951
- }));
17952
- },
17953
17795
  Date: function Date(props) {
17954
17796
  return /*#__PURE__*/React.createElement(RangePicker, _objectSpread2(_objectSpread2({
17955
17797
  placeholder: ["".concat(props.name, "\u5F00\u59CB\u65F6\u95F4"), "".concat(props.name, "\u7ED3\u675F\u65F6\u95F4")],
@@ -18892,7 +18734,7 @@ var getTableData$5 = function getTableData(_ref, formData) {
18892
18734
  data: {
18893
18735
  pageSize: pageSize,
18894
18736
  pageNo: current,
18895
- platform: 'WLN_ERP',
18737
+ platform: 'JY_ERP',
18896
18738
  conditionList: conditionList
18897
18739
  }
18898
18740
  }).then(function (res) {
@@ -18920,10 +18762,10 @@ var searchFormData$4 = [{
18920
18762
  dataIndex: 'specNo',
18921
18763
  type: 'optionalInput'
18922
18764
  }, {
18923
- label: '货品名称',
18765
+ label: '商品名称',
18924
18766
  name: 'goodName'
18925
18767
  }, {
18926
- label: '货品编码',
18768
+ label: '商品编码',
18927
18769
  name: 'goodNo',
18928
18770
  type: 'optionalInput'
18929
18771
  }];
@@ -18936,12 +18778,11 @@ var GoodList$5 = function GoodList(props, ref) {
18936
18778
  _useState4 = _slicedToArray(_useState3, 2),
18937
18779
  selectIds = _useState4[0],
18938
18780
  setSelectIds = _useState4[1];
18939
- var _useGetColumns = useGetColumns('wln'),
18781
+ var _useGetColumns = useGetColumns('jy'),
18940
18782
  _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
18941
18783
  columns = _useGetColumns2[0],
18942
18784
  showColumnsDataIndexList = _useGetColumns2[1],
18943
18785
  loading = _useGetColumns2[2];
18944
- console.log("\uD83D\uDE80 ~ GoodsList.tsx:110 ~ GoodList ~ columns:", columns);
18945
18786
  useImperativeHandle(ref, function () {
18946
18787
  return {
18947
18788
  getSelectGoodList: function getSelectGoodList() {
@@ -18996,8 +18837,8 @@ var GoodList$5 = function GoodList(props, ref) {
18996
18837
  getCheckboxProps: function getCheckboxProps(record) {
18997
18838
  var options = {
18998
18839
  disabled: (props.selectedRows || []).map(function (row) {
18999
- return row.specId || record.id;
19000
- }).includes(record.specId || record.id),
18840
+ return row.id || row.specId;
18841
+ }).includes(record.id || record.specId),
19001
18842
  name: record.id
19002
18843
  };
19003
18844
  return options;
@@ -19081,9 +18922,9 @@ var GoodList$5 = function GoodList(props, ref) {
19081
18922
  type: "text"
19082
18923
  }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
19083
18924
  };
19084
- var WlnGoodsList = /*#__PURE__*/forwardRef(GoodList$5);
18925
+ var JyGoodsList = /*#__PURE__*/forwardRef(GoodList$5);
19085
18926
 
19086
- var WlnGoodsModal = function WlnGoodsModal(props, ref) {
18927
+ var JyGoodsModal = function JyGoodsModal(props, ref) {
19087
18928
  useImperativeHandle(ref, function () {
19088
18929
  return {
19089
18930
  open: function open(shopCode) {
@@ -19103,13 +18944,13 @@ var WlnGoodsModal = function WlnGoodsModal(props, ref) {
19103
18944
  _useState4 = _slicedToArray(_useState3, 2),
19104
18945
  selectedRows = _useState4[0],
19105
18946
  setSelectedRows = _useState4[1];
19106
- var jkyGoodsListRef = useRef(null);
18947
+ var jyGoodsListRef = useRef(null);
19107
18948
  var _onCancel = function onCancel() {
19108
18949
  setVisible(false);
19109
18950
  };
19110
18951
  var onOk = function onOk() {
19111
- var _jkyGoodsListRef$curr;
19112
- var selectedList = ((_jkyGoodsListRef$curr = jkyGoodsListRef.current) === null || _jkyGoodsListRef$curr === void 0 ? void 0 : _jkyGoodsListRef$curr.getSelectGoodList()) || [];
18952
+ var _jyGoodsListRef$curre;
18953
+ var selectedList = ((_jyGoodsListRef$curre = jyGoodsListRef.current) === null || _jyGoodsListRef$curre === void 0 ? void 0 : _jyGoodsListRef$curre.getSelectGoodList()) || [];
19113
18954
  onSubmit(selectedList);
19114
18955
  _onCancel();
19115
18956
  };
@@ -19124,12 +18965,12 @@ var WlnGoodsModal = function WlnGoodsModal(props, ref) {
19124
18965
  },
19125
18966
  onOk: onOk,
19126
18967
  wrapClassName: "goodModal"
19127
- }, /*#__PURE__*/React.createElement(WlnGoodsList, {
19128
- ref: jkyGoodsListRef,
18968
+ }, /*#__PURE__*/React.createElement(JyGoodsList, {
18969
+ ref: jyGoodsListRef,
19129
18970
  selectedRows: selectedRows
19130
18971
  })));
19131
18972
  };
19132
- var WlnGoodsModal$1 = /*#__PURE__*/forwardRef(WlnGoodsModal);
18973
+ var JyGoodsModal$1 = /*#__PURE__*/forwardRef(JyGoodsModal);
19133
18974
 
19134
18975
  var getTableData$6 = function getTableData(_ref, formData) {
19135
18976
  var current = _ref.current,
@@ -19140,7 +18981,7 @@ var getTableData$6 = function getTableData(_ref, formData) {
19140
18981
  data: {
19141
18982
  pageSize: pageSize,
19142
18983
  pageNo: current,
19143
- platform: 'JY_ERP',
18984
+ platform: 'JKY_ERP',
19144
18985
  conditionList: conditionList
19145
18986
  }
19146
18987
  }).then(function (res) {
@@ -19168,10 +19009,10 @@ var searchFormData$5 = [{
19168
19009
  dataIndex: 'specNo',
19169
19010
  type: 'optionalInput'
19170
19011
  }, {
19171
- label: '商品名称',
19012
+ label: '货品名称',
19172
19013
  name: 'goodName'
19173
19014
  }, {
19174
- label: '商品编码',
19015
+ label: '货品编码',
19175
19016
  name: 'goodNo',
19176
19017
  type: 'optionalInput'
19177
19018
  }];
@@ -19184,7 +19025,7 @@ var GoodList$6 = function GoodList(props, ref) {
19184
19025
  _useState4 = _slicedToArray(_useState3, 2),
19185
19026
  selectIds = _useState4[0],
19186
19027
  setSelectIds = _useState4[1];
19187
- var _useGetColumns = useGetColumns('jy'),
19028
+ var _useGetColumns = useGetColumns('jky'),
19188
19029
  _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
19189
19030
  columns = _useGetColumns2[0],
19190
19031
  showColumnsDataIndexList = _useGetColumns2[1],
@@ -19243,8 +19084,8 @@ var GoodList$6 = function GoodList(props, ref) {
19243
19084
  getCheckboxProps: function getCheckboxProps(record) {
19244
19085
  var options = {
19245
19086
  disabled: (props.selectedRows || []).map(function (row) {
19246
- return row.id || row.specId;
19247
- }).includes(record.id || record.specId),
19087
+ return row.specId || record.id;
19088
+ }).includes(record.specId || record.id),
19248
19089
  name: record.id
19249
19090
  };
19250
19091
  return options;
@@ -19328,9 +19169,9 @@ var GoodList$6 = function GoodList(props, ref) {
19328
19169
  type: "text"
19329
19170
  }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
19330
19171
  };
19331
- var JyGoodsList = /*#__PURE__*/forwardRef(GoodList$6);
19172
+ var JkyGoodsList = /*#__PURE__*/forwardRef(GoodList$6);
19332
19173
 
19333
- var JyGoodsModal = function JyGoodsModal(props, ref) {
19174
+ var JkyGoodsModal = function JkyGoodsModal(props, ref) {
19334
19175
  useImperativeHandle(ref, function () {
19335
19176
  return {
19336
19177
  open: function open(shopCode) {
@@ -19350,13 +19191,13 @@ var JyGoodsModal = function JyGoodsModal(props, ref) {
19350
19191
  _useState4 = _slicedToArray(_useState3, 2),
19351
19192
  selectedRows = _useState4[0],
19352
19193
  setSelectedRows = _useState4[1];
19353
- var jyGoodsListRef = useRef(null);
19194
+ var jkyGoodsListRef = useRef(null);
19354
19195
  var _onCancel = function onCancel() {
19355
19196
  setVisible(false);
19356
19197
  };
19357
19198
  var onOk = function onOk() {
19358
- var _jyGoodsListRef$curre;
19359
- var selectedList = ((_jyGoodsListRef$curre = jyGoodsListRef.current) === null || _jyGoodsListRef$curre === void 0 ? void 0 : _jyGoodsListRef$curre.getSelectGoodList()) || [];
19199
+ var _jkyGoodsListRef$curr;
19200
+ var selectedList = ((_jkyGoodsListRef$curr = jkyGoodsListRef.current) === null || _jkyGoodsListRef$curr === void 0 ? void 0 : _jkyGoodsListRef$curr.getSelectGoodList()) || [];
19360
19201
  onSubmit(selectedList);
19361
19202
  _onCancel();
19362
19203
  };
@@ -19371,259 +19212,12 @@ var JyGoodsModal = function JyGoodsModal(props, ref) {
19371
19212
  },
19372
19213
  onOk: onOk,
19373
19214
  wrapClassName: "goodModal"
19374
- }, /*#__PURE__*/React.createElement(JyGoodsList, {
19375
- ref: jyGoodsListRef,
19215
+ }, /*#__PURE__*/React.createElement(JkyGoodsList, {
19216
+ ref: jkyGoodsListRef,
19376
19217
  selectedRows: selectedRows
19377
19218
  })));
19378
19219
  };
19379
- var JyGoodsModal$1 = /*#__PURE__*/forwardRef(JyGoodsModal);
19380
-
19381
- var getTableData$7 = function getTableData(_ref, formData) {
19382
- var current = _ref.current,
19383
- pageSize = _ref.pageSize;
19384
- var conditionList = transformFormData(formData);
19385
- return extendRequest('/qy/gdfw/product/product/page', {
19386
- method: 'post',
19387
- data: {
19388
- pageSize: pageSize,
19389
- pageNo: current,
19390
- platform: 'JKY_ERP',
19391
- conditionList: conditionList
19392
- }
19393
- }).then(function (res) {
19394
- var _res$data = res.data,
19395
- _res$data$productSkuL = _res$data.productSkuList,
19396
- productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
19397
- _res$data$total = _res$data.total,
19398
- total = _res$data$total === void 0 ? 0 : _res$data$total;
19399
- var newProducts = productSkuList.map(function (item, index) {
19400
- return _objectSpread2({}, item);
19401
- });
19402
- return {
19403
- total: total,
19404
- list: newProducts
19405
- };
19406
- });
19407
- };
19408
- var searchFormData$6 = [{
19409
- label: '规格名称',
19410
- name: 'skuName',
19411
- dataIndex: 'specName'
19412
- }, {
19413
- label: '规格编码',
19414
- name: 'skuCode',
19415
- dataIndex: 'specNo',
19416
- type: 'optionalInput'
19417
- }, {
19418
- label: '货品名称',
19419
- name: 'goodName'
19420
- }, {
19421
- label: '货品编码',
19422
- name: 'goodNo',
19423
- type: 'optionalInput'
19424
- }];
19425
- var GoodList$7 = function GoodList(props, ref) {
19426
- var _useState = useState([]),
19427
- _useState2 = _slicedToArray(_useState, 2),
19428
- selectList = _useState2[0],
19429
- setSelect = _useState2[1];
19430
- var _useState3 = useState([]),
19431
- _useState4 = _slicedToArray(_useState3, 2),
19432
- selectIds = _useState4[0],
19433
- setSelectIds = _useState4[1];
19434
- var _useGetColumns = useGetColumns('jky'),
19435
- _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
19436
- columns = _useGetColumns2[0],
19437
- showColumnsDataIndexList = _useGetColumns2[1],
19438
- loading = _useGetColumns2[2];
19439
- useImperativeHandle(ref, function () {
19440
- return {
19441
- getSelectGoodList: function getSelectGoodList() {
19442
- return selectList;
19443
- }
19444
- };
19445
- });
19446
- var _Form$useForm = Form.useForm(),
19447
- _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
19448
- form = _Form$useForm2[0];
19449
- var _useAntdTable = useAntdTable(getTableData$7, {
19450
- defaultPageSize: 10,
19451
- form: form
19452
- }),
19453
- tableProps = _useAntdTable.tableProps,
19454
- search = _useAntdTable.search,
19455
- params = _useAntdTable.params;
19456
- var submit = search.submit,
19457
- reset = search.reset;
19458
- var rowSelection = {
19459
- selectedRowKeys: selectIds,
19460
- fixed: true,
19461
- onSelect: function onSelect(record, selected) {
19462
- if (selected) {
19463
- setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
19464
- setSelect([].concat(_toConsumableArray(selectList), [record]));
19465
- } else {
19466
- setSelectIds(selectIds.filter(function (t) {
19467
- return t !== record.id;
19468
- }));
19469
- setSelect(selectList.filter(function (t) {
19470
- return t.id !== record.id;
19471
- }));
19472
- }
19473
- },
19474
- onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
19475
- if (selected) {
19476
- setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
19477
- return t.id;
19478
- }))));
19479
- setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
19480
- } else {
19481
- setSelectIds(difference(selectIds, changeRows.map(function (t) {
19482
- return t.id;
19483
- })));
19484
- var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
19485
- return arrVal.id !== othVal.id;
19486
- });
19487
- setSelect(list);
19488
- }
19489
- },
19490
- getCheckboxProps: function getCheckboxProps(record) {
19491
- var options = {
19492
- disabled: (props.selectedRows || []).map(function (row) {
19493
- return row.specId || record.id;
19494
- }).includes(record.specId || record.id),
19495
- name: record.id
19496
- };
19497
- return options;
19498
- }
19499
- };
19500
- var showTable = function showTable() {
19501
- var handleDelete = function handleDelete(record) {
19502
- setSelectIds(selectIds.filter(function (t) {
19503
- return t !== record.id;
19504
- }));
19505
- setSelect(selectList.filter(function (t) {
19506
- return t.id !== record.id;
19507
- }));
19508
- };
19509
- var showColumns = [{
19510
- dataIndex: '',
19511
- title: "\u64CD\u4F5C",
19512
- ellipsis: true,
19513
- width: 100,
19514
- render: function render(val, record) {
19515
- return /*#__PURE__*/React.createElement(Button, {
19516
- type: "link",
19517
- onClick: function onClick() {
19518
- return handleDelete(record);
19519
- }
19520
- }, "\u5220\u9664");
19521
- }
19522
- }].concat(takeRight(columns, columns.length - 1));
19523
- return selectList.length ? /*#__PURE__*/React.createElement("div", {
19524
- style: {
19525
- width: '100%',
19526
- maxWidth: '387px'
19527
- }
19528
- }, /*#__PURE__*/React.createElement(Table, {
19529
- columns: showColumns,
19530
- rowKey: 'id',
19531
- dataSource: selectList,
19532
- scroll: {
19533
- x: '100%',
19534
- y: 250
19535
- },
19536
- pagination: {
19537
- size: 'small',
19538
- total: selectIds.length,
19539
- pageSize: 10,
19540
- showSizeChanger: false
19541
- }
19542
- })) : null;
19543
- };
19544
- return /*#__PURE__*/React.createElement(Skeleton, {
19545
- active: true,
19546
- loading: loading
19547
- }, /*#__PURE__*/React.createElement(SearchForm, {
19548
- searchFormData: searchFormData$6,
19549
- form: form,
19550
- showColumnsDataIndexList: showColumnsDataIndexList,
19551
- submit: submit,
19552
- reset: reset
19553
- }), /*#__PURE__*/React.createElement("div", {
19554
- style: {
19555
- marginTop: '4px'
19556
- }
19557
- }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
19558
- className: "GoodModalColumns",
19559
- rowSelection: rowSelection,
19560
- rowKey: "id",
19561
- columns: columns,
19562
- scroll: {
19563
- x: '100%',
19564
- y: 250
19565
- },
19566
- size: "small"
19567
- }, tableProps))), /*#__PURE__*/React.createElement(Popover, {
19568
- getPopupContainer: function getPopupContainer(triggerNode) {
19569
- return triggerNode.parentElement;
19570
- },
19571
- content: showTable(),
19572
- title: "\u5DF2\u9009\u62E9".concat(selectList.length, "\u4E2A\u5546\u54C1")
19573
- }, /*#__PURE__*/React.createElement(Button, {
19574
- danger: true,
19575
- type: "text"
19576
- }, "\u5DF2\u9009".concat(selectList.length > 99 ? '99+' : selectList.length, "\u4E2A\u5546\u54C1"), /*#__PURE__*/React.createElement(CaretUpOutlined, null))));
19577
- };
19578
- var JkyGoodsList = /*#__PURE__*/forwardRef(GoodList$7);
19579
-
19580
- var JkyGoodsModal = function JkyGoodsModal(props, ref) {
19581
- useImperativeHandle(ref, function () {
19582
- return {
19583
- open: function open(shopCode) {
19584
- var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
19585
- setVisible(true);
19586
- setSelectedRows(options.value || []);
19587
- }
19588
- };
19589
- });
19590
- var onSubmit = props.onSubmit,
19591
- width = props.width;
19592
- var _useState = useState(false),
19593
- _useState2 = _slicedToArray(_useState, 2),
19594
- visible = _useState2[0],
19595
- setVisible = _useState2[1];
19596
- var _useState3 = useState([]),
19597
- _useState4 = _slicedToArray(_useState3, 2),
19598
- selectedRows = _useState4[0],
19599
- setSelectedRows = _useState4[1];
19600
- var jkyGoodsListRef = useRef(null);
19601
- var _onCancel = function onCancel() {
19602
- setVisible(false);
19603
- };
19604
- var onOk = function onOk() {
19605
- var _jkyGoodsListRef$curr;
19606
- var selectedList = ((_jkyGoodsListRef$curr = jkyGoodsListRef.current) === null || _jkyGoodsListRef$curr === void 0 ? void 0 : _jkyGoodsListRef$curr.getSelectGoodList()) || [];
19607
- onSubmit(selectedList);
19608
- _onCancel();
19609
- };
19610
- return /*#__PURE__*/React.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(Modal, {
19611
- title: '选择商品',
19612
- okText: '确认',
19613
- cancelText: '取消',
19614
- visible: visible,
19615
- width: width || 850,
19616
- onCancel: function onCancel() {
19617
- _onCancel();
19618
- },
19619
- onOk: onOk,
19620
- wrapClassName: "goodModal"
19621
- }, /*#__PURE__*/React.createElement(JkyGoodsList, {
19622
- ref: jkyGoodsListRef,
19623
- selectedRows: selectedRows
19624
- })));
19625
- };
19626
- var JkyGoodsModal$1 = /*#__PURE__*/forwardRef(JkyGoodsModal);
19220
+ var JkyGoodsModal$1 = /*#__PURE__*/forwardRef(JkyGoodsModal);
19627
19221
 
19628
19222
  var getColumns = function getColumns(_ref) {
19629
19223
  var _ref$text = _ref.text,
@@ -20934,7 +20528,7 @@ var getColumns$2 = function getColumns(_ref) {
20934
20528
  };
20935
20529
  };
20936
20530
 
20937
- var getYesOrNo$4 = function getYesOrNo(val) {
20531
+ var getYesOrNo$3 = function getYesOrNo(val) {
20938
20532
  if (isNull(val)) return null;
20939
20533
  return val ? '是' : '否';
20940
20534
  };
@@ -20959,13 +20553,6 @@ var getColumns$3 = function getColumns(_ref) {
20959
20553
  ellipsis: true,
20960
20554
  width: 250,
20961
20555
  render: renderTextEllipsis
20962
- }, {
20963
- dataIndex: 'wlnSkuName',
20964
- title: "sku\u540D\u79F0",
20965
- align: 'center',
20966
- ellipsis: true,
20967
- width: 250,
20968
- render: renderTextEllipsis
20969
20556
  }, {
20970
20557
  dataIndex: 'skuCode',
20971
20558
  title: "sku\u7F16\u7801",
@@ -21067,251 +20654,6 @@ var getColumns$3 = function getColumns(_ref) {
21067
20654
  ellipsis: true,
21068
20655
  width: 70,
21069
20656
  render: renderTextEllipsis
21070
- }, {
21071
- dataIndex: 'discountedUnitPrice',
21072
- title: "\u6298\u540E\u5355\u4EF7",
21073
- align: 'center',
21074
- ellipsis: true,
21075
- width: 250,
21076
- render: renderTextEllipsis
21077
- }, {
21078
- dataIndex: 'originPrice',
21079
- title: "\u539F\u4EF7",
21080
- align: 'center',
21081
- ellipsis: true,
21082
- width: 250,
21083
- render: renderTextEllipsis
21084
- }, {
21085
- dataIndex: 'price',
21086
- title: "\u5355\u4EF7",
21087
- align: 'center',
21088
- ellipsis: true,
21089
- width: 250,
21090
- render: renderTextEllipsis
21091
- }, {
21092
- dataIndex: 'receivable',
21093
- title: "\u9500\u552E\u91D1\u989D",
21094
- align: 'center',
21095
- ellipsis: true,
21096
- width: 250,
21097
- render: renderTextEllipsis
21098
- }, {
21099
- dataIndex: 'type',
21100
- title: "\u8D60\u54C1\u7C7B\u578B",
21101
- align: 'center',
21102
- ellipsis: true,
21103
- width: 100,
21104
- render: renderTextEllipsis
21105
- }, {
21106
- dataIndex: 'isPackage',
21107
- title: "\u662F\u5426\u7EC4\u5408\u5546\u54C1",
21108
- align: 'center',
21109
- ellipsis: true,
21110
- render: function render(val, record, index) {
21111
- return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
21112
- value: val,
21113
- onChange: function onChange(value) {
21114
- updateHandle(value, index, 'isGift');
21115
- },
21116
- options: [{
21117
- label: '是',
21118
- value: true
21119
- }, {
21120
- label: '否',
21121
- value: false
21122
- }]
21123
- }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
21124
- },
21125
- width: 100
21126
- }, {
21127
- dataIndex: 'hasRefund',
21128
- title: "\u662F\u5426\u9000\u6B3E",
21129
- align: 'center',
21130
- ellipsis: true,
21131
- width: 100,
21132
- render: function render(val, record, index) {
21133
- return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
21134
- value: val,
21135
- onChange: function onChange(value) {
21136
- updateHandle(value, index, 'isGift');
21137
- },
21138
- options: [{
21139
- label: '是',
21140
- value: 1
21141
- }, {
21142
- label: '否',
21143
- value: 0
21144
- }]
21145
- }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
21146
- }
21147
- }, {
21148
- dataIndex: 'unit',
21149
- title: "\u5355\u4F4D",
21150
- align: 'center',
21151
- ellipsis: true,
21152
- width: 100,
21153
- render: renderTextEllipsis
21154
- }, {
21155
- dataIndex: 'pkgGoodsName',
21156
- title: "\u539F\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
21157
- align: 'center',
21158
- ellipsis: true,
21159
- width: 200,
21160
- render: renderTextEllipsis
21161
- }, {
21162
- dataIndex: 'pkgGoodsCode',
21163
- title: "\u539F\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
21164
- align: 'center',
21165
- ellipsis: true,
21166
- width: 200,
21167
- render: renderTextEllipsis
21168
- }, {
21169
- dataIndex: 'pkgGoodsId',
21170
- title: "\u539F\u7EC4\u5408\u5546\u54C1id",
21171
- align: 'center',
21172
- ellipsis: true,
21173
- width: 200,
21174
- render: renderTextEllipsis
21175
- }],
21176
- WLN_REISSUE_GOODS: [{
21177
- dataIndex: 'wlnItemName',
21178
- title: "\u5546\u54C1\u540D\u79F0",
21179
- align: 'center',
21180
- ellipsis: true,
21181
- width: 250,
21182
- render: renderTextEllipsis
21183
- }, {
21184
- dataIndex: 'goodsCode',
21185
- title: "\u5546\u54C1\u7F16\u7801",
21186
- align: 'center',
21187
- ellipsis: true,
21188
- width: 250,
21189
- render: renderTextEllipsis
21190
- }, {
21191
- dataIndex: 'wlnSkuName',
21192
- title: "sku\u540D\u79F0",
21193
- align: 'center',
21194
- ellipsis: true,
21195
- width: 250,
21196
- render: renderTextEllipsis
21197
- }, {
21198
- dataIndex: 'skuCode',
21199
- title: "sku\u7F16\u7801",
21200
- align: 'center',
21201
- ellipsis: true,
21202
- width: 250,
21203
- render: renderTextEllipsis
21204
- }, {
21205
- dataIndex: 'skuName',
21206
- title: "\u7EBF\u4E0Asku\u540D\u79F0",
21207
- align: 'center',
21208
- ellipsis: true,
21209
- width: 250,
21210
- render: renderTextEllipsis
21211
- }, {
21212
- dataIndex: 'olnSkuCode',
21213
- title: "\u7EBF\u4E0Asku\u7F16\u7801",
21214
- align: 'center',
21215
- ellipsis: true,
21216
- width: 150,
21217
- render: renderTextEllipsis
21218
- }, {
21219
- dataIndex: 'sku',
21220
- title: "\u7EBF\u4E0Asku id",
21221
- align: 'center',
21222
- ellipsis: true,
21223
- width: 150,
21224
- render: renderTextEllipsis
21225
- }, {
21226
- dataIndex: 'name',
21227
- title: "\u7EBF\u4E0A\u5546\u54C1\u540D\u79F0",
21228
- align: 'center',
21229
- ellipsis: true,
21230
- width: 250,
21231
- render: renderTextEllipsis
21232
- }, {
21233
- dataIndex: 'pic',
21234
- title: "\u7EBF\u4E0A\u56FE\u7247",
21235
- align: 'center',
21236
- ellipsis: true,
21237
- width: 100,
21238
- render: function render(val) {
21239
- return /*#__PURE__*/React.createElement(Image, {
21240
- width: 30,
21241
- src: val
21242
- });
21243
- }
21244
- }, {
21245
- dataIndex: 'olnItemCOde',
21246
- title: "\u7EBF\u4E0A\u5546\u54C1\u7F16\u7801",
21247
- align: 'center',
21248
- ellipsis: true,
21249
- width: 150,
21250
- render: renderTextEllipsis
21251
- }, {
21252
- dataIndex: 'code',
21253
- title: "\u7EBF\u4E0A\u5546\u54C1id",
21254
- align: 'center',
21255
- ellipsis: true,
21256
- width: 150,
21257
- render: renderTextEllipsis
21258
- }, {
21259
- dataIndex: 'barCode',
21260
- title: "\u5546\u54C1\u6761\u7801",
21261
- align: 'center',
21262
- ellipsis: true,
21263
- width: 150,
21264
- render: renderTextEllipsis
21265
- }, {
21266
- dataIndex: 'price',
21267
- title: "\u5355\u4EF7",
21268
- align: 'center',
21269
- ellipsis: true,
21270
- width: 250,
21271
- render: renderTextEllipsis
21272
- }, {
21273
- dataIndex: 'number',
21274
- title: "".concat(text, "\u6570\u91CF"),
21275
- align: 'center',
21276
- ellipsis: true,
21277
- width: 100,
21278
- render: function render(val, record, index) {
21279
- return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
21280
- style: {
21281
- width: 70
21282
- },
21283
- value: val,
21284
- min: 1,
21285
- precision: 0,
21286
- onChange: function onChange(num) {
21287
- return updateHandle(num, index, 'number');
21288
- }
21289
- }) : /*#__PURE__*/React.createElement("span", null, val);
21290
- }
21291
- }, {
21292
- dataIndex: 'outPrice',
21293
- title: "\u5B9E\u4ED8\u91D1\u989D",
21294
- width: 150,
21295
- render: function render(_, record, index) {
21296
- var value;
21297
- if ((typeof record.number === 'number' || record.number) && (typeof record.price === 'number' || record.price)) {
21298
- value = +(record.number * record.price).toFixed(2);
21299
- }
21300
- if (record.canUpdateNumber && !disabled) {
21301
- return /*#__PURE__*/React.createElement(InputNumber, {
21302
- style: {
21303
- width: 70
21304
- },
21305
- value: value,
21306
- min: 1,
21307
- precision: 0,
21308
- onChange: function onChange(num) {
21309
- return updateHandle(num, index, 'total');
21310
- }
21311
- });
21312
- }
21313
- return value || value === 0 ? value : '';
21314
- }
21315
20657
  }, {
21316
20658
  dataIndex: 'type',
21317
20659
  title: "\u8D60\u54C1\u7C7B\u578B",
@@ -21337,37 +20679,9 @@ var getColumns$3 = function getColumns(_ref) {
21337
20679
  label: '否',
21338
20680
  value: false
21339
20681
  }]
21340
- }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
20682
+ }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
21341
20683
  },
21342
20684
  width: 100
21343
- }, {
21344
- dataIndex: 'unit',
21345
- title: "\u5355\u4F4D",
21346
- align: 'center',
21347
- ellipsis: true,
21348
- width: 100,
21349
- render: renderTextEllipsis
21350
- }, {
21351
- dataIndex: 'pkgGoodsName',
21352
- title: "\u539F\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
21353
- align: 'center',
21354
- ellipsis: true,
21355
- width: 200,
21356
- render: renderTextEllipsis
21357
- }, {
21358
- dataIndex: 'pkgGoodsCode',
21359
- title: "\u539F\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
21360
- align: 'center',
21361
- ellipsis: true,
21362
- width: 200,
21363
- render: renderTextEllipsis
21364
- }, {
21365
- dataIndex: 'pkgGoodsId',
21366
- title: "\u539F\u7EC4\u5408\u5546\u54C1id",
21367
- align: 'center',
21368
- ellipsis: true,
21369
- width: 200,
21370
- render: renderTextEllipsis
21371
20685
  }]
21372
20686
  };
21373
20687
  };
@@ -21377,7 +20691,7 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
21377
20691
  if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
21378
20692
  return false;
21379
20693
  };
21380
- var getYesOrNo$5 = function getYesOrNo(val) {
20694
+ var getYesOrNo$4 = function getYesOrNo(val) {
21381
20695
  if (isNull(val)) return null;
21382
20696
  return val ? '是' : '否';
21383
20697
  };
@@ -21492,7 +20806,7 @@ var getColumns$4 = function getColumns(_ref) {
21492
20806
  title: "\u662F\u5426\u53D6\u6D88",
21493
20807
  width: 150,
21494
20808
  render: function render(val) {
21495
- return /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
20809
+ return /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
21496
20810
  }
21497
20811
  }, {
21498
20812
  dataIndex: 'isGift',
@@ -21511,7 +20825,7 @@ var getColumns$4 = function getColumns(_ref) {
21511
20825
  label: '否',
21512
20826
  value: 0
21513
20827
  }]
21514
- }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
20828
+ }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
21515
20829
  }
21516
20830
  }, {
21517
20831
  dataIndex: 'skuNote',
@@ -21637,7 +20951,7 @@ var getColumns$4 = function getColumns(_ref) {
21637
20951
  label: '否',
21638
20952
  value: 0
21639
20953
  }]
21640
- }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
20954
+ }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
21641
20955
  }
21642
20956
  }].map(function (item) {
21643
20957
  return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21766,7 +21080,7 @@ var getColumns$4 = function getColumns(_ref) {
21766
21080
  label: '否',
21767
21081
  value: 0
21768
21082
  }]
21769
- }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
21083
+ }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
21770
21084
  }
21771
21085
  }].map(function (item) {
21772
21086
  return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -24486,9 +23800,6 @@ var isErpType = {
24486
23800
  },
24487
23801
  isJky: function isJky(type) {
24488
23802
  return ['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type);
24489
- },
24490
- isWln: function isWln(type) {
24491
- return ['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(type);
24492
23803
  }
24493
23804
  };
24494
23805
  var processGoods$1 = function processGoods(_ref) {
@@ -24548,13 +23859,6 @@ var processGoods$1 = function processGoods(_ref) {
24548
23859
  canUpdateNumber: canUpdateNumber,
24549
23860
  source: source
24550
23861
  });
24551
- } else if (isErpType.isWln(type)) {
24552
- newList = processWlnGoods$1({
24553
- list: list,
24554
- type: type,
24555
- canUpdateNumber: canUpdateNumber,
24556
- source: source
24557
- });
24558
23862
  } else {
24559
23863
  newList = processDefaultGoods({
24560
23864
  list: list,
@@ -24637,63 +23941,11 @@ var processJkyGoods$1 = function processJkyGoods(_ref3) {
24637
23941
  });
24638
23942
  });
24639
23943
  };
24640
- var processWlnGoods$1 = function processWlnGoods(_ref4) {
23944
+ // 处理不同类型的商品数据
23945
+ var processWdtGoods$1 = function processWdtGoods(_ref4) {
24641
23946
  var list = _ref4.list,
23947
+ type = _ref4.type,
24642
23948
  canUpdateNumber = _ref4.canUpdateNumber;
24643
- return list.map(function (item) {
24644
- var goodName = item.goodName,
24645
- goodShortName = item.goodShortName,
24646
- goodNo = item.goodNo,
24647
- goodId = item.goodId,
24648
- goodBarcode = item.goodBarcode,
24649
- propertiesValue = item.propertiesValue,
24650
- specNo = item.specNo,
24651
- specId = item.specId,
24652
- specImgUrl = item.specImgUrl,
24653
- specBarcode = item.specBarcode,
24654
- brandName = item.brandName,
24655
- retailPrice = item.retailPrice,
24656
- marketPrice = item.marketPrice,
24657
- unitName = item.unitName,
24658
- skuType = item.skuType;
24659
- return _objectSpread2(_objectSpread2({}, item), {}, {
24660
- wlnItemName: goodName,
24661
- goodsCode: goodNo,
24662
- wlnSkuName: propertiesValue,
24663
- skuCode: specNo,
24664
- // skuName: '', // "线上sku名称",
24665
- // olnSkuCode: '', // "线上sku编码",
24666
- // sku: '', // "线上sku id",
24667
- // name: '', // "线上商品名称",
24668
- // pic: '', // "线上图片",
24669
- // olnItemCOde: '', // "线上商品编码",
24670
- // code: '', // "线上商品id",
24671
- barCode: goodBarcode,
24672
- // money: '', // "实付金额",
24673
- number: 1,
24674
- share: '',
24675
- // discountedUnitPrice: '', // "折后单价",
24676
- originPrice: marketPrice,
24677
- price: retailPrice,
24678
- receivable: +((marketPrice || 0) * (retailPrice || 0)).toFixed(2),
24679
- // type: '', // "赠品类型",
24680
- isPackage: skuType === 'combine',
24681
- // hasRefund: '', // 是否退款,
24682
- unit: unitName,
24683
- // pkgGoodsName: '', // "原组合商品名称",
24684
- // pkgGoodsCode: '', // "原组合商品编码",
24685
- // pkgGoodsId: '', // "原组合商品id",
24686
- uuid: uuid(),
24687
- canDelete: true,
24688
- canEdit: true
24689
- });
24690
- });
24691
- };
24692
- // 处理不同类型的商品数据
24693
- var processWdtGoods$1 = function processWdtGoods(_ref5) {
24694
- var list = _ref5.list,
24695
- type = _ref5.type,
24696
- canUpdateNumber = _ref5.canUpdateNumber;
24697
23949
  return list.map(function (item) {
24698
23950
  var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
24699
23951
  uuid: uuid(),
@@ -24711,9 +23963,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref5) {
24711
23963
  return processedItem;
24712
23964
  });
24713
23965
  };
24714
- var processBsE3Goods$1 = function processBsE3Goods(_ref6) {
24715
- var list = _ref6.list,
24716
- canUpdateNumber = _ref6.canUpdateNumber;
23966
+ var processBsE3Goods$1 = function processBsE3Goods(_ref5) {
23967
+ var list = _ref5.list,
23968
+ canUpdateNumber = _ref5.canUpdateNumber;
24717
23969
  return list.map(function (item) {
24718
23970
  var specNo = item.specNo,
24719
23971
  specId = item.specId,
@@ -24748,9 +24000,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref6) {
24748
24000
  });
24749
24001
  });
24750
24002
  };
24751
- var processGyGoods$1 = function processGyGoods(_ref7) {
24752
- var list = _ref7.list,
24753
- source = _ref7.source;
24003
+ var processGyGoods$1 = function processGyGoods(_ref6) {
24004
+ var list = _ref6.list,
24005
+ source = _ref6.source;
24754
24006
  var isFormWorkOrder = source === 'workOrder';
24755
24007
  return list.map(function (item) {
24756
24008
  var goodName = item.goodName,
@@ -24777,8 +24029,8 @@ var processGyGoods$1 = function processGyGoods(_ref7) {
24777
24029
  });
24778
24030
  });
24779
24031
  };
24780
- var processJstGoods$1 = function processJstGoods(_ref8) {
24781
- var list = _ref8.list;
24032
+ var processJstGoods$1 = function processJstGoods(_ref7) {
24033
+ var list = _ref7.list;
24782
24034
  return list.map(function (item) {
24783
24035
  return {
24784
24036
  name: item.goodName,
@@ -24796,9 +24048,9 @@ var processJstGoods$1 = function processJstGoods(_ref8) {
24796
24048
  };
24797
24049
  });
24798
24050
  };
24799
- var processKmGoods$1 = function processKmGoods(_ref9) {
24800
- var list = _ref9.list,
24801
- type = _ref9.type;
24051
+ var processKmGoods$1 = function processKmGoods(_ref8) {
24052
+ var list = _ref8.list,
24053
+ type = _ref8.type;
24802
24054
  var initParamsMap = {
24803
24055
  KM_GOODS: {
24804
24056
  num: 1
@@ -24837,9 +24089,9 @@ var processKmGoods$1 = function processKmGoods(_ref9) {
24837
24089
  }, initParamsMap[type] || {});
24838
24090
  });
24839
24091
  };
24840
- var processDefaultGoods = function processDefaultGoods(_ref10) {
24841
- var list = _ref10.list,
24842
- canUpdateNumber = _ref10.canUpdateNumber;
24092
+ var processDefaultGoods = function processDefaultGoods(_ref9) {
24093
+ var list = _ref9.list,
24094
+ canUpdateNumber = _ref9.canUpdateNumber;
24843
24095
  return list.map(function (item) {
24844
24096
  var goodsId = item.goodsId,
24845
24097
  name = item.name,
@@ -24888,7 +24140,6 @@ var GoodsModalMap = {
24888
24140
  JY_REISSUE_GOODS: JyGoodsModal$1,
24889
24141
  JKY_GOODS: JkyGoodsModal$1,
24890
24142
  JKY_REISSUE_GOODS: JkyGoodsModal$1,
24891
- WLN_REISSUE_GOODS: WlnGoodsModal$1,
24892
24143
  OTHER_GOODS: GoodsModal$2
24893
24144
  };
24894
24145
  var systemOrderNoMap = {
@@ -24903,7 +24154,6 @@ var systemOrderNoMap = {
24903
24154
  JY_REISSUE_GOODS: 'tradeNo',
24904
24155
  JKY_GOODS: 'tradeNo',
24905
24156
  JKY_REISSUE_GOODS: 'tradeNo',
24906
- WLN_REISSUE_GOODS: 'tradeNo',
24907
24157
  KM_REISSUE_GOODS: 'sid',
24908
24158
  KM_RETURN_GOODS: 'sid',
24909
24159
  KM_EXCHANGE_GOODS: 'sid',
@@ -25161,9 +24411,6 @@ var getButtonText = function getButtonText() {
25161
24411
  if (['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type)) {
25162
24412
  return '选择吉客云ERP商品';
25163
24413
  }
25164
- if (['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(type)) {
25165
- return '选择万里牛ERP商品';
25166
- }
25167
24414
  return '选择商品';
25168
24415
  };
25169
24416
  var GoodItem$1 = function GoodItem(props) {
@@ -25223,8 +24470,8 @@ var GoodItem$1 = function GoodItem(props) {
25223
24470
  var jstReturnGoods = Form === null || Form === void 0 ? void 0 : Form.useWatch('3979edfd6d', form);
25224
24471
  var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
25225
24472
  // 判断是否为是否展示系统单筛选项
25226
- var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
25227
- var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS'].includes(type) || false;
24473
+ var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
24474
+ var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS'].includes(type) || false;
25228
24475
  var refModal = useRef();
25229
24476
  console.debug('表格数据', value);
25230
24477
  var handleDelete = function handleDelete(record, index) {
@@ -25319,7 +24566,6 @@ var GoodItem$1 = function GoodItem(props) {
25319
24566
  case 'JY_REISSUE_GOODS':
25320
24567
  case 'JKY_GOODS':
25321
24568
  case 'JKY_REISSUE_GOODS':
25322
- case 'WLN_REISSUE_GOODS':
25323
24569
  case 'SKX_GOODS':
25324
24570
  case 'SKX_RETURN_GOODS':
25325
24571
  {
@@ -25579,7 +24825,6 @@ var GoodItem$1 = function GoodItem(props) {
25579
24825
  templateDetail: templateDetail
25580
24826
  }));
25581
24827
  };
25582
- GoodItem$1.displayName = 'GoodItem';
25583
24828
 
25584
24829
  var BsGoods = function BsGoods(props) {
25585
24830
  var _withInfo$current3, _withInfo$current4;
@@ -28416,32 +27661,6 @@ var componentMap$2 = {
28416
27661
  },
28417
27662
  getOrderList: jkyUtils.getJkyOrderListSingleton
28418
27663
  },
28419
- WLN_GOODS: {
28420
- type: 'jky',
28421
- key: 'wlnGoods',
28422
- name: '吉客云',
28423
- orderNo: 'tradeNo',
28424
- goodDetailOrderNo: 'tradeNo',
28425
- eventNameMap: {
28426
- // pubsub 事件
28427
- type: 'wlnType',
28428
- updateGoodsHandle: updateWlnGoodsHandle,
28429
- selectListReturn: 'wlnSelectListReturn',
28430
- selectList: 'wlnSelectList',
28431
- reissueSelectList: 'wlnReissueSelectList',
28432
- reissueSelectListReturn: 'wlnReissueSelectListReturn',
28433
- reissueDeleteGood: 'wlnReissueDeleteGood',
28434
- changeShopCode: 'wlnChangeShopCode',
28435
- reissueType: 'wlnReissueType',
28436
- returnType: 'wlnReturnType',
28437
- returnSelectListReturn: 'wlnReturnSelectListReturn',
28438
- returnSelectList: 'wlnReturnSelectList',
28439
- deleteGood: 'wlnDeleteGood',
28440
- returnDeleteGood: 'wlnReturnDeleteGood',
28441
- exchangeDeleteGood: 'wlnExchangeDeleteGood'
28442
- },
28443
- getOrderList: wlnUtils.getOrderListSingleton
28444
- },
28445
27664
  WDT_AFTERSALE_GOODS: {
28446
27665
  type: 'wdtAftersale',
28447
27666
  key: 'wdtAftersaleGoods',
@@ -29626,22 +28845,6 @@ var typeMap$2 = {
29626
28845
  goodDetailsKey: 'goodsDetail',
29627
28846
  isShowSelectTradeGoods: true,
29628
28847
  showModeBtn: true
29629
- },
29630
- WLN_REISSUE_GOODS: {
29631
- compType: '补发',
29632
- key: 'wlnReissueGoods',
29633
- typeName: 'wlnReissueType',
29634
- systemOrder: 'wlnSystemOrder',
29635
- systemOrderNo: 'wlnSystemOrderNo',
29636
- getOrderList: wlnUtils.getOrderListSingleton,
29637
- updateGoodsHandle: updateWlnGoodsHandle,
29638
- alwaysShowChooseErpGoodsBtn: true,
29639
- orderTypeKey: 'orderType',
29640
- oIdKey: 'billNo',
29641
- outerOiIdKey: 'tpTid',
29642
- goodDetailsKey: 'items',
29643
- isShowSelectTradeGoods: true,
29644
- showModeBtn: true
29645
28848
  }
29646
28849
  };
29647
28850
  var PublicReissue = function PublicReissue(props) {
@@ -29701,7 +28904,7 @@ var PublicReissue = function PublicReissue(props) {
29701
28904
  case 0:
29702
28905
  (_typeMap$type5 = typeMap$2[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.getOrderList(orderNo).then(function (data) {
29703
28906
  var _valueRef$current3, _typeMap$type6, _typeMap$type7, _typeMap$type11, _ref3, _typeMap$type12;
29704
- var orders = (type === 'WLN_REISSUE_GOODS' ? data === null || data === void 0 ? void 0 : data.orders : data) || [];
28907
+ var orders = data || [];
29705
28908
  var showOrderInfo = orders === null || orders === void 0 ? void 0 : orders.map(function (orderItem) {
29706
28909
  return _defineProperty({}, typeMap$2[type].oIdKey, orderItem[typeMap$2[type].oIdKey]);
29707
28910
  });
@@ -29750,7 +28953,6 @@ var PublicReissue = function PublicReissue(props) {
29750
28953
  // 切换到非原单,清空列表
29751
28954
  newValue[(_typeMap$type15 = typeMap$2[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.key] = [];
29752
28955
  }
29753
- console.log('**** changeTypeHandle', newValue);
29754
28956
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
29755
28957
  };
29756
28958
  var handleModeChange = function handleModeChange(mode) {
@@ -29875,17 +29077,12 @@ var PublicReissue = function PublicReissue(props) {
29875
29077
  orderRest = {
29876
29078
  canEdit: true
29877
29079
  };
29878
- } else if (['WLN_REISSUE_GOODS'].includes(type)) {
29879
- orderRest = {
29880
- canEdit: true
29881
- };
29882
29080
  }
29883
29081
  var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
29884
29082
  var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
29885
29083
  var _order$typeMap$type$g;
29886
29084
  return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
29887
29085
  });
29888
- console.log('***** hasGoodDetails', hasGoodDetails);
29889
29086
  var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest, type)) : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.updateGoodsHandle(orders, orderRest, type) : [];
29890
29087
  var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
29891
29088
  var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
@@ -30398,7 +29595,7 @@ var GoodsModal$5 = function GoodsModal(props) {
30398
29595
  key: item.value
30399
29596
  }, item.label);
30400
29597
  })), /*#__PURE__*/React.createElement(Search$1, {
30401
- placeholder: "\u5B9D\u8D1D\u6807\u9898",
29598
+ placeholder: "\u5B9D\u8D1D\u94FE\u63A5\uFF0C\u6807\u9898",
30402
29599
  allowClear: true,
30403
29600
  enterButton: "\u641C\u7D22",
30404
29601
  style: {