@kmkf-fe-packages/basic-components 1.22.1-beta.55 → 1.22.1-beta.59
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/README.md +1 -1
- package/dist/index.esm.js +65 -103
- package/dist/index.js +64 -102
- package/package.json +3 -3
- package/dist/src/bs/component/GoodItem/constants/gyReissueGoodsColumns.d.ts +0 -9
package/README.md
CHANGED
package/dist/index.esm.js
CHANGED
|
@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
|
|
|
3
3
|
import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
|
|
4
4
|
import request, { extend as extend$1 } from 'umi-request';
|
|
5
5
|
import { CopyToClipboard } from 'react-copy-to-clipboard';
|
|
6
|
-
import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, GY_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
|
|
6
|
+
import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, GY_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
|
|
7
7
|
import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
|
|
8
8
|
import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
|
|
9
9
|
import zhCN from 'antd/lib/locale/zh_CN';
|
|
@@ -12498,8 +12498,8 @@ var getTableData$2 = function getTableData(_ref, formData) {
|
|
|
12498
12498
|
pageSize = _ref.pageSize;
|
|
12499
12499
|
var data = {
|
|
12500
12500
|
skuName: formData.skuName || null,
|
|
12501
|
-
|
|
12502
|
-
|
|
12501
|
+
skuCode: formData.skuCode || null,
|
|
12502
|
+
goodName: formData.goodName || null,
|
|
12503
12503
|
goodNo: formData.goodNo || null
|
|
12504
12504
|
};
|
|
12505
12505
|
return extendRequest('/qy/gdfw/product/product/page', {
|
|
@@ -12516,10 +12516,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
|
|
|
12516
12516
|
_res$data$total = _res$data.total,
|
|
12517
12517
|
total = _res$data$total === void 0 ? 0 : _res$data$total;
|
|
12518
12518
|
var newProducts = productSkuList.map(function (item, index) {
|
|
12519
|
-
return _objectSpread2(
|
|
12520
|
-
salesPrice: item === null || item === void 0 ? void 0 : item.retailPrice,
|
|
12521
|
-
specNo: item.goodId
|
|
12522
|
-
});
|
|
12519
|
+
return _objectSpread2({}, item);
|
|
12523
12520
|
});
|
|
12524
12521
|
return {
|
|
12525
12522
|
total: total,
|
|
@@ -13738,10 +13735,15 @@ var isNumberOrNumberString = function isNumberOrNumberString(value) {
|
|
|
13738
13735
|
if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
|
|
13739
13736
|
return false;
|
|
13740
13737
|
};
|
|
13738
|
+
var getYesOrNo = function getYesOrNo(val) {
|
|
13739
|
+
if (isNull(val)) return null;
|
|
13740
|
+
return val ? '是' : '否';
|
|
13741
|
+
};
|
|
13741
13742
|
var getColumns$4 = function getColumns(_ref) {
|
|
13742
13743
|
var _ref$text = _ref.text,
|
|
13743
13744
|
disabled = _ref.disabled,
|
|
13744
|
-
updateHandle = _ref.updateHandle
|
|
13745
|
+
updateHandle = _ref.updateHandle,
|
|
13746
|
+
updateDataHandle = _ref.updateDataHandle;
|
|
13745
13747
|
return {
|
|
13746
13748
|
//管易商品信息
|
|
13747
13749
|
GY_GOODS: [{
|
|
@@ -13781,7 +13783,11 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13781
13783
|
min: 1,
|
|
13782
13784
|
precision: 0,
|
|
13783
13785
|
onChange: function onChange(num) {
|
|
13784
|
-
|
|
13786
|
+
updateDataHandle({
|
|
13787
|
+
qty: num,
|
|
13788
|
+
amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
|
|
13789
|
+
originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
|
|
13790
|
+
}, index);
|
|
13785
13791
|
}
|
|
13786
13792
|
}) : /*#__PURE__*/React.createElement("span", null, val);
|
|
13787
13793
|
}
|
|
@@ -13798,17 +13804,17 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13798
13804
|
min: 0,
|
|
13799
13805
|
precision: 2,
|
|
13800
13806
|
onChange: function onChange(num) {
|
|
13801
|
-
|
|
13807
|
+
updateDataHandle({
|
|
13808
|
+
price: num,
|
|
13809
|
+
amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
|
|
13810
|
+
}, index);
|
|
13802
13811
|
}
|
|
13803
13812
|
}) : /*#__PURE__*/React.createElement("span", null, val);
|
|
13804
13813
|
}
|
|
13805
13814
|
}, {
|
|
13806
13815
|
dataIndex: 'amount',
|
|
13807
13816
|
title: "\u5B9E\u9645\u91D1\u989D",
|
|
13808
|
-
width: 150
|
|
13809
|
-
render: function render(_, record) {
|
|
13810
|
-
return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
|
|
13811
|
-
}
|
|
13817
|
+
width: 150
|
|
13812
13818
|
}, {
|
|
13813
13819
|
dataIndex: 'originPrice',
|
|
13814
13820
|
title: "\u6807\u51C6\u5355\u4EF7",
|
|
@@ -13816,10 +13822,7 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13816
13822
|
}, {
|
|
13817
13823
|
dataIndex: 'originAmount',
|
|
13818
13824
|
title: "\u6807\u51C6\u91D1\u989D",
|
|
13819
|
-
width: 150
|
|
13820
|
-
render: function render(_, record) {
|
|
13821
|
-
return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
|
|
13822
|
-
}
|
|
13825
|
+
width: 150
|
|
13823
13826
|
}, {
|
|
13824
13827
|
dataIndex: 'discountFee',
|
|
13825
13828
|
title: "\u8BA9\u5229\u91D1\u989D",
|
|
@@ -13833,7 +13836,7 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13833
13836
|
title: "\u662F\u5426\u53D6\u6D88",
|
|
13834
13837
|
width: 150,
|
|
13835
13838
|
render: function render(val) {
|
|
13836
|
-
return /*#__PURE__*/React.createElement("span", null,
|
|
13839
|
+
return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
|
|
13837
13840
|
}
|
|
13838
13841
|
}, {
|
|
13839
13842
|
dataIndex: 'isGift',
|
|
@@ -13852,13 +13855,18 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13852
13855
|
label: '否',
|
|
13853
13856
|
value: 0
|
|
13854
13857
|
}]
|
|
13855
|
-
}) : /*#__PURE__*/React.createElement("span", null,
|
|
13858
|
+
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
|
|
13856
13859
|
}
|
|
13857
13860
|
}, {
|
|
13858
13861
|
dataIndex: 'skuNote',
|
|
13859
13862
|
title: "\u5546\u54C1\u5907\u6CE8",
|
|
13860
13863
|
width: 150
|
|
13861
|
-
}]
|
|
13864
|
+
}].map(function (item) {
|
|
13865
|
+
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
13866
|
+
align: 'center',
|
|
13867
|
+
ellipsis: true
|
|
13868
|
+
});
|
|
13869
|
+
}),
|
|
13862
13870
|
//管易补发商品信息
|
|
13863
13871
|
GY_REISSUE_GOODS: [{
|
|
13864
13872
|
dataIndex: 'goodName',
|
|
@@ -13897,7 +13905,11 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13897
13905
|
min: 1,
|
|
13898
13906
|
precision: 0,
|
|
13899
13907
|
onChange: function onChange(num) {
|
|
13900
|
-
|
|
13908
|
+
updateDataHandle({
|
|
13909
|
+
qty: num,
|
|
13910
|
+
amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
|
|
13911
|
+
originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
|
|
13912
|
+
}, index);
|
|
13901
13913
|
}
|
|
13902
13914
|
}) : /*#__PURE__*/React.createElement("span", null, val);
|
|
13903
13915
|
}
|
|
@@ -13914,17 +13926,17 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13914
13926
|
min: 0,
|
|
13915
13927
|
precision: 2,
|
|
13916
13928
|
onChange: function onChange(num) {
|
|
13917
|
-
|
|
13929
|
+
updateDataHandle({
|
|
13930
|
+
price: num,
|
|
13931
|
+
amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
|
|
13932
|
+
}, index);
|
|
13918
13933
|
}
|
|
13919
13934
|
}) : /*#__PURE__*/React.createElement("span", null, val);
|
|
13920
13935
|
}
|
|
13921
13936
|
}, {
|
|
13922
13937
|
dataIndex: 'amount',
|
|
13923
13938
|
title: "\u5B9E\u9645\u91D1\u989D",
|
|
13924
|
-
width: 150
|
|
13925
|
-
render: function render(_, record) {
|
|
13926
|
-
return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
|
|
13927
|
-
}
|
|
13939
|
+
width: 150
|
|
13928
13940
|
}, {
|
|
13929
13941
|
dataIndex: 'originPrice',
|
|
13930
13942
|
title: "\u6807\u51C6\u5355\u4EF7",
|
|
@@ -13932,10 +13944,7 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13932
13944
|
}, {
|
|
13933
13945
|
dataIndex: 'originAmount',
|
|
13934
13946
|
title: "\u6807\u51C6\u91D1\u989D",
|
|
13935
|
-
width: 150
|
|
13936
|
-
render: function render(_, record) {
|
|
13937
|
-
return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
|
|
13938
|
-
}
|
|
13947
|
+
width: 150
|
|
13939
13948
|
}, {
|
|
13940
13949
|
dataIndex: 'isGift',
|
|
13941
13950
|
title: "\u662F\u5426\u8D60\u54C1",
|
|
@@ -13953,9 +13962,14 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13953
13962
|
label: '否',
|
|
13954
13963
|
value: 0
|
|
13955
13964
|
}]
|
|
13956
|
-
}) : /*#__PURE__*/React.createElement("span", null,
|
|
13965
|
+
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
|
|
13957
13966
|
}
|
|
13958
|
-
}]
|
|
13967
|
+
}].map(function (item) {
|
|
13968
|
+
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
13969
|
+
align: 'center',
|
|
13970
|
+
ellipsis: true
|
|
13971
|
+
});
|
|
13972
|
+
})
|
|
13959
13973
|
};
|
|
13960
13974
|
};
|
|
13961
13975
|
|
|
@@ -14070,7 +14084,8 @@ var getColumnsMap = function getColumnsMap(args) {
|
|
|
14070
14084
|
_ref$text = _ref.text,
|
|
14071
14085
|
text = _ref$text === void 0 ? '' : _ref$text,
|
|
14072
14086
|
disabled = _ref.disabled,
|
|
14073
|
-
updateHandle = _ref.updateHandle
|
|
14087
|
+
updateHandle = _ref.updateHandle,
|
|
14088
|
+
updateDataHandle = _ref.updateDataHandle;
|
|
14074
14089
|
return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
|
|
14075
14090
|
text: text,
|
|
14076
14091
|
disabled: disabled,
|
|
@@ -14090,7 +14105,8 @@ var getColumnsMap = function getColumnsMap(args) {
|
|
|
14090
14105
|
})), getColumns$4({
|
|
14091
14106
|
text: text,
|
|
14092
14107
|
disabled: disabled,
|
|
14093
|
-
updateHandle: updateHandle
|
|
14108
|
+
updateHandle: updateHandle,
|
|
14109
|
+
updateDataHandle: updateDataHandle
|
|
14094
14110
|
})), {}, {
|
|
14095
14111
|
default: getColumns$5({
|
|
14096
14112
|
text: text,
|
|
@@ -14196,61 +14212,6 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
|
|
|
14196
14212
|
});
|
|
14197
14213
|
};
|
|
14198
14214
|
|
|
14199
|
-
var renderGiftType$1 = function renderGiftType(val) {
|
|
14200
|
-
var giftTypeMap = {
|
|
14201
|
-
0: '非赠品',
|
|
14202
|
-
1: '自动赠送',
|
|
14203
|
-
2: '手工赠送',
|
|
14204
|
-
3: '回购自动送赠品',
|
|
14205
|
-
4: '前N有礼送赠品',
|
|
14206
|
-
6: '天猫优仓赠品',
|
|
14207
|
-
7: '淘宝CRM会员送赠'
|
|
14208
|
-
};
|
|
14209
|
-
return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
|
|
14210
|
-
};
|
|
14211
|
-
var renderFieldMap$2 = {
|
|
14212
|
-
num: function num(_ref) {
|
|
14213
|
-
var disabled = _ref.disabled,
|
|
14214
|
-
updateHandle = _ref.updateHandle;
|
|
14215
|
-
return function (val, record, index) {
|
|
14216
|
-
return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
|
|
14217
|
-
style: {
|
|
14218
|
-
width: 70
|
|
14219
|
-
},
|
|
14220
|
-
value: val,
|
|
14221
|
-
min: 1,
|
|
14222
|
-
precision: 0,
|
|
14223
|
-
onChange: function onChange(num) {
|
|
14224
|
-
return updateHandle(num, index, 'num');
|
|
14225
|
-
}
|
|
14226
|
-
}) : /*#__PURE__*/React.createElement("span", null, val);
|
|
14227
|
-
};
|
|
14228
|
-
},
|
|
14229
|
-
giftType: function giftType() {
|
|
14230
|
-
return renderGiftType$1;
|
|
14231
|
-
}
|
|
14232
|
-
};
|
|
14233
|
-
var getGyReissueGoodColumns = function getGyReissueGoodColumns(_ref2) {
|
|
14234
|
-
var disabled = _ref2.disabled,
|
|
14235
|
-
updateHandle = _ref2.updateHandle,
|
|
14236
|
-
operate = _ref2.operate;
|
|
14237
|
-
return getColumnsMap()['GY_REISSUE_GOODS'].map(function (item) {
|
|
14238
|
-
var newItem = _objectSpread2({
|
|
14239
|
-
align: 'center',
|
|
14240
|
-
ellipsis: true
|
|
14241
|
-
}, item);
|
|
14242
|
-
if (operate && (renderFieldMap$2 === null || renderFieldMap$2 === void 0 ? void 0 : renderFieldMap$2[item.dataIndex])) {
|
|
14243
|
-
return _objectSpread2(_objectSpread2({}, newItem), {}, {
|
|
14244
|
-
render: renderFieldMap$2 === null || renderFieldMap$2 === void 0 ? void 0 : renderFieldMap$2[item.dataIndex]({
|
|
14245
|
-
disabled: disabled,
|
|
14246
|
-
updateHandle: updateHandle
|
|
14247
|
-
})
|
|
14248
|
-
});
|
|
14249
|
-
}
|
|
14250
|
-
return newItem;
|
|
14251
|
-
});
|
|
14252
|
-
};
|
|
14253
|
-
|
|
14254
14215
|
var MAIN_FIELD = 'uuid';
|
|
14255
14216
|
var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
14256
14217
|
var columns = _ref.columns,
|
|
@@ -14403,6 +14364,12 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
14403
14364
|
onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(value));
|
|
14404
14365
|
}
|
|
14405
14366
|
};
|
|
14367
|
+
var updateDataHandle = function updateDataHandle(data, index) {
|
|
14368
|
+
if (value === null || value === void 0 ? void 0 : value.length) {
|
|
14369
|
+
value[index] = _objectSpread2(_objectSpread2({}, value[index]), data);
|
|
14370
|
+
onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(value));
|
|
14371
|
+
}
|
|
14372
|
+
};
|
|
14406
14373
|
var COLUMNS_MAP = function COLUMNS_MAP() {
|
|
14407
14374
|
var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
|
|
14408
14375
|
var operate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
|
|
@@ -14416,11 +14383,13 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
14416
14383
|
case 'BS_GOODS':
|
|
14417
14384
|
case 'WLN_GOODS':
|
|
14418
14385
|
case 'GY_GOODS':
|
|
14386
|
+
case 'GY_REISSUE_GOODS':
|
|
14419
14387
|
{
|
|
14420
14388
|
columns = getColumnsMap({
|
|
14421
14389
|
text: text,
|
|
14422
14390
|
disabled: disabled,
|
|
14423
|
-
updateHandle: updateHandle
|
|
14391
|
+
updateHandle: updateHandle,
|
|
14392
|
+
updateDataHandle: updateDataHandle
|
|
14424
14393
|
})[type];
|
|
14425
14394
|
}
|
|
14426
14395
|
break;
|
|
@@ -14433,15 +14402,6 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
14433
14402
|
});
|
|
14434
14403
|
}
|
|
14435
14404
|
break;
|
|
14436
|
-
case 'GY_REISSUE_GOODS':
|
|
14437
|
-
{
|
|
14438
|
-
columns = getGyReissueGoodColumns({
|
|
14439
|
-
disabled: disabled,
|
|
14440
|
-
updateHandle: updateHandle,
|
|
14441
|
-
operate: operate
|
|
14442
|
-
});
|
|
14443
|
-
}
|
|
14444
|
-
break;
|
|
14445
14405
|
case 'BS_E3_REISSUE_GOODS':
|
|
14446
14406
|
{
|
|
14447
14407
|
columns = getBsE3ReissueGoodColumns({
|
|
@@ -14455,7 +14415,8 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
14455
14415
|
columns = getColumnsMap({
|
|
14456
14416
|
text: text,
|
|
14457
14417
|
disabled: disabled,
|
|
14458
|
-
updateHandle: updateHandle
|
|
14418
|
+
updateHandle: updateHandle,
|
|
14419
|
+
updateDataHandle: updateDataHandle
|
|
14459
14420
|
})['default'];
|
|
14460
14421
|
}
|
|
14461
14422
|
return columns;
|
|
@@ -14596,7 +14557,8 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
14596
14557
|
goodNo: goodNo,
|
|
14597
14558
|
specName: specName,
|
|
14598
14559
|
specNo: specNo,
|
|
14599
|
-
originPrice: retailPrice
|
|
14560
|
+
originPrice: !isNull(retailPrice) ? Number(retailPrice) : null,
|
|
14561
|
+
originAmount: !isNull(retailPrice) ? Number(retailPrice) : null
|
|
14600
14562
|
});
|
|
14601
14563
|
});
|
|
14602
14564
|
} else {
|
|
@@ -15841,7 +15803,7 @@ var index$1 = (function (props) {
|
|
|
15841
15803
|
case 0:
|
|
15842
15804
|
gyUtils.getGyOrderListSingleton(orderNo).then(function (data) {
|
|
15843
15805
|
var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
|
|
15844
|
-
return (item.
|
|
15806
|
+
return (item.platformCode || '').split(',').includes(orderNo);
|
|
15845
15807
|
});
|
|
15846
15808
|
_onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
|
|
15847
15809
|
orders: trades,
|
package/dist/index.js
CHANGED
|
@@ -12510,8 +12510,8 @@ var getTableData$2 = function getTableData(_ref, formData) {
|
|
|
12510
12510
|
pageSize = _ref.pageSize;
|
|
12511
12511
|
var data = {
|
|
12512
12512
|
skuName: formData.skuName || null,
|
|
12513
|
-
|
|
12514
|
-
|
|
12513
|
+
skuCode: formData.skuCode || null,
|
|
12514
|
+
goodName: formData.goodName || null,
|
|
12515
12515
|
goodNo: formData.goodNo || null
|
|
12516
12516
|
};
|
|
12517
12517
|
return extendRequest('/qy/gdfw/product/product/page', {
|
|
@@ -12528,10 +12528,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
|
|
|
12528
12528
|
_res$data$total = _res$data.total,
|
|
12529
12529
|
total = _res$data$total === void 0 ? 0 : _res$data$total;
|
|
12530
12530
|
var newProducts = productSkuList.map(function (item, index) {
|
|
12531
|
-
return _objectSpread2(
|
|
12532
|
-
salesPrice: item === null || item === void 0 ? void 0 : item.retailPrice,
|
|
12533
|
-
specNo: item.goodId
|
|
12534
|
-
});
|
|
12531
|
+
return _objectSpread2({}, item);
|
|
12535
12532
|
});
|
|
12536
12533
|
return {
|
|
12537
12534
|
total: total,
|
|
@@ -13750,10 +13747,15 @@ var isNumberOrNumberString = function isNumberOrNumberString(value) {
|
|
|
13750
13747
|
if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
|
|
13751
13748
|
return false;
|
|
13752
13749
|
};
|
|
13750
|
+
var getYesOrNo = function getYesOrNo(val) {
|
|
13751
|
+
if (kmkfUtils.isNull(val)) return null;
|
|
13752
|
+
return val ? '是' : '否';
|
|
13753
|
+
};
|
|
13753
13754
|
var getColumns$4 = function getColumns(_ref) {
|
|
13754
13755
|
var _ref$text = _ref.text,
|
|
13755
13756
|
disabled = _ref.disabled,
|
|
13756
|
-
updateHandle = _ref.updateHandle
|
|
13757
|
+
updateHandle = _ref.updateHandle,
|
|
13758
|
+
updateDataHandle = _ref.updateDataHandle;
|
|
13757
13759
|
return {
|
|
13758
13760
|
//管易商品信息
|
|
13759
13761
|
GY_GOODS: [{
|
|
@@ -13793,7 +13795,11 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13793
13795
|
min: 1,
|
|
13794
13796
|
precision: 0,
|
|
13795
13797
|
onChange: function onChange(num) {
|
|
13796
|
-
|
|
13798
|
+
updateDataHandle({
|
|
13799
|
+
qty: num,
|
|
13800
|
+
amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
|
|
13801
|
+
originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
|
|
13802
|
+
}, index);
|
|
13797
13803
|
}
|
|
13798
13804
|
}) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
|
|
13799
13805
|
}
|
|
@@ -13810,17 +13816,17 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13810
13816
|
min: 0,
|
|
13811
13817
|
precision: 2,
|
|
13812
13818
|
onChange: function onChange(num) {
|
|
13813
|
-
|
|
13819
|
+
updateDataHandle({
|
|
13820
|
+
price: num,
|
|
13821
|
+
amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
|
|
13822
|
+
}, index);
|
|
13814
13823
|
}
|
|
13815
13824
|
}) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
|
|
13816
13825
|
}
|
|
13817
13826
|
}, {
|
|
13818
13827
|
dataIndex: 'amount',
|
|
13819
13828
|
title: "\u5B9E\u9645\u91D1\u989D",
|
|
13820
|
-
width: 150
|
|
13821
|
-
render: function render(_, record) {
|
|
13822
|
-
return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
|
|
13823
|
-
}
|
|
13829
|
+
width: 150
|
|
13824
13830
|
}, {
|
|
13825
13831
|
dataIndex: 'originPrice',
|
|
13826
13832
|
title: "\u6807\u51C6\u5355\u4EF7",
|
|
@@ -13828,10 +13834,7 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13828
13834
|
}, {
|
|
13829
13835
|
dataIndex: 'originAmount',
|
|
13830
13836
|
title: "\u6807\u51C6\u91D1\u989D",
|
|
13831
|
-
width: 150
|
|
13832
|
-
render: function render(_, record) {
|
|
13833
|
-
return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
|
|
13834
|
-
}
|
|
13837
|
+
width: 150
|
|
13835
13838
|
}, {
|
|
13836
13839
|
dataIndex: 'discountFee',
|
|
13837
13840
|
title: "\u8BA9\u5229\u91D1\u989D",
|
|
@@ -13845,7 +13848,7 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13845
13848
|
title: "\u662F\u5426\u53D6\u6D88",
|
|
13846
13849
|
width: 150,
|
|
13847
13850
|
render: function render(val) {
|
|
13848
|
-
return /*#__PURE__*/React__default['default'].createElement("span", null,
|
|
13851
|
+
return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
|
|
13849
13852
|
}
|
|
13850
13853
|
}, {
|
|
13851
13854
|
dataIndex: 'isGift',
|
|
@@ -13864,13 +13867,18 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13864
13867
|
label: '否',
|
|
13865
13868
|
value: 0
|
|
13866
13869
|
}]
|
|
13867
|
-
}) : /*#__PURE__*/React__default['default'].createElement("span", null,
|
|
13870
|
+
}) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
|
|
13868
13871
|
}
|
|
13869
13872
|
}, {
|
|
13870
13873
|
dataIndex: 'skuNote',
|
|
13871
13874
|
title: "\u5546\u54C1\u5907\u6CE8",
|
|
13872
13875
|
width: 150
|
|
13873
|
-
}]
|
|
13876
|
+
}].map(function (item) {
|
|
13877
|
+
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
13878
|
+
align: 'center',
|
|
13879
|
+
ellipsis: true
|
|
13880
|
+
});
|
|
13881
|
+
}),
|
|
13874
13882
|
//管易补发商品信息
|
|
13875
13883
|
GY_REISSUE_GOODS: [{
|
|
13876
13884
|
dataIndex: 'goodName',
|
|
@@ -13909,7 +13917,11 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13909
13917
|
min: 1,
|
|
13910
13918
|
precision: 0,
|
|
13911
13919
|
onChange: function onChange(num) {
|
|
13912
|
-
|
|
13920
|
+
updateDataHandle({
|
|
13921
|
+
qty: num,
|
|
13922
|
+
amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
|
|
13923
|
+
originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
|
|
13924
|
+
}, index);
|
|
13913
13925
|
}
|
|
13914
13926
|
}) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
|
|
13915
13927
|
}
|
|
@@ -13926,17 +13938,17 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13926
13938
|
min: 0,
|
|
13927
13939
|
precision: 2,
|
|
13928
13940
|
onChange: function onChange(num) {
|
|
13929
|
-
|
|
13941
|
+
updateDataHandle({
|
|
13942
|
+
price: num,
|
|
13943
|
+
amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
|
|
13944
|
+
}, index);
|
|
13930
13945
|
}
|
|
13931
13946
|
}) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
|
|
13932
13947
|
}
|
|
13933
13948
|
}, {
|
|
13934
13949
|
dataIndex: 'amount',
|
|
13935
13950
|
title: "\u5B9E\u9645\u91D1\u989D",
|
|
13936
|
-
width: 150
|
|
13937
|
-
render: function render(_, record) {
|
|
13938
|
-
return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
|
|
13939
|
-
}
|
|
13951
|
+
width: 150
|
|
13940
13952
|
}, {
|
|
13941
13953
|
dataIndex: 'originPrice',
|
|
13942
13954
|
title: "\u6807\u51C6\u5355\u4EF7",
|
|
@@ -13944,10 +13956,7 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13944
13956
|
}, {
|
|
13945
13957
|
dataIndex: 'originAmount',
|
|
13946
13958
|
title: "\u6807\u51C6\u91D1\u989D",
|
|
13947
|
-
width: 150
|
|
13948
|
-
render: function render(_, record) {
|
|
13949
|
-
return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
|
|
13950
|
-
}
|
|
13959
|
+
width: 150
|
|
13951
13960
|
}, {
|
|
13952
13961
|
dataIndex: 'isGift',
|
|
13953
13962
|
title: "\u662F\u5426\u8D60\u54C1",
|
|
@@ -13965,9 +13974,14 @@ var getColumns$4 = function getColumns(_ref) {
|
|
|
13965
13974
|
label: '否',
|
|
13966
13975
|
value: 0
|
|
13967
13976
|
}]
|
|
13968
|
-
}) : /*#__PURE__*/React__default['default'].createElement("span", null,
|
|
13977
|
+
}) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
|
|
13969
13978
|
}
|
|
13970
|
-
}]
|
|
13979
|
+
}].map(function (item) {
|
|
13980
|
+
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
13981
|
+
align: 'center',
|
|
13982
|
+
ellipsis: true
|
|
13983
|
+
});
|
|
13984
|
+
})
|
|
13971
13985
|
};
|
|
13972
13986
|
};
|
|
13973
13987
|
|
|
@@ -14082,7 +14096,8 @@ var getColumnsMap = function getColumnsMap(args) {
|
|
|
14082
14096
|
_ref$text = _ref.text,
|
|
14083
14097
|
text = _ref$text === void 0 ? '' : _ref$text,
|
|
14084
14098
|
disabled = _ref.disabled,
|
|
14085
|
-
updateHandle = _ref.updateHandle
|
|
14099
|
+
updateHandle = _ref.updateHandle,
|
|
14100
|
+
updateDataHandle = _ref.updateDataHandle;
|
|
14086
14101
|
return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
|
|
14087
14102
|
text: text,
|
|
14088
14103
|
disabled: disabled,
|
|
@@ -14102,7 +14117,8 @@ var getColumnsMap = function getColumnsMap(args) {
|
|
|
14102
14117
|
})), getColumns$4({
|
|
14103
14118
|
text: text,
|
|
14104
14119
|
disabled: disabled,
|
|
14105
|
-
updateHandle: updateHandle
|
|
14120
|
+
updateHandle: updateHandle,
|
|
14121
|
+
updateDataHandle: updateDataHandle
|
|
14106
14122
|
})), {}, {
|
|
14107
14123
|
default: getColumns$5({
|
|
14108
14124
|
text: text,
|
|
@@ -14208,61 +14224,6 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
|
|
|
14208
14224
|
});
|
|
14209
14225
|
};
|
|
14210
14226
|
|
|
14211
|
-
var renderGiftType$1 = function renderGiftType(val) {
|
|
14212
|
-
var giftTypeMap = {
|
|
14213
|
-
0: '非赠品',
|
|
14214
|
-
1: '自动赠送',
|
|
14215
|
-
2: '手工赠送',
|
|
14216
|
-
3: '回购自动送赠品',
|
|
14217
|
-
4: '前N有礼送赠品',
|
|
14218
|
-
6: '天猫优仓赠品',
|
|
14219
|
-
7: '淘宝CRM会员送赠'
|
|
14220
|
-
};
|
|
14221
|
-
return /*#__PURE__*/React__default['default'].createElement("span", null, giftTypeMap[val]);
|
|
14222
|
-
};
|
|
14223
|
-
var renderFieldMap$2 = {
|
|
14224
|
-
num: function num(_ref) {
|
|
14225
|
-
var disabled = _ref.disabled,
|
|
14226
|
-
updateHandle = _ref.updateHandle;
|
|
14227
|
-
return function (val, record, index) {
|
|
14228
|
-
return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
|
|
14229
|
-
style: {
|
|
14230
|
-
width: 70
|
|
14231
|
-
},
|
|
14232
|
-
value: val,
|
|
14233
|
-
min: 1,
|
|
14234
|
-
precision: 0,
|
|
14235
|
-
onChange: function onChange(num) {
|
|
14236
|
-
return updateHandle(num, index, 'num');
|
|
14237
|
-
}
|
|
14238
|
-
}) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
|
|
14239
|
-
};
|
|
14240
|
-
},
|
|
14241
|
-
giftType: function giftType() {
|
|
14242
|
-
return renderGiftType$1;
|
|
14243
|
-
}
|
|
14244
|
-
};
|
|
14245
|
-
var getGyReissueGoodColumns = function getGyReissueGoodColumns(_ref2) {
|
|
14246
|
-
var disabled = _ref2.disabled,
|
|
14247
|
-
updateHandle = _ref2.updateHandle,
|
|
14248
|
-
operate = _ref2.operate;
|
|
14249
|
-
return getColumnsMap()['GY_REISSUE_GOODS'].map(function (item) {
|
|
14250
|
-
var newItem = _objectSpread2({
|
|
14251
|
-
align: 'center',
|
|
14252
|
-
ellipsis: true
|
|
14253
|
-
}, item);
|
|
14254
|
-
if (operate && (renderFieldMap$2 === null || renderFieldMap$2 === void 0 ? void 0 : renderFieldMap$2[item.dataIndex])) {
|
|
14255
|
-
return _objectSpread2(_objectSpread2({}, newItem), {}, {
|
|
14256
|
-
render: renderFieldMap$2 === null || renderFieldMap$2 === void 0 ? void 0 : renderFieldMap$2[item.dataIndex]({
|
|
14257
|
-
disabled: disabled,
|
|
14258
|
-
updateHandle: updateHandle
|
|
14259
|
-
})
|
|
14260
|
-
});
|
|
14261
|
-
}
|
|
14262
|
-
return newItem;
|
|
14263
|
-
});
|
|
14264
|
-
};
|
|
14265
|
-
|
|
14266
14227
|
var MAIN_FIELD = 'uuid';
|
|
14267
14228
|
var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
14268
14229
|
var columns = _ref.columns,
|
|
@@ -14415,6 +14376,12 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
14415
14376
|
onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(value));
|
|
14416
14377
|
}
|
|
14417
14378
|
};
|
|
14379
|
+
var updateDataHandle = function updateDataHandle(data, index) {
|
|
14380
|
+
if (value === null || value === void 0 ? void 0 : value.length) {
|
|
14381
|
+
value[index] = _objectSpread2(_objectSpread2({}, value[index]), data);
|
|
14382
|
+
onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(value));
|
|
14383
|
+
}
|
|
14384
|
+
};
|
|
14418
14385
|
var COLUMNS_MAP = function COLUMNS_MAP() {
|
|
14419
14386
|
var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
|
|
14420
14387
|
var operate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
|
|
@@ -14428,11 +14395,13 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
14428
14395
|
case 'BS_GOODS':
|
|
14429
14396
|
case 'WLN_GOODS':
|
|
14430
14397
|
case 'GY_GOODS':
|
|
14398
|
+
case 'GY_REISSUE_GOODS':
|
|
14431
14399
|
{
|
|
14432
14400
|
columns = getColumnsMap({
|
|
14433
14401
|
text: text,
|
|
14434
14402
|
disabled: disabled,
|
|
14435
|
-
updateHandle: updateHandle
|
|
14403
|
+
updateHandle: updateHandle,
|
|
14404
|
+
updateDataHandle: updateDataHandle
|
|
14436
14405
|
})[type];
|
|
14437
14406
|
}
|
|
14438
14407
|
break;
|
|
@@ -14445,15 +14414,6 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
14445
14414
|
});
|
|
14446
14415
|
}
|
|
14447
14416
|
break;
|
|
14448
|
-
case 'GY_REISSUE_GOODS':
|
|
14449
|
-
{
|
|
14450
|
-
columns = getGyReissueGoodColumns({
|
|
14451
|
-
disabled: disabled,
|
|
14452
|
-
updateHandle: updateHandle,
|
|
14453
|
-
operate: operate
|
|
14454
|
-
});
|
|
14455
|
-
}
|
|
14456
|
-
break;
|
|
14457
14417
|
case 'BS_E3_REISSUE_GOODS':
|
|
14458
14418
|
{
|
|
14459
14419
|
columns = getBsE3ReissueGoodColumns({
|
|
@@ -14467,7 +14427,8 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
14467
14427
|
columns = getColumnsMap({
|
|
14468
14428
|
text: text,
|
|
14469
14429
|
disabled: disabled,
|
|
14470
|
-
updateHandle: updateHandle
|
|
14430
|
+
updateHandle: updateHandle,
|
|
14431
|
+
updateDataHandle: updateDataHandle
|
|
14471
14432
|
})['default'];
|
|
14472
14433
|
}
|
|
14473
14434
|
return columns;
|
|
@@ -14608,7 +14569,8 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
14608
14569
|
goodNo: goodNo,
|
|
14609
14570
|
specName: specName,
|
|
14610
14571
|
specNo: specNo,
|
|
14611
|
-
originPrice: retailPrice
|
|
14572
|
+
originPrice: !kmkfUtils.isNull(retailPrice) ? Number(retailPrice) : null,
|
|
14573
|
+
originAmount: !kmkfUtils.isNull(retailPrice) ? Number(retailPrice) : null
|
|
14612
14574
|
});
|
|
14613
14575
|
});
|
|
14614
14576
|
} else {
|
|
@@ -15853,7 +15815,7 @@ var index$1 = (function (props) {
|
|
|
15853
15815
|
case 0:
|
|
15854
15816
|
gyUtils.getGyOrderListSingleton(orderNo).then(function (data) {
|
|
15855
15817
|
var trades = ((data === null || data === void 0 ? void 0 : data.trades) || []).filter(function (item) {
|
|
15856
|
-
return (item.
|
|
15818
|
+
return (item.platformCode || '').split(',').includes(orderNo);
|
|
15857
15819
|
});
|
|
15858
15820
|
_onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
|
|
15859
15821
|
orders: trades,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/basic-components",
|
|
3
|
-
"version": "1.22.1-beta.
|
|
3
|
+
"version": "1.22.1-beta.59",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"homepage": "",
|
|
6
6
|
"license": "ISC",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.
|
|
23
|
+
"@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.58",
|
|
24
24
|
"ahooks": "^3.7.4",
|
|
25
25
|
"bignumber.js": "^9.1.2",
|
|
26
26
|
"kmkf-monitor": "^0.8.9",
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"publishConfig": {
|
|
66
66
|
"access": "public"
|
|
67
67
|
},
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "b0825d8a048c88897806a83a4c19bf704d064305"
|
|
69
69
|
}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
|
-
export declare const renderGiftType: (val: number) => React.JSX.Element;
|
|
3
|
-
type P = {
|
|
4
|
-
disabled: boolean | undefined;
|
|
5
|
-
updateHandle: (v: any, index: number, key: string) => void;
|
|
6
|
-
operate?: boolean;
|
|
7
|
-
};
|
|
8
|
-
export declare const getGyReissueGoodColumns: ({ disabled, updateHandle, operate, }: P) => any[];
|
|
9
|
-
export {};
|