@kmkf-fe-packages/basic-components 2.10.9-beta.1 → 2.10.9-beta.2
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
|
@@ -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, 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_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, 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, PLATFORM_AFTER_SALES_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, 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, 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, DxdSuppliersData, 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_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, 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, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, 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';
|
|
@@ -8156,7 +8156,8 @@ var updateWorkTypeKeys = {
|
|
|
8156
8156
|
REPAIR_ORDER_ID: 'repairOrderId',
|
|
8157
8157
|
PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
|
|
8158
8158
|
ACTUAL_RECEIPT_PAYMENT: 'actualReceiptPayment',
|
|
8159
|
-
WDT_SHOP: 'shopCode'
|
|
8159
|
+
WDT_SHOP: 'shopCode',
|
|
8160
|
+
DXD_SHOP: 'shopCode'
|
|
8160
8161
|
};
|
|
8161
8162
|
var systemOrderMap = {
|
|
8162
8163
|
BS_SYSTEM_ORDER: {
|
|
@@ -8203,6 +8204,11 @@ var systemOrderMap = {
|
|
|
8203
8204
|
no: 'wdtReturnBillNo',
|
|
8204
8205
|
ids: 'wdtReturnBillSelectIds',
|
|
8205
8206
|
order: 'wdtReturnBillShowOrder'
|
|
8207
|
+
},
|
|
8208
|
+
DXD_SYSTEM_ORDER: {
|
|
8209
|
+
no: 'dxdSystemOrderNo',
|
|
8210
|
+
ids: 'dxdSystemSelectIds',
|
|
8211
|
+
order: 'dxdSystemShowOrder'
|
|
8206
8212
|
}
|
|
8207
8213
|
};
|
|
8208
8214
|
//直接将key component 添加到 transformWorkOrderData中的componentProcessors
|
|
@@ -8809,6 +8815,60 @@ var processJkyGoods = function processJkyGoods(templateColumns) {
|
|
|
8809
8815
|
};
|
|
8810
8816
|
};
|
|
8811
8817
|
};
|
|
8818
|
+
var processDxdGoods = function processDxdGoods(templateColumns) {
|
|
8819
|
+
return function (getValue) {
|
|
8820
|
+
return function (nex, config) {
|
|
8821
|
+
var _values = {
|
|
8822
|
+
dxdGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_dxdGoods")), []),
|
|
8823
|
+
shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
|
|
8824
|
+
};
|
|
8825
|
+
var selectIds = [];
|
|
8826
|
+
var orderNo = '';
|
|
8827
|
+
var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
8828
|
+
return col.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
8829
|
+
});
|
|
8830
|
+
if (tradeId) {
|
|
8831
|
+
orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
|
|
8832
|
+
}
|
|
8833
|
+
var dxdSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
8834
|
+
return col.workOrderComponentType === 'DXD_SYSTEM_ORDER';
|
|
8835
|
+
});
|
|
8836
|
+
if (dxdSystemOrder) {
|
|
8837
|
+
selectIds = jsonParseSecurity(getValue("".concat(dxdSystemOrder.uniqueKey, "_").concat(systemOrderMap[dxdSystemOrder.workOrderComponentType].ids)), []);
|
|
8838
|
+
}
|
|
8839
|
+
_values.selectIds = selectIds;
|
|
8840
|
+
_values.orderNo = orderNo;
|
|
8841
|
+
return _defineProperty({}, nex.uniqueKey, _values);
|
|
8842
|
+
};
|
|
8843
|
+
};
|
|
8844
|
+
};
|
|
8845
|
+
var processDxdSuppliers = function processDxdSuppliers(templateColumns) {
|
|
8846
|
+
return function (getValue) {
|
|
8847
|
+
return function (nex, config) {
|
|
8848
|
+
var _values = {
|
|
8849
|
+
dxdSuppliers: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_dxdSuppliers")), []),
|
|
8850
|
+
shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
|
|
8851
|
+
};
|
|
8852
|
+
var selectIds = [];
|
|
8853
|
+
var orderNo = '';
|
|
8854
|
+
var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
8855
|
+
return col.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
8856
|
+
});
|
|
8857
|
+
if (tradeId) {
|
|
8858
|
+
orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
|
|
8859
|
+
}
|
|
8860
|
+
var dxdSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
8861
|
+
return col.workOrderComponentType === 'DXD_SYSTEM_ORDER';
|
|
8862
|
+
});
|
|
8863
|
+
if (dxdSystemOrder) {
|
|
8864
|
+
selectIds = jsonParseSecurity(getValue("".concat(dxdSystemOrder.uniqueKey, "_").concat(systemOrderMap[dxdSystemOrder.workOrderComponentType].ids)), []);
|
|
8865
|
+
}
|
|
8866
|
+
_values.selectIds = selectIds;
|
|
8867
|
+
_values.orderNo = orderNo;
|
|
8868
|
+
return _defineProperty({}, nex.uniqueKey, _values);
|
|
8869
|
+
};
|
|
8870
|
+
};
|
|
8871
|
+
};
|
|
8812
8872
|
var processWdtGoods = function processWdtGoods(templateColumns) {
|
|
8813
8873
|
return function (getValue) {
|
|
8814
8874
|
return function (nex, config) {
|
|
@@ -9138,6 +9198,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
|
|
|
9138
9198
|
no: 'wdtReturnBillNo',
|
|
9139
9199
|
ids: 'wdtReturnBillSelectIds',
|
|
9140
9200
|
order: 'wdtReturnBillShowOrder'
|
|
9201
|
+
},
|
|
9202
|
+
DXD_SYSTEM_ORDER: {
|
|
9203
|
+
no: 'dxdSystemOrderNo',
|
|
9204
|
+
ids: 'dxdSystemSelectIds',
|
|
9205
|
+
order: 'dxdSystemShowOrder'
|
|
9141
9206
|
}
|
|
9142
9207
|
};
|
|
9143
9208
|
return _defineProperty({}, nex.uniqueKey, _objectSpread2({
|
|
@@ -9407,14 +9472,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
|
|
|
9407
9472
|
};
|
|
9408
9473
|
var processLabel = function processLabel(getValue) {
|
|
9409
9474
|
return function (nex, config) {
|
|
9410
|
-
var
|
|
9411
|
-
return
|
|
9475
|
+
var _ref79;
|
|
9476
|
+
return _ref79 = {}, _defineProperty(_ref79, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref79, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref79;
|
|
9412
9477
|
};
|
|
9413
9478
|
};
|
|
9414
9479
|
var processMemberLevel = function processMemberLevel(getValue) {
|
|
9415
9480
|
return function (nex, config) {
|
|
9416
|
-
var
|
|
9417
|
-
return
|
|
9481
|
+
var _ref80;
|
|
9482
|
+
return _ref80 = {}, _defineProperty(_ref80, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref80, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref80;
|
|
9418
9483
|
};
|
|
9419
9484
|
};
|
|
9420
9485
|
var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
|
|
@@ -9541,6 +9606,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9541
9606
|
BS_GOODS: processBsGoods,
|
|
9542
9607
|
WDT_GOODS: processWdtGoods(templateColumns),
|
|
9543
9608
|
JKY_GOODS: processJkyGoods(templateColumns),
|
|
9609
|
+
DXD_GOODS: processDxdGoods(templateColumns),
|
|
9610
|
+
DXD_SUPPLIERS: processDxdSuppliers(templateColumns),
|
|
9544
9611
|
WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
|
|
9545
9612
|
JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
|
|
9546
9613
|
BS_E3_GOODS: processBsE3Goods(templateColumns),
|
|
@@ -9567,6 +9634,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9567
9634
|
BS_E3_SYSTEM_ORDER: processErpSystemOrder,
|
|
9568
9635
|
JST_SYSTEM_ORDER: processErpSystemOrder,
|
|
9569
9636
|
GY_SYSTEM_ORDER: processErpSystemOrder,
|
|
9637
|
+
DXD_SYSTEM_ORDER: processErpSystemOrder,
|
|
9570
9638
|
BUYER_MESSAGE_NOTICE: processBuyerMessageNotice,
|
|
9571
9639
|
ORDER_TYPE: processOrderType,
|
|
9572
9640
|
REFUND_TYPE: processRefundType,
|
|
@@ -9610,6 +9678,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9610
9678
|
BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns),
|
|
9611
9679
|
ACTUAL_RECEIPT_PAYMENT: processSingleField,
|
|
9612
9680
|
WDT_SHOP: processSingleField,
|
|
9681
|
+
DXD_SHOP: processSingleField,
|
|
9613
9682
|
KM_VIDEO: processKmVideo,
|
|
9614
9683
|
WDT_TAGS: wdtTags,
|
|
9615
9684
|
EXECUTE_ACTION_TYPE: processExecuteActionType,
|
|
@@ -14196,7 +14265,7 @@ var jstGoods = function jstGoods(props) {
|
|
|
14196
14265
|
changeIndex = _useState2[0],
|
|
14197
14266
|
setChangeIndex = _useState2[1]; //选中的包裹
|
|
14198
14267
|
var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
|
|
14199
|
-
var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln'].includes(platformType);
|
|
14268
|
+
var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln', 'dxd'].includes(platformType);
|
|
14200
14269
|
var expressDateInstance = ExpressData.getInstance(platformType);
|
|
14201
14270
|
var isSendGoodSavedId = isSelectName && !['jst', 'wln'].includes(platformType);
|
|
14202
14271
|
useEffect(function () {
|
|
@@ -24388,7 +24457,160 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
24388
24457
|
};
|
|
24389
24458
|
};
|
|
24390
24459
|
|
|
24391
|
-
var getColumns$a = function getColumns(
|
|
24460
|
+
var getColumns$a = function getColumns() {
|
|
24461
|
+
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
24462
|
+
disabled = _ref.disabled,
|
|
24463
|
+
updateDataHandle = _ref.updateDataHandle;
|
|
24464
|
+
return {
|
|
24465
|
+
// 大希地商品信息
|
|
24466
|
+
DXD_GOODS: [{
|
|
24467
|
+
dataIndex: 'skuName',
|
|
24468
|
+
title: 'SKU名称',
|
|
24469
|
+
width: 150,
|
|
24470
|
+
render: renderTextEllipsis
|
|
24471
|
+
}, {
|
|
24472
|
+
dataIndex: 'skuCode',
|
|
24473
|
+
title: 'SKU编码',
|
|
24474
|
+
width: 150,
|
|
24475
|
+
render: renderTextEllipsis
|
|
24476
|
+
}, {
|
|
24477
|
+
dataIndex: 'skuBarcode',
|
|
24478
|
+
title: 'SKU条码',
|
|
24479
|
+
width: 150,
|
|
24480
|
+
render: renderTextEllipsis
|
|
24481
|
+
}, {
|
|
24482
|
+
dataIndex: 'packageName',
|
|
24483
|
+
title: '套餐名称',
|
|
24484
|
+
width: 150,
|
|
24485
|
+
render: renderTextEllipsis
|
|
24486
|
+
}, {
|
|
24487
|
+
dataIndex: 'packageCode',
|
|
24488
|
+
title: '套餐编码',
|
|
24489
|
+
width: 150,
|
|
24490
|
+
render: renderTextEllipsis
|
|
24491
|
+
}, {
|
|
24492
|
+
dataIndex: 'platformItemId',
|
|
24493
|
+
title: '平台商品ID',
|
|
24494
|
+
width: 150,
|
|
24495
|
+
render: renderTextEllipsis
|
|
24496
|
+
}, {
|
|
24497
|
+
dataIndex: 'platformSkuId',
|
|
24498
|
+
title: '平台商品SKU ID',
|
|
24499
|
+
width: 150,
|
|
24500
|
+
render: renderTextEllipsis
|
|
24501
|
+
}, {
|
|
24502
|
+
dataIndex: 'quantity',
|
|
24503
|
+
title: '数量',
|
|
24504
|
+
width: 100,
|
|
24505
|
+
render: renderTextEllipsis
|
|
24506
|
+
}, {
|
|
24507
|
+
dataIndex: 'unit',
|
|
24508
|
+
title: '单位',
|
|
24509
|
+
width: 100,
|
|
24510
|
+
render: renderTextEllipsis
|
|
24511
|
+
}].map(function (item) {
|
|
24512
|
+
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
24513
|
+
align: 'center',
|
|
24514
|
+
ellipsis: true
|
|
24515
|
+
});
|
|
24516
|
+
}),
|
|
24517
|
+
// 大希地供应商商品信息
|
|
24518
|
+
DXD_SUPPLIERS: [{
|
|
24519
|
+
dataIndex: 'skuName',
|
|
24520
|
+
title: 'SKU名称',
|
|
24521
|
+
width: 150,
|
|
24522
|
+
render: renderTextEllipsis
|
|
24523
|
+
}, {
|
|
24524
|
+
dataIndex: 'skuCode',
|
|
24525
|
+
title: 'SKU编码',
|
|
24526
|
+
width: 150,
|
|
24527
|
+
render: renderTextEllipsis
|
|
24528
|
+
}, {
|
|
24529
|
+
dataIndex: 'skuBarcode',
|
|
24530
|
+
title: 'SKU条码',
|
|
24531
|
+
width: 150,
|
|
24532
|
+
render: renderTextEllipsis
|
|
24533
|
+
}, {
|
|
24534
|
+
dataIndex: 'supplierName',
|
|
24535
|
+
title: '供应商名称',
|
|
24536
|
+
width: 150,
|
|
24537
|
+
validator: function validator(_rule, value) {
|
|
24538
|
+
var title = '';
|
|
24539
|
+
if (((value === null || value === void 0 ? void 0 : value.dxdSuppliers) || []).some(function (goods) {
|
|
24540
|
+
var res = !(goods === null || goods === void 0 ? void 0 : goods.supplierCode);
|
|
24541
|
+
if (res) {
|
|
24542
|
+
title = (goods === null || goods === void 0 ? void 0 : goods.skuName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.skuName, "]") : '';
|
|
24543
|
+
}
|
|
24544
|
+
return res;
|
|
24545
|
+
})) {
|
|
24546
|
+
return Promise.reject("".concat(title, "\u4F9B\u5E94\u5546\u4E0D\u80FD\u4E3A\u7A7A"));
|
|
24547
|
+
}
|
|
24548
|
+
},
|
|
24549
|
+
render: function render(_val, record, index) {
|
|
24550
|
+
var options = DxdSuppliersData.getInstance().getSuppliersBySkuCode(record === null || record === void 0 ? void 0 : record.skuCode);
|
|
24551
|
+
return /*#__PURE__*/React.createElement(Select, {
|
|
24552
|
+
style: {
|
|
24553
|
+
width: '100%'
|
|
24554
|
+
},
|
|
24555
|
+
value: record === null || record === void 0 ? void 0 : record.supplierCode,
|
|
24556
|
+
options: options,
|
|
24557
|
+
allowClear: true,
|
|
24558
|
+
showSearch: true,
|
|
24559
|
+
optionFilterProp: "label",
|
|
24560
|
+
placeholder: "\u8BF7\u9009\u62E9\u4F9B\u5E94\u5546",
|
|
24561
|
+
onChange: function onChange(v) {
|
|
24562
|
+
var _opt$label;
|
|
24563
|
+
var opt = options.find(function (o) {
|
|
24564
|
+
return o.value === v;
|
|
24565
|
+
});
|
|
24566
|
+
updateDataHandle({
|
|
24567
|
+
supplierCode: v !== null && v !== void 0 ? v : '',
|
|
24568
|
+
supplierName: (_opt$label = opt === null || opt === void 0 ? void 0 : opt.label) !== null && _opt$label !== void 0 ? _opt$label : ''
|
|
24569
|
+
}, index);
|
|
24570
|
+
}
|
|
24571
|
+
});
|
|
24572
|
+
},
|
|
24573
|
+
conditionOptionsSetting: {
|
|
24574
|
+
dataType: 'weakenArray',
|
|
24575
|
+
getOptions: function getOptions() {
|
|
24576
|
+
return DxdSuppliersData.getInstance().supplierOptions || [];
|
|
24577
|
+
}
|
|
24578
|
+
}
|
|
24579
|
+
}, {
|
|
24580
|
+
dataIndex: 'supplierCode',
|
|
24581
|
+
title: '供应商编码',
|
|
24582
|
+
width: 150,
|
|
24583
|
+
render: renderTextEllipsis
|
|
24584
|
+
}, {
|
|
24585
|
+
dataIndex: 'packageName',
|
|
24586
|
+
title: '套餐名称',
|
|
24587
|
+
width: 150,
|
|
24588
|
+
render: renderTextEllipsis
|
|
24589
|
+
}, {
|
|
24590
|
+
dataIndex: 'packageCode',
|
|
24591
|
+
title: '套餐编码',
|
|
24592
|
+
width: 150,
|
|
24593
|
+
render: renderTextEllipsis
|
|
24594
|
+
}, {
|
|
24595
|
+
dataIndex: 'platformItemId',
|
|
24596
|
+
title: '平台商品ID',
|
|
24597
|
+
width: 150,
|
|
24598
|
+
render: renderTextEllipsis
|
|
24599
|
+
}, {
|
|
24600
|
+
dataIndex: 'platformSkuId',
|
|
24601
|
+
title: '平台商品SKU ID',
|
|
24602
|
+
width: 150,
|
|
24603
|
+
render: renderTextEllipsis
|
|
24604
|
+
}].map(function (item) {
|
|
24605
|
+
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
24606
|
+
align: 'center',
|
|
24607
|
+
ellipsis: true
|
|
24608
|
+
});
|
|
24609
|
+
})
|
|
24610
|
+
};
|
|
24611
|
+
};
|
|
24612
|
+
|
|
24613
|
+
var getColumns$b = function getColumns(_ref) {
|
|
24392
24614
|
var _ref$text = _ref.text,
|
|
24393
24615
|
text = _ref$text === void 0 ? '' : _ref$text,
|
|
24394
24616
|
disabled = _ref.disabled,
|
|
@@ -24505,7 +24727,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
|
|
|
24505
24727
|
disabled = _ref.disabled,
|
|
24506
24728
|
updateHandle = _ref.updateHandle,
|
|
24507
24729
|
updateDataHandle = _ref.updateDataHandle;
|
|
24508
|
-
return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
|
|
24730
|
+
return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
|
|
24509
24731
|
text: text,
|
|
24510
24732
|
disabled: disabled,
|
|
24511
24733
|
updateHandle: updateHandle
|
|
@@ -24549,8 +24771,13 @@ var getColumnsMap$1 = function getColumnsMap(args) {
|
|
|
24549
24771
|
disabled: disabled,
|
|
24550
24772
|
updateHandle: updateHandle,
|
|
24551
24773
|
updateDataHandle: updateDataHandle
|
|
24774
|
+
})), getColumns$a({
|
|
24775
|
+
text: text,
|
|
24776
|
+
disabled: disabled,
|
|
24777
|
+
updateHandle: updateHandle,
|
|
24778
|
+
updateDataHandle: updateDataHandle
|
|
24552
24779
|
})), {}, {
|
|
24553
|
-
default: getColumns$
|
|
24780
|
+
default: getColumns$b({
|
|
24554
24781
|
text: text,
|
|
24555
24782
|
disabled: disabled,
|
|
24556
24783
|
updateHandle: updateHandle
|
|
@@ -25118,6 +25345,7 @@ var systemOrderNoMap = {
|
|
|
25118
25345
|
JY_REISSUE_GOODS: 'tradeNo',
|
|
25119
25346
|
JKY_GOODS: 'tradeNo',
|
|
25120
25347
|
JKY_REISSUE_GOODS: 'tradeNo',
|
|
25348
|
+
DXD_GOODS: 'orderNo',
|
|
25121
25349
|
WLN_REISSUE_GOODS: 'tradeNo',
|
|
25122
25350
|
KM_REISSUE_GOODS: 'sid',
|
|
25123
25351
|
KM_RETURN_GOODS: 'sid',
|
|
@@ -25153,6 +25381,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
|
|
|
25153
25381
|
_ref$isReloadSelectTa = _ref.isReloadSelectTable,
|
|
25154
25382
|
isReloadSelectTable = _ref$isReloadSelectTa === void 0 ? false : _ref$isReloadSelectTa,
|
|
25155
25383
|
validSystemOrderFn = _ref.validSystemOrderFn;
|
|
25384
|
+
console.log('systemOrders---', systemOrders);
|
|
25156
25385
|
var _useState = useState(),
|
|
25157
25386
|
_useState2 = _slicedToArray(_useState, 2),
|
|
25158
25387
|
selectSystemNo = _useState2[0],
|
|
@@ -25378,6 +25607,12 @@ var getButtonText = function getButtonText() {
|
|
|
25378
25607
|
if (['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type)) {
|
|
25379
25608
|
return '选择吉客云ERP商品';
|
|
25380
25609
|
}
|
|
25610
|
+
if (['DXD_GOODS'].includes(type)) {
|
|
25611
|
+
return '选择大希地ERP商品';
|
|
25612
|
+
}
|
|
25613
|
+
if (['DXD_SUPPLIERS'].includes(type)) {
|
|
25614
|
+
return '选择大希地供应商商品';
|
|
25615
|
+
}
|
|
25381
25616
|
if (['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(type)) {
|
|
25382
25617
|
return '选择万里牛ERP商品';
|
|
25383
25618
|
}
|
|
@@ -25441,7 +25676,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
25441
25676
|
// const isShowSelectTradeGoods =
|
|
25442
25677
|
// type !== 'JST_EXCHANGE_GOODS' || jstReturnGoods?.jstSystemOrderNo;
|
|
25443
25678
|
// 判断是否为是否展示系统单筛选项
|
|
25444
|
-
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', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
|
|
25679
|
+
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', 'DXD_GOODS', 'DXD_SUPPLIERS', 'WLN_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
|
|
25445
25680
|
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;
|
|
25446
25681
|
var refModal = useRef();
|
|
25447
25682
|
console.debug('表格数据', value);
|
|
@@ -25537,6 +25772,8 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
25537
25772
|
case 'JY_REISSUE_GOODS':
|
|
25538
25773
|
case 'JKY_GOODS':
|
|
25539
25774
|
case 'JKY_REISSUE_GOODS':
|
|
25775
|
+
case 'DXD_GOODS':
|
|
25776
|
+
case 'DXD_SUPPLIERS':
|
|
25540
25777
|
case 'WLN_REISSUE_GOODS':
|
|
25541
25778
|
case 'SKX_GOODS':
|
|
25542
25779
|
case 'SKX_RETURN_GOODS':
|
|
@@ -26800,13 +27037,55 @@ var jkyUtils = {
|
|
|
26800
27037
|
};
|
|
26801
27038
|
|
|
26802
27039
|
var singletonMap$8 = new Map();
|
|
27040
|
+
/**
|
|
27041
|
+
* 按 platformOrderNo 拉取大希地订单详情(/qy/gdfw/daxidi/erp/orderDetail)。
|
|
27042
|
+
* 返回订单原始数据结构:
|
|
27043
|
+
* { platformOrderNo, shopCode, shopName, split,
|
|
27044
|
+
* items: [{ platformItemId, platformSkuId, packageCode, packageName, quantity, skus: [{ skuCode, skuName, skuBarcode, quantity, unit }] }],
|
|
27045
|
+
* doOrders: [{ orderNo, warehouseCode, warehouseName, logisticsCode, logisticsName, coldChain, skus }] }
|
|
27046
|
+
* 不做 WDT 风格的 trades/billNo/billType 等转换,保留 DXD 原始结构由消费方按需处理。
|
|
27047
|
+
*/
|
|
27048
|
+
var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
|
|
27049
|
+
if (!singletonMap$8.has(orderNo)) {
|
|
27050
|
+
var p = new Promise(function (resolve, reject) {
|
|
27051
|
+
var doReject = function doReject(err) {
|
|
27052
|
+
// 清空掉错误的请求记录
|
|
27053
|
+
singletonMap$8.delete(orderNo);
|
|
27054
|
+
reject(err);
|
|
27055
|
+
};
|
|
27056
|
+
extendRequest('/qy/gdfw/daxidi/erp/orderDetail', {
|
|
27057
|
+
method: 'post',
|
|
27058
|
+
data: {
|
|
27059
|
+
platformOrderNo: orderNo
|
|
27060
|
+
}
|
|
27061
|
+
}).then(function (data) {
|
|
27062
|
+
if (data === null || data === void 0 ? void 0 : data.success) {
|
|
27063
|
+
resolve((data === null || data === void 0 ? void 0 : data.data) || {});
|
|
27064
|
+
// 延迟10秒清除,保证订单的时效性
|
|
27065
|
+
setTimeout(function () {
|
|
27066
|
+
singletonMap$8.delete(orderNo);
|
|
27067
|
+
}, 1000 * 10);
|
|
27068
|
+
} else {
|
|
27069
|
+
doReject(data);
|
|
27070
|
+
}
|
|
27071
|
+
}).catch(doReject);
|
|
27072
|
+
});
|
|
27073
|
+
singletonMap$8.set(orderNo, p);
|
|
27074
|
+
}
|
|
27075
|
+
return singletonMap$8.get(orderNo);
|
|
27076
|
+
};
|
|
27077
|
+
var dxdUtils = {
|
|
27078
|
+
getOrderListSingleton: getOrderListSingleton$2
|
|
27079
|
+
};
|
|
27080
|
+
|
|
27081
|
+
var singletonMap$9 = new Map();
|
|
26803
27082
|
var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
|
|
26804
27083
|
var cacheKey = "".concat(params.orderNo, "_").concat(params.shopId);
|
|
26805
|
-
if (!singletonMap$
|
|
27084
|
+
if (!singletonMap$9.has(cacheKey)) {
|
|
26806
27085
|
var p = new Promise(function (resolve, reject) {
|
|
26807
27086
|
var doReject = function doReject(err) {
|
|
26808
27087
|
// 清空掉错误的请求记录
|
|
26809
|
-
singletonMap$
|
|
27088
|
+
singletonMap$9.delete(cacheKey);
|
|
26810
27089
|
reject(err);
|
|
26811
27090
|
};
|
|
26812
27091
|
extendRequest('/qy/gdfw/order/queryTradeAfterSaleList', {
|
|
@@ -26817,28 +27096,28 @@ var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
|
|
|
26817
27096
|
resolve(res.data || []);
|
|
26818
27097
|
// 延迟10秒清除,保证订单的时效性
|
|
26819
27098
|
setTimeout(function () {
|
|
26820
|
-
singletonMap$
|
|
27099
|
+
singletonMap$9.delete(cacheKey);
|
|
26821
27100
|
}, 1000 * 10);
|
|
26822
27101
|
} else {
|
|
26823
27102
|
doReject(res);
|
|
26824
27103
|
}
|
|
26825
27104
|
}).catch(doReject);
|
|
26826
27105
|
});
|
|
26827
|
-
singletonMap$
|
|
27106
|
+
singletonMap$9.set(cacheKey, p);
|
|
26828
27107
|
}
|
|
26829
|
-
return singletonMap$
|
|
27108
|
+
return singletonMap$9.get(cacheKey);
|
|
26830
27109
|
};
|
|
26831
27110
|
var platformUtils = {
|
|
26832
27111
|
getAfterSalesOrderList: getAfterSalesOrderList
|
|
26833
27112
|
};
|
|
26834
27113
|
|
|
26835
|
-
var singletonMap$
|
|
26836
|
-
var getOrderListSingleton$
|
|
26837
|
-
if (!singletonMap$
|
|
27114
|
+
var singletonMap$a = new Map();
|
|
27115
|
+
var getOrderListSingleton$3 = function getOrderListSingleton(orderNo) {
|
|
27116
|
+
if (!singletonMap$a.has(orderNo)) {
|
|
26838
27117
|
var p = new Promise(function (resolve, reject) {
|
|
26839
27118
|
var doReject = function doReject(err) {
|
|
26840
27119
|
// 清空掉错误的请求记录
|
|
26841
|
-
singletonMap$
|
|
27120
|
+
singletonMap$a.delete(orderNo);
|
|
26842
27121
|
reject(err);
|
|
26843
27122
|
};
|
|
26844
27123
|
extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
|
|
@@ -26864,23 +27143,24 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
|
|
|
26864
27143
|
}
|
|
26865
27144
|
// 延迟10秒清除,保证订单的时效性
|
|
26866
27145
|
setTimeout(function () {
|
|
26867
|
-
singletonMap$
|
|
27146
|
+
singletonMap$a.delete(orderNo);
|
|
26868
27147
|
}, 1000 * 10);
|
|
26869
27148
|
} else {
|
|
26870
27149
|
doReject(data);
|
|
26871
27150
|
}
|
|
26872
27151
|
}).catch(doReject);
|
|
26873
27152
|
});
|
|
26874
|
-
singletonMap$
|
|
27153
|
+
singletonMap$a.set(orderNo, p);
|
|
26875
27154
|
}
|
|
26876
|
-
return singletonMap$
|
|
27155
|
+
return singletonMap$a.get(orderNo);
|
|
26877
27156
|
};
|
|
26878
27157
|
var kmUtils = {
|
|
26879
|
-
getOrderListSingleton: getOrderListSingleton$
|
|
27158
|
+
getOrderListSingleton: getOrderListSingleton$3
|
|
26880
27159
|
};
|
|
26881
27160
|
|
|
26882
27161
|
var _excluded$k = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"],
|
|
26883
|
-
_excluded2 = ["shopCode"]
|
|
27162
|
+
_excluded2 = ["shopCode"],
|
|
27163
|
+
_excluded3 = ["doOrders", "isSplit", "billNo", "billType", "billTag", "sysStatus"];
|
|
26884
27164
|
var columnsMap = {
|
|
26885
27165
|
BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
|
|
26886
27166
|
KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
|
|
@@ -26892,7 +27172,8 @@ var columnsMap = {
|
|
|
26892
27172
|
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
|
|
26893
27173
|
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
|
|
26894
27174
|
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
|
|
26895
|
-
PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
|
|
27175
|
+
PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns,
|
|
27176
|
+
DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
|
|
26896
27177
|
};
|
|
26897
27178
|
var rowKeyMap = {
|
|
26898
27179
|
BS_SYSTEM_ORDER: 'billNo',
|
|
@@ -26905,7 +27186,8 @@ var rowKeyMap = {
|
|
|
26905
27186
|
JY_SYSTEM_ORDER: 'tradeNo',
|
|
26906
27187
|
JKY_SYSTEM_ORDER: 'tradeNo',
|
|
26907
27188
|
WDT_RETURN_BILL_NO: 'refundNo',
|
|
26908
|
-
PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId'
|
|
27189
|
+
PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId',
|
|
27190
|
+
DXD_SYSTEM_ORDER: 'billNo'
|
|
26909
27191
|
};
|
|
26910
27192
|
var RADIO_TABLE_KEYS = ['PLATFORM_AFTER_SALES_ORDER'];
|
|
26911
27193
|
var index$2 = (function (props) {
|
|
@@ -26969,6 +27251,8 @@ var index$2 = (function (props) {
|
|
|
26969
27251
|
getJyOrderList(value.orderNo);
|
|
26970
27252
|
} else if (type === 'JKY_SYSTEM_ORDER') {
|
|
26971
27253
|
getJkyOrderList(value.orderNo);
|
|
27254
|
+
} else if (type === 'DXD_SYSTEM_ORDER') {
|
|
27255
|
+
getDxdOrderList(value.orderNo);
|
|
26972
27256
|
} else if (type === 'PLATFORM_AFTER_SALES_ORDER') {
|
|
26973
27257
|
value.shopId && getPlatformAfterSalesOrderList(value.orderNo, value.shopId);
|
|
26974
27258
|
}
|
|
@@ -27028,6 +27312,22 @@ var index$2 = (function (props) {
|
|
|
27028
27312
|
// deliveryStateName - 发货状态映射 (0: "未发货", 2: "全部发货")
|
|
27029
27313
|
map['deliveryStateName'] = _objectSpread2({}, GY_DELIVERY_STATE_MAPPING);
|
|
27030
27314
|
}
|
|
27315
|
+
// DXD_SYSTEM_ORDER 需要处理的字段
|
|
27316
|
+
if (type === 'DXD_SYSTEM_ORDER') {
|
|
27317
|
+
// billType - 订单类型映射(0: "普通订单", 1: "货到付款", ...)
|
|
27318
|
+
map['billType'] = _objectSpread2({}, KM_ORDER_TYPE_MAP);
|
|
27319
|
+
// sysStatus - 订单系统状态映射
|
|
27320
|
+
map['sysStatus'] = _objectSpread2({}, KM_ORDER_STATUS);
|
|
27321
|
+
// 布尔字段映射
|
|
27322
|
+
map['coldChain'] = {
|
|
27323
|
+
true: '是',
|
|
27324
|
+
false: '否'
|
|
27325
|
+
};
|
|
27326
|
+
map['split'] = {
|
|
27327
|
+
true: '是',
|
|
27328
|
+
false: '否'
|
|
27329
|
+
};
|
|
27330
|
+
}
|
|
27031
27331
|
return map;
|
|
27032
27332
|
}, [type]);
|
|
27033
27333
|
// 过滤后的表格数据 - 根据选中字段和关键词模糊匹配(不区分大小写)
|
|
@@ -27370,6 +27670,62 @@ var index$2 = (function (props) {
|
|
|
27370
27670
|
return _ref13.apply(this, arguments);
|
|
27371
27671
|
};
|
|
27372
27672
|
}();
|
|
27673
|
+
var getDxdOrderList = /*#__PURE__*/function () {
|
|
27674
|
+
var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(orderNo) {
|
|
27675
|
+
return _regeneratorRuntime().wrap(function _callee11$(_context11) {
|
|
27676
|
+
while (1) switch (_context11.prev = _context11.next) {
|
|
27677
|
+
case 0:
|
|
27678
|
+
dxdUtils.getOrderListSingleton(orderNo).then(function (trades) {
|
|
27679
|
+
var formatDxdOrders = (trades || []).reduce(function (prv, trade) {
|
|
27680
|
+
var _ref15 = trade || {},
|
|
27681
|
+
_ref15$doOrders = _ref15.doOrders,
|
|
27682
|
+
doOrders = _ref15$doOrders === void 0 ? [] : _ref15$doOrders,
|
|
27683
|
+
isSplit = _ref15.isSplit,
|
|
27684
|
+
billNo = _ref15.billNo,
|
|
27685
|
+
billType = _ref15.billType,
|
|
27686
|
+
billTag = _ref15.billTag,
|
|
27687
|
+
sysStatus = _ref15.sysStatus,
|
|
27688
|
+
restTrade = _objectWithoutProperties(_ref15, _excluded3);
|
|
27689
|
+
if (!doOrders.length) {
|
|
27690
|
+
prv.push(_objectSpread2(_objectSpread2({}, restTrade), {}, {
|
|
27691
|
+
billNo: billNo,
|
|
27692
|
+
billType: billType,
|
|
27693
|
+
billTag: billTag,
|
|
27694
|
+
sysStatus: sysStatus,
|
|
27695
|
+
isSplit: isSplit,
|
|
27696
|
+
rowKey: billNo
|
|
27697
|
+
}));
|
|
27698
|
+
return prv;
|
|
27699
|
+
}
|
|
27700
|
+
doOrders.forEach(function (doOrder, index) {
|
|
27701
|
+
var currentOrderNo = doOrder === null || doOrder === void 0 ? void 0 : doOrder.orderNo;
|
|
27702
|
+
prv.push(_objectSpread2(_objectSpread2(_objectSpread2({}, restTrade), doOrder), {}, {
|
|
27703
|
+
billNo: billNo,
|
|
27704
|
+
billType: billType,
|
|
27705
|
+
billTag: billTag,
|
|
27706
|
+
sysStatus: sysStatus,
|
|
27707
|
+
isSplit: isSplit,
|
|
27708
|
+
rowKey: currentOrderNo ? "".concat(billNo, "_").concat(currentOrderNo) : "".concat(billNo, "_").concat(index)
|
|
27709
|
+
}));
|
|
27710
|
+
});
|
|
27711
|
+
return prv;
|
|
27712
|
+
}, []);
|
|
27713
|
+
_onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
|
|
27714
|
+
orders: formatDxdOrders,
|
|
27715
|
+
showOrderInfo: formatDxdOrders
|
|
27716
|
+
}));
|
|
27717
|
+
});
|
|
27718
|
+
onceRef.current = false;
|
|
27719
|
+
case 2:
|
|
27720
|
+
case "end":
|
|
27721
|
+
return _context11.stop();
|
|
27722
|
+
}
|
|
27723
|
+
}, _callee11);
|
|
27724
|
+
}));
|
|
27725
|
+
return function getDxdOrderList(_x12) {
|
|
27726
|
+
return _ref14.apply(this, arguments);
|
|
27727
|
+
};
|
|
27728
|
+
}();
|
|
27373
27729
|
var rowKey = rowKeyMap[type] || 'billNo';
|
|
27374
27730
|
var handleRadioChange = function handleRadioChange(record) {
|
|
27375
27731
|
var _value$selectIds;
|
|
@@ -27844,16 +28200,16 @@ var orderSubFormConstants = {
|
|
|
27844
28200
|
};
|
|
27845
28201
|
|
|
27846
28202
|
var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
|
|
27847
|
-
var singletonMap$
|
|
27848
|
-
var getOrderListSingleton$
|
|
28203
|
+
var singletonMap$b = new Map();
|
|
28204
|
+
var getOrderListSingleton$4 = function getOrderListSingleton(parmas) {
|
|
27849
28205
|
var orderNo = parmas.orderNo,
|
|
27850
28206
|
shopId = parmas.shopId;
|
|
27851
28207
|
var key = "".concat(orderNo, "-").concat(shopId);
|
|
27852
|
-
if (!singletonMap$
|
|
28208
|
+
if (!singletonMap$b.has(key)) {
|
|
27853
28209
|
var p = new Promise(function (resolve, reject) {
|
|
27854
28210
|
var doReject = function doReject(err) {
|
|
27855
28211
|
// 清空掉错误的请求记录
|
|
27856
|
-
singletonMap$
|
|
28212
|
+
singletonMap$b.delete(key);
|
|
27857
28213
|
reject(err);
|
|
27858
28214
|
};
|
|
27859
28215
|
extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
|
|
@@ -27869,16 +28225,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
|
|
|
27869
28225
|
}
|
|
27870
28226
|
// 延迟10秒清除,保证订单的时效性
|
|
27871
28227
|
setTimeout(function () {
|
|
27872
|
-
singletonMap$
|
|
28228
|
+
singletonMap$b.delete(key);
|
|
27873
28229
|
}, 1000 * 10);
|
|
27874
28230
|
} else {
|
|
27875
28231
|
doReject(data);
|
|
27876
28232
|
}
|
|
27877
28233
|
}).catch(doReject);
|
|
27878
28234
|
});
|
|
27879
|
-
singletonMap$
|
|
28235
|
+
singletonMap$b.set(key, p);
|
|
27880
28236
|
}
|
|
27881
|
-
return singletonMap$
|
|
28237
|
+
return singletonMap$b.get(key);
|
|
27882
28238
|
};
|
|
27883
28239
|
var renderEditItem = function renderEditItem(_ref) {
|
|
27884
28240
|
var item = _ref.item,
|
|
@@ -28010,7 +28366,7 @@ var renderDetailItem = function renderDetailItem(_ref2) {
|
|
|
28010
28366
|
return Component;
|
|
28011
28367
|
};
|
|
28012
28368
|
var utils = {
|
|
28013
|
-
getOrderListSingleton: getOrderListSingleton$
|
|
28369
|
+
getOrderListSingleton: getOrderListSingleton$4,
|
|
28014
28370
|
renderEditItem: renderEditItem,
|
|
28015
28371
|
renderDetailItem: renderDetailItem
|
|
28016
28372
|
};
|
|
@@ -28018,7 +28374,7 @@ var utils = {
|
|
|
28018
28374
|
var getOrderSubformColumns$1 = orderSubFormConstants.getOrderSubformColumns;
|
|
28019
28375
|
var renderEditItem$1 = utils.renderEditItem,
|
|
28020
28376
|
renderDetailItem$1 = utils.renderDetailItem,
|
|
28021
|
-
getOrderListSingleton$
|
|
28377
|
+
getOrderListSingleton$5 = utils.getOrderListSingleton;
|
|
28022
28378
|
var OrderSubForm = function OrderSubForm(props) {
|
|
28023
28379
|
var _props$value = props.value,
|
|
28024
28380
|
value = _props$value === void 0 ? {} : _props$value,
|
|
@@ -28220,7 +28576,7 @@ var OrderSubForm = function OrderSubForm(props) {
|
|
|
28220
28576
|
var JOIN_SHOP = shopList === null || shopList === void 0 ? void 0 : shopList.find(function (item) {
|
|
28221
28577
|
return !item.notJoin && item.shopId == shopId;
|
|
28222
28578
|
});
|
|
28223
|
-
return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$
|
|
28579
|
+
return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$5({
|
|
28224
28580
|
orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
|
|
28225
28581
|
shopId: shopId
|
|
28226
28582
|
}).then(function (data) {
|
|
@@ -28314,6 +28670,9 @@ var isErpType$1 = {
|
|
|
28314
28670
|
},
|
|
28315
28671
|
isJky: function isJky(type) {
|
|
28316
28672
|
return ['JKY_GOODS'].includes(type);
|
|
28673
|
+
},
|
|
28674
|
+
isDxd: function isDxd(type) {
|
|
28675
|
+
return ['DXD_GOODS', 'DXD_SUPPLIERS'].includes(type);
|
|
28317
28676
|
}
|
|
28318
28677
|
};
|
|
28319
28678
|
var processAllOrders = function processAllOrders(_ref) {
|
|
@@ -28346,6 +28705,9 @@ var processAllOrders = function processAllOrders(_ref) {
|
|
|
28346
28705
|
data: data,
|
|
28347
28706
|
orderNo: orderNo
|
|
28348
28707
|
});
|
|
28708
|
+
} else if (isErpType$1.isDxd(type)) {
|
|
28709
|
+
// DXD 选品用出库订单 doOrders(每项含 skus[])
|
|
28710
|
+
newList = (data === null || data === void 0 ? void 0 : data.doOrders) || [];
|
|
28349
28711
|
} else {
|
|
28350
28712
|
newList = processDefaultOrders({
|
|
28351
28713
|
data: data
|
|
@@ -28640,6 +29002,48 @@ var componentMap$2 = {
|
|
|
28640
29002
|
},
|
|
28641
29003
|
getOrderList: jkyUtils.getJkyOrderListSingleton
|
|
28642
29004
|
},
|
|
29005
|
+
DXD_GOODS: {
|
|
29006
|
+
type: 'dxd',
|
|
29007
|
+
key: 'dxdGoods',
|
|
29008
|
+
name: '大希地',
|
|
29009
|
+
orderNo: 'srcTid',
|
|
29010
|
+
goodDetailOrderNo: 'srcTid',
|
|
29011
|
+
hiddenErpGoodsBtn: true,
|
|
29012
|
+
eventNameMap: {
|
|
29013
|
+
// pubsub 事件
|
|
29014
|
+
type: 'dxdType',
|
|
29015
|
+
// DXD 按自身数据格式(doOrders.skus)标准化商品,不复用 WDT
|
|
29016
|
+
updateGoodsHandle: updateDxdGoodsHandle,
|
|
29017
|
+
selectListReturn: 'dxdSelectListReturn',
|
|
29018
|
+
selectList: 'dxdSelectList',
|
|
29019
|
+
reissueSelectList: 'dxdReissueSelectList',
|
|
29020
|
+
reissueSelectListReturn: 'dxdReissueSelectListReturn',
|
|
29021
|
+
reissueDeleteGood: 'dxdReissueDeleteGood',
|
|
29022
|
+
changeShopCode: 'dxdChangeShopCode',
|
|
29023
|
+
reissueType: 'dxdReissueType',
|
|
29024
|
+
returnType: 'dxdReturnType',
|
|
29025
|
+
returnSelectListReturn: 'dxdReturnSelectListReturn',
|
|
29026
|
+
returnSelectList: 'dxdReturnSelectList',
|
|
29027
|
+
deleteGood: 'dxdDeleteGood',
|
|
29028
|
+
returnDeleteGood: 'dxdReturnDeleteGood',
|
|
29029
|
+
exchangeDeleteGood: 'dxdExchangeDeleteGood'
|
|
29030
|
+
},
|
|
29031
|
+
getOrderList: dxdUtils.getOrderListSingleton
|
|
29032
|
+
},
|
|
29033
|
+
DXD_SUPPLIERS: {
|
|
29034
|
+
type: 'dxd',
|
|
29035
|
+
key: 'dxdSuppliers',
|
|
29036
|
+
name: '大希地供应商',
|
|
29037
|
+
orderNo: 'srcTid',
|
|
29038
|
+
goodDetailOrderNo: 'srcTid',
|
|
29039
|
+
eventNameMap: {
|
|
29040
|
+
// pubsub 事件(用 dxdSuppliers 前缀,避免与 DXD_GOODS 的 dxd 前缀事件冲突)
|
|
29041
|
+
type: 'dxdSuppliersType',
|
|
29042
|
+
selectListReturn: 'dxdSuppliersSelectListReturn',
|
|
29043
|
+
selectList: 'dxdSuppliersSelectList',
|
|
29044
|
+
changeShopCode: 'dxdSuppliersChangeShopCode'
|
|
29045
|
+
}
|
|
29046
|
+
},
|
|
28643
29047
|
WLN_GOODS: {
|
|
28644
29048
|
type: 'jky',
|
|
28645
29049
|
key: 'wlnGoods',
|
|
@@ -28704,11 +29108,13 @@ var componentMap$2 = {
|
|
|
28704
29108
|
}
|
|
28705
29109
|
};
|
|
28706
29110
|
var CommonGoods = function CommonGoods(props) {
|
|
28707
|
-
var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7;
|
|
29111
|
+
var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7, _componentMap$compTyp8;
|
|
28708
29112
|
var value = props.value,
|
|
28709
|
-
|
|
29113
|
+
rawDisabled = props.disabled,
|
|
28710
29114
|
onChange = props.onChange,
|
|
28711
29115
|
compType = props.type;
|
|
29116
|
+
// DXD_SUPPLIERS 纯镜像 DXD_GOODS(由 FormRender useWatch 联动同步增删),禁用独立增删
|
|
29117
|
+
var disabled = rawDisabled || compType === 'DXD_SUPPLIERS';
|
|
28712
29118
|
// console.log('value?.orders', value?.orders);
|
|
28713
29119
|
// 合并单订单会包含","
|
|
28714
29120
|
var showModeBtn = ((_componentMap$compTyp = componentMap$2[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.checkShowModeBtn) ? componentMap$2[compType].checkShowModeBtn(value) : !['BS_E3_GOODS'].includes(compType) && ((value === null || value === void 0 ? void 0 : value.orders) || []).some(function (order) {
|
|
@@ -29068,6 +29474,7 @@ var CommonGoods = function CommonGoods(props) {
|
|
|
29068
29474
|
orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
|
|
29069
29475
|
type: compType
|
|
29070
29476
|
});
|
|
29477
|
+
console.log('list---', list);
|
|
29071
29478
|
onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
|
|
29072
29479
|
allOrders: list || []
|
|
29073
29480
|
}));
|
|
@@ -29093,9 +29500,10 @@ var CommonGoods = function CommonGoods(props) {
|
|
|
29093
29500
|
onModeChange: handleModeChange,
|
|
29094
29501
|
showModeBtn: showModeBtn,
|
|
29095
29502
|
isStrict: value === null || value === void 0 ? void 0 : value.isStrict,
|
|
29096
|
-
systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
|
|
29503
|
+
systemOrders: (value === null || value === void 0 ? void 0 : value.systemOrders) || (value === null || value === void 0 ? void 0 : value.allOrders),
|
|
29097
29504
|
selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
|
|
29098
29505
|
showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
|
|
29506
|
+
showErpGoodsBtn: !((_componentMap$compTyp8 = componentMap$2[compType]) === null || _componentMap$compTyp8 === void 0 ? void 0 : _componentMap$compTyp8.hiddenErpGoodsBtn),
|
|
29099
29507
|
tradeGoods: {
|
|
29100
29508
|
originDataSource: originDataSource,
|
|
29101
29509
|
getDataSourceAsync: getDataSourceAsync,
|
|
@@ -32593,10 +33001,11 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
|
|
|
32593
33001
|
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
|
|
32594
33002
|
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
|
|
32595
33003
|
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
|
|
32596
|
-
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
|
|
33004
|
+
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
|
|
33005
|
+
DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
|
|
32597
33006
|
};
|
|
32598
33007
|
var FIELD_COLUMNS_MAP = {
|
|
32599
33008
|
PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
|
|
32600
33009
|
};
|
|
32601
33010
|
|
|
32602
|
-
export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasImage, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, FIELD_COLUMNS_MAP, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$9 as getJkyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap };
|
|
33011
|
+
export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasImage, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, FIELD_COLUMNS_MAP, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$a as getDxdColumns, getColumns$4 as getGyColumns, getColumns$9 as getJkyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap };
|
|
@@ -6,4 +6,5 @@ export { default as getKmColumns } from './km';
|
|
|
6
6
|
export { default as getJyColumns } from './jy';
|
|
7
7
|
export { default as getSkxColumns } from './skx';
|
|
8
8
|
export { default as getJkyColumns } from './jky';
|
|
9
|
+
export { default as getDxdColumns } from './dxd';
|
|
9
10
|
export { default as orderSubFormConstants } from './orderSubForm';
|
|
@@ -110,6 +110,34 @@ declare const SYSTEM_ORDER_COLUMNS_MAP: {
|
|
|
110
110
|
ellipsis: boolean;
|
|
111
111
|
disabled: boolean;
|
|
112
112
|
})[];
|
|
113
|
+
DXD_SYSTEM_ORDER: ({
|
|
114
|
+
dataIndex: string;
|
|
115
|
+
title: string;
|
|
116
|
+
width: number;
|
|
117
|
+
render?: undefined;
|
|
118
|
+
renderExport?: undefined;
|
|
119
|
+
conditionOptionsSetting?: undefined;
|
|
120
|
+
} | {
|
|
121
|
+
dataIndex: string;
|
|
122
|
+
title: string;
|
|
123
|
+
width: number;
|
|
124
|
+
render: (val: boolean) => "否" | "是";
|
|
125
|
+
renderExport: (val: boolean) => "否" | "是";
|
|
126
|
+
conditionOptionsSetting: {
|
|
127
|
+
dataType: string;
|
|
128
|
+
getOptions: () => {
|
|
129
|
+
value: boolean;
|
|
130
|
+
label: string;
|
|
131
|
+
}[];
|
|
132
|
+
};
|
|
133
|
+
} | {
|
|
134
|
+
dataIndex: string;
|
|
135
|
+
title: string;
|
|
136
|
+
width: number;
|
|
137
|
+
render: (val: boolean) => "否" | "是";
|
|
138
|
+
renderExport: (val: boolean) => "否" | "是";
|
|
139
|
+
conditionOptionsSetting?: undefined;
|
|
140
|
+
})[];
|
|
113
141
|
};
|
|
114
142
|
export declare const FIELD_COLUMNS_MAP: {
|
|
115
143
|
PLATFORM_AFTER_SALES_ORDER: any[];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/basic-components",
|
|
3
|
-
"version": "2.10.9-beta.
|
|
3
|
+
"version": "2.10.9-beta.2",
|
|
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.10.9-beta.
|
|
23
|
+
"@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.2",
|
|
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": "dac375113d0fa85fd02bf62d03604d4ffb1b486e"
|
|
70
70
|
}
|