@kmkf-fe-packages/basic-components 2.6.0 → 2.6.1-beta.10
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, 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, 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';
|
|
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';
|
|
@@ -8601,6 +8601,10 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
|
|
|
8601
8601
|
REPAIR_ORDER_STATUS: {
|
|
8602
8602
|
status: 'repairOrderStatusValue',
|
|
8603
8603
|
reason: 'repairOrderStatusReason'
|
|
8604
|
+
},
|
|
8605
|
+
ERP_REMARK: {
|
|
8606
|
+
status: 'erpRemarkStatusValue',
|
|
8607
|
+
reason: 'erpRemarkStatusReason'
|
|
8604
8608
|
}
|
|
8605
8609
|
};
|
|
8606
8610
|
return _defineProperty({}, nex.uniqueKey, {
|
|
@@ -9033,6 +9037,12 @@ var processBsReturnGoods = function processBsReturnGoods(getValue) {
|
|
|
9033
9037
|
var processErpSystemOrder = function processErpSystemOrder(getValue) {
|
|
9034
9038
|
return function (nex, config) {
|
|
9035
9039
|
var systemOrderMap = {
|
|
9040
|
+
PLATFORM_AFTER_SALES_ORDER: {
|
|
9041
|
+
no: 'platformAfaterSalesOrderNo',
|
|
9042
|
+
ids: 'platformAfaterSalesSelectIds',
|
|
9043
|
+
order: 'platformAfaterSalesShowOrder',
|
|
9044
|
+
shopId: 'platformAfaterSalesShopId'
|
|
9045
|
+
},
|
|
9036
9046
|
BS_SYSTEM_ORDER: {
|
|
9037
9047
|
no: 'bsSystemOrderNo',
|
|
9038
9048
|
ids: 'bsSystemSelectIds',
|
|
@@ -9079,12 +9089,14 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
|
|
|
9079
9089
|
order: 'wdtReturnBillShowOrder'
|
|
9080
9090
|
}
|
|
9081
9091
|
};
|
|
9082
|
-
return _defineProperty({}, nex.uniqueKey, {
|
|
9092
|
+
return _defineProperty({}, nex.uniqueKey, _objectSpread2({
|
|
9083
9093
|
orderNo: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].no)),
|
|
9084
9094
|
orders: nex.workOrderComponentType === 'WDT_RETURN_BILL_NO' ? jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), []) : [],
|
|
9085
9095
|
selectIds: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].ids)), []),
|
|
9086
9096
|
showOrderInfo: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), [])
|
|
9087
|
-
}
|
|
9097
|
+
}, systemOrderMap[nex.workOrderComponentType].shopId ? {
|
|
9098
|
+
shopId: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].shopId))
|
|
9099
|
+
} : {}));
|
|
9088
9100
|
};
|
|
9089
9101
|
};
|
|
9090
9102
|
var processBuyerMessageNotice = function processBuyerMessageNotice(getValue) {
|
|
@@ -9132,6 +9144,10 @@ var processErpTradeId = function processErpTradeId(getValue) {
|
|
|
9132
9144
|
EXCHANGE_TRADE_ID: {
|
|
9133
9145
|
key: 'tradeItemList',
|
|
9134
9146
|
defaultValue: []
|
|
9147
|
+
},
|
|
9148
|
+
SWAP_OUT_TRADE_ID: {
|
|
9149
|
+
key: 'tradeItemList',
|
|
9150
|
+
defaultValue: []
|
|
9135
9151
|
}
|
|
9136
9152
|
};
|
|
9137
9153
|
return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
|
|
@@ -9434,6 +9450,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9434
9450
|
REISSUE_LOGISTICS: processReissueLogistics,
|
|
9435
9451
|
REISSUE_STATUS: processCallBackStatus,
|
|
9436
9452
|
ADJUST_WORK_ORDER_STATUS: processCallBackStatus,
|
|
9453
|
+
ERP_REMARK: processCallBackStatus,
|
|
9437
9454
|
CREATE_STATUS: processCallBackStatus,
|
|
9438
9455
|
INVOICE_STATUS: processCallBackStatus,
|
|
9439
9456
|
INVOICING_STATUS: processCallBackStatus,
|
|
@@ -9484,6 +9501,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9484
9501
|
BS_RETURN_GOODS: processBsReturnGoods,
|
|
9485
9502
|
WDT_RETURN_GOODS: processWdtReturnGoods(),
|
|
9486
9503
|
JST_RETURN_GOODS: processJstReturnGoods(templateColumns),
|
|
9504
|
+
PLATFORM_AFTER_SALES_ORDER: processErpSystemOrder,
|
|
9487
9505
|
BS_SYSTEM_ORDER: processErpSystemOrder,
|
|
9488
9506
|
KM_SYSTEM_ORDER: processErpSystemOrder,
|
|
9489
9507
|
WLN_SYSTEM_ORDER: processErpSystemOrder,
|
|
@@ -9499,6 +9517,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9499
9517
|
RETURN_GOODS_TRADE_ID: processErpTradeId,
|
|
9500
9518
|
BS_DELIVERY_NO: processErpTradeId,
|
|
9501
9519
|
REISSUE_TRADE_ID: processErpTradeId,
|
|
9520
|
+
SWAP_OUT_TRADE_ID: processErpTradeId,
|
|
9502
9521
|
ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
|
|
9503
9522
|
EXCHANGE_TRADE_ID: processErpTradeId,
|
|
9504
9523
|
WLN_GOODS: processWlnGoods(templateColumns),
|
|
@@ -11629,7 +11648,7 @@ var GoodsModal = function GoodsModal(props) {
|
|
|
11629
11648
|
key: item.value
|
|
11630
11649
|
}, item.label);
|
|
11631
11650
|
})), /*#__PURE__*/React.createElement(Search, {
|
|
11632
|
-
placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '
|
|
11651
|
+
placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝标题' : '商品ID' : '宝贝标题',
|
|
11633
11652
|
// enterButton="搜索"
|
|
11634
11653
|
className: "search",
|
|
11635
11654
|
value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
|
|
@@ -16139,30 +16158,33 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16139
16158
|
selectedRowKeys: selectIds,
|
|
16140
16159
|
fixed: true,
|
|
16141
16160
|
onSelect: function onSelect(record, selected) {
|
|
16161
|
+
var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16142
16162
|
if (selected) {
|
|
16143
|
-
setSelectIds([].concat(_toConsumableArray(selectIds), [
|
|
16163
|
+
setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
|
|
16144
16164
|
setSelect([].concat(_toConsumableArray(selectList), [record]));
|
|
16145
16165
|
} else {
|
|
16146
16166
|
setSelectIds(selectIds.filter(function (t) {
|
|
16147
|
-
return t !==
|
|
16167
|
+
return t !== uniqueKey;
|
|
16148
16168
|
}));
|
|
16149
16169
|
setSelect(selectList.filter(function (t) {
|
|
16150
|
-
return t.specNo !==
|
|
16170
|
+
return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
|
|
16151
16171
|
}));
|
|
16152
16172
|
}
|
|
16153
16173
|
},
|
|
16154
16174
|
onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
|
|
16155
16175
|
if (selected) {
|
|
16156
|
-
|
|
16157
|
-
return t.specNo;
|
|
16158
|
-
})
|
|
16176
|
+
var changeKeys = changeRows.map(function (t) {
|
|
16177
|
+
return "".concat(t.goodNo, "-").concat(t.specNo);
|
|
16178
|
+
});
|
|
16179
|
+
setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
|
|
16159
16180
|
setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
|
|
16160
16181
|
} else {
|
|
16161
|
-
|
|
16162
|
-
return t.specNo;
|
|
16163
|
-
})
|
|
16182
|
+
var _changeKeys = changeRows.map(function (t) {
|
|
16183
|
+
return "".concat(t.goodNo, "-").concat(t.specNo);
|
|
16184
|
+
});
|
|
16185
|
+
setSelectIds(difference(selectIds, _changeKeys));
|
|
16164
16186
|
var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
|
|
16165
|
-
return arrVal.specNo !== othVal.specNo;
|
|
16187
|
+
return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
|
|
16166
16188
|
});
|
|
16167
16189
|
setSelect(list);
|
|
16168
16190
|
}
|
|
@@ -16170,11 +16192,12 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16170
16192
|
};
|
|
16171
16193
|
var showTable = function showTable() {
|
|
16172
16194
|
var handleDelete = function handleDelete(record) {
|
|
16195
|
+
var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16173
16196
|
setSelectIds(selectIds.filter(function (t) {
|
|
16174
|
-
return t !==
|
|
16197
|
+
return t !== uniqueKey;
|
|
16175
16198
|
}));
|
|
16176
16199
|
setSelect(selectList.filter(function (t) {
|
|
16177
|
-
return t.specNo !==
|
|
16200
|
+
return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
|
|
16178
16201
|
}));
|
|
16179
16202
|
};
|
|
16180
16203
|
var showColumns = [{
|
|
@@ -16198,7 +16221,9 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16198
16221
|
}
|
|
16199
16222
|
}, /*#__PURE__*/React.createElement(Table, {
|
|
16200
16223
|
columns: showColumns,
|
|
16201
|
-
rowKey:
|
|
16224
|
+
rowKey: function rowKey(record) {
|
|
16225
|
+
return "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16226
|
+
},
|
|
16202
16227
|
dataSource: selectList,
|
|
16203
16228
|
scroll: {
|
|
16204
16229
|
x: '100%',
|
|
@@ -16228,7 +16253,9 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16228
16253
|
}, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
|
|
16229
16254
|
className: "GoodModalColumns",
|
|
16230
16255
|
rowSelection: rowSelection,
|
|
16231
|
-
rowKey:
|
|
16256
|
+
rowKey: function rowKey(record) {
|
|
16257
|
+
return "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16258
|
+
},
|
|
16232
16259
|
columns: columns,
|
|
16233
16260
|
scroll: {
|
|
16234
16261
|
x: '100%',
|
|
@@ -25803,12 +25830,45 @@ var jkyUtils = {
|
|
|
25803
25830
|
};
|
|
25804
25831
|
|
|
25805
25832
|
var singletonMap$8 = new Map();
|
|
25833
|
+
var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
|
|
25834
|
+
var cacheKey = "".concat(params.orderNo, "_").concat(params.shopId);
|
|
25835
|
+
if (!singletonMap$8.has(cacheKey)) {
|
|
25836
|
+
var p = new Promise(function (resolve, reject) {
|
|
25837
|
+
var doReject = function doReject(err) {
|
|
25838
|
+
// 清空掉错误的请求记录
|
|
25839
|
+
singletonMap$8.delete(cacheKey);
|
|
25840
|
+
reject(err);
|
|
25841
|
+
};
|
|
25842
|
+
extendRequest('/qy/gdfw/order/queryTradeAfterSaleList', {
|
|
25843
|
+
method: 'post',
|
|
25844
|
+
data: params
|
|
25845
|
+
}).then(function (res) {
|
|
25846
|
+
if (res === null || res === void 0 ? void 0 : res.success) {
|
|
25847
|
+
resolve(res.data || []);
|
|
25848
|
+
// 延迟10秒清除,保证订单的时效性
|
|
25849
|
+
setTimeout(function () {
|
|
25850
|
+
singletonMap$8.delete(cacheKey);
|
|
25851
|
+
}, 1000 * 10);
|
|
25852
|
+
} else {
|
|
25853
|
+
doReject(res);
|
|
25854
|
+
}
|
|
25855
|
+
}).catch(doReject);
|
|
25856
|
+
});
|
|
25857
|
+
singletonMap$8.set(cacheKey, p);
|
|
25858
|
+
}
|
|
25859
|
+
return singletonMap$8.get(cacheKey);
|
|
25860
|
+
};
|
|
25861
|
+
var platformUtils = {
|
|
25862
|
+
getAfterSalesOrderList: getAfterSalesOrderList
|
|
25863
|
+
};
|
|
25864
|
+
|
|
25865
|
+
var singletonMap$9 = new Map();
|
|
25806
25866
|
var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
|
|
25807
|
-
if (!singletonMap$
|
|
25867
|
+
if (!singletonMap$9.has(orderNo)) {
|
|
25808
25868
|
var p = new Promise(function (resolve, reject) {
|
|
25809
25869
|
var doReject = function doReject(err) {
|
|
25810
25870
|
// 清空掉错误的请求记录
|
|
25811
|
-
singletonMap$
|
|
25871
|
+
singletonMap$9.delete(orderNo);
|
|
25812
25872
|
reject(err);
|
|
25813
25873
|
};
|
|
25814
25874
|
extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
|
|
@@ -25834,16 +25894,16 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
|
|
|
25834
25894
|
}
|
|
25835
25895
|
// 延迟10秒清除,保证订单的时效性
|
|
25836
25896
|
setTimeout(function () {
|
|
25837
|
-
singletonMap$
|
|
25897
|
+
singletonMap$9.delete(orderNo);
|
|
25838
25898
|
}, 1000 * 10);
|
|
25839
25899
|
} else {
|
|
25840
25900
|
doReject(data);
|
|
25841
25901
|
}
|
|
25842
25902
|
}).catch(doReject);
|
|
25843
25903
|
});
|
|
25844
|
-
singletonMap$
|
|
25904
|
+
singletonMap$9.set(orderNo, p);
|
|
25845
25905
|
}
|
|
25846
|
-
return singletonMap$
|
|
25906
|
+
return singletonMap$9.get(orderNo);
|
|
25847
25907
|
};
|
|
25848
25908
|
var kmUtils = {
|
|
25849
25909
|
getOrderListSingleton: getOrderListSingleton$2
|
|
@@ -25861,7 +25921,8 @@ var columnsMap = {
|
|
|
25861
25921
|
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
|
|
25862
25922
|
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
|
|
25863
25923
|
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
|
|
25864
|
-
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
|
|
25924
|
+
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
|
|
25925
|
+
PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
|
|
25865
25926
|
};
|
|
25866
25927
|
var rowKeyMap = {
|
|
25867
25928
|
BS_SYSTEM_ORDER: 'billNo',
|
|
@@ -25873,8 +25934,10 @@ var rowKeyMap = {
|
|
|
25873
25934
|
JST_SYSTEM_ORDER: 'oId',
|
|
25874
25935
|
JY_SYSTEM_ORDER: 'tradeNo',
|
|
25875
25936
|
JKY_SYSTEM_ORDER: 'tradeNo',
|
|
25876
|
-
WDT_RETURN_BILL_NO: 'refundNo'
|
|
25937
|
+
WDT_RETURN_BILL_NO: 'refundNo',
|
|
25938
|
+
PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId'
|
|
25877
25939
|
};
|
|
25940
|
+
var RADIO_TABLE_KEYS = ['PLATFORM_AFTER_SALES_ORDER'];
|
|
25878
25941
|
var index$2 = (function (props) {
|
|
25879
25942
|
var value = props.value,
|
|
25880
25943
|
_onChange = props.onChange,
|
|
@@ -25884,6 +25947,7 @@ var index$2 = (function (props) {
|
|
|
25884
25947
|
showHeader = _props$showHeader === void 0 ? [] : _props$showHeader;
|
|
25885
25948
|
var onceRef = useRef(false);
|
|
25886
25949
|
var valueRef = useRef(null);
|
|
25950
|
+
var isRadio = RADIO_TABLE_KEYS.includes(type);
|
|
25887
25951
|
// 字段筛选状态 - 用户选择要筛选的字段(单选)
|
|
25888
25952
|
var _useState = useState(''),
|
|
25889
25953
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -25935,6 +25999,8 @@ var index$2 = (function (props) {
|
|
|
25935
25999
|
getJyOrderList(value.orderNo);
|
|
25936
26000
|
} else if (type === 'JKY_SYSTEM_ORDER') {
|
|
25937
26001
|
getJkyOrderList(value.orderNo);
|
|
26002
|
+
} else if (type === 'PLATFORM_AFTER_SALES_ORDER') {
|
|
26003
|
+
value.shopId && getPlatformAfterSalesOrderList(value.orderNo, value.shopId);
|
|
25938
26004
|
}
|
|
25939
26005
|
}
|
|
25940
26006
|
}, [value, type]);
|
|
@@ -26309,10 +26375,71 @@ var index$2 = (function (props) {
|
|
|
26309
26375
|
return _ref12.apply(this, arguments);
|
|
26310
26376
|
};
|
|
26311
26377
|
}();
|
|
26312
|
-
var
|
|
26378
|
+
var getPlatformAfterSalesOrderList = /*#__PURE__*/function () {
|
|
26379
|
+
var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(orderNo, shopId) {
|
|
26380
|
+
return _regeneratorRuntime().wrap(function _callee10$(_context10) {
|
|
26381
|
+
while (1) switch (_context10.prev = _context10.next) {
|
|
26382
|
+
case 0:
|
|
26383
|
+
platformUtils.getAfterSalesOrderList({
|
|
26384
|
+
orderNo: orderNo,
|
|
26385
|
+
shopId: shopId
|
|
26386
|
+
}).then(function (data) {
|
|
26387
|
+
_onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
|
|
26388
|
+
orders: data || [],
|
|
26389
|
+
showOrderInfo: data || []
|
|
26390
|
+
}));
|
|
26391
|
+
});
|
|
26392
|
+
onceRef.current = false;
|
|
26393
|
+
case 2:
|
|
26394
|
+
case "end":
|
|
26395
|
+
return _context10.stop();
|
|
26396
|
+
}
|
|
26397
|
+
}, _callee10);
|
|
26398
|
+
}));
|
|
26399
|
+
return function getPlatformAfterSalesOrderList(_x10, _x11) {
|
|
26400
|
+
return _ref13.apply(this, arguments);
|
|
26401
|
+
};
|
|
26402
|
+
}();
|
|
26403
|
+
var rowKey = rowKeyMap[type] || 'billNo';
|
|
26404
|
+
var handleRadioChange = function handleRadioChange(record) {
|
|
26405
|
+
var _value$selectIds;
|
|
26406
|
+
if (disabled) return;
|
|
26407
|
+
var currentKey = String(value === null || value === void 0 ? void 0 : (_value$selectIds = value.selectIds) === null || _value$selectIds === void 0 ? void 0 : _value$selectIds[0]);
|
|
26408
|
+
var rowKeyVal = String(record[rowKey]);
|
|
26409
|
+
if (currentKey && currentKey === rowKeyVal) {
|
|
26410
|
+
_onChange(_objectSpread2(_objectSpread2({}, value), {}, {
|
|
26411
|
+
selectIds: [],
|
|
26412
|
+
selectedRows: []
|
|
26413
|
+
}));
|
|
26414
|
+
} else {
|
|
26415
|
+
_onChange(_objectSpread2(_objectSpread2({}, value), {}, {
|
|
26416
|
+
selectIds: [rowKeyVal],
|
|
26417
|
+
selectedRows: [record]
|
|
26418
|
+
}));
|
|
26419
|
+
}
|
|
26420
|
+
};
|
|
26421
|
+
var radioColumn = isRadio ? {
|
|
26422
|
+
width: 50,
|
|
26423
|
+
fixed: true,
|
|
26424
|
+
render: function render(_, record) {
|
|
26425
|
+
var _value$selectIds2;
|
|
26426
|
+
var checked = String(value === null || value === void 0 ? void 0 : (_value$selectIds2 = value.selectIds) === null || _value$selectIds2 === void 0 ? void 0 : _value$selectIds2[0]) === String(record[rowKey]);
|
|
26427
|
+
return /*#__PURE__*/React.createElement(Radio, {
|
|
26428
|
+
checked: checked,
|
|
26429
|
+
onClick: function onClick(e) {
|
|
26430
|
+
e.preventDefault();
|
|
26431
|
+
handleRadioChange(record);
|
|
26432
|
+
},
|
|
26433
|
+
disabled: disabled
|
|
26434
|
+
});
|
|
26435
|
+
}
|
|
26436
|
+
} : null;
|
|
26437
|
+
var displayColumns = isRadio && radioColumn ? [radioColumn].concat(_toConsumableArray(columns)) : columns;
|
|
26438
|
+
var rowSelection = isRadio ? undefined : {
|
|
26439
|
+
type: 'checkbox',
|
|
26313
26440
|
selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
|
|
26314
26441
|
fixed: true,
|
|
26315
|
-
onChange: function onChange(selectedRowKeys, selectedRows
|
|
26442
|
+
onChange: function onChange(selectedRowKeys, selectedRows) {
|
|
26316
26443
|
_onChange(_objectSpread2(_objectSpread2({}, value), {}, {
|
|
26317
26444
|
selectIds: selectedRowKeys,
|
|
26318
26445
|
selectedRows: selectedRows
|
|
@@ -26358,9 +26485,9 @@ var index$2 = (function (props) {
|
|
|
26358
26485
|
allowClear: true
|
|
26359
26486
|
})), /*#__PURE__*/React.createElement(Table, {
|
|
26360
26487
|
dataSource: filteredData,
|
|
26361
|
-
columns:
|
|
26488
|
+
columns: displayColumns,
|
|
26362
26489
|
rowSelection: rowSelection,
|
|
26363
|
-
rowKey:
|
|
26490
|
+
rowKey: rowKey,
|
|
26364
26491
|
size: "small",
|
|
26365
26492
|
pagination: false,
|
|
26366
26493
|
scroll: {
|
|
@@ -26747,16 +26874,16 @@ var orderSubFormConstants = {
|
|
|
26747
26874
|
};
|
|
26748
26875
|
|
|
26749
26876
|
var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
|
|
26750
|
-
var singletonMap$
|
|
26877
|
+
var singletonMap$a = new Map();
|
|
26751
26878
|
var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
|
|
26752
26879
|
var orderNo = parmas.orderNo,
|
|
26753
26880
|
shopId = parmas.shopId;
|
|
26754
26881
|
var key = "".concat(orderNo, "-").concat(shopId);
|
|
26755
|
-
if (!singletonMap$
|
|
26882
|
+
if (!singletonMap$a.has(key)) {
|
|
26756
26883
|
var p = new Promise(function (resolve, reject) {
|
|
26757
26884
|
var doReject = function doReject(err) {
|
|
26758
26885
|
// 清空掉错误的请求记录
|
|
26759
|
-
singletonMap$
|
|
26886
|
+
singletonMap$a.delete(key);
|
|
26760
26887
|
reject(err);
|
|
26761
26888
|
};
|
|
26762
26889
|
extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
|
|
@@ -26772,16 +26899,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
|
|
|
26772
26899
|
}
|
|
26773
26900
|
// 延迟10秒清除,保证订单的时效性
|
|
26774
26901
|
setTimeout(function () {
|
|
26775
|
-
singletonMap$
|
|
26902
|
+
singletonMap$a.delete(key);
|
|
26776
26903
|
}, 1000 * 10);
|
|
26777
26904
|
} else {
|
|
26778
26905
|
doReject(data);
|
|
26779
26906
|
}
|
|
26780
26907
|
}).catch(doReject);
|
|
26781
26908
|
});
|
|
26782
|
-
singletonMap$
|
|
26909
|
+
singletonMap$a.set(key, p);
|
|
26783
26910
|
}
|
|
26784
|
-
return singletonMap$
|
|
26911
|
+
return singletonMap$a.get(key);
|
|
26785
26912
|
};
|
|
26786
26913
|
var renderEditItem = function renderEditItem(_ref) {
|
|
26787
26914
|
var item = _ref.item,
|
|
@@ -29477,7 +29604,7 @@ var GoodsModal$5 = function GoodsModal(props) {
|
|
|
29477
29604
|
key: item.value
|
|
29478
29605
|
}, item.label);
|
|
29479
29606
|
})), /*#__PURE__*/React.createElement(Search$1, {
|
|
29480
|
-
placeholder: "\u5B9D\u8D1D\
|
|
29607
|
+
placeholder: "\u5B9D\u8D1D\u6807\u9898",
|
|
29481
29608
|
allowClear: true,
|
|
29482
29609
|
enterButton: "\u641C\u7D22",
|
|
29483
29610
|
style: {
|
|
@@ -31410,5 +31537,8 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
|
|
|
31410
31537
|
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
|
|
31411
31538
|
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
|
|
31412
31539
|
};
|
|
31540
|
+
var FIELD_COLUMNS_MAP = {
|
|
31541
|
+
PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
|
|
31542
|
+
};
|
|
31413
31543
|
|
|
31414
|
-
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, 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 };
|
|
31544
|
+
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 };
|
package/dist/index.js
CHANGED
|
@@ -8616,6 +8616,10 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
|
|
|
8616
8616
|
REPAIR_ORDER_STATUS: {
|
|
8617
8617
|
status: 'repairOrderStatusValue',
|
|
8618
8618
|
reason: 'repairOrderStatusReason'
|
|
8619
|
+
},
|
|
8620
|
+
ERP_REMARK: {
|
|
8621
|
+
status: 'erpRemarkStatusValue',
|
|
8622
|
+
reason: 'erpRemarkStatusReason'
|
|
8619
8623
|
}
|
|
8620
8624
|
};
|
|
8621
8625
|
return _defineProperty({}, nex.uniqueKey, {
|
|
@@ -9048,6 +9052,12 @@ var processBsReturnGoods = function processBsReturnGoods(getValue) {
|
|
|
9048
9052
|
var processErpSystemOrder = function processErpSystemOrder(getValue) {
|
|
9049
9053
|
return function (nex, config) {
|
|
9050
9054
|
var systemOrderMap = {
|
|
9055
|
+
PLATFORM_AFTER_SALES_ORDER: {
|
|
9056
|
+
no: 'platformAfaterSalesOrderNo',
|
|
9057
|
+
ids: 'platformAfaterSalesSelectIds',
|
|
9058
|
+
order: 'platformAfaterSalesShowOrder',
|
|
9059
|
+
shopId: 'platformAfaterSalesShopId'
|
|
9060
|
+
},
|
|
9051
9061
|
BS_SYSTEM_ORDER: {
|
|
9052
9062
|
no: 'bsSystemOrderNo',
|
|
9053
9063
|
ids: 'bsSystemSelectIds',
|
|
@@ -9094,12 +9104,14 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
|
|
|
9094
9104
|
order: 'wdtReturnBillShowOrder'
|
|
9095
9105
|
}
|
|
9096
9106
|
};
|
|
9097
|
-
return _defineProperty({}, nex.uniqueKey, {
|
|
9107
|
+
return _defineProperty({}, nex.uniqueKey, _objectSpread2({
|
|
9098
9108
|
orderNo: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].no)),
|
|
9099
9109
|
orders: nex.workOrderComponentType === 'WDT_RETURN_BILL_NO' ? jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), []) : [],
|
|
9100
9110
|
selectIds: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].ids)), []),
|
|
9101
9111
|
showOrderInfo: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)), [])
|
|
9102
|
-
}
|
|
9112
|
+
}, systemOrderMap[nex.workOrderComponentType].shopId ? {
|
|
9113
|
+
shopId: getValue("".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].shopId))
|
|
9114
|
+
} : {}));
|
|
9103
9115
|
};
|
|
9104
9116
|
};
|
|
9105
9117
|
var processBuyerMessageNotice = function processBuyerMessageNotice(getValue) {
|
|
@@ -9147,6 +9159,10 @@ var processErpTradeId = function processErpTradeId(getValue) {
|
|
|
9147
9159
|
EXCHANGE_TRADE_ID: {
|
|
9148
9160
|
key: 'tradeItemList',
|
|
9149
9161
|
defaultValue: []
|
|
9162
|
+
},
|
|
9163
|
+
SWAP_OUT_TRADE_ID: {
|
|
9164
|
+
key: 'tradeItemList',
|
|
9165
|
+
defaultValue: []
|
|
9150
9166
|
}
|
|
9151
9167
|
};
|
|
9152
9168
|
return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
|
|
@@ -9449,6 +9465,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9449
9465
|
REISSUE_LOGISTICS: processReissueLogistics,
|
|
9450
9466
|
REISSUE_STATUS: processCallBackStatus,
|
|
9451
9467
|
ADJUST_WORK_ORDER_STATUS: processCallBackStatus,
|
|
9468
|
+
ERP_REMARK: processCallBackStatus,
|
|
9452
9469
|
CREATE_STATUS: processCallBackStatus,
|
|
9453
9470
|
INVOICE_STATUS: processCallBackStatus,
|
|
9454
9471
|
INVOICING_STATUS: processCallBackStatus,
|
|
@@ -9499,6 +9516,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9499
9516
|
BS_RETURN_GOODS: processBsReturnGoods,
|
|
9500
9517
|
WDT_RETURN_GOODS: processWdtReturnGoods(),
|
|
9501
9518
|
JST_RETURN_GOODS: processJstReturnGoods(templateColumns),
|
|
9519
|
+
PLATFORM_AFTER_SALES_ORDER: processErpSystemOrder,
|
|
9502
9520
|
BS_SYSTEM_ORDER: processErpSystemOrder,
|
|
9503
9521
|
KM_SYSTEM_ORDER: processErpSystemOrder,
|
|
9504
9522
|
WLN_SYSTEM_ORDER: processErpSystemOrder,
|
|
@@ -9514,6 +9532,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9514
9532
|
RETURN_GOODS_TRADE_ID: processErpTradeId,
|
|
9515
9533
|
BS_DELIVERY_NO: processErpTradeId,
|
|
9516
9534
|
REISSUE_TRADE_ID: processErpTradeId,
|
|
9535
|
+
SWAP_OUT_TRADE_ID: processErpTradeId,
|
|
9517
9536
|
ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
|
|
9518
9537
|
EXCHANGE_TRADE_ID: processErpTradeId,
|
|
9519
9538
|
WLN_GOODS: processWlnGoods(templateColumns),
|
|
@@ -11644,7 +11663,7 @@ var GoodsModal = function GoodsModal(props) {
|
|
|
11644
11663
|
key: item.value
|
|
11645
11664
|
}, item.label);
|
|
11646
11665
|
})), /*#__PURE__*/React__default['default'].createElement(Search, {
|
|
11647
|
-
placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '
|
|
11666
|
+
placeholder: searchParams.type !== 'orderProduct' ? platform === 'taobao' ? '宝贝标题' : '商品ID' : '宝贝标题',
|
|
11648
11667
|
// enterButton="搜索"
|
|
11649
11668
|
className: "search",
|
|
11650
11669
|
value: platform === 'taobao' ? searchParams.title : searchParams.numIids,
|
|
@@ -16154,30 +16173,33 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16154
16173
|
selectedRowKeys: selectIds,
|
|
16155
16174
|
fixed: true,
|
|
16156
16175
|
onSelect: function onSelect(record, selected) {
|
|
16176
|
+
var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16157
16177
|
if (selected) {
|
|
16158
|
-
setSelectIds([].concat(_toConsumableArray(selectIds), [
|
|
16178
|
+
setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
|
|
16159
16179
|
setSelect([].concat(_toConsumableArray(selectList), [record]));
|
|
16160
16180
|
} else {
|
|
16161
16181
|
setSelectIds(selectIds.filter(function (t) {
|
|
16162
|
-
return t !==
|
|
16182
|
+
return t !== uniqueKey;
|
|
16163
16183
|
}));
|
|
16164
16184
|
setSelect(selectList.filter(function (t) {
|
|
16165
|
-
return t.specNo !==
|
|
16185
|
+
return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
|
|
16166
16186
|
}));
|
|
16167
16187
|
}
|
|
16168
16188
|
},
|
|
16169
16189
|
onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
|
|
16170
16190
|
if (selected) {
|
|
16171
|
-
|
|
16172
|
-
return t.specNo;
|
|
16173
|
-
})
|
|
16191
|
+
var changeKeys = changeRows.map(function (t) {
|
|
16192
|
+
return "".concat(t.goodNo, "-").concat(t.specNo);
|
|
16193
|
+
});
|
|
16194
|
+
setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
|
|
16174
16195
|
setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
|
|
16175
16196
|
} else {
|
|
16176
|
-
|
|
16177
|
-
return t.specNo;
|
|
16178
|
-
})
|
|
16197
|
+
var _changeKeys = changeRows.map(function (t) {
|
|
16198
|
+
return "".concat(t.goodNo, "-").concat(t.specNo);
|
|
16199
|
+
});
|
|
16200
|
+
setSelectIds(lodash.difference(selectIds, _changeKeys));
|
|
16179
16201
|
var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
|
|
16180
|
-
return arrVal.specNo !== othVal.specNo;
|
|
16202
|
+
return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
|
|
16181
16203
|
});
|
|
16182
16204
|
setSelect(list);
|
|
16183
16205
|
}
|
|
@@ -16185,11 +16207,12 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16185
16207
|
};
|
|
16186
16208
|
var showTable = function showTable() {
|
|
16187
16209
|
var handleDelete = function handleDelete(record) {
|
|
16210
|
+
var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16188
16211
|
setSelectIds(selectIds.filter(function (t) {
|
|
16189
|
-
return t !==
|
|
16212
|
+
return t !== uniqueKey;
|
|
16190
16213
|
}));
|
|
16191
16214
|
setSelect(selectList.filter(function (t) {
|
|
16192
|
-
return t.specNo !==
|
|
16215
|
+
return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
|
|
16193
16216
|
}));
|
|
16194
16217
|
};
|
|
16195
16218
|
var showColumns = [{
|
|
@@ -16213,7 +16236,9 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16213
16236
|
}
|
|
16214
16237
|
}, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
|
|
16215
16238
|
columns: showColumns,
|
|
16216
|
-
rowKey:
|
|
16239
|
+
rowKey: function rowKey(record) {
|
|
16240
|
+
return "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16241
|
+
},
|
|
16217
16242
|
dataSource: selectList,
|
|
16218
16243
|
scroll: {
|
|
16219
16244
|
x: '100%',
|
|
@@ -16243,7 +16268,9 @@ var GoodList = function GoodList(props, ref) {
|
|
|
16243
16268
|
}, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({
|
|
16244
16269
|
className: "GoodModalColumns",
|
|
16245
16270
|
rowSelection: rowSelection,
|
|
16246
|
-
rowKey:
|
|
16271
|
+
rowKey: function rowKey(record) {
|
|
16272
|
+
return "".concat(record.goodNo, "-").concat(record.specNo);
|
|
16273
|
+
},
|
|
16247
16274
|
columns: columns,
|
|
16248
16275
|
scroll: {
|
|
16249
16276
|
x: '100%',
|
|
@@ -25818,12 +25845,45 @@ var jkyUtils = {
|
|
|
25818
25845
|
};
|
|
25819
25846
|
|
|
25820
25847
|
var singletonMap$8 = new Map();
|
|
25848
|
+
var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
|
|
25849
|
+
var cacheKey = "".concat(params.orderNo, "_").concat(params.shopId);
|
|
25850
|
+
if (!singletonMap$8.has(cacheKey)) {
|
|
25851
|
+
var p = new Promise(function (resolve, reject) {
|
|
25852
|
+
var doReject = function doReject(err) {
|
|
25853
|
+
// 清空掉错误的请求记录
|
|
25854
|
+
singletonMap$8.delete(cacheKey);
|
|
25855
|
+
reject(err);
|
|
25856
|
+
};
|
|
25857
|
+
extendRequest('/qy/gdfw/order/queryTradeAfterSaleList', {
|
|
25858
|
+
method: 'post',
|
|
25859
|
+
data: params
|
|
25860
|
+
}).then(function (res) {
|
|
25861
|
+
if (res === null || res === void 0 ? void 0 : res.success) {
|
|
25862
|
+
resolve(res.data || []);
|
|
25863
|
+
// 延迟10秒清除,保证订单的时效性
|
|
25864
|
+
setTimeout(function () {
|
|
25865
|
+
singletonMap$8.delete(cacheKey);
|
|
25866
|
+
}, 1000 * 10);
|
|
25867
|
+
} else {
|
|
25868
|
+
doReject(res);
|
|
25869
|
+
}
|
|
25870
|
+
}).catch(doReject);
|
|
25871
|
+
});
|
|
25872
|
+
singletonMap$8.set(cacheKey, p);
|
|
25873
|
+
}
|
|
25874
|
+
return singletonMap$8.get(cacheKey);
|
|
25875
|
+
};
|
|
25876
|
+
var platformUtils = {
|
|
25877
|
+
getAfterSalesOrderList: getAfterSalesOrderList
|
|
25878
|
+
};
|
|
25879
|
+
|
|
25880
|
+
var singletonMap$9 = new Map();
|
|
25821
25881
|
var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
|
|
25822
|
-
if (!singletonMap$
|
|
25882
|
+
if (!singletonMap$9.has(orderNo)) {
|
|
25823
25883
|
var p = new Promise(function (resolve, reject) {
|
|
25824
25884
|
var doReject = function doReject(err) {
|
|
25825
25885
|
// 清空掉错误的请求记录
|
|
25826
|
-
singletonMap$
|
|
25886
|
+
singletonMap$9.delete(orderNo);
|
|
25827
25887
|
reject(err);
|
|
25828
25888
|
};
|
|
25829
25889
|
extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
|
|
@@ -25849,16 +25909,16 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
|
|
|
25849
25909
|
}
|
|
25850
25910
|
// 延迟10秒清除,保证订单的时效性
|
|
25851
25911
|
setTimeout(function () {
|
|
25852
|
-
singletonMap$
|
|
25912
|
+
singletonMap$9.delete(orderNo);
|
|
25853
25913
|
}, 1000 * 10);
|
|
25854
25914
|
} else {
|
|
25855
25915
|
doReject(data);
|
|
25856
25916
|
}
|
|
25857
25917
|
}).catch(doReject);
|
|
25858
25918
|
});
|
|
25859
|
-
singletonMap$
|
|
25919
|
+
singletonMap$9.set(orderNo, p);
|
|
25860
25920
|
}
|
|
25861
|
-
return singletonMap$
|
|
25921
|
+
return singletonMap$9.get(orderNo);
|
|
25862
25922
|
};
|
|
25863
25923
|
var kmUtils = {
|
|
25864
25924
|
getOrderListSingleton: getOrderListSingleton$2
|
|
@@ -25876,7 +25936,8 @@ var columnsMap = {
|
|
|
25876
25936
|
JST_SYSTEM_ORDER: kmkfUtils.JST_SYSTEM_ORDER_CONFIG.columns,
|
|
25877
25937
|
JY_SYSTEM_ORDER: kmkfUtils.JY_SYSTEM_ORDER_CONFIG.columns,
|
|
25878
25938
|
JKY_SYSTEM_ORDER: kmkfUtils.JKY_SYSTEM_ORDER_CONFIG.columns,
|
|
25879
|
-
WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
|
|
25939
|
+
WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns,
|
|
25940
|
+
PLATFORM_AFTER_SALES_ORDER: kmkfUtils.PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
|
|
25880
25941
|
};
|
|
25881
25942
|
var rowKeyMap = {
|
|
25882
25943
|
BS_SYSTEM_ORDER: 'billNo',
|
|
@@ -25888,8 +25949,10 @@ var rowKeyMap = {
|
|
|
25888
25949
|
JST_SYSTEM_ORDER: 'oId',
|
|
25889
25950
|
JY_SYSTEM_ORDER: 'tradeNo',
|
|
25890
25951
|
JKY_SYSTEM_ORDER: 'tradeNo',
|
|
25891
|
-
WDT_RETURN_BILL_NO: 'refundNo'
|
|
25952
|
+
WDT_RETURN_BILL_NO: 'refundNo',
|
|
25953
|
+
PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId'
|
|
25892
25954
|
};
|
|
25955
|
+
var RADIO_TABLE_KEYS = ['PLATFORM_AFTER_SALES_ORDER'];
|
|
25893
25956
|
var index$2 = (function (props) {
|
|
25894
25957
|
var value = props.value,
|
|
25895
25958
|
_onChange = props.onChange,
|
|
@@ -25899,6 +25962,7 @@ var index$2 = (function (props) {
|
|
|
25899
25962
|
showHeader = _props$showHeader === void 0 ? [] : _props$showHeader;
|
|
25900
25963
|
var onceRef = React.useRef(false);
|
|
25901
25964
|
var valueRef = React.useRef(null);
|
|
25965
|
+
var isRadio = RADIO_TABLE_KEYS.includes(type);
|
|
25902
25966
|
// 字段筛选状态 - 用户选择要筛选的字段(单选)
|
|
25903
25967
|
var _useState = React.useState(''),
|
|
25904
25968
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -25950,6 +26014,8 @@ var index$2 = (function (props) {
|
|
|
25950
26014
|
getJyOrderList(value.orderNo);
|
|
25951
26015
|
} else if (type === 'JKY_SYSTEM_ORDER') {
|
|
25952
26016
|
getJkyOrderList(value.orderNo);
|
|
26017
|
+
} else if (type === 'PLATFORM_AFTER_SALES_ORDER') {
|
|
26018
|
+
value.shopId && getPlatformAfterSalesOrderList(value.orderNo, value.shopId);
|
|
25953
26019
|
}
|
|
25954
26020
|
}
|
|
25955
26021
|
}, [value, type]);
|
|
@@ -26324,10 +26390,71 @@ var index$2 = (function (props) {
|
|
|
26324
26390
|
return _ref12.apply(this, arguments);
|
|
26325
26391
|
};
|
|
26326
26392
|
}();
|
|
26327
|
-
var
|
|
26393
|
+
var getPlatformAfterSalesOrderList = /*#__PURE__*/function () {
|
|
26394
|
+
var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(orderNo, shopId) {
|
|
26395
|
+
return _regeneratorRuntime().wrap(function _callee10$(_context10) {
|
|
26396
|
+
while (1) switch (_context10.prev = _context10.next) {
|
|
26397
|
+
case 0:
|
|
26398
|
+
platformUtils.getAfterSalesOrderList({
|
|
26399
|
+
orderNo: orderNo,
|
|
26400
|
+
shopId: shopId
|
|
26401
|
+
}).then(function (data) {
|
|
26402
|
+
_onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
|
|
26403
|
+
orders: data || [],
|
|
26404
|
+
showOrderInfo: data || []
|
|
26405
|
+
}));
|
|
26406
|
+
});
|
|
26407
|
+
onceRef.current = false;
|
|
26408
|
+
case 2:
|
|
26409
|
+
case "end":
|
|
26410
|
+
return _context10.stop();
|
|
26411
|
+
}
|
|
26412
|
+
}, _callee10);
|
|
26413
|
+
}));
|
|
26414
|
+
return function getPlatformAfterSalesOrderList(_x10, _x11) {
|
|
26415
|
+
return _ref13.apply(this, arguments);
|
|
26416
|
+
};
|
|
26417
|
+
}();
|
|
26418
|
+
var rowKey = rowKeyMap[type] || 'billNo';
|
|
26419
|
+
var handleRadioChange = function handleRadioChange(record) {
|
|
26420
|
+
var _value$selectIds;
|
|
26421
|
+
if (disabled) return;
|
|
26422
|
+
var currentKey = String(value === null || value === void 0 ? void 0 : (_value$selectIds = value.selectIds) === null || _value$selectIds === void 0 ? void 0 : _value$selectIds[0]);
|
|
26423
|
+
var rowKeyVal = String(record[rowKey]);
|
|
26424
|
+
if (currentKey && currentKey === rowKeyVal) {
|
|
26425
|
+
_onChange(_objectSpread2(_objectSpread2({}, value), {}, {
|
|
26426
|
+
selectIds: [],
|
|
26427
|
+
selectedRows: []
|
|
26428
|
+
}));
|
|
26429
|
+
} else {
|
|
26430
|
+
_onChange(_objectSpread2(_objectSpread2({}, value), {}, {
|
|
26431
|
+
selectIds: [rowKeyVal],
|
|
26432
|
+
selectedRows: [record]
|
|
26433
|
+
}));
|
|
26434
|
+
}
|
|
26435
|
+
};
|
|
26436
|
+
var radioColumn = isRadio ? {
|
|
26437
|
+
width: 50,
|
|
26438
|
+
fixed: true,
|
|
26439
|
+
render: function render(_, record) {
|
|
26440
|
+
var _value$selectIds2;
|
|
26441
|
+
var checked = String(value === null || value === void 0 ? void 0 : (_value$selectIds2 = value.selectIds) === null || _value$selectIds2 === void 0 ? void 0 : _value$selectIds2[0]) === String(record[rowKey]);
|
|
26442
|
+
return /*#__PURE__*/React__default['default'].createElement(antd.Radio, {
|
|
26443
|
+
checked: checked,
|
|
26444
|
+
onClick: function onClick(e) {
|
|
26445
|
+
e.preventDefault();
|
|
26446
|
+
handleRadioChange(record);
|
|
26447
|
+
},
|
|
26448
|
+
disabled: disabled
|
|
26449
|
+
});
|
|
26450
|
+
}
|
|
26451
|
+
} : null;
|
|
26452
|
+
var displayColumns = isRadio && radioColumn ? [radioColumn].concat(_toConsumableArray(columns)) : columns;
|
|
26453
|
+
var rowSelection = isRadio ? undefined : {
|
|
26454
|
+
type: 'checkbox',
|
|
26328
26455
|
selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
|
|
26329
26456
|
fixed: true,
|
|
26330
|
-
onChange: function onChange(selectedRowKeys, selectedRows
|
|
26457
|
+
onChange: function onChange(selectedRowKeys, selectedRows) {
|
|
26331
26458
|
_onChange(_objectSpread2(_objectSpread2({}, value), {}, {
|
|
26332
26459
|
selectIds: selectedRowKeys,
|
|
26333
26460
|
selectedRows: selectedRows
|
|
@@ -26373,9 +26500,9 @@ var index$2 = (function (props) {
|
|
|
26373
26500
|
allowClear: true
|
|
26374
26501
|
})), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
|
|
26375
26502
|
dataSource: filteredData,
|
|
26376
|
-
columns:
|
|
26503
|
+
columns: displayColumns,
|
|
26377
26504
|
rowSelection: rowSelection,
|
|
26378
|
-
rowKey:
|
|
26505
|
+
rowKey: rowKey,
|
|
26379
26506
|
size: "small",
|
|
26380
26507
|
pagination: false,
|
|
26381
26508
|
scroll: {
|
|
@@ -26762,16 +26889,16 @@ var orderSubFormConstants = {
|
|
|
26762
26889
|
};
|
|
26763
26890
|
|
|
26764
26891
|
var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
|
|
26765
|
-
var singletonMap$
|
|
26892
|
+
var singletonMap$a = new Map();
|
|
26766
26893
|
var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
|
|
26767
26894
|
var orderNo = parmas.orderNo,
|
|
26768
26895
|
shopId = parmas.shopId;
|
|
26769
26896
|
var key = "".concat(orderNo, "-").concat(shopId);
|
|
26770
|
-
if (!singletonMap$
|
|
26897
|
+
if (!singletonMap$a.has(key)) {
|
|
26771
26898
|
var p = new Promise(function (resolve, reject) {
|
|
26772
26899
|
var doReject = function doReject(err) {
|
|
26773
26900
|
// 清空掉错误的请求记录
|
|
26774
|
-
singletonMap$
|
|
26901
|
+
singletonMap$a.delete(key);
|
|
26775
26902
|
reject(err);
|
|
26776
26903
|
};
|
|
26777
26904
|
extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
|
|
@@ -26787,16 +26914,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
|
|
|
26787
26914
|
}
|
|
26788
26915
|
// 延迟10秒清除,保证订单的时效性
|
|
26789
26916
|
setTimeout(function () {
|
|
26790
|
-
singletonMap$
|
|
26917
|
+
singletonMap$a.delete(key);
|
|
26791
26918
|
}, 1000 * 10);
|
|
26792
26919
|
} else {
|
|
26793
26920
|
doReject(data);
|
|
26794
26921
|
}
|
|
26795
26922
|
}).catch(doReject);
|
|
26796
26923
|
});
|
|
26797
|
-
singletonMap$
|
|
26924
|
+
singletonMap$a.set(key, p);
|
|
26798
26925
|
}
|
|
26799
|
-
return singletonMap$
|
|
26926
|
+
return singletonMap$a.get(key);
|
|
26800
26927
|
};
|
|
26801
26928
|
var renderEditItem = function renderEditItem(_ref) {
|
|
26802
26929
|
var item = _ref.item,
|
|
@@ -29492,7 +29619,7 @@ var GoodsModal$5 = function GoodsModal(props) {
|
|
|
29492
29619
|
key: item.value
|
|
29493
29620
|
}, item.label);
|
|
29494
29621
|
})), /*#__PURE__*/React__default['default'].createElement(Search$1, {
|
|
29495
|
-
placeholder: "\u5B9D\u8D1D\
|
|
29622
|
+
placeholder: "\u5B9D\u8D1D\u6807\u9898",
|
|
29496
29623
|
allowClear: true,
|
|
29497
29624
|
enterButton: "\u641C\u7D22",
|
|
29498
29625
|
style: {
|
|
@@ -31425,6 +31552,9 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
|
|
|
31425
31552
|
JKY_SYSTEM_ORDER: kmkfUtils.JKY_SYSTEM_ORDER_CONFIG.columns,
|
|
31426
31553
|
WDT_RETURN_BILL_NO: kmkfUtils.WDT_RETURN_BILL_NO_CONFIG.columns
|
|
31427
31554
|
};
|
|
31555
|
+
var FIELD_COLUMNS_MAP = {
|
|
31556
|
+
PLATFORM_AFTER_SALES_ORDER: kmkfUtils.PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
|
|
31557
|
+
};
|
|
31428
31558
|
|
|
31429
31559
|
exports.Address = ApaasAddress;
|
|
31430
31560
|
exports.AliPay = AliPay;
|
|
@@ -31466,6 +31596,7 @@ exports.CommonStatus = CommonStatus;
|
|
|
31466
31596
|
exports.CommonSystemOrder = CommonSystemOrder;
|
|
31467
31597
|
exports.CopyTextIcon = CopyTextIcon;
|
|
31468
31598
|
exports.ExpressLogistics = ExpressLogistics;
|
|
31599
|
+
exports.FIELD_COLUMNS_MAP = FIELD_COLUMNS_MAP;
|
|
31469
31600
|
exports.Goods = Goods;
|
|
31470
31601
|
exports.GoodsTable = index$3;
|
|
31471
31602
|
exports.GyReissue = GyReissue;
|
package/dist/src/index.d.ts
CHANGED
|
@@ -74,5 +74,5 @@ export { default as OrderSubFormUtils } from './apaas/OrderSubForm/utils';
|
|
|
74
74
|
export { default as SkxIdInputSelect } from './skx/IdInputSelect';
|
|
75
75
|
export { default as SkxGoods } from './skx/Goods';
|
|
76
76
|
export { default as columnsBaseInfoMap, erpColumnsMap, erpFormValidator, } from './constants/columnsBaseInfoMap';
|
|
77
|
-
export { default as SYSTEM_ORDER_COLUMNS_MAP } from './constants/systemOrderColumnsMap';
|
|
77
|
+
export { default as SYSTEM_ORDER_COLUMNS_MAP, FIELD_COLUMNS_MAP } from './constants/systemOrderColumnsMap';
|
|
78
78
|
export { default as erpModalColumnsMap } from './bs/component/model/Columns';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/basic-components",
|
|
3
|
-
"version": "2.6.
|
|
3
|
+
"version": "2.6.1-beta.10",
|
|
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.6.
|
|
23
|
+
"@kmkf-fe-packages/kmkf-utils": "2.6.1-beta.10",
|
|
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": "aa1a82517582f1260e843c4b6160bb4f3fb6ddcf"
|
|
70
70
|
}
|