@kmkf-fe-packages/basic-components 2.2.44-beta.0 → 2.2.44-beta.16
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 +52 -31
- package/dist/index.js +51 -30
- package/dist/src/bs/component/model/Columns/Erp/km.d.ts +6 -0
- package/package.json +3 -3
package/dist/index.esm.js
CHANGED
|
@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
|
|
|
3
3
|
import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } 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, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
|
|
6
|
+
import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, JkyAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
|
|
7
7
|
import every from 'lodash/every';
|
|
8
8
|
import maxBy from 'lodash/maxBy';
|
|
9
9
|
import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
|
|
@@ -7758,7 +7758,8 @@ var Province = function Province(props) {
|
|
|
7758
7758
|
wdt: WdtAddressData.getInstance(),
|
|
7759
7759
|
gy: GyAddressData.getInstance(),
|
|
7760
7760
|
km: AddressData.getInstance(),
|
|
7761
|
-
jst: JstAddressData.getInstance()
|
|
7761
|
+
jst: JstAddressData.getInstance(),
|
|
7762
|
+
jky: JkyAddressData.getInstance()
|
|
7762
7763
|
};
|
|
7763
7764
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
|
|
7764
7765
|
options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
|
|
@@ -8605,7 +8606,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
|
|
|
8605
8606
|
WAREHOUSING_STATUS: 'inStockStatusItemList',
|
|
8606
8607
|
BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
|
|
8607
8608
|
MSG_STATUS: 'msgStatusValues',
|
|
8608
|
-
WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList'
|
|
8609
|
+
WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
|
|
8610
|
+
JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
|
|
8609
8611
|
};
|
|
8610
8612
|
return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
|
|
8611
8613
|
};
|
|
@@ -9360,6 +9362,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9360
9362
|
BS_E3_WAREHOUSING_STATUS: processSceneStatus,
|
|
9361
9363
|
MSG_STATUS: processSceneStatus,
|
|
9362
9364
|
WDT_WAREHOUSING_STATUS: processSceneStatus,
|
|
9365
|
+
JKY_WAREHOUSING_STATUS: processSceneStatus,
|
|
9363
9366
|
BS_LOGISTICS: processErpLogistics,
|
|
9364
9367
|
WLN_LOGISTICS: processErpLogistics,
|
|
9365
9368
|
WDT_LOGISTICS: processErpLogistics,
|
|
@@ -15086,7 +15089,9 @@ var kmColumns = [{
|
|
|
15086
15089
|
title: "\u5546\u54C1\u7C7B\u578B",
|
|
15087
15090
|
ellipsis: true,
|
|
15088
15091
|
width: 150,
|
|
15089
|
-
render:
|
|
15092
|
+
render: function render(type) {
|
|
15093
|
+
return renderTextEllipsis((kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[type]) || type);
|
|
15094
|
+
}
|
|
15090
15095
|
}, {
|
|
15091
15096
|
dataIndex: 'specName',
|
|
15092
15097
|
title: "SKU\u540D\u79F0",
|
|
@@ -15806,14 +15811,7 @@ var transformFormData = function transformFormData(formData) {
|
|
|
15806
15811
|
if (formData[key]) {
|
|
15807
15812
|
var _formData$key, _formData$key2, _formData$key3, _formData$key4;
|
|
15808
15813
|
var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
|
|
15809
|
-
|
|
15810
|
-
if (typeof value === 'string' && (value.includes(',') || value.includes("\uFF0C") || value.includes(' '))) {
|
|
15811
|
-
var _value, _value$replace, _value$replace$split;
|
|
15812
|
-
value = (_value = value) === null || _value === void 0 ? void 0 : (_value$replace = _value.replace(/[,， ]/g, ',')) === null || _value$replace === void 0 ? void 0 : (_value$replace$split = _value$replace.split(',')) === null || _value$replace$split === void 0 ? void 0 : _value$replace$split.filter(function (v) {
|
|
15813
|
-
return v;
|
|
15814
|
-
});
|
|
15815
|
-
}
|
|
15816
|
-
var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'include' : 'eq';
|
|
15814
|
+
var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : 'like';
|
|
15817
15815
|
conditionList.push({
|
|
15818
15816
|
leftValue: key,
|
|
15819
15817
|
compareSymbol: compareSymbol,
|
|
@@ -22425,7 +22423,7 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22425
22423
|
updateHandle = _ref.updateHandle,
|
|
22426
22424
|
updateDataHandle = _ref.updateDataHandle;
|
|
22427
22425
|
return {
|
|
22428
|
-
|
|
22426
|
+
//吉客云商品信息
|
|
22429
22427
|
JKY_GOODS: [{
|
|
22430
22428
|
dataIndex: 'goodsNo',
|
|
22431
22429
|
title: "\u8D27\u54C1\u7F16\u53F7",
|
|
@@ -22723,7 +22721,7 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22723
22721
|
ellipsis: true
|
|
22724
22722
|
});
|
|
22725
22723
|
}),
|
|
22726
|
-
//
|
|
22724
|
+
// 吉客云补发商品信息
|
|
22727
22725
|
JKY_REISSUE_GOODS: [{
|
|
22728
22726
|
dataIndex: 'goodsNo',
|
|
22729
22727
|
title: "\u8D27\u54C1\u7F16\u53F7",
|
|
@@ -22794,7 +22792,7 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22794
22792
|
}
|
|
22795
22793
|
},
|
|
22796
22794
|
render: function render(val, record, index) {
|
|
22797
|
-
return
|
|
22795
|
+
return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
|
|
22798
22796
|
style: {
|
|
22799
22797
|
width: 70
|
|
22800
22798
|
},
|
|
@@ -22814,7 +22812,7 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22814
22812
|
title: "\u5355\u4EF7",
|
|
22815
22813
|
width: 150,
|
|
22816
22814
|
render: function render(val, record, index) {
|
|
22817
|
-
return
|
|
22815
|
+
return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
|
|
22818
22816
|
style: {
|
|
22819
22817
|
width: 130
|
|
22820
22818
|
},
|
|
@@ -22834,25 +22832,28 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22834
22832
|
title: "\u603B\u91D1\u989D",
|
|
22835
22833
|
width: 150,
|
|
22836
22834
|
render: function render(val, record, index) {
|
|
22837
|
-
|
|
22835
|
+
if ((typeof record.sellCount === 'number' || record.sellCount) && (typeof record.sellPrice === 'number' || record.sellPrice)) {
|
|
22836
|
+
return record.sellCount * record.sellPrice;
|
|
22837
|
+
}
|
|
22838
|
+
return '';
|
|
22838
22839
|
}
|
|
22839
22840
|
}, {
|
|
22840
22841
|
dataIndex: 'reason',
|
|
22841
22842
|
title: "\u9000\u6362\u539F\u56E0",
|
|
22842
22843
|
width: 250,
|
|
22843
22844
|
render: function render(val, record, index) {
|
|
22844
|
-
return /*#__PURE__*/React.createElement(ApaasInput, {
|
|
22845
|
+
return !disabled ? /*#__PURE__*/React.createElement(ApaasInput, {
|
|
22845
22846
|
onChange: function onChange(value) {
|
|
22846
22847
|
updateHandle(value, index, 'reason');
|
|
22847
22848
|
}
|
|
22848
|
-
});
|
|
22849
|
+
}) : /*#__PURE__*/React.createElement("span", null, val);
|
|
22849
22850
|
}
|
|
22850
22851
|
}, {
|
|
22851
22852
|
dataIndex: 'isGift',
|
|
22852
22853
|
title: "\u662F\u5426\u8D60\u54C1",
|
|
22853
22854
|
width: 150,
|
|
22854
22855
|
render: function render(val, record, index) {
|
|
22855
|
-
return
|
|
22856
|
+
return !disabled ? /*#__PURE__*/React.createElement(Select, {
|
|
22856
22857
|
value: val,
|
|
22857
22858
|
onChange: function onChange(value) {
|
|
22858
22859
|
updateHandle(value, index, 'isGift');
|
|
@@ -22871,7 +22872,7 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22871
22872
|
title: "\u662F\u5426\u7EC4\u5408\u88C5",
|
|
22872
22873
|
width: 150,
|
|
22873
22874
|
render: function render(val, record, index) {
|
|
22874
|
-
return
|
|
22875
|
+
return !disabled ? /*#__PURE__*/React.createElement(Select, {
|
|
22875
22876
|
value: val,
|
|
22876
22877
|
onChange: function onChange(value) {
|
|
22877
22878
|
updateHandle(value, index, 'isFit');
|
|
@@ -23447,7 +23448,7 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
|
|
|
23447
23448
|
sysPicPath: item.goodPicUrl,
|
|
23448
23449
|
payment: null,
|
|
23449
23450
|
price: item.retailPrice,
|
|
23450
|
-
type: null,
|
|
23451
|
+
type: (kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
|
|
23451
23452
|
uuid: uuid(),
|
|
23452
23453
|
canDelete: true,
|
|
23453
23454
|
canEdit: true
|
|
@@ -23810,7 +23811,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
23810
23811
|
var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
|
|
23811
23812
|
// 判断是否为是否展示系统单筛选项
|
|
23812
23813
|
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', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
|
|
23813
|
-
var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
|
|
23814
|
+
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;
|
|
23814
23815
|
var refModal = useRef();
|
|
23815
23816
|
console.debug('表格数据', value);
|
|
23816
23817
|
var handleDelete = function handleDelete(record, index) {
|
|
@@ -25115,7 +25116,7 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
|
|
|
25115
25116
|
singletonMap$7.delete(orderNo);
|
|
25116
25117
|
reject(err);
|
|
25117
25118
|
};
|
|
25118
|
-
extendRequest('/qy/gdfw/
|
|
25119
|
+
extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
|
|
25119
25120
|
method: 'post',
|
|
25120
25121
|
data: {
|
|
25121
25122
|
billNo: orderNo
|
|
@@ -27845,10 +27846,26 @@ var typeMap$2 = {
|
|
|
27845
27846
|
outerOiIdKey: '',
|
|
27846
27847
|
goodDetailsKey: 'subOrderDetails',
|
|
27847
27848
|
isShowSelectTradeGoods: true
|
|
27849
|
+
},
|
|
27850
|
+
JKY_REISSUE_GOODS: {
|
|
27851
|
+
compType: '补发',
|
|
27852
|
+
key: 'jkyReissueGoods',
|
|
27853
|
+
typeName: 'jkyReissueType',
|
|
27854
|
+
systemOrder: 'jkySystemOrder',
|
|
27855
|
+
systemOrderNo: 'jkySystemOrderNo',
|
|
27856
|
+
getOrderList: jkyUtils.getJkyOrderListSingleton,
|
|
27857
|
+
updateGoodsHandle: updateJkyGoodsHandle,
|
|
27858
|
+
alwaysShowChooseErpGoodsBtn: true,
|
|
27859
|
+
orderTypeKey: 'orderType',
|
|
27860
|
+
oIdKey: 'tradeNo',
|
|
27861
|
+
outerOiIdKey: '',
|
|
27862
|
+
goodDetailsKey: 'subOrderDetails',
|
|
27863
|
+
isShowSelectTradeGoods: true,
|
|
27864
|
+
showModeBtn: true
|
|
27848
27865
|
}
|
|
27849
27866
|
};
|
|
27850
27867
|
var PublicReissue = function PublicReissue(props) {
|
|
27851
|
-
var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$
|
|
27868
|
+
var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _value$typeMap$type$s9, _typeMap$type54, _typeMap$type55, _typeMap$type56, _typeMap$type57;
|
|
27852
27869
|
var value = props.value,
|
|
27853
27870
|
onChange = props.onChange,
|
|
27854
27871
|
_props$reasonList = props.reasonList,
|
|
@@ -28070,6 +28087,10 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
28070
28087
|
orderRest = {
|
|
28071
28088
|
canEdit: true
|
|
28072
28089
|
};
|
|
28090
|
+
} else if (['JKY_REISSUE_GOODS'].includes(type)) {
|
|
28091
|
+
orderRest = {
|
|
28092
|
+
canEdit: true
|
|
28093
|
+
};
|
|
28073
28094
|
}
|
|
28074
28095
|
var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
|
|
28075
28096
|
var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
|
|
@@ -28211,17 +28232,17 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
28211
28232
|
return changeGoodHandle(val);
|
|
28212
28233
|
},
|
|
28213
28234
|
onModeChange: handleModeChange,
|
|
28214
|
-
showModeBtn:
|
|
28235
|
+
showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.showModeBtn),
|
|
28215
28236
|
isStrict: isStrict,
|
|
28216
|
-
isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
28217
|
-
systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$
|
|
28218
|
-
selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
28237
|
+
isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods,
|
|
28238
|
+
systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
|
|
28239
|
+
selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.systemOrderNo)]] : [],
|
|
28219
28240
|
tradeGoods: {
|
|
28220
28241
|
originDataSource: getGoodDetails({
|
|
28221
28242
|
mode: isStrict,
|
|
28222
|
-
isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
28243
|
+
isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.isShowSelectTradeGoods
|
|
28223
28244
|
}),
|
|
28224
|
-
uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
28245
|
+
uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.uniqueKey) || 'uuid',
|
|
28225
28246
|
selectedGoodsChange: selectedGoodsChange
|
|
28226
28247
|
}
|
|
28227
28248
|
})));
|
package/dist/index.js
CHANGED
|
@@ -7773,7 +7773,8 @@ var Province = function Province(props) {
|
|
|
7773
7773
|
wdt: kmkfUtils.WdtAddressData.getInstance(),
|
|
7774
7774
|
gy: kmkfUtils.GyAddressData.getInstance(),
|
|
7775
7775
|
km: kmkfUtils.AddressData.getInstance(),
|
|
7776
|
-
jst: kmkfUtils.JstAddressData.getInstance()
|
|
7776
|
+
jst: kmkfUtils.JstAddressData.getInstance(),
|
|
7777
|
+
jky: kmkfUtils.JkyAddressData.getInstance()
|
|
7777
7778
|
};
|
|
7778
7779
|
return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
|
|
7779
7780
|
options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
|
|
@@ -8620,7 +8621,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
|
|
|
8620
8621
|
WAREHOUSING_STATUS: 'inStockStatusItemList',
|
|
8621
8622
|
BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
|
|
8622
8623
|
MSG_STATUS: 'msgStatusValues',
|
|
8623
|
-
WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList'
|
|
8624
|
+
WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
|
|
8625
|
+
JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
|
|
8624
8626
|
};
|
|
8625
8627
|
return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
|
|
8626
8628
|
};
|
|
@@ -9375,6 +9377,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9375
9377
|
BS_E3_WAREHOUSING_STATUS: processSceneStatus,
|
|
9376
9378
|
MSG_STATUS: processSceneStatus,
|
|
9377
9379
|
WDT_WAREHOUSING_STATUS: processSceneStatus,
|
|
9380
|
+
JKY_WAREHOUSING_STATUS: processSceneStatus,
|
|
9378
9381
|
BS_LOGISTICS: processErpLogistics,
|
|
9379
9382
|
WLN_LOGISTICS: processErpLogistics,
|
|
9380
9383
|
WDT_LOGISTICS: processErpLogistics,
|
|
@@ -15101,7 +15104,9 @@ var kmColumns = [{
|
|
|
15101
15104
|
title: "\u5546\u54C1\u7C7B\u578B",
|
|
15102
15105
|
ellipsis: true,
|
|
15103
15106
|
width: 150,
|
|
15104
|
-
render:
|
|
15107
|
+
render: function render(type) {
|
|
15108
|
+
return renderTextEllipsis((kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[type]) || type);
|
|
15109
|
+
}
|
|
15105
15110
|
}, {
|
|
15106
15111
|
dataIndex: 'specName',
|
|
15107
15112
|
title: "SKU\u540D\u79F0",
|
|
@@ -15821,14 +15826,7 @@ var transformFormData = function transformFormData(formData) {
|
|
|
15821
15826
|
if (formData[key]) {
|
|
15822
15827
|
var _formData$key, _formData$key2, _formData$key3, _formData$key4;
|
|
15823
15828
|
var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
|
|
15824
|
-
|
|
15825
|
-
if (typeof value === 'string' && (value.includes(',') || value.includes("\uFF0C") || value.includes(' '))) {
|
|
15826
|
-
var _value, _value$replace, _value$replace$split;
|
|
15827
|
-
value = (_value = value) === null || _value === void 0 ? void 0 : (_value$replace = _value.replace(/[,， ]/g, ',')) === null || _value$replace === void 0 ? void 0 : (_value$replace$split = _value$replace.split(',')) === null || _value$replace$split === void 0 ? void 0 : _value$replace$split.filter(function (v) {
|
|
15828
|
-
return v;
|
|
15829
|
-
});
|
|
15830
|
-
}
|
|
15831
|
-
var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'include' : 'eq';
|
|
15829
|
+
var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : 'like';
|
|
15832
15830
|
conditionList.push({
|
|
15833
15831
|
leftValue: key,
|
|
15834
15832
|
compareSymbol: compareSymbol,
|
|
@@ -22440,7 +22438,7 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22440
22438
|
updateHandle = _ref.updateHandle,
|
|
22441
22439
|
updateDataHandle = _ref.updateDataHandle;
|
|
22442
22440
|
return {
|
|
22443
|
-
|
|
22441
|
+
//吉客云商品信息
|
|
22444
22442
|
JKY_GOODS: [{
|
|
22445
22443
|
dataIndex: 'goodsNo',
|
|
22446
22444
|
title: "\u8D27\u54C1\u7F16\u53F7",
|
|
@@ -22738,7 +22736,7 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22738
22736
|
ellipsis: true
|
|
22739
22737
|
});
|
|
22740
22738
|
}),
|
|
22741
|
-
//
|
|
22739
|
+
// 吉客云补发商品信息
|
|
22742
22740
|
JKY_REISSUE_GOODS: [{
|
|
22743
22741
|
dataIndex: 'goodsNo',
|
|
22744
22742
|
title: "\u8D27\u54C1\u7F16\u53F7",
|
|
@@ -22809,7 +22807,7 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22809
22807
|
}
|
|
22810
22808
|
},
|
|
22811
22809
|
render: function render(val, record, index) {
|
|
22812
|
-
return
|
|
22810
|
+
return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
|
|
22813
22811
|
style: {
|
|
22814
22812
|
width: 70
|
|
22815
22813
|
},
|
|
@@ -22829,7 +22827,7 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22829
22827
|
title: "\u5355\u4EF7",
|
|
22830
22828
|
width: 150,
|
|
22831
22829
|
render: function render(val, record, index) {
|
|
22832
|
-
return
|
|
22830
|
+
return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
|
|
22833
22831
|
style: {
|
|
22834
22832
|
width: 130
|
|
22835
22833
|
},
|
|
@@ -22849,25 +22847,28 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22849
22847
|
title: "\u603B\u91D1\u989D",
|
|
22850
22848
|
width: 150,
|
|
22851
22849
|
render: function render(val, record, index) {
|
|
22852
|
-
|
|
22850
|
+
if ((typeof record.sellCount === 'number' || record.sellCount) && (typeof record.sellPrice === 'number' || record.sellPrice)) {
|
|
22851
|
+
return record.sellCount * record.sellPrice;
|
|
22852
|
+
}
|
|
22853
|
+
return '';
|
|
22853
22854
|
}
|
|
22854
22855
|
}, {
|
|
22855
22856
|
dataIndex: 'reason',
|
|
22856
22857
|
title: "\u9000\u6362\u539F\u56E0",
|
|
22857
22858
|
width: 250,
|
|
22858
22859
|
render: function render(val, record, index) {
|
|
22859
|
-
return /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
|
|
22860
|
+
return !disabled ? /*#__PURE__*/React__default['default'].createElement(ApaasInput, {
|
|
22860
22861
|
onChange: function onChange(value) {
|
|
22861
22862
|
updateHandle(value, index, 'reason');
|
|
22862
22863
|
}
|
|
22863
|
-
});
|
|
22864
|
+
}) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
|
|
22864
22865
|
}
|
|
22865
22866
|
}, {
|
|
22866
22867
|
dataIndex: 'isGift',
|
|
22867
22868
|
title: "\u662F\u5426\u8D60\u54C1",
|
|
22868
22869
|
width: 150,
|
|
22869
22870
|
render: function render(val, record, index) {
|
|
22870
|
-
return
|
|
22871
|
+
return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
|
|
22871
22872
|
value: val,
|
|
22872
22873
|
onChange: function onChange(value) {
|
|
22873
22874
|
updateHandle(value, index, 'isGift');
|
|
@@ -22886,7 +22887,7 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
22886
22887
|
title: "\u662F\u5426\u7EC4\u5408\u88C5",
|
|
22887
22888
|
width: 150,
|
|
22888
22889
|
render: function render(val, record, index) {
|
|
22889
|
-
return
|
|
22890
|
+
return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
|
|
22890
22891
|
value: val,
|
|
22891
22892
|
onChange: function onChange(value) {
|
|
22892
22893
|
updateHandle(value, index, 'isFit');
|
|
@@ -23462,7 +23463,7 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
|
|
|
23462
23463
|
sysPicPath: item.goodPicUrl,
|
|
23463
23464
|
payment: null,
|
|
23464
23465
|
price: item.retailPrice,
|
|
23465
|
-
type: null,
|
|
23466
|
+
type: (kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
|
|
23466
23467
|
uuid: kmkfUtils.uuid(),
|
|
23467
23468
|
canDelete: true,
|
|
23468
23469
|
canEdit: true
|
|
@@ -23825,7 +23826,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
23825
23826
|
var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
|
|
23826
23827
|
// 判断是否为是否展示系统单筛选项
|
|
23827
23828
|
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', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
|
|
23828
|
-
var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
|
|
23829
|
+
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;
|
|
23829
23830
|
var refModal = React.useRef();
|
|
23830
23831
|
console.debug('表格数据', value);
|
|
23831
23832
|
var handleDelete = function handleDelete(record, index) {
|
|
@@ -25130,7 +25131,7 @@ var getJkyOrderListSingleton = function getJkyOrderListSingleton(orderNo) {
|
|
|
25130
25131
|
singletonMap$7.delete(orderNo);
|
|
25131
25132
|
reject(err);
|
|
25132
25133
|
};
|
|
25133
|
-
extendRequest('/qy/gdfw/
|
|
25134
|
+
extendRequest('/qy/gdfw/jky/erp/trade/fullInfo', {
|
|
25134
25135
|
method: 'post',
|
|
25135
25136
|
data: {
|
|
25136
25137
|
billNo: orderNo
|
|
@@ -27860,10 +27861,26 @@ var typeMap$2 = {
|
|
|
27860
27861
|
outerOiIdKey: '',
|
|
27861
27862
|
goodDetailsKey: 'subOrderDetails',
|
|
27862
27863
|
isShowSelectTradeGoods: true
|
|
27864
|
+
},
|
|
27865
|
+
JKY_REISSUE_GOODS: {
|
|
27866
|
+
compType: '补发',
|
|
27867
|
+
key: 'jkyReissueGoods',
|
|
27868
|
+
typeName: 'jkyReissueType',
|
|
27869
|
+
systemOrder: 'jkySystemOrder',
|
|
27870
|
+
systemOrderNo: 'jkySystemOrderNo',
|
|
27871
|
+
getOrderList: jkyUtils.getJkyOrderListSingleton,
|
|
27872
|
+
updateGoodsHandle: kmkfUtils.updateJkyGoodsHandle,
|
|
27873
|
+
alwaysShowChooseErpGoodsBtn: true,
|
|
27874
|
+
orderTypeKey: 'orderType',
|
|
27875
|
+
oIdKey: 'tradeNo',
|
|
27876
|
+
outerOiIdKey: '',
|
|
27877
|
+
goodDetailsKey: 'subOrderDetails',
|
|
27878
|
+
isShowSelectTradeGoods: true,
|
|
27879
|
+
showModeBtn: true
|
|
27863
27880
|
}
|
|
27864
27881
|
};
|
|
27865
27882
|
var PublicReissue = function PublicReissue(props) {
|
|
27866
|
-
var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$
|
|
27883
|
+
var _typeMap$type36, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _value$typeMap$type$s8, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _typeMap$type53, _value$typeMap$type$s9, _typeMap$type54, _typeMap$type55, _typeMap$type56, _typeMap$type57;
|
|
27867
27884
|
var value = props.value,
|
|
27868
27885
|
onChange = props.onChange,
|
|
27869
27886
|
_props$reasonList = props.reasonList,
|
|
@@ -28085,6 +28102,10 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
28085
28102
|
orderRest = {
|
|
28086
28103
|
canEdit: true
|
|
28087
28104
|
};
|
|
28105
|
+
} else if (['JKY_REISSUE_GOODS'].includes(type)) {
|
|
28106
|
+
orderRest = {
|
|
28107
|
+
canEdit: true
|
|
28108
|
+
};
|
|
28088
28109
|
}
|
|
28089
28110
|
var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
|
|
28090
28111
|
var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
|
|
@@ -28226,17 +28247,17 @@ var PublicReissue = function PublicReissue(props) {
|
|
|
28226
28247
|
return changeGoodHandle(val);
|
|
28227
28248
|
},
|
|
28228
28249
|
onModeChange: handleModeChange,
|
|
28229
|
-
showModeBtn:
|
|
28250
|
+
showModeBtn: !!(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.showModeBtn),
|
|
28230
28251
|
isStrict: isStrict,
|
|
28231
|
-
isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
28232
|
-
systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$
|
|
28233
|
-
selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
28252
|
+
isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.isShowSelectTradeGoods,
|
|
28253
|
+
systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
|
|
28254
|
+
selectedSystemOrders: showChangeBtn ? [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.systemOrderNo)]] : [],
|
|
28234
28255
|
tradeGoods: {
|
|
28235
28256
|
originDataSource: getGoodDetails({
|
|
28236
28257
|
mode: isStrict,
|
|
28237
|
-
isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
28258
|
+
isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type56 = typeMap$2[type]) === null || _typeMap$type56 === void 0 ? void 0 : _typeMap$type56.isShowSelectTradeGoods
|
|
28238
28259
|
}),
|
|
28239
|
-
uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$
|
|
28260
|
+
uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type57 = typeMap$2[type]) === null || _typeMap$type57 === void 0 ? void 0 : _typeMap$type57.uniqueKey) || 'uuid',
|
|
28240
28261
|
selectedGoodsChange: selectedGoodsChange
|
|
28241
28262
|
}
|
|
28242
28263
|
})));
|
|
@@ -5,6 +5,12 @@ declare const _default: ({
|
|
|
5
5
|
width: number;
|
|
6
6
|
render: (val: string) => React.JSX.Element;
|
|
7
7
|
ellipsis?: undefined;
|
|
8
|
+
} | {
|
|
9
|
+
dataIndex: string;
|
|
10
|
+
title: string;
|
|
11
|
+
ellipsis: boolean;
|
|
12
|
+
width: number;
|
|
13
|
+
render: (type: number) => React.JSX.Element;
|
|
8
14
|
} | {
|
|
9
15
|
dataIndex: string;
|
|
10
16
|
title: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/basic-components",
|
|
3
|
-
"version": "2.2.44-beta.
|
|
3
|
+
"version": "2.2.44-beta.16",
|
|
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": "2.2.44-beta.
|
|
23
|
+
"@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.16",
|
|
24
24
|
"ahooks": "^3.7.4",
|
|
25
25
|
"ali-react-table": "2.6.1",
|
|
26
26
|
"bignumber.js": "^9.1.2",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "c7d81a20c3111c37996eb2c3ce346c326d9b1d64"
|
|
70
70
|
}
|