@kmkf-fe-packages/basic-components 2.10.13 → 2.10.15
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 +657 -135
- package/dist/src/bs/component/GoodItem/index.d.ts +1 -0
- package/dist/src/constants/constants.d.ts +1 -1
- package/dist/src/constants/dxd.d.ts +3 -0
- package/dist/src/constants/index.d.ts +1 -0
- package/dist/src/constants/systemOrderColumnsMap.d.ts +28 -0
- package/dist/src/dxd/common/index.d.ts +3 -0
- package/package.json +3 -3
package/dist/index.esm.js
CHANGED
|
@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
|
|
|
3
3
|
import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
|
|
4
4
|
import request, { extend as extend$1 } from 'umi-request';
|
|
5
5
|
import { CopyToClipboard } from 'react-copy-to-clipboard';
|
|
6
|
-
import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, 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';
|
|
@@ -736,6 +736,12 @@ var ApaasUpload = function ApaasUpload(_ref) {
|
|
|
736
736
|
resetProps = _objectWithoutProperties(_ref, _excluded$4);
|
|
737
737
|
var inputRef = useRef(null);
|
|
738
738
|
var valueRef = useRef(value);
|
|
739
|
+
// 当前批次的文件选择序号,用于按选择顺序展示上传结果
|
|
740
|
+
var batchSeqRef = useRef(0);
|
|
741
|
+
// 当前批次的上传结果,按序号存储,最后统一排序合并
|
|
742
|
+
var batchResultsRef = useRef(new Map());
|
|
743
|
+
// 当前批次正在处理的文件数,用于判断批次何时结束
|
|
744
|
+
var pendingCountRef = useRef(0);
|
|
739
745
|
var _useState = useState(false),
|
|
740
746
|
_useState2 = _slicedToArray(_useState, 2),
|
|
741
747
|
visible = _useState2[0],
|
|
@@ -751,6 +757,32 @@ var ApaasUpload = function ApaasUpload(_ref) {
|
|
|
751
757
|
useEffect(function () {
|
|
752
758
|
valueRef.current = value;
|
|
753
759
|
}, [value]);
|
|
760
|
+
// 获取当前批次的文件选择序号;没有正在处理的文件时视为新一批,重置批次状态
|
|
761
|
+
var acquireBatchSeq = function acquireBatchSeq() {
|
|
762
|
+
if (pendingCountRef.current === 0) {
|
|
763
|
+
batchSeqRef.current = 0;
|
|
764
|
+
batchResultsRef.current.clear();
|
|
765
|
+
}
|
|
766
|
+
return batchSeqRef.current++;
|
|
767
|
+
};
|
|
768
|
+
// 将单个文件结果存入当前批次,本批次全部完成时按选择顺序合并到 value
|
|
769
|
+
var appendResult = function appendResult(batchSeq, result) {
|
|
770
|
+
if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
|
|
771
|
+
batchResultsRef.current.set(batchSeq, result);
|
|
772
|
+
}
|
|
773
|
+
pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
|
|
774
|
+
if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
|
|
775
|
+
var sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
|
|
776
|
+
return a[0] - b[0];
|
|
777
|
+
}).map(function (_ref2) {
|
|
778
|
+
var _ref3 = _slicedToArray(_ref2, 2),
|
|
779
|
+
v = _ref3[1];
|
|
780
|
+
return v;
|
|
781
|
+
});
|
|
782
|
+
handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
|
|
783
|
+
batchResultsRef.current.clear();
|
|
784
|
+
}
|
|
785
|
+
};
|
|
754
786
|
var imgReader = function imgReader(item) {
|
|
755
787
|
var blob = item.getAsFile(),
|
|
756
788
|
reader = new FileReader();
|
|
@@ -758,14 +790,16 @@ var ApaasUpload = function ApaasUpload(_ref) {
|
|
|
758
790
|
message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
|
|
759
791
|
return;
|
|
760
792
|
}
|
|
761
|
-
if (valueRef.current.length >= maxCount) {
|
|
793
|
+
if (valueRef.current.length + pendingCountRef.current >= maxCount) {
|
|
762
794
|
message.error("\u53EA\u80FD\u4E0A\u4F20".concat(maxCount, "\u5F20\u56FE\u7247"));
|
|
763
795
|
return;
|
|
764
796
|
}
|
|
797
|
+
var batchSeq = acquireBatchSeq();
|
|
798
|
+
pendingCountRef.current += 1;
|
|
765
799
|
reader.onload = function (e) {
|
|
766
800
|
var _e$target;
|
|
767
801
|
var result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
|
|
768
|
-
|
|
802
|
+
appendResult(batchSeq, result);
|
|
769
803
|
};
|
|
770
804
|
reader.readAsDataURL(blob);
|
|
771
805
|
};
|
|
@@ -798,7 +832,8 @@ var ApaasUpload = function ApaasUpload(_ref) {
|
|
|
798
832
|
// 手动上传模式, 一直返回false
|
|
799
833
|
var beforeUpload = function beforeUpload(file) {
|
|
800
834
|
var size = file.size / 1024 / 1024 < maxSize;
|
|
801
|
-
|
|
835
|
+
// 并发上传时用「已上传 + 待上传」一起判断,避免一次选多张时超出 maxCount
|
|
836
|
+
if (valueRef.current.length + pendingCountRef.current >= maxCount) {
|
|
802
837
|
message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
|
|
803
838
|
return Upload.LIST_IGNORE;
|
|
804
839
|
}
|
|
@@ -806,8 +841,10 @@ var ApaasUpload = function ApaasUpload(_ref) {
|
|
|
806
841
|
message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
|
|
807
842
|
return Upload.LIST_IGNORE;
|
|
808
843
|
}
|
|
844
|
+
var batchSeq = acquireBatchSeq();
|
|
845
|
+
pendingCountRef.current += 1;
|
|
809
846
|
getBase64(file).then(function (res) {
|
|
810
|
-
|
|
847
|
+
appendResult(batchSeq, res);
|
|
811
848
|
});
|
|
812
849
|
return Upload.LIST_IGNORE;
|
|
813
850
|
};
|
|
@@ -909,6 +946,7 @@ var ApaasUpload = function ApaasUpload(_ref) {
|
|
|
909
946
|
name: "file",
|
|
910
947
|
listType: "picture-card",
|
|
911
948
|
maxCount: maxCount,
|
|
949
|
+
multiple: true,
|
|
912
950
|
className: styles.upload,
|
|
913
951
|
beforeUpload: beforeUpload
|
|
914
952
|
}, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
|
|
@@ -1049,6 +1087,16 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
|
|
|
1049
1087
|
resetProps = _objectWithoutProperties(_ref, _excluded$6);
|
|
1050
1088
|
var inputRef = useRef(null);
|
|
1051
1089
|
var valueRef = useRef(value);
|
|
1090
|
+
// 并发上传时用于正确控制 loading 状态(多个文件同时上传)
|
|
1091
|
+
var uploadingCountRef = useRef(0);
|
|
1092
|
+
// 已选中待上传的文件数,用于数量预占,避免并发上传超过 maxCount
|
|
1093
|
+
var pendingCountRef = useRef(0);
|
|
1094
|
+
// 文件序号,保证并发上传时文件名唯一
|
|
1095
|
+
var seqRef = useRef(0);
|
|
1096
|
+
// 当前批次的文件选择序号,用于按选择顺序展示上传结果
|
|
1097
|
+
var batchSeqRef = useRef(0);
|
|
1098
|
+
// 当前批次的上传结果,按序号存储,最后统一排序合并
|
|
1099
|
+
var batchResultsRef = useRef(new Map());
|
|
1052
1100
|
var _useState = useState(false),
|
|
1053
1101
|
_useState2 = _slicedToArray(_useState, 2),
|
|
1054
1102
|
uploading = _useState2[0],
|
|
@@ -1063,48 +1111,80 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
|
|
|
1063
1111
|
useEffect(function () {
|
|
1064
1112
|
valueRef.current = value;
|
|
1065
1113
|
}, [value]);
|
|
1114
|
+
var genFileName = function genFileName() {
|
|
1115
|
+
seqRef.current += 1;
|
|
1116
|
+
return "".concat(uniqueKey, "_").concat(seqRef.current, "_").concat(new Date().getTime(), ".jpg");
|
|
1117
|
+
};
|
|
1118
|
+
// 获取当前批次的文件选择序号;没有正在上传的文件时视为新一批,重置批次状态
|
|
1119
|
+
var acquireBatchSeq = function acquireBatchSeq() {
|
|
1120
|
+
if (pendingCountRef.current === 0) {
|
|
1121
|
+
batchSeqRef.current = 0;
|
|
1122
|
+
batchResultsRef.current.clear();
|
|
1123
|
+
}
|
|
1124
|
+
return batchSeqRef.current++;
|
|
1125
|
+
};
|
|
1066
1126
|
var asyncUpload = /*#__PURE__*/function () {
|
|
1067
|
-
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
|
|
1068
|
-
var
|
|
1069
|
-
var formData, fileName, _yield$request, success, data;
|
|
1127
|
+
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file, batchSeq) {
|
|
1128
|
+
var formData, fileName, _yield$request, success, data, sorted;
|
|
1070
1129
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
1071
1130
|
while (1) switch (_context.prev = _context.next) {
|
|
1072
1131
|
case 0:
|
|
1132
|
+
pendingCountRef.current += 1;
|
|
1133
|
+
uploadingCountRef.current += 1;
|
|
1073
1134
|
setUploading(true);
|
|
1074
1135
|
formData = new FormData();
|
|
1075
1136
|
formData.append('file', file);
|
|
1076
|
-
fileName =
|
|
1137
|
+
fileName = genFileName();
|
|
1077
1138
|
formData.append('fileName', fileName);
|
|
1078
|
-
_context.prev =
|
|
1079
|
-
_context.next =
|
|
1139
|
+
_context.prev = 7;
|
|
1140
|
+
_context.next = 10;
|
|
1080
1141
|
return request(actionUrl, {
|
|
1081
1142
|
method: 'post',
|
|
1082
1143
|
body: formData
|
|
1083
1144
|
});
|
|
1084
|
-
case
|
|
1145
|
+
case 10:
|
|
1085
1146
|
_yield$request = _context.sent;
|
|
1086
1147
|
success = _yield$request.success;
|
|
1087
1148
|
data = _yield$request.data;
|
|
1088
1149
|
if (success) {
|
|
1089
|
-
|
|
1150
|
+
if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
|
|
1151
|
+
// 先暂存到当前批次,等本批次全部完成后再按选择顺序合并
|
|
1152
|
+
batchResultsRef.current.set(batchSeq, data);
|
|
1153
|
+
}
|
|
1090
1154
|
}
|
|
1091
|
-
_context.next =
|
|
1155
|
+
_context.next = 19;
|
|
1092
1156
|
break;
|
|
1093
|
-
case
|
|
1094
|
-
_context.prev =
|
|
1095
|
-
_context.t0 = _context["catch"](
|
|
1157
|
+
case 16:
|
|
1158
|
+
_context.prev = 16;
|
|
1159
|
+
_context.t0 = _context["catch"](7);
|
|
1096
1160
|
message.error('图片上传失败');
|
|
1097
|
-
case
|
|
1098
|
-
_context.prev =
|
|
1099
|
-
|
|
1100
|
-
|
|
1101
|
-
|
|
1161
|
+
case 19:
|
|
1162
|
+
_context.prev = 19;
|
|
1163
|
+
pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
|
|
1164
|
+
uploadingCountRef.current = Math.max(0, uploadingCountRef.current - 1);
|
|
1165
|
+
// 本批次全部上传完成,按选择序号排序后一次性合并到 value
|
|
1166
|
+
if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
|
|
1167
|
+
sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
|
|
1168
|
+
return a[0] - b[0];
|
|
1169
|
+
}).map(function (_ref3) {
|
|
1170
|
+
var _ref4 = _slicedToArray(_ref3, 2),
|
|
1171
|
+
v = _ref4[1];
|
|
1172
|
+
return v;
|
|
1173
|
+
});
|
|
1174
|
+
handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
|
|
1175
|
+
batchResultsRef.current.clear();
|
|
1176
|
+
}
|
|
1177
|
+
if (uploadingCountRef.current === 0) {
|
|
1178
|
+
setUploading(false);
|
|
1179
|
+
}
|
|
1180
|
+
return _context.finish(19);
|
|
1181
|
+
case 25:
|
|
1102
1182
|
case "end":
|
|
1103
1183
|
return _context.stop();
|
|
1104
1184
|
}
|
|
1105
|
-
}, _callee, null, [[
|
|
1185
|
+
}, _callee, null, [[7, 16, 19, 25]]);
|
|
1106
1186
|
}));
|
|
1107
|
-
return function asyncUpload(_x) {
|
|
1187
|
+
return function asyncUpload(_x, _x2) {
|
|
1108
1188
|
return _ref2.apply(this, arguments);
|
|
1109
1189
|
};
|
|
1110
1190
|
}();
|
|
@@ -1120,24 +1200,24 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
|
|
|
1120
1200
|
return;
|
|
1121
1201
|
}
|
|
1122
1202
|
reader.onload = /*#__PURE__*/function () {
|
|
1123
|
-
var
|
|
1124
|
-
var _e$target
|
|
1203
|
+
var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
|
|
1204
|
+
var _e$target;
|
|
1125
1205
|
var result, fileName, file;
|
|
1126
1206
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
1127
1207
|
while (1) switch (_context2.prev = _context2.next) {
|
|
1128
1208
|
case 0:
|
|
1129
1209
|
result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
|
|
1130
|
-
fileName =
|
|
1210
|
+
fileName = genFileName();
|
|
1131
1211
|
file = dataURLtoFile(result, fileName);
|
|
1132
|
-
asyncUpload(file);
|
|
1212
|
+
asyncUpload(file, acquireBatchSeq());
|
|
1133
1213
|
case 4:
|
|
1134
1214
|
case "end":
|
|
1135
1215
|
return _context2.stop();
|
|
1136
1216
|
}
|
|
1137
1217
|
}, _callee2);
|
|
1138
1218
|
}));
|
|
1139
|
-
return function (
|
|
1140
|
-
return
|
|
1219
|
+
return function (_x3) {
|
|
1220
|
+
return _ref5.apply(this, arguments);
|
|
1141
1221
|
};
|
|
1142
1222
|
}();
|
|
1143
1223
|
reader.readAsDataURL(blob);
|
|
@@ -1171,7 +1251,8 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
|
|
|
1171
1251
|
// 手动上传模式, 一直返回false
|
|
1172
1252
|
var beforeUpload = function beforeUpload(file) {
|
|
1173
1253
|
var size = file.size / 1024 / 1024 < maxSize;
|
|
1174
|
-
|
|
1254
|
+
// 并发上传时用「已上传 + 待上传」一起判断,避免一次选多张时超出 maxCount
|
|
1255
|
+
if (valueRef.current.length + pendingCountRef.current >= maxCount) {
|
|
1175
1256
|
message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
|
|
1176
1257
|
return Upload.LIST_IGNORE;
|
|
1177
1258
|
}
|
|
@@ -1179,7 +1260,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
|
|
|
1179
1260
|
message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
|
|
1180
1261
|
return Upload.LIST_IGNORE;
|
|
1181
1262
|
}
|
|
1182
|
-
asyncUpload(file);
|
|
1263
|
+
asyncUpload(file, acquireBatchSeq());
|
|
1183
1264
|
return Upload.LIST_IGNORE;
|
|
1184
1265
|
};
|
|
1185
1266
|
var handleDelete = function handleDelete(key) {
|
|
@@ -1276,6 +1357,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
|
|
|
1276
1357
|
name: "file",
|
|
1277
1358
|
listType: "picture-card",
|
|
1278
1359
|
maxCount: maxCount,
|
|
1360
|
+
multiple: true,
|
|
1279
1361
|
className: styles$1.upload,
|
|
1280
1362
|
beforeUpload: beforeUpload
|
|
1281
1363
|
}, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
|
|
@@ -1319,6 +1401,16 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
|
|
|
1319
1401
|
resetProps = _objectWithoutProperties(_ref, _excluded$7);
|
|
1320
1402
|
var inputRef = useRef(null);
|
|
1321
1403
|
var valueRef = useRef(value);
|
|
1404
|
+
// 并发上传时用于正确控制 loading 状态(多个文件同时上传)
|
|
1405
|
+
var uploadingCountRef = useRef(0);
|
|
1406
|
+
// 已选中待上传的文件数,用于数量预占,避免并发上传超过 maxCount
|
|
1407
|
+
var pendingCountRef = useRef(0);
|
|
1408
|
+
// 文件序号,保证并发上传时文件名唯一
|
|
1409
|
+
var seqRef = useRef(0);
|
|
1410
|
+
// 当前批次的文件选择序号,用于按选择顺序展示上传结果
|
|
1411
|
+
var batchSeqRef = useRef(0);
|
|
1412
|
+
// 当前批次的上传结果,按序号存储,最后统一排序合并
|
|
1413
|
+
var batchResultsRef = useRef(new Map());
|
|
1322
1414
|
var _useState = useState(false),
|
|
1323
1415
|
_useState2 = _slicedToArray(_useState, 2),
|
|
1324
1416
|
uploading = _useState2[0],
|
|
@@ -1333,61 +1425,84 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
|
|
|
1333
1425
|
useEffect(function () {
|
|
1334
1426
|
valueRef.current = value;
|
|
1335
1427
|
}, [value]);
|
|
1428
|
+
var genFileName = function genFileName() {
|
|
1429
|
+
seqRef.current += 1;
|
|
1430
|
+
return "".concat(uniqueKey, "_").concat(seqRef.current, "_").concat(new Date().getTime(), ".jpg");
|
|
1431
|
+
};
|
|
1432
|
+
// 获取当前批次的文件选择序号;没有正在上传的文件时视为新一批,重置批次状态
|
|
1433
|
+
var acquireBatchSeq = function acquireBatchSeq() {
|
|
1434
|
+
if (pendingCountRef.current === 0) {
|
|
1435
|
+
batchSeqRef.current = 0;
|
|
1436
|
+
batchResultsRef.current.clear();
|
|
1437
|
+
}
|
|
1438
|
+
return batchSeqRef.current++;
|
|
1439
|
+
};
|
|
1336
1440
|
var asyncUpload = /*#__PURE__*/function () {
|
|
1337
|
-
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
|
|
1338
|
-
var
|
|
1339
|
-
var formData, fileName, showName, _yield$request, success, data;
|
|
1441
|
+
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file, batchSeq) {
|
|
1442
|
+
var formData, fileName, showName, _yield$request, success, data, sorted;
|
|
1340
1443
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
1341
1444
|
while (1) switch (_context.prev = _context.next) {
|
|
1342
1445
|
case 0:
|
|
1446
|
+
pendingCountRef.current += 1;
|
|
1447
|
+
uploadingCountRef.current += 1;
|
|
1343
1448
|
setUploading(true);
|
|
1344
1449
|
formData = new FormData();
|
|
1345
1450
|
formData.append('file', file);
|
|
1346
|
-
fileName =
|
|
1451
|
+
fileName = genFileName();
|
|
1347
1452
|
formData.append('fileName', fileName);
|
|
1348
1453
|
showName = file.name.substring(0, file.name.lastIndexOf('.'));
|
|
1349
|
-
_context.prev =
|
|
1350
|
-
_context.next =
|
|
1454
|
+
_context.prev = 8;
|
|
1455
|
+
_context.next = 11;
|
|
1351
1456
|
return request(actionUrl, {
|
|
1352
1457
|
method: 'post',
|
|
1353
1458
|
body: formData
|
|
1354
1459
|
});
|
|
1355
|
-
case
|
|
1460
|
+
case 11:
|
|
1356
1461
|
_yield$request = _context.sent;
|
|
1357
1462
|
success = _yield$request.success;
|
|
1358
1463
|
data = _yield$request.data;
|
|
1359
|
-
if (
|
|
1360
|
-
|
|
1361
|
-
|
|
1362
|
-
|
|
1363
|
-
|
|
1364
|
-
|
|
1365
|
-
|
|
1464
|
+
if (success) {
|
|
1465
|
+
if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
|
|
1466
|
+
// 先暂存到当前批次,等本批次全部完成后再按选择顺序合并
|
|
1467
|
+
batchResultsRef.current.set(batchSeq, {
|
|
1468
|
+
url: data,
|
|
1469
|
+
name: showName
|
|
1470
|
+
});
|
|
1471
|
+
}
|
|
1366
1472
|
}
|
|
1367
|
-
|
|
1368
|
-
case 15:
|
|
1369
|
-
handleChange([].concat(_toConsumableArray(valueRef.current), [{
|
|
1370
|
-
url: data,
|
|
1371
|
-
name: showName
|
|
1372
|
-
}]));
|
|
1373
|
-
case 16:
|
|
1374
|
-
_context.next = 21;
|
|
1473
|
+
_context.next = 20;
|
|
1375
1474
|
break;
|
|
1376
|
-
case
|
|
1377
|
-
_context.prev =
|
|
1378
|
-
_context.t0 = _context["catch"](
|
|
1475
|
+
case 17:
|
|
1476
|
+
_context.prev = 17;
|
|
1477
|
+
_context.t0 = _context["catch"](8);
|
|
1379
1478
|
message.error('图片上传失败');
|
|
1380
|
-
case
|
|
1381
|
-
_context.prev =
|
|
1382
|
-
|
|
1383
|
-
|
|
1384
|
-
|
|
1479
|
+
case 20:
|
|
1480
|
+
_context.prev = 20;
|
|
1481
|
+
pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
|
|
1482
|
+
uploadingCountRef.current = Math.max(0, uploadingCountRef.current - 1);
|
|
1483
|
+
// 本批次全部上传完成,按选择序号排序后一次性合并到 value
|
|
1484
|
+
if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
|
|
1485
|
+
sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
|
|
1486
|
+
return a[0] - b[0];
|
|
1487
|
+
}).map(function (_ref3) {
|
|
1488
|
+
var _ref4 = _slicedToArray(_ref3, 2),
|
|
1489
|
+
v = _ref4[1];
|
|
1490
|
+
return v;
|
|
1491
|
+
});
|
|
1492
|
+
handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
|
|
1493
|
+
batchResultsRef.current.clear();
|
|
1494
|
+
}
|
|
1495
|
+
if (uploadingCountRef.current === 0) {
|
|
1496
|
+
setUploading(false);
|
|
1497
|
+
}
|
|
1498
|
+
return _context.finish(20);
|
|
1499
|
+
case 26:
|
|
1385
1500
|
case "end":
|
|
1386
1501
|
return _context.stop();
|
|
1387
1502
|
}
|
|
1388
|
-
}, _callee, null, [[
|
|
1503
|
+
}, _callee, null, [[8, 17, 20, 26]]);
|
|
1389
1504
|
}));
|
|
1390
|
-
return function asyncUpload(_x) {
|
|
1505
|
+
return function asyncUpload(_x, _x2) {
|
|
1391
1506
|
return _ref2.apply(this, arguments);
|
|
1392
1507
|
};
|
|
1393
1508
|
}();
|
|
@@ -1403,24 +1518,24 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
|
|
|
1403
1518
|
return;
|
|
1404
1519
|
}
|
|
1405
1520
|
reader.onload = /*#__PURE__*/function () {
|
|
1406
|
-
var
|
|
1407
|
-
var _e$target
|
|
1521
|
+
var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
|
|
1522
|
+
var _e$target;
|
|
1408
1523
|
var result, fileName, file;
|
|
1409
1524
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
1410
1525
|
while (1) switch (_context2.prev = _context2.next) {
|
|
1411
1526
|
case 0:
|
|
1412
1527
|
result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
|
|
1413
|
-
fileName =
|
|
1528
|
+
fileName = genFileName();
|
|
1414
1529
|
file = dataURLtoFile(result, fileName);
|
|
1415
|
-
asyncUpload(file);
|
|
1530
|
+
asyncUpload(file, acquireBatchSeq());
|
|
1416
1531
|
case 4:
|
|
1417
1532
|
case "end":
|
|
1418
1533
|
return _context2.stop();
|
|
1419
1534
|
}
|
|
1420
1535
|
}, _callee2);
|
|
1421
1536
|
}));
|
|
1422
|
-
return function (
|
|
1423
|
-
return
|
|
1537
|
+
return function (_x3) {
|
|
1538
|
+
return _ref5.apply(this, arguments);
|
|
1424
1539
|
};
|
|
1425
1540
|
}();
|
|
1426
1541
|
reader.readAsDataURL(blob);
|
|
@@ -1454,7 +1569,8 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
|
|
|
1454
1569
|
// 手动上传模式, 一直返回false
|
|
1455
1570
|
var beforeUpload = function beforeUpload(file) {
|
|
1456
1571
|
var size = file.size / 1024 / 1024 < maxSize;
|
|
1457
|
-
|
|
1572
|
+
// 并发上传时用「已上传 + 待上传」一起判断,避免一次选多张时超出 maxCount
|
|
1573
|
+
if (valueRef.current.length + pendingCountRef.current >= maxCount) {
|
|
1458
1574
|
message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
|
|
1459
1575
|
return Upload.LIST_IGNORE;
|
|
1460
1576
|
}
|
|
@@ -1462,7 +1578,7 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
|
|
|
1462
1578
|
message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
|
|
1463
1579
|
return Upload.LIST_IGNORE;
|
|
1464
1580
|
}
|
|
1465
|
-
asyncUpload(file);
|
|
1581
|
+
asyncUpload(file, acquireBatchSeq());
|
|
1466
1582
|
return Upload.LIST_IGNORE;
|
|
1467
1583
|
};
|
|
1468
1584
|
var handleDelete = function handleDelete(key) {
|
|
@@ -1596,6 +1712,7 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
|
|
|
1596
1712
|
name: "file",
|
|
1597
1713
|
listType: "picture-card",
|
|
1598
1714
|
maxCount: maxCount,
|
|
1715
|
+
multiple: true,
|
|
1599
1716
|
className: styles$2.uploadPro,
|
|
1600
1717
|
beforeUpload: beforeUpload
|
|
1601
1718
|
}, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
|
|
@@ -8174,7 +8291,8 @@ var updateWorkTypeKeys = {
|
|
|
8174
8291
|
REPAIR_ORDER_ID: 'repairOrderId',
|
|
8175
8292
|
PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
|
|
8176
8293
|
ACTUAL_RECEIPT_PAYMENT: 'actualReceiptPayment',
|
|
8177
|
-
WDT_SHOP: 'shopCode'
|
|
8294
|
+
WDT_SHOP: 'shopCode',
|
|
8295
|
+
DXD_SHOP: 'shopCode'
|
|
8178
8296
|
};
|
|
8179
8297
|
var systemOrderMap = {
|
|
8180
8298
|
BS_SYSTEM_ORDER: {
|
|
@@ -8221,6 +8339,11 @@ var systemOrderMap = {
|
|
|
8221
8339
|
no: 'wdtReturnBillNo',
|
|
8222
8340
|
ids: 'wdtReturnBillSelectIds',
|
|
8223
8341
|
order: 'wdtReturnBillShowOrder'
|
|
8342
|
+
},
|
|
8343
|
+
DXD_SYSTEM_ORDER: {
|
|
8344
|
+
no: 'dxdSystemOrderNo',
|
|
8345
|
+
ids: 'dxdSystemSelectIds',
|
|
8346
|
+
order: 'dxdSystemShowOrder'
|
|
8224
8347
|
}
|
|
8225
8348
|
};
|
|
8226
8349
|
//直接将key component 添加到 transformWorkOrderData中的componentProcessors
|
|
@@ -8688,6 +8811,7 @@ var processSceneStatus = function processSceneStatus(getValue) {
|
|
|
8688
8811
|
BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
|
|
8689
8812
|
MSG_STATUS: 'msgStatusValues',
|
|
8690
8813
|
WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
|
|
8814
|
+
DXD_WAREHOUSING_STATUS: 'dxdInStockStatusItemList',
|
|
8691
8815
|
JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
|
|
8692
8816
|
JST_WAREHOUSING_STATUS: 'jstInStockStatusItemList',
|
|
8693
8817
|
WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList',
|
|
@@ -8719,6 +8843,9 @@ var processErpLogistics = function processErpLogistics(getValue) {
|
|
|
8719
8843
|
},
|
|
8720
8844
|
SKX_LOGISTICS: {
|
|
8721
8845
|
listKey: 'skxLogisticsList'
|
|
8846
|
+
},
|
|
8847
|
+
DXD_LOGISTICS: {
|
|
8848
|
+
listKey: 'dxdLogisticsList'
|
|
8722
8849
|
}
|
|
8723
8850
|
};
|
|
8724
8851
|
var initValue = [{
|
|
@@ -8827,6 +8954,60 @@ var processJkyGoods = function processJkyGoods(templateColumns) {
|
|
|
8827
8954
|
};
|
|
8828
8955
|
};
|
|
8829
8956
|
};
|
|
8957
|
+
var processDxdGoods = function processDxdGoods(templateColumns) {
|
|
8958
|
+
return function (getValue) {
|
|
8959
|
+
return function (nex, config) {
|
|
8960
|
+
var _values = {
|
|
8961
|
+
dxdGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_dxdGoods")), []),
|
|
8962
|
+
shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
|
|
8963
|
+
};
|
|
8964
|
+
var selectIds = [];
|
|
8965
|
+
var orderNo = '';
|
|
8966
|
+
var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
8967
|
+
return col.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
8968
|
+
});
|
|
8969
|
+
if (tradeId) {
|
|
8970
|
+
orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
|
|
8971
|
+
}
|
|
8972
|
+
var dxdSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
8973
|
+
return col.workOrderComponentType === 'DXD_SYSTEM_ORDER';
|
|
8974
|
+
});
|
|
8975
|
+
if (dxdSystemOrder) {
|
|
8976
|
+
selectIds = jsonParseSecurity(getValue("".concat(dxdSystemOrder.uniqueKey, "_").concat(systemOrderMap[dxdSystemOrder.workOrderComponentType].ids)), []);
|
|
8977
|
+
}
|
|
8978
|
+
_values.selectIds = selectIds;
|
|
8979
|
+
_values.orderNo = orderNo;
|
|
8980
|
+
return _defineProperty({}, nex.uniqueKey, _values);
|
|
8981
|
+
};
|
|
8982
|
+
};
|
|
8983
|
+
};
|
|
8984
|
+
var processDxdSuppliers = function processDxdSuppliers(templateColumns) {
|
|
8985
|
+
return function (getValue) {
|
|
8986
|
+
return function (nex, config) {
|
|
8987
|
+
var _values = {
|
|
8988
|
+
dxdSuppliers: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_dxdSuppliers")), []),
|
|
8989
|
+
shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
|
|
8990
|
+
};
|
|
8991
|
+
var selectIds = [];
|
|
8992
|
+
var orderNo = '';
|
|
8993
|
+
var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
8994
|
+
return col.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
8995
|
+
});
|
|
8996
|
+
if (tradeId) {
|
|
8997
|
+
orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
|
|
8998
|
+
}
|
|
8999
|
+
var dxdSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
|
|
9000
|
+
return col.workOrderComponentType === 'DXD_SYSTEM_ORDER';
|
|
9001
|
+
});
|
|
9002
|
+
if (dxdSystemOrder) {
|
|
9003
|
+
selectIds = jsonParseSecurity(getValue("".concat(dxdSystemOrder.uniqueKey, "_").concat(systemOrderMap[dxdSystemOrder.workOrderComponentType].ids)), []);
|
|
9004
|
+
}
|
|
9005
|
+
_values.selectIds = selectIds;
|
|
9006
|
+
_values.orderNo = orderNo;
|
|
9007
|
+
return _defineProperty({}, nex.uniqueKey, _values);
|
|
9008
|
+
};
|
|
9009
|
+
};
|
|
9010
|
+
};
|
|
8830
9011
|
var processWdtGoods = function processWdtGoods(templateColumns) {
|
|
8831
9012
|
return function (getValue) {
|
|
8832
9013
|
return function (nex, config) {
|
|
@@ -9156,6 +9337,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
|
|
|
9156
9337
|
no: 'wdtReturnBillNo',
|
|
9157
9338
|
ids: 'wdtReturnBillSelectIds',
|
|
9158
9339
|
order: 'wdtReturnBillShowOrder'
|
|
9340
|
+
},
|
|
9341
|
+
DXD_SYSTEM_ORDER: {
|
|
9342
|
+
no: 'dxdSystemOrderNo',
|
|
9343
|
+
ids: 'dxdSystemSelectIds',
|
|
9344
|
+
order: 'dxdSystemShowOrder'
|
|
9159
9345
|
}
|
|
9160
9346
|
};
|
|
9161
9347
|
return _defineProperty({}, nex.uniqueKey, _objectSpread2({
|
|
@@ -9425,14 +9611,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
|
|
|
9425
9611
|
};
|
|
9426
9612
|
var processLabel = function processLabel(getValue) {
|
|
9427
9613
|
return function (nex, config) {
|
|
9428
|
-
var
|
|
9429
|
-
return
|
|
9614
|
+
var _ref79;
|
|
9615
|
+
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;
|
|
9430
9616
|
};
|
|
9431
9617
|
};
|
|
9432
9618
|
var processMemberLevel = function processMemberLevel(getValue) {
|
|
9433
9619
|
return function (nex, config) {
|
|
9434
|
-
var
|
|
9435
|
-
return
|
|
9620
|
+
var _ref80;
|
|
9621
|
+
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;
|
|
9436
9622
|
};
|
|
9437
9623
|
};
|
|
9438
9624
|
var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
|
|
@@ -9538,6 +9724,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9538
9724
|
BS_E3_WAREHOUSING_STATUS: processSceneStatus,
|
|
9539
9725
|
MSG_STATUS: processSceneStatus,
|
|
9540
9726
|
WDT_WAREHOUSING_STATUS: processSceneStatus,
|
|
9727
|
+
DXD_WAREHOUSING_STATUS: processSceneStatus,
|
|
9541
9728
|
WLN_WAREHOUSING_STATUS: processSceneStatus,
|
|
9542
9729
|
JKY_WAREHOUSING_STATUS: processSceneStatus,
|
|
9543
9730
|
JST_WAREHOUSING_STATUS: processSceneStatus,
|
|
@@ -9548,6 +9735,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9548
9735
|
GY_LOGISTICS: processErpLogistics,
|
|
9549
9736
|
BS_E3_LOGISTICS: processErpLogistics,
|
|
9550
9737
|
KM_LOGISTICS: processErpLogistics,
|
|
9738
|
+
DXD_LOGISTICS: processErpLogistics,
|
|
9551
9739
|
BS_SEND_GOOD: processErpSendGood,
|
|
9552
9740
|
WLN_SEND_GOOD: processErpSendGood,
|
|
9553
9741
|
WDT_SEND_GOOD: processErpSendGood,
|
|
@@ -9559,6 +9747,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9559
9747
|
BS_GOODS: processBsGoods,
|
|
9560
9748
|
WDT_GOODS: processWdtGoods(templateColumns),
|
|
9561
9749
|
JKY_GOODS: processJkyGoods(templateColumns),
|
|
9750
|
+
DXD_GOODS: processDxdGoods(templateColumns),
|
|
9751
|
+
DXD_SUPPLIERS: processDxdSuppliers(templateColumns),
|
|
9562
9752
|
WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
|
|
9563
9753
|
JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
|
|
9564
9754
|
BS_E3_GOODS: processBsE3Goods(templateColumns),
|
|
@@ -9585,6 +9775,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9585
9775
|
BS_E3_SYSTEM_ORDER: processErpSystemOrder,
|
|
9586
9776
|
JST_SYSTEM_ORDER: processErpSystemOrder,
|
|
9587
9777
|
GY_SYSTEM_ORDER: processErpSystemOrder,
|
|
9778
|
+
DXD_SYSTEM_ORDER: processErpSystemOrder,
|
|
9588
9779
|
BUYER_MESSAGE_NOTICE: processBuyerMessageNotice,
|
|
9589
9780
|
ORDER_TYPE: processOrderType,
|
|
9590
9781
|
REFUND_TYPE: processRefundType,
|
|
@@ -9628,6 +9819,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
9628
9819
|
BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns),
|
|
9629
9820
|
ACTUAL_RECEIPT_PAYMENT: processSingleField,
|
|
9630
9821
|
WDT_SHOP: processSingleField,
|
|
9822
|
+
DXD_SHOP: processSingleField,
|
|
9631
9823
|
KM_VIDEO: processKmVideo,
|
|
9632
9824
|
WDT_TAGS: wdtTags,
|
|
9633
9825
|
EXECUTE_ACTION_TYPE: processExecuteActionType,
|
|
@@ -14207,7 +14399,7 @@ var jstGoods = function jstGoods(props) {
|
|
|
14207
14399
|
changeIndex = _useState2[0],
|
|
14208
14400
|
setChangeIndex = _useState2[1]; //选中的包裹
|
|
14209
14401
|
var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
|
|
14210
|
-
var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln'].includes(platformType);
|
|
14402
|
+
var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln', 'dxd'].includes(platformType);
|
|
14211
14403
|
var expressDateInstance = ExpressData.getInstance(platformType);
|
|
14212
14404
|
var isSendGoodSavedId = isSelectName && !['jst', 'wln'].includes(platformType);
|
|
14213
14405
|
useEffect(function () {
|
|
@@ -21038,17 +21230,18 @@ var getColumns$2 = function getColumns(_ref) {
|
|
|
21038
21230
|
};
|
|
21039
21231
|
|
|
21040
21232
|
var getYesOrNo$4 = function getYesOrNo(val) {
|
|
21233
|
+
var content = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['是', '否'];
|
|
21041
21234
|
switch (val) {
|
|
21042
21235
|
case true:
|
|
21043
21236
|
case '1':
|
|
21044
21237
|
case 1:
|
|
21045
|
-
return
|
|
21238
|
+
return content[0];
|
|
21046
21239
|
case false:
|
|
21047
21240
|
case '0':
|
|
21048
21241
|
case 0:
|
|
21049
21242
|
return '否';
|
|
21050
21243
|
default:
|
|
21051
|
-
return
|
|
21244
|
+
return content[1];
|
|
21052
21245
|
}
|
|
21053
21246
|
};
|
|
21054
21247
|
|
|
@@ -21247,7 +21440,7 @@ var getColumns$3 = function getColumns(_ref) {
|
|
|
21247
21440
|
label: '非赠品',
|
|
21248
21441
|
value: 0
|
|
21249
21442
|
}]
|
|
21250
|
-
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
|
|
21443
|
+
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
|
|
21251
21444
|
}
|
|
21252
21445
|
}, {
|
|
21253
21446
|
dataIndex: 'isPackage',
|
|
@@ -21479,7 +21672,7 @@ var getColumns$3 = function getColumns(_ref) {
|
|
|
21479
21672
|
label: '非赠品',
|
|
21480
21673
|
value: 0
|
|
21481
21674
|
}]
|
|
21482
|
-
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
|
|
21675
|
+
}) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
|
|
21483
21676
|
}
|
|
21484
21677
|
}, {
|
|
21485
21678
|
dataIndex: 'isPackage',
|
|
@@ -24407,7 +24600,160 @@ var getColumns$9 = function getColumns(_ref) {
|
|
|
24407
24600
|
};
|
|
24408
24601
|
};
|
|
24409
24602
|
|
|
24410
|
-
var getColumns$a = function getColumns(
|
|
24603
|
+
var getColumns$a = function getColumns() {
|
|
24604
|
+
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
24605
|
+
disabled = _ref.disabled,
|
|
24606
|
+
updateDataHandle = _ref.updateDataHandle;
|
|
24607
|
+
return {
|
|
24608
|
+
// 大希地商品信息
|
|
24609
|
+
DXD_GOODS: [{
|
|
24610
|
+
dataIndex: 'skuName',
|
|
24611
|
+
title: 'SKU名称',
|
|
24612
|
+
width: 150,
|
|
24613
|
+
render: renderTextEllipsis
|
|
24614
|
+
}, {
|
|
24615
|
+
dataIndex: 'skuCode',
|
|
24616
|
+
title: 'SKU编码',
|
|
24617
|
+
width: 150,
|
|
24618
|
+
render: renderTextEllipsis
|
|
24619
|
+
}, {
|
|
24620
|
+
dataIndex: 'skuBarcode',
|
|
24621
|
+
title: 'SKU条码',
|
|
24622
|
+
width: 150,
|
|
24623
|
+
render: renderTextEllipsis
|
|
24624
|
+
}, {
|
|
24625
|
+
dataIndex: 'packageName',
|
|
24626
|
+
title: '套餐名称',
|
|
24627
|
+
width: 150,
|
|
24628
|
+
render: renderTextEllipsis
|
|
24629
|
+
}, {
|
|
24630
|
+
dataIndex: 'packageCode',
|
|
24631
|
+
title: '套餐编码',
|
|
24632
|
+
width: 150,
|
|
24633
|
+
render: renderTextEllipsis
|
|
24634
|
+
}, {
|
|
24635
|
+
dataIndex: 'platformItemId',
|
|
24636
|
+
title: '平台商品ID',
|
|
24637
|
+
width: 150,
|
|
24638
|
+
render: renderTextEllipsis
|
|
24639
|
+
}, {
|
|
24640
|
+
dataIndex: 'platformSkuId',
|
|
24641
|
+
title: '平台商品SKU ID',
|
|
24642
|
+
width: 150,
|
|
24643
|
+
render: renderTextEllipsis
|
|
24644
|
+
}, {
|
|
24645
|
+
dataIndex: 'quantity',
|
|
24646
|
+
title: '数量',
|
|
24647
|
+
width: 100,
|
|
24648
|
+
render: renderTextEllipsis
|
|
24649
|
+
}, {
|
|
24650
|
+
dataIndex: 'unit',
|
|
24651
|
+
title: '单位',
|
|
24652
|
+
width: 100,
|
|
24653
|
+
render: renderTextEllipsis
|
|
24654
|
+
}].map(function (item) {
|
|
24655
|
+
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
24656
|
+
align: 'center',
|
|
24657
|
+
ellipsis: true
|
|
24658
|
+
});
|
|
24659
|
+
}),
|
|
24660
|
+
// 大希地供应商商品信息
|
|
24661
|
+
DXD_SUPPLIERS: [{
|
|
24662
|
+
dataIndex: 'skuName',
|
|
24663
|
+
title: 'SKU名称',
|
|
24664
|
+
width: 150,
|
|
24665
|
+
render: renderTextEllipsis
|
|
24666
|
+
}, {
|
|
24667
|
+
dataIndex: 'skuCode',
|
|
24668
|
+
title: 'SKU编码',
|
|
24669
|
+
width: 150,
|
|
24670
|
+
render: renderTextEllipsis
|
|
24671
|
+
}, {
|
|
24672
|
+
dataIndex: 'skuBarcode',
|
|
24673
|
+
title: 'SKU条码',
|
|
24674
|
+
width: 150,
|
|
24675
|
+
render: renderTextEllipsis
|
|
24676
|
+
}, {
|
|
24677
|
+
dataIndex: 'supplierName',
|
|
24678
|
+
title: '供应商名称',
|
|
24679
|
+
width: 150,
|
|
24680
|
+
validator: function validator(_rule, value) {
|
|
24681
|
+
var title = '';
|
|
24682
|
+
if (((value === null || value === void 0 ? void 0 : value.dxdSuppliers) || []).some(function (goods) {
|
|
24683
|
+
var res = !(goods === null || goods === void 0 ? void 0 : goods.supplierCode);
|
|
24684
|
+
if (res) {
|
|
24685
|
+
title = (goods === null || goods === void 0 ? void 0 : goods.skuName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.skuName, "]") : '';
|
|
24686
|
+
}
|
|
24687
|
+
return res;
|
|
24688
|
+
})) {
|
|
24689
|
+
return Promise.reject("".concat(title, "\u4F9B\u5E94\u5546\u4E0D\u80FD\u4E3A\u7A7A"));
|
|
24690
|
+
}
|
|
24691
|
+
},
|
|
24692
|
+
render: function render(_val, record, index) {
|
|
24693
|
+
var options = DxdSuppliersData.getInstance().getSuppliersBySkuCode(record === null || record === void 0 ? void 0 : record.skuCode);
|
|
24694
|
+
return !disabled ? /*#__PURE__*/React.createElement(Select, {
|
|
24695
|
+
style: {
|
|
24696
|
+
width: '100%'
|
|
24697
|
+
},
|
|
24698
|
+
value: record === null || record === void 0 ? void 0 : record.supplierCode,
|
|
24699
|
+
options: options,
|
|
24700
|
+
allowClear: true,
|
|
24701
|
+
showSearch: true,
|
|
24702
|
+
optionFilterProp: "label",
|
|
24703
|
+
placeholder: "\u8BF7\u9009\u62E9\u4F9B\u5E94\u5546",
|
|
24704
|
+
onChange: function onChange(v) {
|
|
24705
|
+
var _opt$label;
|
|
24706
|
+
var opt = options.find(function (o) {
|
|
24707
|
+
return o.value === v;
|
|
24708
|
+
});
|
|
24709
|
+
updateDataHandle({
|
|
24710
|
+
supplierCode: v !== null && v !== void 0 ? v : '',
|
|
24711
|
+
supplierName: (_opt$label = opt === null || opt === void 0 ? void 0 : opt.label) !== null && _opt$label !== void 0 ? _opt$label : ''
|
|
24712
|
+
}, index);
|
|
24713
|
+
}
|
|
24714
|
+
}) : DxdSuppliersData.getInstance().getSupplierNameByCode(record === null || record === void 0 ? void 0 : record.supplierCode);
|
|
24715
|
+
},
|
|
24716
|
+
conditionOptionsSetting: {
|
|
24717
|
+
dataType: 'weakenArray',
|
|
24718
|
+
getOptions: function getOptions() {
|
|
24719
|
+
return DxdSuppliersData.getInstance().supplierOptions || [];
|
|
24720
|
+
}
|
|
24721
|
+
}
|
|
24722
|
+
}, {
|
|
24723
|
+
dataIndex: 'supplierCode',
|
|
24724
|
+
title: '供应商编码',
|
|
24725
|
+
width: 150,
|
|
24726
|
+
render: renderTextEllipsis
|
|
24727
|
+
}, {
|
|
24728
|
+
dataIndex: 'packageName',
|
|
24729
|
+
title: '套餐名称',
|
|
24730
|
+
width: 150,
|
|
24731
|
+
render: renderTextEllipsis
|
|
24732
|
+
}, {
|
|
24733
|
+
dataIndex: 'packageCode',
|
|
24734
|
+
title: '套餐编码',
|
|
24735
|
+
width: 150,
|
|
24736
|
+
render: renderTextEllipsis
|
|
24737
|
+
}, {
|
|
24738
|
+
dataIndex: 'platformItemId',
|
|
24739
|
+
title: '平台商品ID',
|
|
24740
|
+
width: 150,
|
|
24741
|
+
render: renderTextEllipsis
|
|
24742
|
+
}, {
|
|
24743
|
+
dataIndex: 'platformSkuId',
|
|
24744
|
+
title: '平台商品SKU ID',
|
|
24745
|
+
width: 150,
|
|
24746
|
+
render: renderTextEllipsis
|
|
24747
|
+
}].map(function (item) {
|
|
24748
|
+
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
24749
|
+
align: 'center',
|
|
24750
|
+
ellipsis: true
|
|
24751
|
+
});
|
|
24752
|
+
})
|
|
24753
|
+
};
|
|
24754
|
+
};
|
|
24755
|
+
|
|
24756
|
+
var getColumns$b = function getColumns(_ref) {
|
|
24411
24757
|
var _ref$text = _ref.text,
|
|
24412
24758
|
text = _ref$text === void 0 ? '' : _ref$text,
|
|
24413
24759
|
disabled = _ref.disabled,
|
|
@@ -24524,7 +24870,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
|
|
|
24524
24870
|
disabled = _ref.disabled,
|
|
24525
24871
|
updateHandle = _ref.updateHandle,
|
|
24526
24872
|
updateDataHandle = _ref.updateDataHandle;
|
|
24527
|
-
return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
|
|
24873
|
+
return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
|
|
24528
24874
|
text: text,
|
|
24529
24875
|
disabled: disabled,
|
|
24530
24876
|
updateHandle: updateHandle
|
|
@@ -24568,8 +24914,13 @@ var getColumnsMap$1 = function getColumnsMap(args) {
|
|
|
24568
24914
|
disabled: disabled,
|
|
24569
24915
|
updateHandle: updateHandle,
|
|
24570
24916
|
updateDataHandle: updateDataHandle
|
|
24917
|
+
})), getColumns$a({
|
|
24918
|
+
text: text,
|
|
24919
|
+
disabled: disabled,
|
|
24920
|
+
updateHandle: updateHandle,
|
|
24921
|
+
updateDataHandle: updateDataHandle
|
|
24571
24922
|
})), {}, {
|
|
24572
|
-
default: getColumns$
|
|
24923
|
+
default: getColumns$b({
|
|
24573
24924
|
text: text,
|
|
24574
24925
|
disabled: disabled,
|
|
24575
24926
|
updateHandle: updateHandle
|
|
@@ -25137,6 +25488,7 @@ var systemOrderNoMap = {
|
|
|
25137
25488
|
JY_REISSUE_GOODS: 'tradeNo',
|
|
25138
25489
|
JKY_GOODS: 'tradeNo',
|
|
25139
25490
|
JKY_REISSUE_GOODS: 'tradeNo',
|
|
25491
|
+
DXD_GOODS: 'orderNo',
|
|
25140
25492
|
WLN_REISSUE_GOODS: 'tradeNo',
|
|
25141
25493
|
KM_REISSUE_GOODS: 'sid',
|
|
25142
25494
|
KM_RETURN_GOODS: 'sid',
|
|
@@ -25396,6 +25748,12 @@ var getButtonText = function getButtonText() {
|
|
|
25396
25748
|
if (['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type)) {
|
|
25397
25749
|
return '选择吉客云ERP商品';
|
|
25398
25750
|
}
|
|
25751
|
+
if (['DXD_GOODS'].includes(type)) {
|
|
25752
|
+
return '选择大希地ERP商品';
|
|
25753
|
+
}
|
|
25754
|
+
if (['DXD_SUPPLIERS'].includes(type)) {
|
|
25755
|
+
return '选择大希地供应商商品';
|
|
25756
|
+
}
|
|
25399
25757
|
if (['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(type)) {
|
|
25400
25758
|
return '选择万里牛ERP商品';
|
|
25401
25759
|
}
|
|
@@ -25436,6 +25794,8 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
25436
25794
|
otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
|
|
25437
25795
|
_props$canUpdateNumbe = props.canUpdateNumber,
|
|
25438
25796
|
canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
|
|
25797
|
+
_props$notAllowedOper = props.notAllowedOperation,
|
|
25798
|
+
notAllowedOperation = _props$notAllowedOper === void 0 ? false : _props$notAllowedOper,
|
|
25439
25799
|
shopCode = props.shopCode,
|
|
25440
25800
|
_props$companyKey = props.companyKey,
|
|
25441
25801
|
companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
|
|
@@ -25459,7 +25819,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
25459
25819
|
// const isShowSelectTradeGoods =
|
|
25460
25820
|
// type !== 'JST_EXCHANGE_GOODS' || jstReturnGoods?.jstSystemOrderNo;
|
|
25461
25821
|
// 判断是否为是否展示系统单筛选项
|
|
25462
|
-
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;
|
|
25822
|
+
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;
|
|
25463
25823
|
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;
|
|
25464
25824
|
var refModal = useRef();
|
|
25465
25825
|
var handleDelete = function handleDelete(record, index) {
|
|
@@ -25554,6 +25914,8 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
25554
25914
|
case 'JY_REISSUE_GOODS':
|
|
25555
25915
|
case 'JKY_GOODS':
|
|
25556
25916
|
case 'JKY_REISSUE_GOODS':
|
|
25917
|
+
case 'DXD_GOODS':
|
|
25918
|
+
case 'DXD_SUPPLIERS':
|
|
25557
25919
|
case 'WLN_REISSUE_GOODS':
|
|
25558
25920
|
case 'SKX_GOODS':
|
|
25559
25921
|
case 'SKX_RETURN_GOODS':
|
|
@@ -25641,14 +26003,14 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
25641
26003
|
render: function render(val, record, index) {
|
|
25642
26004
|
return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
|
|
25643
26005
|
index: index,
|
|
25644
|
-
hoveredRowIndex: !disabled && (record.canDelete || canDelete) ? hoveredRowIndex : null,
|
|
26006
|
+
hoveredRowIndex: !disabled && !notAllowedOperation && (record.canDelete || canDelete) ? hoveredRowIndex : null,
|
|
25645
26007
|
handleClick: function handleClick() {
|
|
25646
26008
|
return handleDelete(record, index);
|
|
25647
26009
|
}
|
|
25648
26010
|
});
|
|
25649
26011
|
}
|
|
25650
26012
|
}].concat(_toConsumableArray(baseInfoColumns));
|
|
25651
|
-
if (!disabled) {
|
|
26013
|
+
if (!disabled && !notAllowedOperation) {
|
|
25652
26014
|
columnList.push({
|
|
25653
26015
|
dataIndex: '',
|
|
25654
26016
|
title: "\u64CD\u4F5C",
|
|
@@ -25690,22 +26052,6 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
25690
26052
|
}
|
|
25691
26053
|
}].concat(_toConsumableArray(list));
|
|
25692
26054
|
}, [showHeader, value, disabled, hoveredRowIndex]);
|
|
25693
|
-
var orderColumns = useMemo(function () {
|
|
25694
|
-
var columns = COLUMNS_MAP('', {
|
|
25695
|
-
operate: false,
|
|
25696
|
-
disabled: true
|
|
25697
|
-
})(type);
|
|
25698
|
-
return [{
|
|
25699
|
-
dataIndex: '',
|
|
25700
|
-
title: '序号',
|
|
25701
|
-
align: 'center',
|
|
25702
|
-
ellipsis: true,
|
|
25703
|
-
width: 50,
|
|
25704
|
-
render: function render(val, record, index) {
|
|
25705
|
-
return /*#__PURE__*/React.createElement("span", null, index + 1);
|
|
25706
|
-
}
|
|
25707
|
-
}].concat(_toConsumableArray(columns));
|
|
25708
|
-
}, []);
|
|
25709
26055
|
var onSubmit = function onSubmit(list) {
|
|
25710
26056
|
var newList = processGoods$1({
|
|
25711
26057
|
list: list,
|
|
@@ -25745,7 +26091,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
25745
26091
|
var validSystemOrder = useMemo(function () {
|
|
25746
26092
|
return ['GY_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'KM_REISSUE_GOODS'].includes(type) && !hasSelectedSystemOrder;
|
|
25747
26093
|
}, [type, hasSelectedSystemOrder]);
|
|
25748
|
-
return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
|
|
26094
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && !notAllowedOperation && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
|
|
25749
26095
|
style: {
|
|
25750
26096
|
float: 'right'
|
|
25751
26097
|
}
|
|
@@ -26816,13 +27162,65 @@ var jkyUtils = {
|
|
|
26816
27162
|
};
|
|
26817
27163
|
|
|
26818
27164
|
var singletonMap$8 = new Map();
|
|
27165
|
+
/**
|
|
27166
|
+
* 按 platformOrderNo 拉取大希地订单详情(/qy/gdfw/daxidi/erp/orderDetail)。
|
|
27167
|
+
* 返回订单原始数据结构:
|
|
27168
|
+
* { platformOrderNo, shopCode, shopName, split,
|
|
27169
|
+
* items: [{ platformItemId, platformSkuId, packageCode, packageName, quantity, skus: [{ skuCode, skuName, skuBarcode, quantity, unit }] }],
|
|
27170
|
+
* doOrders: [{ orderNo, warehouseCode, warehouseName, logisticsCode, logisticsName, coldChain, skus }] }
|
|
27171
|
+
* 不做 WDT 风格的 trades/billNo/billType 等转换,保留 DXD 原始结构由消费方按需处理。
|
|
27172
|
+
*/
|
|
27173
|
+
var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
|
|
27174
|
+
if (!singletonMap$8.has(orderNo)) {
|
|
27175
|
+
var p = new Promise(function (resolve, reject) {
|
|
27176
|
+
var doReject = function doReject(err) {
|
|
27177
|
+
// 清空掉错误的请求记录
|
|
27178
|
+
singletonMap$8.delete(orderNo);
|
|
27179
|
+
reject(err);
|
|
27180
|
+
};
|
|
27181
|
+
extendRequest('/qy/gdfw/daxidi/erp/orderDetail', {
|
|
27182
|
+
method: 'post',
|
|
27183
|
+
data: {
|
|
27184
|
+
platformOrderNo: orderNo
|
|
27185
|
+
}
|
|
27186
|
+
}).then(function (data) {
|
|
27187
|
+
if (data === null || data === void 0 ? void 0 : data.success) {
|
|
27188
|
+
var _data$data, _data$data$doOrders;
|
|
27189
|
+
if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$doOrders = _data$data.doOrders) === null || _data$data$doOrders === void 0 ? void 0 : _data$data$doOrders.length) {
|
|
27190
|
+
var _data$data2;
|
|
27191
|
+
(_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.doOrders.forEach(function (item) {
|
|
27192
|
+
item.platformOrderNo = data.platformOrderNo;
|
|
27193
|
+
item.shopCode = data.shopCode;
|
|
27194
|
+
item.shopName = data.shopName;
|
|
27195
|
+
item.split = data.split;
|
|
27196
|
+
});
|
|
27197
|
+
}
|
|
27198
|
+
resolve((data === null || data === void 0 ? void 0 : data.data) || {});
|
|
27199
|
+
// 延迟10秒清除,保证订单的时效性
|
|
27200
|
+
setTimeout(function () {
|
|
27201
|
+
singletonMap$8.delete(orderNo);
|
|
27202
|
+
}, 1000 * 10);
|
|
27203
|
+
} else {
|
|
27204
|
+
doReject(data);
|
|
27205
|
+
}
|
|
27206
|
+
}).catch(doReject);
|
|
27207
|
+
});
|
|
27208
|
+
singletonMap$8.set(orderNo, p);
|
|
27209
|
+
}
|
|
27210
|
+
return singletonMap$8.get(orderNo);
|
|
27211
|
+
};
|
|
27212
|
+
var dxdUtils = {
|
|
27213
|
+
getOrderListSingleton: getOrderListSingleton$2
|
|
27214
|
+
};
|
|
27215
|
+
|
|
27216
|
+
var singletonMap$9 = new Map();
|
|
26819
27217
|
var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
|
|
26820
27218
|
var cacheKey = "".concat(params.orderNo, "_").concat(params.shopId);
|
|
26821
|
-
if (!singletonMap$
|
|
27219
|
+
if (!singletonMap$9.has(cacheKey)) {
|
|
26822
27220
|
var p = new Promise(function (resolve, reject) {
|
|
26823
27221
|
var doReject = function doReject(err) {
|
|
26824
27222
|
// 清空掉错误的请求记录
|
|
26825
|
-
singletonMap$
|
|
27223
|
+
singletonMap$9.delete(cacheKey);
|
|
26826
27224
|
reject(err);
|
|
26827
27225
|
};
|
|
26828
27226
|
extendRequest('/qy/gdfw/order/queryTradeAfterSaleList', {
|
|
@@ -26833,28 +27231,28 @@ var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
|
|
|
26833
27231
|
resolve(res.data || []);
|
|
26834
27232
|
// 延迟10秒清除,保证订单的时效性
|
|
26835
27233
|
setTimeout(function () {
|
|
26836
|
-
singletonMap$
|
|
27234
|
+
singletonMap$9.delete(cacheKey);
|
|
26837
27235
|
}, 1000 * 10);
|
|
26838
27236
|
} else {
|
|
26839
27237
|
doReject(res);
|
|
26840
27238
|
}
|
|
26841
27239
|
}).catch(doReject);
|
|
26842
27240
|
});
|
|
26843
|
-
singletonMap$
|
|
27241
|
+
singletonMap$9.set(cacheKey, p);
|
|
26844
27242
|
}
|
|
26845
|
-
return singletonMap$
|
|
27243
|
+
return singletonMap$9.get(cacheKey);
|
|
26846
27244
|
};
|
|
26847
27245
|
var platformUtils = {
|
|
26848
27246
|
getAfterSalesOrderList: getAfterSalesOrderList
|
|
26849
27247
|
};
|
|
26850
27248
|
|
|
26851
|
-
var singletonMap$
|
|
26852
|
-
var getOrderListSingleton$
|
|
26853
|
-
if (!singletonMap$
|
|
27249
|
+
var singletonMap$a = new Map();
|
|
27250
|
+
var getOrderListSingleton$3 = function getOrderListSingleton(orderNo) {
|
|
27251
|
+
if (!singletonMap$a.has(orderNo)) {
|
|
26854
27252
|
var p = new Promise(function (resolve, reject) {
|
|
26855
27253
|
var doReject = function doReject(err) {
|
|
26856
27254
|
// 清空掉错误的请求记录
|
|
26857
|
-
singletonMap$
|
|
27255
|
+
singletonMap$a.delete(orderNo);
|
|
26858
27256
|
reject(err);
|
|
26859
27257
|
};
|
|
26860
27258
|
extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
|
|
@@ -26880,19 +27278,19 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
|
|
|
26880
27278
|
}
|
|
26881
27279
|
// 延迟10秒清除,保证订单的时效性
|
|
26882
27280
|
setTimeout(function () {
|
|
26883
|
-
singletonMap$
|
|
27281
|
+
singletonMap$a.delete(orderNo);
|
|
26884
27282
|
}, 1000 * 10);
|
|
26885
27283
|
} else {
|
|
26886
27284
|
doReject(data);
|
|
26887
27285
|
}
|
|
26888
27286
|
}).catch(doReject);
|
|
26889
27287
|
});
|
|
26890
|
-
singletonMap$
|
|
27288
|
+
singletonMap$a.set(orderNo, p);
|
|
26891
27289
|
}
|
|
26892
|
-
return singletonMap$
|
|
27290
|
+
return singletonMap$a.get(orderNo);
|
|
26893
27291
|
};
|
|
26894
27292
|
var kmUtils = {
|
|
26895
|
-
getOrderListSingleton: getOrderListSingleton$
|
|
27293
|
+
getOrderListSingleton: getOrderListSingleton$3
|
|
26896
27294
|
};
|
|
26897
27295
|
|
|
26898
27296
|
var _excluded$k = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"],
|
|
@@ -26908,7 +27306,8 @@ var columnsMap = {
|
|
|
26908
27306
|
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
|
|
26909
27307
|
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
|
|
26910
27308
|
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
|
|
26911
|
-
PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
|
|
27309
|
+
PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns,
|
|
27310
|
+
DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
|
|
26912
27311
|
};
|
|
26913
27312
|
var rowKeyMap = {
|
|
26914
27313
|
BS_SYSTEM_ORDER: 'billNo',
|
|
@@ -26921,7 +27320,8 @@ var rowKeyMap = {
|
|
|
26921
27320
|
JY_SYSTEM_ORDER: 'tradeNo',
|
|
26922
27321
|
JKY_SYSTEM_ORDER: 'tradeNo',
|
|
26923
27322
|
WDT_RETURN_BILL_NO: 'refundNo',
|
|
26924
|
-
PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId'
|
|
27323
|
+
PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId',
|
|
27324
|
+
DXD_SYSTEM_ORDER: 'billNo'
|
|
26925
27325
|
};
|
|
26926
27326
|
var RADIO_TABLE_KEYS = ['PLATFORM_AFTER_SALES_ORDER'];
|
|
26927
27327
|
var index$2 = (function (props) {
|
|
@@ -26985,6 +27385,8 @@ var index$2 = (function (props) {
|
|
|
26985
27385
|
getJyOrderList(value.orderNo);
|
|
26986
27386
|
} else if (type === 'JKY_SYSTEM_ORDER') {
|
|
26987
27387
|
getJkyOrderList(value.orderNo);
|
|
27388
|
+
} else if (type === 'DXD_SYSTEM_ORDER') {
|
|
27389
|
+
getDxdOrderList(value.orderNo);
|
|
26988
27390
|
} else if (type === 'PLATFORM_AFTER_SALES_ORDER') {
|
|
26989
27391
|
value.shopId && getPlatformAfterSalesOrderList(value.orderNo, value.shopId);
|
|
26990
27392
|
}
|
|
@@ -27044,6 +27446,22 @@ var index$2 = (function (props) {
|
|
|
27044
27446
|
// deliveryStateName - 发货状态映射 (0: "未发货", 2: "全部发货")
|
|
27045
27447
|
map['deliveryStateName'] = _objectSpread2({}, GY_DELIVERY_STATE_MAPPING);
|
|
27046
27448
|
}
|
|
27449
|
+
// DXD_SYSTEM_ORDER 需要处理的字段
|
|
27450
|
+
if (type === 'DXD_SYSTEM_ORDER') {
|
|
27451
|
+
// billType - 订单类型映射(0: "普通订单", 1: "货到付款", ...)
|
|
27452
|
+
map['billType'] = _objectSpread2({}, KM_ORDER_TYPE_MAP);
|
|
27453
|
+
// sysStatus - 订单系统状态映射
|
|
27454
|
+
map['sysStatus'] = _objectSpread2({}, KM_ORDER_STATUS);
|
|
27455
|
+
// 布尔字段映射
|
|
27456
|
+
map['coldChain'] = {
|
|
27457
|
+
true: '是',
|
|
27458
|
+
false: '否'
|
|
27459
|
+
};
|
|
27460
|
+
map['split'] = {
|
|
27461
|
+
true: '是',
|
|
27462
|
+
false: '否'
|
|
27463
|
+
};
|
|
27464
|
+
}
|
|
27047
27465
|
return map;
|
|
27048
27466
|
}, [type]);
|
|
27049
27467
|
// 过滤后的表格数据 - 根据选中字段和关键词模糊匹配(不区分大小写)
|
|
@@ -27386,6 +27804,35 @@ var index$2 = (function (props) {
|
|
|
27386
27804
|
return _ref13.apply(this, arguments);
|
|
27387
27805
|
};
|
|
27388
27806
|
}();
|
|
27807
|
+
var getDxdOrderList = /*#__PURE__*/function () {
|
|
27808
|
+
var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(orderNo) {
|
|
27809
|
+
return _regeneratorRuntime().wrap(function _callee11$(_context11) {
|
|
27810
|
+
while (1) switch (_context11.prev = _context11.next) {
|
|
27811
|
+
case 0:
|
|
27812
|
+
dxdUtils.getOrderListSingleton(orderNo).then(function (trade) {
|
|
27813
|
+
var _trade$doOrders;
|
|
27814
|
+
var data = (_trade$doOrders = trade.doOrders) === null || _trade$doOrders === void 0 ? void 0 : _trade$doOrders.map(function (order) {
|
|
27815
|
+
return _objectSpread2(_objectSpread2({}, order), {}, {
|
|
27816
|
+
billNo: order.orderNo,
|
|
27817
|
+
billType: (trade === null || trade === void 0 ? void 0 : trade.split) ? '拆分订单' : '普通订单'
|
|
27818
|
+
});
|
|
27819
|
+
});
|
|
27820
|
+
_onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
|
|
27821
|
+
orders: data || [],
|
|
27822
|
+
showOrderInfo: data || []
|
|
27823
|
+
}));
|
|
27824
|
+
});
|
|
27825
|
+
onceRef.current = false;
|
|
27826
|
+
case 2:
|
|
27827
|
+
case "end":
|
|
27828
|
+
return _context11.stop();
|
|
27829
|
+
}
|
|
27830
|
+
}, _callee11);
|
|
27831
|
+
}));
|
|
27832
|
+
return function getDxdOrderList(_x12) {
|
|
27833
|
+
return _ref14.apply(this, arguments);
|
|
27834
|
+
};
|
|
27835
|
+
}();
|
|
27389
27836
|
var rowKey = rowKeyMap[type] || 'billNo';
|
|
27390
27837
|
var handleRadioChange = function handleRadioChange(record) {
|
|
27391
27838
|
var _value$selectIds;
|
|
@@ -27860,16 +28307,16 @@ var orderSubFormConstants = {
|
|
|
27860
28307
|
};
|
|
27861
28308
|
|
|
27862
28309
|
var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
|
|
27863
|
-
var singletonMap$
|
|
27864
|
-
var getOrderListSingleton$
|
|
28310
|
+
var singletonMap$b = new Map();
|
|
28311
|
+
var getOrderListSingleton$4 = function getOrderListSingleton(parmas) {
|
|
27865
28312
|
var orderNo = parmas.orderNo,
|
|
27866
28313
|
shopId = parmas.shopId;
|
|
27867
28314
|
var key = "".concat(orderNo, "-").concat(shopId);
|
|
27868
|
-
if (!singletonMap$
|
|
28315
|
+
if (!singletonMap$b.has(key)) {
|
|
27869
28316
|
var p = new Promise(function (resolve, reject) {
|
|
27870
28317
|
var doReject = function doReject(err) {
|
|
27871
28318
|
// 清空掉错误的请求记录
|
|
27872
|
-
singletonMap$
|
|
28319
|
+
singletonMap$b.delete(key);
|
|
27873
28320
|
reject(err);
|
|
27874
28321
|
};
|
|
27875
28322
|
extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
|
|
@@ -27885,16 +28332,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
|
|
|
27885
28332
|
}
|
|
27886
28333
|
// 延迟10秒清除,保证订单的时效性
|
|
27887
28334
|
setTimeout(function () {
|
|
27888
|
-
singletonMap$
|
|
28335
|
+
singletonMap$b.delete(key);
|
|
27889
28336
|
}, 1000 * 10);
|
|
27890
28337
|
} else {
|
|
27891
28338
|
doReject(data);
|
|
27892
28339
|
}
|
|
27893
28340
|
}).catch(doReject);
|
|
27894
28341
|
});
|
|
27895
|
-
singletonMap$
|
|
28342
|
+
singletonMap$b.set(key, p);
|
|
27896
28343
|
}
|
|
27897
|
-
return singletonMap$
|
|
28344
|
+
return singletonMap$b.get(key);
|
|
27898
28345
|
};
|
|
27899
28346
|
var renderEditItem = function renderEditItem(_ref) {
|
|
27900
28347
|
var item = _ref.item,
|
|
@@ -28026,7 +28473,7 @@ var renderDetailItem = function renderDetailItem(_ref2) {
|
|
|
28026
28473
|
return Component;
|
|
28027
28474
|
};
|
|
28028
28475
|
var utils = {
|
|
28029
|
-
getOrderListSingleton: getOrderListSingleton$
|
|
28476
|
+
getOrderListSingleton: getOrderListSingleton$4,
|
|
28030
28477
|
renderEditItem: renderEditItem,
|
|
28031
28478
|
renderDetailItem: renderDetailItem
|
|
28032
28479
|
};
|
|
@@ -28034,7 +28481,7 @@ var utils = {
|
|
|
28034
28481
|
var getOrderSubformColumns$1 = orderSubFormConstants.getOrderSubformColumns;
|
|
28035
28482
|
var renderEditItem$1 = utils.renderEditItem,
|
|
28036
28483
|
renderDetailItem$1 = utils.renderDetailItem,
|
|
28037
|
-
getOrderListSingleton$
|
|
28484
|
+
getOrderListSingleton$5 = utils.getOrderListSingleton;
|
|
28038
28485
|
var OrderSubForm = function OrderSubForm(props) {
|
|
28039
28486
|
var _props$value = props.value,
|
|
28040
28487
|
value = _props$value === void 0 ? {} : _props$value,
|
|
@@ -28235,7 +28682,7 @@ var OrderSubForm = function OrderSubForm(props) {
|
|
|
28235
28682
|
var JOIN_SHOP = shopList === null || shopList === void 0 ? void 0 : shopList.find(function (item) {
|
|
28236
28683
|
return !item.notJoin && item.shopId == shopId;
|
|
28237
28684
|
});
|
|
28238
|
-
return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$
|
|
28685
|
+
return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$5({
|
|
28239
28686
|
orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
|
|
28240
28687
|
shopId: shopId
|
|
28241
28688
|
}).then(function (data) {
|
|
@@ -28329,6 +28776,9 @@ var isErpType$1 = {
|
|
|
28329
28776
|
},
|
|
28330
28777
|
isJky: function isJky(type) {
|
|
28331
28778
|
return ['JKY_GOODS'].includes(type);
|
|
28779
|
+
},
|
|
28780
|
+
isDxd: function isDxd(type) {
|
|
28781
|
+
return ['DXD_GOODS', 'DXD_SUPPLIERS'].includes(type);
|
|
28332
28782
|
}
|
|
28333
28783
|
};
|
|
28334
28784
|
var processAllOrders = function processAllOrders(_ref) {
|
|
@@ -28361,6 +28811,11 @@ var processAllOrders = function processAllOrders(_ref) {
|
|
|
28361
28811
|
data: data,
|
|
28362
28812
|
orderNo: orderNo
|
|
28363
28813
|
});
|
|
28814
|
+
} else if (isErpType$1.isDxd(type)) {
|
|
28815
|
+
// DXD 选品用出库订单 doOrders(每项含 skus[])
|
|
28816
|
+
newList = processDxdOrders({
|
|
28817
|
+
data: data
|
|
28818
|
+
});
|
|
28364
28819
|
} else {
|
|
28365
28820
|
newList = processDefaultOrders({
|
|
28366
28821
|
data: data
|
|
@@ -28407,8 +28862,28 @@ var processWlnOrders = function processWlnOrders(_ref6) {
|
|
|
28407
28862
|
var data = _ref6.data;
|
|
28408
28863
|
return (data === null || data === void 0 ? void 0 : data.orders) || [];
|
|
28409
28864
|
};
|
|
28410
|
-
var
|
|
28865
|
+
var processDxdOrders = function processDxdOrders(_ref7) {
|
|
28866
|
+
var _data$doOrders;
|
|
28411
28867
|
var data = _ref7.data;
|
|
28868
|
+
var _ref8 = data || {},
|
|
28869
|
+
isSplit = _ref8.isSplit,
|
|
28870
|
+
billNo = _ref8.billNo,
|
|
28871
|
+
billType = _ref8.billType,
|
|
28872
|
+
billTag = _ref8.billTag,
|
|
28873
|
+
sysStatus = _ref8.sysStatus;
|
|
28874
|
+
var trades = (_data$doOrders = data.doOrders) === null || _data$doOrders === void 0 ? void 0 : _data$doOrders.map(function (item) {
|
|
28875
|
+
return _objectSpread2(_objectSpread2({}, item), {}, {
|
|
28876
|
+
billNo: billNo,
|
|
28877
|
+
billType: billType,
|
|
28878
|
+
billTag: billTag,
|
|
28879
|
+
isSplit: isSplit,
|
|
28880
|
+
sysStatus: sysStatus
|
|
28881
|
+
});
|
|
28882
|
+
});
|
|
28883
|
+
return trades;
|
|
28884
|
+
};
|
|
28885
|
+
var processDefaultOrders = function processDefaultOrders(_ref9) {
|
|
28886
|
+
var data = _ref9.data;
|
|
28412
28887
|
return data || [];
|
|
28413
28888
|
};
|
|
28414
28889
|
|
|
@@ -28655,6 +29130,48 @@ var componentMap$2 = {
|
|
|
28655
29130
|
},
|
|
28656
29131
|
getOrderList: jkyUtils.getJkyOrderListSingleton
|
|
28657
29132
|
},
|
|
29133
|
+
DXD_GOODS: {
|
|
29134
|
+
type: 'dxd',
|
|
29135
|
+
key: 'dxdGoods',
|
|
29136
|
+
name: '大希地',
|
|
29137
|
+
orderNo: 'srcTid',
|
|
29138
|
+
goodDetailOrderNo: 'srcTid',
|
|
29139
|
+
hiddenErpGoodsBtn: true,
|
|
29140
|
+
eventNameMap: {
|
|
29141
|
+
// pubsub 事件
|
|
29142
|
+
type: 'dxdType',
|
|
29143
|
+
// DXD 按自身数据格式(doOrders.skus)标准化商品,不复用 WDT
|
|
29144
|
+
updateGoodsHandle: updateDxdGoodsHandle,
|
|
29145
|
+
selectListReturn: 'dxdSelectListReturn',
|
|
29146
|
+
selectList: 'dxdSelectList',
|
|
29147
|
+
reissueSelectList: 'dxdReissueSelectList',
|
|
29148
|
+
reissueSelectListReturn: 'dxdReissueSelectListReturn',
|
|
29149
|
+
reissueDeleteGood: 'dxdReissueDeleteGood',
|
|
29150
|
+
changeShopCode: 'dxdChangeShopCode',
|
|
29151
|
+
reissueType: 'dxdReissueType',
|
|
29152
|
+
returnType: 'dxdReturnType',
|
|
29153
|
+
returnSelectListReturn: 'dxdReturnSelectListReturn',
|
|
29154
|
+
returnSelectList: 'dxdReturnSelectList',
|
|
29155
|
+
deleteGood: 'dxdDeleteGood',
|
|
29156
|
+
returnDeleteGood: 'dxdReturnDeleteGood',
|
|
29157
|
+
exchangeDeleteGood: 'dxdExchangeDeleteGood'
|
|
29158
|
+
},
|
|
29159
|
+
getOrderList: dxdUtils.getOrderListSingleton
|
|
29160
|
+
},
|
|
29161
|
+
DXD_SUPPLIERS: {
|
|
29162
|
+
type: 'dxd',
|
|
29163
|
+
key: 'dxdSuppliers',
|
|
29164
|
+
name: '大希地供应商',
|
|
29165
|
+
orderNo: 'srcTid',
|
|
29166
|
+
goodDetailOrderNo: 'srcTid',
|
|
29167
|
+
eventNameMap: {
|
|
29168
|
+
// pubsub 事件(用 dxdSuppliers 前缀,避免与 DXD_GOODS 的 dxd 前缀事件冲突)
|
|
29169
|
+
type: 'dxdSuppliersType',
|
|
29170
|
+
selectListReturn: 'dxdSuppliersSelectListReturn',
|
|
29171
|
+
selectList: 'dxdSuppliersSelectList',
|
|
29172
|
+
changeShopCode: 'dxdSuppliersChangeShopCode'
|
|
29173
|
+
}
|
|
29174
|
+
},
|
|
28658
29175
|
WLN_GOODS: {
|
|
28659
29176
|
type: 'jky',
|
|
28660
29177
|
key: 'wlnGoods',
|
|
@@ -28719,13 +29236,15 @@ var componentMap$2 = {
|
|
|
28719
29236
|
}
|
|
28720
29237
|
};
|
|
28721
29238
|
var CommonGoods = function CommonGoods(props) {
|
|
28722
|
-
var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7;
|
|
29239
|
+
var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7, _componentMap$compTyp8;
|
|
28723
29240
|
var value = props.value,
|
|
28724
29241
|
disabled = props.disabled,
|
|
28725
29242
|
onChange = props.onChange,
|
|
28726
29243
|
compType = props.type;
|
|
29244
|
+
// DXD_SUPPLIERS 纯镜像 DXD_GOODS(由 FormRender useWatch 联动同步增删),禁用独立增删
|
|
28727
29245
|
// console.log('value?.orders', value?.orders);
|
|
28728
29246
|
// 合并单订单会包含","
|
|
29247
|
+
var notAllowedOperation = ['DXD_SUPPLIERS'].includes(compType);
|
|
28729
29248
|
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) {
|
|
28730
29249
|
var _order$componentMap$c;
|
|
28731
29250
|
return order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$2[compType].orderNo]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.includes(',');
|
|
@@ -29108,9 +29627,11 @@ var CommonGoods = function CommonGoods(props) {
|
|
|
29108
29627
|
onModeChange: handleModeChange,
|
|
29109
29628
|
showModeBtn: showModeBtn,
|
|
29110
29629
|
isStrict: value === null || value === void 0 ? void 0 : value.isStrict,
|
|
29111
|
-
systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
|
|
29630
|
+
systemOrders: (value === null || value === void 0 ? void 0 : value.systemOrders) || (value === null || value === void 0 ? void 0 : value.allOrders),
|
|
29112
29631
|
selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
|
|
29113
29632
|
showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
|
|
29633
|
+
showErpGoodsBtn: !((_componentMap$compTyp8 = componentMap$2[compType]) === null || _componentMap$compTyp8 === void 0 ? void 0 : _componentMap$compTyp8.hiddenErpGoodsBtn),
|
|
29634
|
+
notAllowedOperation: notAllowedOperation,
|
|
29114
29635
|
tradeGoods: {
|
|
29115
29636
|
originDataSource: originDataSource,
|
|
29116
29637
|
getDataSourceAsync: getDataSourceAsync,
|
|
@@ -32590,10 +33111,11 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
|
|
|
32590
33111
|
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
|
|
32591
33112
|
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
|
|
32592
33113
|
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
|
|
32593
|
-
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
|
|
33114
|
+
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
|
|
33115
|
+
DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
|
|
32594
33116
|
};
|
|
32595
33117
|
var FIELD_COLUMNS_MAP = {
|
|
32596
33118
|
PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
|
|
32597
33119
|
};
|
|
32598
33120
|
|
|
32599
|
-
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 };
|
|
33121
|
+
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 };
|