@kmkf-fe-packages/basic-components 2.10.9-beta.5 → 2.10.9-beta.53

package/dist/index.esm.js

@@ -1,14 +1,15 @@
 import React, { useState, useMemo, useEffect, useRef, forwardRef, useImperativeHandle, useCallback } from 'react';
-import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate as Rate$1, Form, Popover, Tooltip, Table, Tabs, ConfigProvider, Pagination, Typography, Skeleton, Empty, Tag } from 'antd';
+import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate as Rate$1, Form, Popover, Tooltip, Table, Tabs, ConfigProvider, Pagination, Typography, Empty, Skeleton, Tag } from 'antd';
 import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-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';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, normalizeYouzanStar, servers, columnsGoodsList, LogisticsAddressData, isJdLogisticsCompany, getJdCustomerCodeOptions, 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, warehouseTypeMap, 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, TTX_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, TTX_INTERNAL_ORDER_TYPE_MAP, TTX_STATUS_MAP, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateTtxGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import every from 'lodash/every';
 import maxBy from 'lodash/maxBy';
 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';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
+import Monitor from 'kmkf-monitor';
 import pubsub from 'pubsub-js';
 import { internals, useTablePipeline, features, BaseTable } from 'ali-react-table';
 import zh_CN from 'antd/lib/locale-provider/zh_CN';
@@ -735,6 +736,12 @@ var ApaasUpload = function ApaasUpload(_ref) {
     resetProps = _objectWithoutProperties(_ref, _excluded$4);
   var inputRef = useRef(null);
   var valueRef = useRef(value);
+  // 当前批次的文件选择序号，用于按选择顺序展示上传结果
+  var batchSeqRef = useRef(0);
+  // 当前批次的上传结果，按序号存储，最后统一排序合并
+  var batchResultsRef = useRef(new Map());
+  // 当前批次正在处理的文件数，用于判断批次何时结束
+  var pendingCountRef = useRef(0);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
@@ -750,6 +757,32 @@ var ApaasUpload = function ApaasUpload(_ref) {
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
+  // 获取当前批次的文件选择序号；没有正在处理的文件时视为新一批，重置批次状态
+  var acquireBatchSeq = function acquireBatchSeq() {
+    if (pendingCountRef.current === 0) {
+      batchSeqRef.current = 0;
+      batchResultsRef.current.clear();
+    }
+    return batchSeqRef.current++;
+  };
+  // 将单个文件结果存入当前批次，本批次全部完成时按选择顺序合并到 value
+  var appendResult = function appendResult(batchSeq, result) {
+    if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
+      batchResultsRef.current.set(batchSeq, result);
+    }
+    pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
+    if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
+      var sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
+        return a[0] - b[0];
+      }).map(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+          v = _ref3[1];
+        return v;
+      });
+      handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
+      batchResultsRef.current.clear();
+    }
+  };
   var imgReader = function imgReader(item) {
     var blob = item.getAsFile(),
       reader = new FileReader();
@@ -757,14 +790,16 @@ var ApaasUpload = function ApaasUpload(_ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return;
     }
-    if (valueRef.current.length >= maxCount) {
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u53EA\u80FD\u4E0A\u4F20".concat(maxCount, "\u5F20\u56FE\u7247"));
       return;
     }
+    var batchSeq = acquireBatchSeq();
+    pendingCountRef.current += 1;
     reader.onload = function (e) {
       var _e$target;
       var result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
-      handleChange([].concat(_toConsumableArray(valueRef.current), [result]));
+      appendResult(batchSeq, result);
     };
     reader.readAsDataURL(blob);
   };
@@ -797,7 +832,8 @@ var ApaasUpload = function ApaasUpload(_ref) {
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    // 并发上传时用「已上传 + 待上传」一起判断，避免一次选多张时超出 maxCount
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
       return Upload.LIST_IGNORE;
     }
@@ -805,8 +841,10 @@ var ApaasUpload = function ApaasUpload(_ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
+    var batchSeq = acquireBatchSeq();
+    pendingCountRef.current += 1;
     getBase64(file).then(function (res) {
-      return handleChange([].concat(_toConsumableArray(valueRef.current), [res]));
+      appendResult(batchSeq, res);
     });
     return Upload.LIST_IGNORE;
   };
@@ -908,6 +946,7 @@ var ApaasUpload = function ApaasUpload(_ref) {
     name: "file",
     listType: "picture-card",
     maxCount: maxCount,
+    multiple: true,
     className: styles.upload,
     beforeUpload: beforeUpload
   }, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
@@ -1048,6 +1087,16 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
     resetProps = _objectWithoutProperties(_ref, _excluded$6);
   var inputRef = useRef(null);
   var valueRef = useRef(value);
+  // 并发上传时用于正确控制 loading 状态（多个文件同时上传）
+  var uploadingCountRef = useRef(0);
+  // 已选中待上传的文件数，用于数量预占，避免并发上传超过 maxCount
+  var pendingCountRef = useRef(0);
+  // 文件序号，保证并发上传时文件名唯一
+  var seqRef = useRef(0);
+  // 当前批次的文件选择序号，用于按选择顺序展示上传结果
+  var batchSeqRef = useRef(0);
+  // 当前批次的上传结果，按序号存储，最后统一排序合并
+  var batchResultsRef = useRef(new Map());
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     uploading = _useState2[0],
@@ -1062,48 +1111,80 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
+  var genFileName = function genFileName() {
+    seqRef.current += 1;
+    return "".concat(uniqueKey, "_").concat(seqRef.current, "_").concat(new Date().getTime(), ".jpg");
+  };
+  // 获取当前批次的文件选择序号；没有正在上传的文件时视为新一批，重置批次状态
+  var acquireBatchSeq = function acquireBatchSeq() {
+    if (pendingCountRef.current === 0) {
+      batchSeqRef.current = 0;
+      batchResultsRef.current.clear();
+    }
+    return batchSeqRef.current++;
+  };
   var asyncUpload = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
-      var _valueRef$current;
-      var formData, fileName, _yield$request, success, data;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file, batchSeq) {
+      var formData, fileName, _yield$request, success, data, sorted;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            pendingCountRef.current += 1;
+            uploadingCountRef.current += 1;
             setUploading(true);
             formData = new FormData();
             formData.append('file', file);
-            fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+            fileName = genFileName();
             formData.append('fileName', fileName);
-            _context.prev = 5;
-            _context.next = 8;
+            _context.prev = 7;
+            _context.next = 10;
             return request(actionUrl, {
               method: 'post',
               body: formData
             });
-          case 8:
+          case 10:
             _yield$request = _context.sent;
             success = _yield$request.success;
             data = _yield$request.data;
             if (success) {
-              handleChange([].concat(_toConsumableArray(valueRef.current), [data]));
+              if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
+                // 先暂存到当前批次，等本批次全部完成后再按选择顺序合并
+                batchResultsRef.current.set(batchSeq, data);
+              }
             }
-            _context.next = 17;
+            _context.next = 19;
             break;
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](5);
+          case 16:
+            _context.prev = 16;
+            _context.t0 = _context["catch"](7);
             message.error('图片上传失败');
-          case 17:
-            _context.prev = 17;
-            setUploading(false);
-            return _context.finish(17);
-          case 20:
+          case 19:
+            _context.prev = 19;
+            pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
+            uploadingCountRef.current = Math.max(0, uploadingCountRef.current - 1);
+            // 本批次全部上传完成，按选择序号排序后一次性合并到 value
+            if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
+              sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
+                return a[0] - b[0];
+              }).map(function (_ref3) {
+                var _ref4 = _slicedToArray(_ref3, 2),
+                  v = _ref4[1];
+                return v;
+              });
+              handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
+              batchResultsRef.current.clear();
+            }
+            if (uploadingCountRef.current === 0) {
+              setUploading(false);
+            }
+            return _context.finish(19);
+          case 25:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 14, 17, 20]]);
+      }, _callee, null, [[7, 16, 19, 25]]);
     }));
-    return function asyncUpload(_x) {
+    return function asyncUpload(_x, _x2) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -1119,24 +1200,24 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
       return;
     }
     reader.onload = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
-        var _e$target, _valueRef$current2;
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+        var _e$target;
         var result, fileName, file;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
-              fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+              fileName = genFileName();
               file = dataURLtoFile(result, fileName);
-              asyncUpload(file);
+              asyncUpload(file, acquireBatchSeq());
             case 4:
             case "end":
               return _context2.stop();
           }
         }, _callee2);
       }));
-      return function (_x2) {
-        return _ref3.apply(this, arguments);
+      return function (_x3) {
+        return _ref5.apply(this, arguments);
       };
     }();
     reader.readAsDataURL(blob);
@@ -1170,7 +1251,8 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    // 并发上传时用「已上传 + 待上传」一起判断，避免一次选多张时超出 maxCount
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
       return Upload.LIST_IGNORE;
     }
@@ -1178,7 +1260,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
-    asyncUpload(file);
+    asyncUpload(file, acquireBatchSeq());
     return Upload.LIST_IGNORE;
   };
   var handleDelete = function handleDelete(key) {
@@ -1275,6 +1357,7 @@ var ApaasUploadAsync = function ApaasUploadAsync(_ref, ref) {
     name: "file",
     listType: "picture-card",
     maxCount: maxCount,
+    multiple: true,
     className: styles$1.upload,
     beforeUpload: beforeUpload
   }, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
@@ -1318,6 +1401,16 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
     resetProps = _objectWithoutProperties(_ref, _excluded$7);
   var inputRef = useRef(null);
   var valueRef = useRef(value);
+  // 并发上传时用于正确控制 loading 状态（多个文件同时上传）
+  var uploadingCountRef = useRef(0);
+  // 已选中待上传的文件数，用于数量预占，避免并发上传超过 maxCount
+  var pendingCountRef = useRef(0);
+  // 文件序号，保证并发上传时文件名唯一
+  var seqRef = useRef(0);
+  // 当前批次的文件选择序号，用于按选择顺序展示上传结果
+  var batchSeqRef = useRef(0);
+  // 当前批次的上传结果，按序号存储，最后统一排序合并
+  var batchResultsRef = useRef(new Map());
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     uploading = _useState2[0],
@@ -1332,61 +1425,84 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
   useEffect(function () {
     valueRef.current = value;
   }, [value]);
+  var genFileName = function genFileName() {
+    seqRef.current += 1;
+    return "".concat(uniqueKey, "_").concat(seqRef.current, "_").concat(new Date().getTime(), ".jpg");
+  };
+  // 获取当前批次的文件选择序号；没有正在上传的文件时视为新一批，重置批次状态
+  var acquireBatchSeq = function acquireBatchSeq() {
+    if (pendingCountRef.current === 0) {
+      batchSeqRef.current = 0;
+      batchResultsRef.current.clear();
+    }
+    return batchSeqRef.current++;
+  };
   var asyncUpload = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
-      var _valueRef$current;
-      var formData, fileName, showName, _yield$request, success, data;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file, batchSeq) {
+      var formData, fileName, showName, _yield$request, success, data, sorted;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            pendingCountRef.current += 1;
+            uploadingCountRef.current += 1;
             setUploading(true);
             formData = new FormData();
             formData.append('file', file);
-            fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+            fileName = genFileName();
             formData.append('fileName', fileName);
             showName = file.name.substring(0, file.name.lastIndexOf('.'));
-            _context.prev = 6;
-            _context.next = 9;
+            _context.prev = 8;
+            _context.next = 11;
             return request(actionUrl, {
               method: 'post',
               body: formData
             });
-          case 9:
+          case 11:
             _yield$request = _context.sent;
             success = _yield$request.success;
             data = _yield$request.data;
-            if (!success) {
-              _context.next = 16;
-              break;
-            }
-            if (!(valueRef.current.length >= maxCount)) {
-              _context.next = 15;
-              break;
+            if (success) {
+              if (valueRef.current.length + batchResultsRef.current.size < maxCount) {
+                // 先暂存到当前批次，等本批次全部完成后再按选择顺序合并
+                batchResultsRef.current.set(batchSeq, {
+                  url: data,
+                  name: showName
+                });
+              }
             }
-            return _context.abrupt("return");
-          case 15:
-            handleChange([].concat(_toConsumableArray(valueRef.current), [{
-              url: data,
-              name: showName
-            }]));
-          case 16:
-            _context.next = 21;
+            _context.next = 20;
             break;
-          case 18:
-            _context.prev = 18;
-            _context.t0 = _context["catch"](6);
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](8);
             message.error('图片上传失败');
-          case 21:
-            _context.prev = 21;
-            setUploading(false);
-            return _context.finish(21);
-          case 24:
+          case 20:
+            _context.prev = 20;
+            pendingCountRef.current = Math.max(0, pendingCountRef.current - 1);
+            uploadingCountRef.current = Math.max(0, uploadingCountRef.current - 1);
+            // 本批次全部上传完成，按选择序号排序后一次性合并到 value
+            if (pendingCountRef.current === 0 && batchResultsRef.current.size > 0) {
+              sorted = _toConsumableArray(batchResultsRef.current.entries()).sort(function (a, b) {
+                return a[0] - b[0];
+              }).map(function (_ref3) {
+                var _ref4 = _slicedToArray(_ref3, 2),
+                  v = _ref4[1];
+                return v;
+              });
+              handleChange([].concat(_toConsumableArray(valueRef.current), _toConsumableArray(sorted)));
+              batchResultsRef.current.clear();
+            }
+            if (uploadingCountRef.current === 0) {
+              setUploading(false);
+            }
+            return _context.finish(20);
+          case 26:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 18, 21, 24]]);
+      }, _callee, null, [[8, 17, 20, 26]]);
     }));
-    return function asyncUpload(_x) {
+    return function asyncUpload(_x, _x2) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -1402,24 +1518,24 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
       return;
     }
     reader.onload = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
-        var _e$target, _valueRef$current2;
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+        var _e$target;
         var result, fileName, file;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               result = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
-              fileName = "".concat(uniqueKey, "_").concat(((_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.length) + 1, "_").concat(new Date().getTime(), ".jpg");
+              fileName = genFileName();
               file = dataURLtoFile(result, fileName);
-              asyncUpload(file);
+              asyncUpload(file, acquireBatchSeq());
             case 4:
             case "end":
               return _context2.stop();
           }
         }, _callee2);
       }));
-      return function (_x2) {
-        return _ref3.apply(this, arguments);
+      return function (_x3) {
+        return _ref5.apply(this, arguments);
       };
     }();
     reader.readAsDataURL(blob);
@@ -1453,7 +1569,8 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
   // 手动上传模式, 一直返回false
   var beforeUpload = function beforeUpload(file) {
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    // 并发上传时用「已上传 + 待上传」一起判断，避免一次选多张时超出 maxCount
+    if (valueRef.current.length + pendingCountRef.current >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u5F20\u56FE\u7247\uFF01"));
       return Upload.LIST_IGNORE;
     }
@@ -1461,7 +1578,7 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "MB"));
       return Upload.LIST_IGNORE;
     }
-    asyncUpload(file);
+    asyncUpload(file, acquireBatchSeq());
     return Upload.LIST_IGNORE;
   };
   var handleDelete = function handleDelete(key) {
@@ -1595,6 +1712,7 @@ var ApaasUploadProAsync = function ApaasUploadProAsync(_ref, ref) {
     name: "file",
     listType: "picture-card",
     maxCount: maxCount,
+    multiple: true,
     className: styles$2.uploadPro,
     beforeUpload: beforeUpload
   }, resetProps), value.length >= maxCount ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
@@ -8228,6 +8346,11 @@ var systemOrderMap = {
     no: 'dxdSystemOrderNo',
     ids: 'dxdSystemSelectIds',
     order: 'dxdSystemShowOrder'
+  },
+  TTX_SYSTEM_ORDER: {
+    no: 'ttxSystemOrderNo',
+    ids: 'ttxSystemSelectIds',
+    order: 'ttxSystemShowOrder'
   }
 };
 //直接将key component 添加到 transformWorkOrderData中的componentProcessors
@@ -8514,7 +8637,7 @@ var processLogisticsInterception = function processLogisticsInterception(getValu
     address = every(address, function (item) {
       return !item;
     }) ? [] : address;
-    var subFields = ['interceptCompany', 'interceptCode', 'interceptType', 'interceptSenderMobile', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsUserKCode', 'interceptLogisticsUserSecretKey'];
+    var subFields = ['interceptCompany', 'interceptCode', 'interceptType', 'interceptSenderMobile', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsUserKCode', 'interceptLogisticsUserSecretKey', 'interceptLogisticsCustomerCode'];
     var map = subFields.reduce(function (cur, nxt) {
       return _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
     }, {});
@@ -8695,8 +8818,11 @@ var processSceneStatus = function processSceneStatus(getValue) {
       BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
       MSG_STATUS: 'msgStatusValues',
       WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
+      WDT_WAREHOUSING_STATUS_V2: 'wdtInStockStatusV2ItemList',
+      DXD_WAREHOUSING_STATUS: 'dxdInStockStatusItemList',
       JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
       JST_WAREHOUSING_STATUS: 'jstInStockStatusItemList',
+      TTX_WAREHOUSING_STATUS: 'ttxInStockStatusItemList',
       WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList',
       KM_WAREHOUSING_STATUS: 'kmInStockStatusItemList'
     };
@@ -8726,6 +8852,12 @@ var processErpLogistics = function processErpLogistics(getValue) {
       },
       SKX_LOGISTICS: {
         listKey: 'skxLogisticsList'
+      },
+      DXD_LOGISTICS: {
+        listKey: 'dxdLogisticsList'
+      },
+      TTX_LOGISTICS: {
+        listKey: 'ttxLogisticsList'
       }
     };
     var initValue = [{
@@ -8756,6 +8888,9 @@ var processErpSendGood = function processErpSendGood(getValue) {
       },
       GY_SEND_GOOD: {
         list: 'gySendGood'
+      },
+      TTX_SEND_GOOD: {
+        list: 'ttxSendGood'
       }
     };
     var initValue = [{
@@ -8861,6 +8996,23 @@ var processDxdGoods = function processDxdGoods(templateColumns) {
     };
   };
 };
+var processTtxGoods = function processTtxGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      var systemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TTX_SYSTEM_ORDER';
+      });
+      return _defineProperty({}, nex.uniqueKey, {
+        ttxGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_ttxGoods")), []),
+        orderNo: tradeId ? getValue("".concat(tradeId.uniqueKey, "_tradeId")) : '',
+        selectIds: systemOrder ? jsonParseSecurity(getValue("".concat(systemOrder.uniqueKey, "_").concat(systemOrderMap.TTX_SYSTEM_ORDER.ids)), []) : []
+      });
+    };
+  };
+};
 var processDxdSuppliers = function processDxdSuppliers(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
@@ -9222,6 +9374,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
         no: 'dxdSystemOrderNo',
         ids: 'dxdSystemSelectIds',
         order: 'dxdSystemShowOrder'
+      },
+      TTX_SYSTEM_ORDER: {
+        no: 'ttxSystemOrderNo',
+        ids: 'ttxSystemSelectIds',
+        order: 'ttxSystemShowOrder'
       }
     };
     return _defineProperty({}, nex.uniqueKey, _objectSpread2({
@@ -9491,14 +9648,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref79;
-    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;
+    var _ref80;
+    return _ref80 = {}, _defineProperty(_ref80, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref80, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref80;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref80;
-    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;
+    var _ref81;
+    return _ref81 = {}, _defineProperty(_ref81, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref81, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref81;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9604,9 +9761,12 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_WAREHOUSING_STATUS: processSceneStatus,
       MSG_STATUS: processSceneStatus,
       WDT_WAREHOUSING_STATUS: processSceneStatus,
+      WDT_WAREHOUSING_STATUS_V2: processSceneStatus,
+      DXD_WAREHOUSING_STATUS: processSceneStatus,
       WLN_WAREHOUSING_STATUS: processSceneStatus,
       JKY_WAREHOUSING_STATUS: processSceneStatus,
       JST_WAREHOUSING_STATUS: processSceneStatus,
+      TTX_WAREHOUSING_STATUS: processSceneStatus,
       KM_WAREHOUSING_STATUS: processSceneStatus,
       BS_LOGISTICS: processErpLogistics,
       WLN_LOGISTICS: processErpLogistics,
@@ -9614,18 +9774,22 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       GY_LOGISTICS: processErpLogistics,
       BS_E3_LOGISTICS: processErpLogistics,
       KM_LOGISTICS: processErpLogistics,
+      DXD_LOGISTICS: processErpLogistics,
+      TTX_LOGISTICS: processErpLogistics,
       BS_SEND_GOOD: processErpSendGood,
       WLN_SEND_GOOD: processErpSendGood,
       WDT_SEND_GOOD: processErpSendGood,
       BS_E3_SEND_GOOD: processErpSendGood,
       KM_SEND_GOOD: processErpSendGood,
       GY_SEND_GOOD: processErpSendGood,
+      TTX_SEND_GOOD: processErpSendGood,
       KM_RETURN_WAREHOUSE: processErpReturnWarehouse,
       BS_POSTING: processBsPosting,
       BS_GOODS: processBsGoods,
       WDT_GOODS: processWdtGoods(templateColumns),
       JKY_GOODS: processJkyGoods(templateColumns),
       DXD_GOODS: processDxdGoods(templateColumns),
+      TTX_GOODS: processTtxGoods(templateColumns),
       DXD_SUPPLIERS: processDxdSuppliers(templateColumns),
       WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
       JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
@@ -9654,6 +9818,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       JST_SYSTEM_ORDER: processErpSystemOrder,
       GY_SYSTEM_ORDER: processErpSystemOrder,
       DXD_SYSTEM_ORDER: processErpSystemOrder,
+      TTX_SYSTEM_ORDER: processErpSystemOrder,
       BUYER_MESSAGE_NOTICE: processBuyerMessageNotice,
       ORDER_TYPE: processOrderType,
       REFUND_TYPE: processRefundType,
@@ -10347,6 +10512,7 @@ var SubForm = function SubForm(props) {
     maxCount = props.maxCount;
   var ref = useRef(null);
   var isRequest = useRef(false);
+  var cursorIdRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -10590,6 +10756,7 @@ var SubForm = function SubForm(props) {
   };
   var getWorkOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _cursorIdRef$current;
       var _ref2,
         _ref2$pageNo,
         pageNo,
@@ -10597,9 +10764,13 @@ var SubForm = function SubForm(props) {
         componentList,
         params,
         queryComponents,
+        cursorParams,
+        queryKey,
         res,
         data,
         success,
+        _cursorIdRef$current2,
+        _cursorIdRef$current3,
         transDataSourceItem,
         headerKeys,
         newList,
@@ -10622,6 +10793,8 @@ var SubForm = function SubForm(props) {
               templateKey: workOrderTemplateId,
               needReturnRepeatValue: true,
               needFilterShopByPermission: needFilterShopByPermission,
+              needTotal: false,
+              useNext: true,
               queryComponents: [{
                 key: 'flowStatus',
                 symbol: 'in',
@@ -10634,30 +10807,51 @@ var SubForm = function SubForm(props) {
                 symbol: 'in',
                 value: flowStatus
               }];
-              if (['0qFEv9GEyd_returnLogisticsCode', 'jbCFrJV4m7_trajectoryCode'].includes(selectKey)) {
-                queryComponents.push({
-                  key: selectKey,
-                  symbol: 'like',
-                  value: inputValue
-                });
+              queryComponents.push({
+                key: selectKey,
+                symbol: 'in',
+                value: [inputValue]
+              });
+              params.queryComponents = queryComponents;
+            }
+            params.queryComponents = params.queryComponents.filter(function (item) {
+              var _item$value;
+              if (item.key === 'flowStatus' && ((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.length) === 4) {
+                return false;
               } else {
-                queryComponents.push({
-                  key: selectKey,
-                  symbol: 'in',
-                  value: [inputValue]
-                });
+                return true;
               }
-              params.queryComponents = queryComponents;
+            });
+            cursorParams = _objectSpread2({}, params);
+            delete cursorParams.pageNo;
+            queryKey = JSON.stringify(cursorParams);
+            if (((_cursorIdRef$current = cursorIdRef.current) === null || _cursorIdRef$current === void 0 ? void 0 : _cursorIdRef$current.queryKey) === queryKey) {
+              if (cursorIdRef.current.cursorId) {
+                params.cursorId = cursorIdRef.current.cursorId;
+              }
+              if (cursorIdRef.current.cursorCreated) {
+                params.cursorCreated = cursorIdRef.current.cursorCreated;
+              }
+            } else {
+              cursorIdRef.current = {
+                queryKey: queryKey
+              };
             }
-            _context.next = 7;
-            return extendRequest('/qy/view/workOrderList', {
+            _context.next = 12;
+            return extendRequest('/qy/view/workOrderListCached', {
               method: 'post',
               data: params
             });
-          case 7:
+          case 12:
             res = _context.sent;
             data = res.data, success = res.success;
             if (success) {
+              if ((data === null || data === void 0 ? void 0 : data.cursorId) && ((_cursorIdRef$current2 = cursorIdRef.current) === null || _cursorIdRef$current2 === void 0 ? void 0 : _cursorIdRef$current2.queryKey) === queryKey) {
+                cursorIdRef.current.cursorId = data.cursorId;
+              }
+              if ((data === null || data === void 0 ? void 0 : data.cursorCreated) && ((_cursorIdRef$current3 = cursorIdRef.current) === null || _cursorIdRef$current3 === void 0 ? void 0 : _cursorIdRef$current3.queryKey) === queryKey) {
+                cursorIdRef.current.cursorCreated = data.cursorCreated;
+              }
               transDataSourceItem = transformWorkOrderData(componentDtoList.length ? componentDtoList : componentList, 'edit');
               headerKeys = correlationList.map(function (t) {
                 return t.key;
@@ -10683,7 +10877,7 @@ var SubForm = function SubForm(props) {
               setHasMore((data === null || data === void 0 ? void 0 : data.list.length) === pageSize);
               isRequest.current = false;
             }
-          case 10:
+          case 15:
           case "end":
             return _context.stop();
         }
@@ -11071,6 +11265,39 @@ function ApaasAddress(props) {
   }));
 }
 
+var YouzanStar = function YouzanStar(_ref) {
+  var disabled = _ref.disabled,
+    compact = _ref.compact,
+    value = _ref.value,
+    _onChange = _ref.onChange;
+  var star = normalizeYouzanStar(value);
+  if (compact) {
+    return star ? /*#__PURE__*/React.createElement("span", {
+      style: {
+        display: 'inline-flex',
+        alignItems: 'center',
+        gap: 4,
+        color: '#f8da14'
+      }
+    }, /*#__PURE__*/React.createElement("span", null, star), /*#__PURE__*/React.createElement(Rate$1, {
+      count: 1,
+      disabled: true,
+      value: 1,
+      style: {
+        color: '#f8da14'
+      }
+    })) : null;
+  }
+  return /*#__PURE__*/React.createElement(Rate$1, {
+    allowClear: !disabled,
+    disabled: disabled,
+    value: star || 0,
+    onChange: function onChange(nextValue) {
+      return _onChange === null || _onChange === void 0 ? void 0 : _onChange(normalizeYouzanStar(nextValue));
+    }
+  });
+};
+
 var trade0 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1MEQ1MkIyMjIzQUIxMUU0QjU5NjkwNDQxQkU4N0E1MiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1MEQ1MkIyMzIzQUIxMUU0QjU5NjkwNDQxQkU4N0E1MiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjUwRDUyQjIwMjNBQjExRTRCNTk2OTA0NDFCRTg3QTUyIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjUwRDUyQjIxMjNBQjExRTRCNTk2OTA0NDFCRTg3QTUyIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+PFEh+QAAAPhJREFUeNqM0MFKAkEcx/FZNcwSihBBT3oRog4RBHnqoiA+SuAL7J73Fbz7Ah5DOiw5QcdOQUhECoL1BBpC0/eP/0URUf/wYWaH+c3Ofzzf97+NMR1kcY85BuiqLxSRD8PQppgk0MC7WdQBLpWPsWzGC+qy+QEVfMBpKB7lwBKOcBUEwZkEnnCoJ/+YZbkVUjncSOBZF8sr11qvOHQngRHecK3NSnkbSDWT1tq/KIrOtfFIr9aGxRRpnGhgmNLJI1qYyW95vt/4LjR6yiAHZvDqOedkscDHpzwdm2tmS0kPhk0TSeOWcG5nQKuHY1T3DfR1vNgW+BdgACxMP/P+iLA3AAAAAElFTkSuQmCC";
 
 var trade1 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpFQ0NGNkNCNjIzQUExMUU0OTZDM0UxQUI1MEVCOUU2RSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpFQ0NGNkNCNzIzQUExMUU0OTZDM0UxQUI1MEVCOUU2RSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkVDQ0Y2Q0I0MjNBQTExRTQ5NkMzRTFBQjUwRUI5RTZFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkVDQ0Y2Q0I1MjNBQTExRTQ5NkMzRTFBQjUwRUI5RTZFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+WQ64bQAAAPVJREFUeNqM0M9KQkEUx/GZwUDNhYQItjKCQNyEEOSqVZtewHcQfIE2Posv0FIiWvQHLDeuBBEXUgTX3LmxRHH6njgXrnC5eODDzFzmNzPn2jdrZ8aYDnJoYo0x7tQUxyhebrcvlsCcRYARGma3NviSzegRuHZMujjDBF43hmMKZWRx/u7ckQSekMYBviOn+wipAi4k8KofT/RZcRWGriTwgSFq2qyUjSF142hko886xQJ93KKt/X1GbvpJ6eQBLfzKtRyyCnfQaJ6hggwGxntv+LUlLPEo6yTSg+HE4D/NlBMLJqFcZH6PQ9T3DTzrWE0K/AkwAPKxWrUjgeKsAAAAAElFTkSuQmCC";
@@ -11087,6 +11314,7 @@ var TextArea$2 = Input.TextArea;
 var imgList = [trade0, trade1, trade2, trade3, trade4, trade5];
 var RemarkInput = function RemarkInput(props) {
   var isShowFlag = props.isShowFlag,
+    isYouzan = props.isYouzan,
     value = props.value,
     onChange = props.onChange,
     disabled = props.disabled;
@@ -11103,6 +11331,11 @@ var RemarkInput = function RemarkInput(props) {
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
+  var changeStar = function changeStar(star) {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+      flag: star
+    }));
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TextArea$2, {
     disabled: disabled,
     rows: 4,
@@ -11110,7 +11343,19 @@ var RemarkInput = function RemarkInput(props) {
     placeholder: "\u8BF7\u8F93\u5165\u5907\u6CE8",
     key: "remark",
     onChange: changeRemark
-  }), isShowFlag && /*#__PURE__*/React.createElement(Radio.Group, {
+  }), isShowFlag && isYouzan && /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '12px'
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      marginRight: '8px'
+    }
+  }, "\u661F\u6807\uFF1A"), /*#__PURE__*/React.createElement(YouzanStar, {
+    disabled: disabled,
+    value: value === null || value === void 0 ? void 0 : value.flag,
+    onChange: changeStar
+  })), isShowFlag && !isYouzan && /*#__PURE__*/React.createElement(Radio.Group, {
     style: {
       marginTop: '12px'
     },
@@ -13295,7 +13540,6 @@ var Item = Form.Item;
 var LogisticsInterception = function LogisticsInterception(props) {
   var _value$interceptLogis3, _value$interceptLogis4, _value$interceptLogis5;
   var LogisticsAddress = LogisticsAddressData.getInstance();
-  var LogisticsAddressOptions = (LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getAddressData()) || [];
   var address = AddressData.getInstance();
   var _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
@@ -13333,6 +13577,12 @@ var LogisticsInterception = function LogisticsInterception(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     isInterface = _useState8[0],
     setIsInterface = _useState8[1];
+  var _useState9 = useState(function () {
+      return (LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getAddressData()) || [];
+    }),
+    _useState10 = _slicedToArray(_useState9, 2),
+    logisticsAddressData = _useState10[0],
+    setLogisticsAddressData = _useState10[1];
   useEffect(function () {
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) {
       setTypeOptions([]);
@@ -13347,6 +13597,13 @@ var LogisticsInterception = function LogisticsInterception(props) {
     setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.logisticsStatusList) || []);
     setIsInterface(interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.isInterface);
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  useEffect(function () {
+    if (!isJdLogisticsCompany(value === null || value === void 0 ? void 0 : value.interceptCompany) && (value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode) !== undefined) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        interceptLogisticsCustomerCode: undefined
+      }));
+    }
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode]);
   //拦截类型切换 需要清空派送地址
   useEffect(function () {
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) return;
@@ -13409,6 +13666,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
     return isShow;
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  var showCustomerCode = useMemo(function () {
+    return isJdLogisticsCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //判断是否能修改物流信息
   var isEdit = useMemo(function () {
     var company = expressInterceptData.find(function (item) {
@@ -13420,13 +13680,13 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var baseFieldDisabled = disabled || isEdit && !canEditPreCreateBaseFields;
   //退回地址列表
   var logisticsAddressOptions = useMemo(function () {
-    return LogisticsAddressOptions === null || LogisticsAddressOptions === void 0 ? void 0 : LogisticsAddressOptions.filter(function (item) {
+    return logisticsAddressData === null || logisticsAddressData === void 0 ? void 0 : logisticsAddressData.filter(function (item) {
       return item.cpCode === (value === null || value === void 0 ? void 0 : value.interceptCompany);
     });
-  }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  }, [logisticsAddressData, value === null || value === void 0 ? void 0 : value.interceptCompany]);
   // K码列表
   var kCodeList = useMemo(function () {
-    return LogisticsAddressOptions === null || LogisticsAddressOptions === void 0 ? void 0 : LogisticsAddressOptions.filter(function (item) {
+    return logisticsAddressData === null || logisticsAddressData === void 0 ? void 0 : logisticsAddressData.filter(function (item) {
       return item.cpCode === (value === null || value === void 0 ? void 0 : value.interceptCompany) && item.userKCode;
     }).map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -13434,7 +13694,45 @@ var LogisticsInterception = function LogisticsInterception(props) {
         label: item === null || item === void 0 ? void 0 : item.userKCode
       });
     });
-  }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  }, [logisticsAddressData, value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  var customerCodeOptions = useMemo(function () {
+    return getJdCustomerCodeOptions(logisticsAddressData);
+  }, [logisticsAddressData]);
+  var refreshLogisticsAddressOptions = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _yield$request, data, latestData;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return request$1({
+              url: '/qy/userConfig/listLogisticsAddress',
+              method: 'get',
+              data: {}
+            });
+          case 3:
+            _yield$request = _context.sent;
+            data = _yield$request.data;
+            latestData = data || [];
+            LogisticsAddress.setaddressData(latestData);
+            setLogisticsAddressData(latestData);
+            _context.next = 13;
+            break;
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](0);
+            console.log(_context.t0);
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 10]]);
+    }));
+    return function refreshLogisticsAddressOptions() {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var returnValue = useMemo(function () {
     var _value$interceptAddre, _value$interceptAddre2, _value$interceptAddre3;
     var uk = LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getUkByInfo({
@@ -13490,9 +13788,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
       //     userSecretKey: '12345678',
       //   },
       // ];
-      var matchKCodeList = LogisticsAddressOptions === null || LogisticsAddressOptions === void 0 ? void 0 : LogisticsAddressOptions.filter(function (item) {
-        return item.cpCode === val && item.userKCode;
-      });
       newValue = _objectSpread2(_objectSpread2({}, newValue), {}, {
         interceptCompany: val,
         interceptType: (_defaultInterceptType = defaultInterceptType) === null || _defaultInterceptType === void 0 ? void 0 : _defaultInterceptType.value,
@@ -13511,7 +13806,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         },
         interceptLogisticsApiStatusReason: undefined,
         interceptLogisticsUserKCode: undefined,
-        interceptLogisticsUserSecretKey: undefined
+        interceptLogisticsUserSecretKey: undefined,
+        interceptLogisticsCustomerCode: undefined
       });
     }
     if (type === 'interceptLogisticsApiStatus') {
@@ -13592,7 +13888,41 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'interceptCode');
     },
     value: value === null || value === void 0 ? void 0 : value.interceptCode
-  }))), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Item, {
+  }))), /*#__PURE__*/React.createElement(Item, {
+    label: /*#__PURE__*/React.createElement("span", null, "\u5BA2\u6237\u7F16\u7801", platform === 'pc' ? /*#__PURE__*/React.createElement(React.Fragment, null, "\uFF1A", /*#__PURE__*/React.createElement(Typography.Link, {
+      style: {
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return onJumpPage && (onJumpPage === null || onJumpPage === void 0 ? void 0 : onJumpPage({
+          type: 'interceptConfig',
+          state: {
+            tab: 'JDLCodeRelation'
+          }
+        }));
+      }
+    }, 'K码/EBU码配置>>')) : null),
+    required: showCustomerCode,
+    key: 'interceptLogisticsCustomerCode',
+    hidden: !showCustomerCode
+  }, /*#__PURE__*/React.createElement(Select, {
+    disabled: disabled,
+    placeholder: "\u9009\u62E9\u5BA2\u6237\u7F16\u7801",
+    notFoundContent: "\u6682\u65E0\u5BA2\u6237\u7F16\u7801\u914D\u7F6E\uFF0C\u8BF7\u5148\u524D\u5F80K\u7801/EBU\u7801\u914D\u7F6E>>",
+    showSearch: true,
+    style: {
+      width: '200px'
+    },
+    onChange: function onChange(val) {
+      return changeHandle(val, 'interceptLogisticsCustomerCode');
+    },
+    onFocus: refreshLogisticsAddressOptions,
+    options: customerCodeOptions,
+    value: value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode,
+    filterOption: function filterOption(input, option) {
+      return option.label.includes(input);
+    }
+  })), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Item, {
     label: /*#__PURE__*/React.createElement("span", null, "\u5BA2\u6237\u7F16\u7801\uFF08K\u7801\uFF09\uFF1A", platform === 'pc' ? /*#__PURE__*/React.createElement(Typography.Link, {
       style: {
         cursor: 'pointer'
@@ -13637,7 +13967,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     value: value === null || value === void 0 ? void 0 : value.interceptLogisticsUserSecretKey
   }))), /*#__PURE__*/React.createElement(Item, {
     label: '拦截类型',
-    required: required,
+    required: required && !showCustomerCode,
     key: 'interceptType'
   }, /*#__PURE__*/React.createElement(Select, {
     disabled: baseFieldDisabled,
@@ -14277,14 +14607,14 @@ var jstGoods = function jstGoods(props) {
     showField = _props$showField === void 0 ? '' : _props$showField,
     _props$platformType = props.platformType,
     platformType = _props$platformType === void 0 ? 'default' : _props$platformType,
-    onlyShowFieldSelect = props.onlyShowFieldSelect,
-    logisticsCompanyFormType = props.logisticsCompanyFormType;
+    logisticsCompanyFormType = props.logisticsCompanyFormType,
+    form = props.form;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
-  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln', 'dxd'].includes(platformType);
+  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln', 'dxd', 'ttx'].includes(platformType);
   var expressDateInstance = ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst', 'wln'].includes(platformType);
   useEffect(function () {
@@ -14293,6 +14623,28 @@ var jstGoods = function jstGoods(props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
     }
   }, [value, type]);
+  useEffect(function () {
+    //丢失sendSnapshotName，未找到具体原因，兜底处理
+    if (type === 3 && isSendGoodSavedId && value && value.length && value.some(function (item) {
+      return !item.sendSnapshotName;
+    }) && value.every(function (item) {
+      return item.sendId;
+    })) {
+      var orderNo = form === null || form === void 0 ? void 0 : form.getFieldValue('m3ap1EvEyd');
+      console.log('发货仓走兜底处理-oldValue--', orderNo, cloneDeep(value));
+      var newValue = cloneDeep(value).map(function (item) {
+        if (item.sendSnapshotName || !item.sendId) return item;
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          sendSnapshotName: SendDataCenter.getInstance(platformType).getSendNameByCode(item.sendId)
+        });
+      });
+      Monitor.automaticReport({
+        message: "\u53D1\u8D27\u4ED3\u8D70\u515C\u5E95\u5904\u7406-".concat(orderNo || '', "-oldValue-").concat(JSON.stringify(cloneDeep(value)), ",newValue-").concat(JSON.stringify(cloneDeep(newValue)))
+      });
+      console.log('发货仓走兜底处理-newValue--', orderNo, cloneDeep(newValue));
+      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    }
+  }, [JSON.stringify(value || []), type]);
   useEffect(function () {
     if (changeIndex > (value === null || value === void 0 ? void 0 : value.length) - 1) {
       setChangeIndex(0);
@@ -14318,12 +14670,10 @@ var jstGoods = function jstGoods(props) {
       }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, t.title), /*#__PURE__*/React.createElement("div", null, "\u7F16\u7801\uFF1A", t.skuId))));
     }));
   };
-  var handleSelected = function handleSelected(val, type, option, onlyShowFieldSelect) {
+  var handleSelected = function handleSelected(val, type, option) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
     changeOrderInfo[type] = val;
-    if (!onlyShowFieldSelect) {
-      changeOrderInfo['sendId'] = option.value;
-    }
+    changeOrderInfo['sendId'] = option.value;
     if (isSelectName && type === 'sendName') {
       if (isSendGoodSavedId) {
         // 如果发货仓名称存的是id，将名称存入快照
@@ -14338,12 +14688,10 @@ var jstGoods = function jstGoods(props) {
     newList[changeIndex] = changeOrderInfo;
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
   };
-  var handleSelectedReturn = function handleSelectedReturn(val, type, option, onlyShowFieldSelect) {
+  var handleSelectedReturn = function handleSelectedReturn(val, type, option) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
     changeOrderInfo[type] = val;
-    if (!onlyShowFieldSelect) {
-      changeOrderInfo['returnWarehouseId'] = option.value;
-    }
+    changeOrderInfo['returnWarehouseId'] = option.value;
     if (isSelectName && type === 'returnWarehouseName') {
       // 如果发货仓名称存的是name，将id存入快照，同时把id替换成名称
       changeOrderInfo['sendSnapshotId'] = option.value;
@@ -14450,7 +14798,7 @@ var jstGoods = function jstGoods(props) {
     filterOption: filterOption,
     value: ((_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendSnapshotId) || ((_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName) || null,
     onChange: function onChange(value, option) {
-      return handleSelected(value, 'sendName', option, onlyShowFieldSelect);
+      return handleSelected(value, 'sendName', option);
     }
   }) : /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
@@ -14485,7 +14833,7 @@ var jstGoods = function jstGoods(props) {
     filterOption: filterOption,
     value: ((_value$changeIndex15 = value[changeIndex]) === null || _value$changeIndex15 === void 0 ? void 0 : _value$changeIndex15.sendSnapshotId) || ((_value$changeIndex16 = value[changeIndex]) === null || _value$changeIndex16 === void 0 ? void 0 : _value$changeIndex16.returnWarehouseName) || null,
     onChange: function onChange(value, option) {
-      return handleSelectedReturn(value, 'returnWarehouseName', option, onlyShowFieldSelect);
+      return handleSelectedReturn(value, 'returnWarehouseName', option);
     }
   }) : /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
@@ -16136,11 +16484,17 @@ var OptionalInput = function OptionalInput(props) {
       });
     }
   };
+  var handleBlur = function handleBlur(event) {
+    var nextTarget = event.relatedTarget;
+    if (nextTarget && event.currentTarget.contains(nextTarget)) return;
+    if (typeof onBlur === 'function') onBlur(event);
+  };
   return /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
       alignItems: 'center'
-    }
+    },
+    onBlur: handleBlur
   }, /*#__PURE__*/React.createElement(Select, {
     className: "optional-input-select",
     style: {
@@ -16148,8 +16502,7 @@ var OptionalInput = function OptionalInput(props) {
     },
     options: compareSymbolList,
     onChange: handleSelectChange,
-    value: (value === null || value === void 0 ? void 0 : value.type) || 'like',
-    onBlur: onBlur
+    value: (value === null || value === void 0 ? void 0 : value.type) || 'like'
   }), /*#__PURE__*/React.createElement(Input, _objectSpread2({
     style: {
       width: '150px'
@@ -16158,11 +16511,34 @@ var OptionalInput = function OptionalInput(props) {
     placeholder: placeholder,
     onChange: handleInputChange,
     onPressEnter: onPressEnter,
-    onBlur: onBlur,
     value: value === null || value === void 0 ? void 0 : value.inputValue
   }, formItemProps)));
 };
 
+var transformFormData = function transformFormData(formData) {
+  var conditionList = [];
+  for (var key in formData) {
+    if (formData[key]) {
+      var _formData$key, _formData$key2, _formData$key3, _formData$key4;
+      var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
+      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'eq' : 'like';
+      if (!isNull(value)) {
+        conditionList.push({
+          leftValue: key,
+          compareSymbol: compareSymbol,
+          rightValue: value
+        });
+      }
+    }
+  }
+  return conditionList;
+};
+var shouldSubmitOnBlur = function shouldSubmitOnBlur(relatedTarget) {
+  var _target$closest;
+  var target = relatedTarget;
+  return !(target === null || target === void 0 ? void 0 : (_target$closest = target.closest) === null || _target$closest === void 0 ? void 0 : _target$closest.call(target, '.search-form-actions'));
+};
+
 function SearchForm(_ref) {
   var searchFormData = _ref.searchFormData,
     form = _ref.form,
@@ -16197,6 +16573,10 @@ function SearchForm(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  var submitFormOnBlur = function submitFormOnBlur(event) {
+    if (!shouldSubmitOnBlur(event.relatedTarget)) return;
+    submitForm();
+  };
   return /*#__PURE__*/React.createElement(Form, {
     layout: "inline",
     form: form,
@@ -16218,9 +16598,7 @@ function SearchForm(_ref) {
       onPressEnter: function onPressEnter() {
         return submitForm();
       },
-      onBlur: function onBlur() {
-        return submitForm();
-      },
+      onBlur: submitFormOnBlur,
       placeholder: label,
       formItemProps: formItemProps
     }) : type === 'select' ? /*#__PURE__*/React.createElement(Select, _objectSpread2({
@@ -16230,9 +16608,7 @@ function SearchForm(_ref) {
       style: {
         width: 150
       },
-      onBlur: function onBlur() {
-        return submitForm();
-      }
+      onBlur: submitFormOnBlur
     }, formItemProps)) : /*#__PURE__*/React.createElement(Input, _objectSpread2({
       placeholder: label,
       allowClear: true,
@@ -16242,9 +16618,7 @@ function SearchForm(_ref) {
       onPressEnter: function onPressEnter() {
         return submitForm();
       },
-      onBlur: function onBlur() {
-        return submitForm();
-      }
+      onBlur: submitFormOnBlur
     }, formItemProps)));
   }), /*#__PURE__*/React.createElement(Form.Item, {
     style: {
@@ -16264,21 +16638,200 @@ function SearchForm(_ref) {
   }, "\u91CD\u7F6E")));
 }
 
-var transformFormData = function transformFormData(formData) {
-  var conditionList = [];
-  for (var key in formData) {
-    if (formData[key]) {
-      var _formData$key, _formData$key2, _formData$key3, _formData$key4;
-      var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
-      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'eq' : 'like';
-      conditionList.push({
-        leftValue: key,
-        compareSymbol: compareSymbol,
-        rightValue: value
+var ACTION_CONFIG = {
+  JST_ERP: [{
+    sourceField: 'styleCode',
+    requestField: 'styleCodes'
+  }, {
+    sourceField: 'goodNo',
+    requestField: 'goodNos'
+  }],
+  WLN_ERP: [{
+    sourceField: 'goodNo',
+    requestField: 'goodNos'
+  }, {
+    sourceField: 'specNo',
+    requestField: 'skuCodes'
+  }],
+  WDT_ERP: [{
+    sourceField: 'goodNo',
+    requestField: 'goodNos'
+  }, {
+    sourceField: 'skuCode',
+    requestField: 'skuCodes'
+  }],
+  GY_ERP: [{
+    sourceField: 'goodNo',
+    requestField: 'goodNos'
+  }],
+  JY_ERP: [{
+    sourceField: 'goodNo',
+    requestField: 'goodNos'
+  }, {
+    sourceField: 'skuCode',
+    requestField: 'skuCodes'
+  }],
+  KM_ERP: [{
+    sourceField: 'goodNo',
+    requestField: 'goodNos'
+  }, {
+    sourceField: 'skuCode',
+    requestField: 'skuCodes'
+  }]
+};
+var getSearchValue = function getSearchValue(value) {
+  var _value$inputValue;
+  var inputValue = (_value$inputValue = value === null || value === void 0 ? void 0 : value.inputValue) !== null && _value$inputValue !== void 0 ? _value$inputValue : value;
+  if (inputValue === undefined || inputValue === null) return '';
+  return String(inputValue).trim();
+};
+var getSkuType = function getSkuType(platform, formData) {
+  if (platform !== 'JST_ERP' && platform !== 'WLN_ERP') return undefined;
+  var values = Array.isArray(formData.skuType) ? formData.skuType : [formData.skuType];
+  var skuTypes = values.filter(function (value) {
+    return value === 'normal' || value === 'combine';
+  });
+  return skuTypes.length === 1 ? skuTypes[0] : undefined;
+};
+var getReSyncActions = function getReSyncActions(platform, total, formData) {
+  if (total !== 0) return [];
+  var skuType = getSkuType(platform, formData);
+  var requestData = _objectSpread2({
+    platform: platform
+  }, skuType ? {
+    skuType: skuType
+  } : {});
+  var values = [];
+  ACTION_CONFIG[platform].forEach(function (config) {
+    var value = getSearchValue(formData[config.sourceField]);
+    if (!value) return;
+    requestData[config.requestField] = [value];
+    values.push(value);
+  });
+  if (!values.length) return [];
+  return [{
+    key: 'goods',
+    label: '同步商品',
+    targetName: '商品',
+    value: values.join('、'),
+    requestData: requestData
+  }];
+};
+
+var useGoodsReSyncQuery = function useGoodsReSyncQuery(service) {
+  var _React$useState = React.useState({
+      total: null,
+      formData: {}
+    }),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    queryState = _React$useState2[0],
+    setQueryState = _React$useState2[1];
+  var serviceWithReSyncState = React.useCallback(function (pagination, formData) {
+    var currentFormData = formData;
+    setQueryState({
+      total: null,
+      formData: currentFormData
+    });
+    return service(pagination, formData).then(function (result) {
+      setQueryState({
+        total: result.total,
+        formData: currentFormData
       });
-    }
-  }
-  return conditionList;
+      return result;
+    }, function (error) {
+      setQueryState({
+        total: null,
+        formData: currentFormData
+      });
+      throw error;
+    });
+  }, [service]);
+  return [serviceWithReSyncState, queryState];
+};
+var getErrorMessage = function getErrorMessage(error, action) {
+  var _error$data;
+  return (error === null || error === void 0 ? void 0 : (_error$data = error.data) === null || _error$data === void 0 ? void 0 : _error$data.message) || (error === null || error === void 0 ? void 0 : error.message) || "".concat(action.label, "\u5931\u8D25");
+};
+var GoodsReSync = function GoodsReSync(_ref) {
+  var platform = _ref.platform,
+    queryState = _ref.queryState,
+    onSuccess = _ref.onSuccess;
+  var _React$useState3 = React.useState(null),
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    loadingAction = _React$useState4[0],
+    setLoadingAction = _React$useState4[1];
+  var actions = getReSyncActions(platform, queryState.total, queryState.formData);
+  var handleReSync = function handleReSync(action) {
+    Modal.confirm({
+      title: "\u786E\u8BA4".concat(action.label),
+      content: "\u5C06\u4ECE ERP \u91CD\u65B0\u62C9\u53D6".concat(action.targetName, "\u201C").concat(action.value, "\u201D\u5E76\u8986\u76D6\u672C\u5730\u6570\u636E"),
+      okText: '确认同步',
+      cancelText: '取消',
+      onOk: function () {
+        var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var response;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                setLoadingAction(action.key);
+                _context.prev = 1;
+                _context.next = 4;
+                return extendRequest('/qy/gdfw/product/reSync', {
+                  method: 'post',
+                  timeout: 60000,
+                  data: action.requestData
+                });
+              case 4:
+                response = _context.sent;
+                if (!((response === null || response === void 0 ? void 0 : response.success) === false)) {
+                  _context.next = 7;
+                  break;
+                }
+                throw new Error(response.message || "".concat(action.label, "\u5931\u8D25"));
+              case 7:
+                message.success((response === null || response === void 0 ? void 0 : response.message) || "".concat(action.label, "\u6210\u529F"));
+                _context.next = 10;
+                return onSuccess();
+              case 10:
+                _context.next = 16;
+                break;
+              case 12:
+                _context.prev = 12;
+                _context.t0 = _context["catch"](1);
+                message.error(getErrorMessage(_context.t0, action));
+                throw _context.t0;
+              case 16:
+                _context.prev = 16;
+                setLoadingAction(null);
+                return _context.finish(16);
+              case 19:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee, null, [[1, 12, 16, 19]]);
+        }));
+        function onOk() {
+          return _onOk.apply(this, arguments);
+        }
+        return onOk;
+      }()
+    });
+  };
+  return /*#__PURE__*/React.createElement(Empty, {
+    image: Empty.PRESENTED_IMAGE_SIMPLE,
+    description: actions.length ? /*#__PURE__*/React.createElement(Space, {
+      size: 8
+    }, actions.map(function (action) {
+      return /*#__PURE__*/React.createElement(Button, {
+        key: action.key,
+        loading: loadingAction === action.key,
+        disabled: loadingAction !== null && loadingAction !== action.key,
+        onClick: function onClick() {
+          return handleReSync(action);
+        }
+      }, action.label);
+    })) : '暂无数据'
+  });
 };
 
 var getTableData = function getTableData(_ref, formData) {
@@ -16338,13 +16891,16 @@ var GoodList = function GoodList(props, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useAntdTable = useAntdTable(getTableData, {
+  var _useGoodsReSyncQuery = useGoodsReSyncQuery(getTableData),
+    _useGoodsReSyncQuery2 = _slicedToArray(_useGoodsReSyncQuery, 2),
+    getTableDataWithReSync = _useGoodsReSyncQuery2[0],
+    reSyncQueryState = _useGoodsReSyncQuery2[1];
+  var _useAntdTable = useAntdTable(getTableDataWithReSync, {
       defaultPageSize: 10,
       form: form
     }),
     tableProps = _useAntdTable.tableProps,
-    search = _useAntdTable.search,
-    params = _useAntdTable.params;
+    search = _useAntdTable.search;
   var submit = search.submit,
     reset = search.reset;
   var setGoodBrandList = function setGoodBrandList() {
@@ -16543,6 +17099,13 @@ var GoodList = function GoodList(props, ref) {
       y: 250
     }
   }, tableProps), {}, {
+    locale: {
+      emptyText: /*#__PURE__*/React.createElement(GoodsReSync, {
+        platform: "WDT_ERP",
+        queryState: reSyncQueryState,
+        onSuccess: submit
+      })
+    },
     size: "small"
   }))), /*#__PURE__*/React.createElement(Popover, {
     getPopupContainer: function getPopupContainer(triggerNode) {
@@ -16687,13 +17250,16 @@ var GoodList$1 = function GoodList(props, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useAntdTable = useAntdTable(getTableData$1, {
+  var _useGoodsReSyncQuery = useGoodsReSyncQuery(getTableData$1),
+    _useGoodsReSyncQuery2 = _slicedToArray(_useGoodsReSyncQuery, 2),
+    getTableDataWithReSync = _useGoodsReSyncQuery2[0],
+    reSyncQueryState = _useGoodsReSyncQuery2[1];
+  var _useAntdTable = useAntdTable(getTableDataWithReSync, {
       defaultPageSize: 10,
       form: form
     }),
     tableProps = _useAntdTable.tableProps,
-    search = _useAntdTable.search,
-    params = _useAntdTable.params;
+    search = _useAntdTable.search;
   var submit = search.submit,
     reset = search.reset;
   var rowSelection = {
@@ -16795,7 +17361,7 @@ var GoodList$1 = function GoodList(props, ref) {
     style: {
       marginTop: '4px'
     }
-  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
     className: "GoodModalColumns",
     rowSelection: rowSelection,
     rowKey: "goodNo",
@@ -16805,7 +17371,15 @@ var GoodList$1 = function GoodList(props, ref) {
       y: 250
     },
     size: "small"
-  }, tableProps))), /*#__PURE__*/React.createElement(Popover, {
+  }, tableProps), {}, {
+    locale: {
+      emptyText: /*#__PURE__*/React.createElement(GoodsReSync, {
+        platform: "JST_ERP",
+        queryState: reSyncQueryState,
+        onSuccess: submit
+      })
+    }
+  }))), /*#__PURE__*/React.createElement(Popover, {
     getPopupContainer: function getPopupContainer(triggerNode) {
       return triggerNode.parentElement;
     },
@@ -17178,13 +17752,16 @@ var GoodList$3 = function GoodList(props, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useAntdTable = useAntdTable(getTableData$3, {
+  var _useGoodsReSyncQuery = useGoodsReSyncQuery(getTableData$3),
+    _useGoodsReSyncQuery2 = _slicedToArray(_useGoodsReSyncQuery, 2),
+    getTableDataWithReSync = _useGoodsReSyncQuery2[0],
+    reSyncQueryState = _useGoodsReSyncQuery2[1];
+  var _useAntdTable = useAntdTable(getTableDataWithReSync, {
       defaultPageSize: 10,
       form: form
     }),
     tableProps = _useAntdTable.tableProps,
-    search = _useAntdTable.search,
-    params = _useAntdTable.params;
+    search = _useAntdTable.search;
   var submit = search.submit,
     reset = search.reset;
   var rowSelection = {
@@ -17286,7 +17863,7 @@ var GoodList$3 = function GoodList(props, ref) {
     style: {
       marginTop: '4px'
     }
-  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
     className: "GoodModalColumns",
     rowSelection: rowSelection,
     rowKey: rowCheckKey,
@@ -17296,7 +17873,15 @@ var GoodList$3 = function GoodList(props, ref) {
       y: 250
     },
     size: "small"
-  }, tableProps))), /*#__PURE__*/React.createElement(Popover, {
+  }, tableProps), {}, {
+    locale: {
+      emptyText: /*#__PURE__*/React.createElement(GoodsReSync, {
+        platform: "KM_ERP",
+        queryState: reSyncQueryState,
+        onSuccess: submit
+      })
+    }
+  }))), /*#__PURE__*/React.createElement(Popover, {
     getPopupContainer: function getPopupContainer(triggerNode) {
       return triggerNode.parentElement;
     },
@@ -17428,13 +18013,16 @@ var GoodList$4 = function GoodList(props, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useAntdTable = useAntdTable(getTableData$4, {
+  var _useGoodsReSyncQuery = useGoodsReSyncQuery(getTableData$4),
+    _useGoodsReSyncQuery2 = _slicedToArray(_useGoodsReSyncQuery, 2),
+    getTableDataWithReSync = _useGoodsReSyncQuery2[0],
+    reSyncQueryState = _useGoodsReSyncQuery2[1];
+  var _useAntdTable = useAntdTable(getTableDataWithReSync, {
       defaultPageSize: 10,
       form: form
     }),
     tableProps = _useAntdTable.tableProps,
-    search = _useAntdTable.search,
-    params = _useAntdTable.params;
+    search = _useAntdTable.search;
   var submit = search.submit,
     reset = search.reset;
   var rowSelection = {
@@ -17537,6 +18125,13 @@ var GoodList$4 = function GoodList(props, ref) {
       y: 250
     }
   }, tableProps), {}, {
+    locale: {
+      emptyText: /*#__PURE__*/React.createElement(GoodsReSync, {
+        platform: "GY_ERP",
+        queryState: reSyncQueryState,
+        onSuccess: submit
+      })
+    },
     size: "small"
   }))), /*#__PURE__*/React.createElement(Popover, {
     getPopupContainer: function getPopupContainer(triggerNode) {
@@ -19123,13 +19718,16 @@ var GoodList$5 = function GoodList(props, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useAntdTable = useAntdTable(getTableData$5, {
+  var _useGoodsReSyncQuery = useGoodsReSyncQuery(getTableData$5),
+    _useGoodsReSyncQuery2 = _slicedToArray(_useGoodsReSyncQuery, 2),
+    getTableDataWithReSync = _useGoodsReSyncQuery2[0],
+    reSyncQueryState = _useGoodsReSyncQuery2[1];
+  var _useAntdTable = useAntdTable(getTableDataWithReSync, {
       defaultPageSize: 10,
       form: form
     }),
     tableProps = _useAntdTable.tableProps,
-    search = _useAntdTable.search,
-    params = _useAntdTable.params;
+    search = _useAntdTable.search;
   var submit = search.submit,
     reset = search.reset;
   var rowSelection = {
@@ -19231,7 +19829,7 @@ var GoodList$5 = function GoodList(props, ref) {
     style: {
       marginTop: '4px'
     }
-  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
     className: "GoodModalColumns",
     rowSelection: rowSelection,
     rowKey: "id",
@@ -19241,7 +19839,15 @@ var GoodList$5 = function GoodList(props, ref) {
       y: 250
     },
     size: "small"
-  }, tableProps))), /*#__PURE__*/React.createElement(Popover, {
+  }, tableProps), {}, {
+    locale: {
+      emptyText: /*#__PURE__*/React.createElement(GoodsReSync, {
+        platform: "WLN_ERP",
+        queryState: reSyncQueryState,
+        onSuccess: submit
+      })
+    }
+  }))), /*#__PURE__*/React.createElement(Popover, {
     getPopupContainer: function getPopupContainer(triggerNode) {
       return triggerNode.parentElement;
     },
@@ -19370,13 +19976,16 @@ var GoodList$6 = function GoodList(props, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useAntdTable = useAntdTable(getTableData$6, {
+  var _useGoodsReSyncQuery = useGoodsReSyncQuery(getTableData$6),
+    _useGoodsReSyncQuery2 = _slicedToArray(_useGoodsReSyncQuery, 2),
+    getTableDataWithReSync = _useGoodsReSyncQuery2[0],
+    reSyncQueryState = _useGoodsReSyncQuery2[1];
+  var _useAntdTable = useAntdTable(getTableDataWithReSync, {
       defaultPageSize: 10,
       form: form
     }),
     tableProps = _useAntdTable.tableProps,
-    search = _useAntdTable.search,
-    params = _useAntdTable.params;
+    search = _useAntdTable.search;
   var submit = search.submit,
     reset = search.reset;
   var rowSelection = {
@@ -19478,7 +20087,7 @@ var GoodList$6 = function GoodList(props, ref) {
     style: {
       marginTop: '4px'
     }
-  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
+  }, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
     className: "GoodModalColumns",
     rowSelection: rowSelection,
     rowKey: "id",
@@ -19488,7 +20097,15 @@ var GoodList$6 = function GoodList(props, ref) {
       y: 250
     },
     size: "small"
-  }, tableProps))), /*#__PURE__*/React.createElement(Popover, {
+  }, tableProps), {}, {
+    locale: {
+      emptyText: /*#__PURE__*/React.createElement(GoodsReSync, {
+        platform: "JY_ERP",
+        queryState: reSyncQueryState,
+        onSuccess: submit
+      })
+    }
+  }))), /*#__PURE__*/React.createElement(Popover, {
     getPopupContainer: function getPopupContainer(triggerNode) {
       return triggerNode.parentElement;
     },
@@ -20701,7 +21318,7 @@ var getColumns$2 = function getColumns(_ref) {
       }
     }, {
       dataIndex: 'returnPrice',
-      title: "".concat(text, "\u9000\u8D27\u91D1\u989D"),
+      title: "".concat(text, "\u9000\u6B3E\u91D1\u989D"),
       align: 'center',
       ellipsis: true,
       width: 100
@@ -21106,17 +21723,18 @@ var getColumns$2 = function getColumns(_ref) {
 };
 
 var getYesOrNo$4 = function getYesOrNo(val) {
+  var content = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['是', '否'];
   switch (val) {
     case true:
     case '1':
     case 1:
-      return '是';
+      return content[0];
     case false:
     case '0':
     case 0:
       return '否';
     default:
-      return null;
+      return content[1];
   }
 };
 
@@ -21315,7 +21933,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
       }
     }, {
       dataIndex: 'isPackage',
@@ -21547,7 +22165,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
       }
     }, {
       dataIndex: 'isPackage',
@@ -22694,10 +23312,14 @@ var getColumns$5 = function getColumns() {
     }, {
       dataIndex: 'qty',
       title: "\u7533\u8BF7\u6570\u91CF",
+      conditionTitle: "\u7533\u8BF7\u603B\u6570\u91CF",
       width: 150,
       align: 'center',
       ellipsis: true,
-      render: renderTextEllipsis
+      render: renderTextEllipsis,
+      conditionOptionsSetting: {
+        dataType: 'number'
+      }
     }, {
       dataIndex: 'rQty',
       title: "\u5B9E\u6536\u9000\u8D27\u6570\u91CF",
@@ -24567,7 +25189,7 @@ var getColumns$a = function getColumns() {
       },
       render: function render(_val, record, index) {
         var options = DxdSuppliersData.getInstance().getSuppliersBySkuCode(record === null || record === void 0 ? void 0 : record.skuCode);
-        return /*#__PURE__*/React.createElement(Select, {
+        return !disabled ? /*#__PURE__*/React.createElement(Select, {
           style: {
             width: '100%'
           },
@@ -24587,7 +25209,7 @@ var getColumns$a = function getColumns() {
               supplierName: (_opt$label = opt === null || opt === void 0 ? void 0 : opt.label) !== null && _opt$label !== void 0 ? _opt$label : ''
             }, index);
           }
-        });
+        }) : DxdSuppliersData.getInstance().getSupplierNameByCode(record === null || record === void 0 ? void 0 : record.supplierCode);
       },
       conditionOptionsSetting: {
         dataType: 'weakenArray',
@@ -24629,7 +25251,128 @@ var getColumns$a = function getColumns() {
   };
 };
 
-var getColumns$b = function getColumns(_ref) {
+var TTX_BOM_TYPE_MAP = {
+  '0': '正常品',
+  '1': '实物组套',
+  '2': '虚拟组套',
+  '3': '虚拟组套子品',
+  '4': '虚拟品'
+};
+var getTtxBomTypeName = function getTtxBomTypeName(value) {
+  var _TTX_BOM_TYPE_MAP$Str;
+  return (_TTX_BOM_TYPE_MAP$Str = TTX_BOM_TYPE_MAP[String(value)]) !== null && _TTX_BOM_TYPE_MAP$Str !== void 0 ? _TTX_BOM_TYPE_MAP$Str : value;
+};
+var getColumns$b = function getColumns() {
+  return {
+    TTX_GOODS: [{
+      dataIndex: 'skuName',
+      title: 'SKU名称',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuCode',
+      title: 'SKU编码',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sourceSpuId',
+      title: '平台商品ID',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sourceSkuId',
+      title: '平台SKU ID',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'requestQty',
+      title: '要求发货数量',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shipQty',
+      title: '已发货数量',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'returnQty',
+      title: '退货数量',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'listPrice',
+      title: '零售价/标价',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'netPrice',
+      title: '客户实付单价',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'msrPrice',
+      title: '建议零售价',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'itemTotalAmount',
+      title: '商品总金额',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'totalPayAmount',
+      title: '实付金额',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      width: 150,
+      render: function render(value) {
+        return renderTextEllipsis(getYesOrNo$4(value));
+      },
+      renderExport: getYesOrNo$4,
+      headerMapping: {
+        transformValue: getYesOrNo$4,
+        renderExport: getYesOrNo$4
+      }
+    }, {
+      dataIndex: 'bomType',
+      title: 'BOM类型',
+      width: 150,
+      render: function render(value) {
+        return renderTextEllipsis(getTtxBomTypeName(value));
+      },
+      renderExport: getTtxBomTypeName,
+      headerMapping: {
+        transformValue: getTtxBomTypeName,
+        renderExport: getTtxBomTypeName
+      }
+    }, {
+      dataIndex: 'bomSkuCode',
+      title: 'BOM商品编码',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'platformSpuCode',
+      title: '商品货号',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'platformSkuCode',
+      title: 'SKU货号',
+      width: 150,
+      render: renderTextEllipsis
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
+  };
+};
+
+var getColumns$c = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
@@ -24739,6 +25482,18 @@ var getColumns$b = function getColumns(_ref) {
   };
 };
 
+var MIN_COLUMN_WIDTH = 80;
+var MAX_COLUMN_WIDTH = 600;
+var resolveColumnWidth = function resolveColumnWidth(width, defaultWidth) {
+  if (width === undefined || width === null || width === '') {
+    return defaultWidth;
+  }
+  var parsedWidth = Number(width);
+  if (!isFinite(parsedWidth)) {
+    return defaultWidth;
+  }
+  return Math.min(MAX_COLUMN_WIDTH, Math.max(MIN_COLUMN_WIDTH, Math.round(parsedWidth)));
+};
 var getColumnsMap$1 = function getColumnsMap(args) {
   var _ref = args || {},
     _ref$text = _ref.text,
@@ -24746,7 +25501,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle,
     updateDataHandle = _ref.updateDataHandle;
-  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -24795,8 +25550,8 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     disabled: disabled,
     updateHandle: updateHandle,
     updateDataHandle: updateDataHandle
-  })), {}, {
-    default: getColumns$b({
+  })), getColumns$b()), {}, {
+    default: getColumns$c({
       text: text,
       disabled: disabled,
       updateHandle: updateHandle
@@ -24832,11 +25587,13 @@ var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
   var newColumns = {};
   Object.keys(clone_columnsMap).forEach(function (key) {
     newColumns[key] = clone_columnsMap[key].map(function (col) {
-      return {
+      return _objectSpread2({
         title: col.title,
         dataIndex: col.dataIndex,
         disabled: !!col.validator
-      };
+      }, key === 'KM_REISSUE_GOODS' ? {
+        width: col.width
+      } : {});
     });
   });
   return newColumns;
@@ -24949,6 +25706,9 @@ var isErpType = {
   },
   isWln: function isWln(type) {
     return ['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(type);
+  },
+  isTtx: function isTtx(type) {
+    return ['TTX_GOODS'].includes(type);
   }
 };
 var processGoods$1 = function processGoods(_ref) {
@@ -25015,6 +25775,12 @@ var processGoods$1 = function processGoods(_ref) {
       canUpdateNumber: canUpdateNumber,
       source: source
     });
+  } else if (isErpType.isTtx(type)) {
+    newList = processTtxGoods$1({
+      list: list,
+      type: type,
+      canUpdateNumber: canUpdateNumber
+    });
   } else {
     newList = processDefaultGoods({
       list: list,
@@ -25025,9 +25791,21 @@ var processGoods$1 = function processGoods(_ref) {
   }
   return newList;
 };
-var processJyGoods = function processJyGoods(_ref2) {
+var processTtxGoods$1 = function processTtxGoods(_ref2) {
   var list = _ref2.list,
     canUpdateNumber = _ref2.canUpdateNumber;
+  return list.map(function (item) {
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      uuid: (item === null || item === void 0 ? void 0 : item.uuid) || uuid(),
+      canDelete: true,
+      canEdit: true,
+      canUpdateNumber: canUpdateNumber
+    });
+  });
+};
+var processJyGoods = function processJyGoods(_ref3) {
+  var list = _ref3.list,
+    canUpdateNumber = _ref3.canUpdateNumber;
   return list.map(function (item) {
     var goodName = item.goodName,
       goodNo = item.goodNo,
@@ -25063,9 +25841,9 @@ var processJyGoods = function processJyGoods(_ref2) {
     });
   });
 };
-var processJkyGoods$1 = function processJkyGoods(_ref3) {
-  var list = _ref3.list,
-    canUpdateNumber = _ref3.canUpdateNumber;
+var processJkyGoods$1 = function processJkyGoods(_ref4) {
+  var list = _ref4.list,
+    canUpdateNumber = _ref4.canUpdateNumber;
   return list.map(function (item) {
     var goodName = item.goodName,
       goodNo = item.goodNo,
@@ -25097,9 +25875,9 @@ var processJkyGoods$1 = function processJkyGoods(_ref3) {
     });
   });
 };
-var processWlnGoods$1 = function processWlnGoods(_ref4) {
-  var list = _ref4.list,
-    canUpdateNumber = _ref4.canUpdateNumber;
+var processWlnGoods$1 = function processWlnGoods(_ref5) {
+  var list = _ref5.list,
+    canUpdateNumber = _ref5.canUpdateNumber;
   return list.map(function (item) {
     var goodName = item.goodName,
       goodShortName = item.goodShortName,
@@ -25150,10 +25928,10 @@ var processWlnGoods$1 = function processWlnGoods(_ref4) {
   });
 };
 // 处理不同类型的商品数据
-var processWdtGoods$1 = function processWdtGoods(_ref5) {
-  var list = _ref5.list,
-    type = _ref5.type,
-    canUpdateNumber = _ref5.canUpdateNumber;
+var processWdtGoods$1 = function processWdtGoods(_ref6) {
+  var list = _ref6.list,
+    type = _ref6.type,
+    canUpdateNumber = _ref6.canUpdateNumber;
   return list.map(function (item) {
     var processedItem = _objectSpread2(_objectSpread2({}, item), {}, {
       uuid: uuid(),
@@ -25171,9 +25949,9 @@ var processWdtGoods$1 = function processWdtGoods(_ref5) {
     return processedItem;
   });
 };
-var processBsE3Goods$1 = function processBsE3Goods(_ref6) {
-  var list = _ref6.list,
-    canUpdateNumber = _ref6.canUpdateNumber;
+var processBsE3Goods$1 = function processBsE3Goods(_ref7) {
+  var list = _ref7.list,
+    canUpdateNumber = _ref7.canUpdateNumber;
   return list.map(function (item) {
     var specNo = item.specNo,
       specId = item.specId,
@@ -25208,9 +25986,9 @@ var processBsE3Goods$1 = function processBsE3Goods(_ref6) {
     });
   });
 };
-var processGyGoods$1 = function processGyGoods(_ref7) {
-  var list = _ref7.list,
-    source = _ref7.source;
+var processGyGoods$1 = function processGyGoods(_ref8) {
+  var list = _ref8.list,
+    source = _ref8.source;
   var isFormWorkOrder = source === 'workOrder';
   return list.map(function (item) {
     var goodName = item.goodName,
@@ -25237,8 +26015,8 @@ var processGyGoods$1 = function processGyGoods(_ref7) {
     });
   });
 };
-var processJstGoods$1 = function processJstGoods(_ref8) {
-  var list = _ref8.list;
+var processJstGoods$1 = function processJstGoods(_ref9) {
+  var list = _ref9.list;
   return list.map(function (item) {
     return {
       name: item.goodName,
@@ -25256,9 +26034,9 @@ var processJstGoods$1 = function processJstGoods(_ref8) {
     };
   });
 };
-var processKmGoods$1 = function processKmGoods(_ref9) {
-  var list = _ref9.list,
-    type = _ref9.type;
+var processKmGoods$1 = function processKmGoods(_ref10) {
+  var list = _ref10.list,
+    type = _ref10.type;
   var initParamsMap = {
     KM_GOODS: {
       num: 1
@@ -25276,7 +26054,7 @@ var processKmGoods$1 = function processKmGoods(_ref9) {
   return list.map(function (item) {
     return _objectSpread2(_objectSpread2({}, item), {}, {
       skuPropertiesName: item.specName,
-      sysSkuPropertiesName: item.specId,
+      sysSkuPropertiesName: item.propertiesValue,
       sysTitle: item.goodName,
       title: null,
       shortTitle: item.goodShortName,
@@ -25297,9 +26075,9 @@ var processKmGoods$1 = function processKmGoods(_ref9) {
     }, initParamsMap[type] || {});
   });
 };
-var processDefaultGoods = function processDefaultGoods(_ref10) {
-  var list = _ref10.list,
-    canUpdateNumber = _ref10.canUpdateNumber;
+var processDefaultGoods = function processDefaultGoods(_ref11) {
+  var list = _ref11.list,
+    canUpdateNumber = _ref11.canUpdateNumber;
   return list.map(function (item) {
     var goodsId = item.goodsId,
       name = item.name,
@@ -25365,6 +26143,7 @@ var systemOrderNoMap = {
   JKY_GOODS: 'tradeNo',
   JKY_REISSUE_GOODS: 'tradeNo',
   DXD_GOODS: 'orderNo',
+  TTX_GOODS: 'code',
   WLN_REISSUE_GOODS: 'tradeNo',
   KM_REISSUE_GOODS: 'sid',
   KM_RETURN_GOODS: 'sid',
@@ -25400,7 +26179,6 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     _ref$isReloadSelectTa = _ref.isReloadSelectTable,
     isReloadSelectTable = _ref$isReloadSelectTa === void 0 ? false : _ref$isReloadSelectTa,
     validSystemOrderFn = _ref.validSystemOrderFn;
-  console.log('systemOrders---', systemOrders);
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     selectSystemNo = _useState2[0],
@@ -25672,6 +26450,8 @@ var GoodItem$1 = function GoodItem(props) {
     otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
+    _props$notAllowedOper = props.notAllowedOperation,
+    notAllowedOperation = _props$notAllowedOper === void 0 ? false : _props$notAllowedOper,
     shopCode = props.shopCode,
     _props$companyKey = props.companyKey,
     companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
@@ -25695,7 +26475,7 @@ var GoodItem$1 = function GoodItem(props) {
   // const isShowSelectTradeGoods =
   //   type !== 'JST_EXCHANGE_GOODS' || jstReturnGoods?.jstSystemOrderNo;
   // 判断是否为是否展示系统单筛选项
-  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;
+  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', 'TTX_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;
   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;
   var refModal = useRef();
   console.debug('表格数据', value);
@@ -25793,6 +26573,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'JKY_REISSUE_GOODS':
         case 'DXD_GOODS':
         case 'DXD_SUPPLIERS':
+        case 'TTX_GOODS':
         case 'WLN_REISSUE_GOODS':
         case 'SKX_GOODS':
         case 'SKX_RETURN_GOODS':
@@ -25858,7 +26639,9 @@ var GoodItem$1 = function GoodItem(props) {
         });
         // 如果列应该显示（show不为false）或者有验证器，则返回对应的列配置
         if (currentCol && (col.show !== false || (currentCol === null || currentCol === void 0 ? void 0 : currentCol.validator))) {
-          return currentCol;
+          return _objectSpread2(_objectSpread2({}, currentCol), {}, {
+            width: resolveColumnWidth(col.width, currentCol.width)
+          });
         }
         return undefined;
       }).filter(Boolean);
@@ -25880,14 +26663,14 @@ var GoodItem$1 = function GoodItem(props) {
       render: function render(val, record, index) {
         return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
           index: index,
-          hoveredRowIndex: !disabled && (record.canDelete || canDelete) ? hoveredRowIndex : null,
+          hoveredRowIndex: !disabled && !notAllowedOperation && (record.canDelete || canDelete) ? hoveredRowIndex : null,
           handleClick: function handleClick() {
             return handleDelete(record, index);
           }
         });
       }
     }].concat(_toConsumableArray(baseInfoColumns));
-    if (!disabled) {
+    if (!disabled && !notAllowedOperation) {
       columnList.push({
         dataIndex: '',
         title: "\u64CD\u4F5C",
@@ -25929,22 +26712,11 @@ var GoodItem$1 = function GoodItem(props) {
       }
     }].concat(_toConsumableArray(list));
   }, [showHeader, value, disabled, hoveredRowIndex]);
-  var orderColumns = useMemo(function () {
-    var columns = COLUMNS_MAP('', {
-      operate: false,
-      disabled: true
-    })(type);
-    return [{
-      dataIndex: '',
-      title: '序号',
-      align: 'center',
-      ellipsis: true,
-      width: 50,
-      render: function render(val, record, index) {
-        return /*#__PURE__*/React.createElement("span", null, index + 1);
-      }
-    }].concat(_toConsumableArray(columns));
-  }, []);
+  var tableScrollX = useMemo(function () {
+    return newColumns.reduce(function (total, column) {
+      return total + (Number(column.width) || 0);
+    }, 0);
+  }, [newColumns]);
   var onSubmit = function onSubmit(list) {
     var newList = processGoods$1({
       list: list,
@@ -25984,7 +26756,7 @@ var GoodItem$1 = function GoodItem(props) {
   var validSystemOrder = useMemo(function () {
     return ['GY_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'KM_REISSUE_GOODS'].includes(type) && !hasSelectedSystemOrder;
   }, [type, hasSelectedSystemOrder]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && !notAllowedOperation && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
     style: {
       float: 'right'
     }
@@ -26024,7 +26796,7 @@ var GoodItem$1 = function GoodItem(props) {
     size: "small",
     pagination: false,
     scroll: {
-      x: '100%'
+      x: tableScrollX
     },
     locale: {
       emptyText: '暂无数据'
@@ -26039,7 +26811,7 @@ var GoodItem$1 = function GoodItem(props) {
         }
       };
     }
-  })), /*#__PURE__*/React.createElement(TheGoodsModal, {
+  })), showErpGoodsBtn && /*#__PURE__*/React.createElement(TheGoodsModal, {
     ref: refModal,
     onSubmit: onSubmit,
     width: width,
@@ -26720,12 +27492,13 @@ var getWdtOrderListSingleton = function getWdtOrderListSingleton(orderNo) {
           var _data$data, _data$data$trades;
           if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$trades = _data$data.trades) === null || _data$data$trades === void 0 ? void 0 : _data$data$trades.length) {
             data.data.trades = filterWdtOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
-              var _tradeStatusMap$data$;
+              var _tradeStatusMap$data$, _warehouseTypeMap$dat;
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 billNo: item.tradeNo,
                 billType: WDT_ORDER_TYPE_MAP[item.tradeType],
                 billTag: item.tagName || item.tags,
                 tradeStatusValue: tradeStatusMap === null || tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$data$ = tradeStatusMap[data.data.version]) === null || _tradeStatusMap$data$ === void 0 ? void 0 : _tradeStatusMap$data$[item.tradeStatus],
+                warehouseType: warehouseTypeMap === null || warehouseTypeMap === void 0 ? void 0 : (_warehouseTypeMap$dat = warehouseTypeMap[data.data.version]) === null || _warehouseTypeMap$dat === void 0 ? void 0 : _warehouseTypeMap$dat[item.warehouseType],
                 logisticsName: ExpressData.getInstance('wdt').getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
               });
             });
@@ -27079,6 +27852,16 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
         }
       }).then(function (data) {
         if (data === null || data === void 0 ? void 0 : data.success) {
+          var _data$data, _data$data$doOrders;
+          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) {
+            var _data$data2;
+            (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.doOrders.forEach(function (item) {
+              item.platformOrderNo = data.platformOrderNo;
+              item.shopCode = data.shopCode;
+              item.shopName = data.shopName;
+              item.split = data.split;
+            });
+          }
           resolve((data === null || data === void 0 ? void 0 : data.data) || {});
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
@@ -27098,13 +27881,43 @@ var dxdUtils = {
 };
 
 var singletonMap$9 = new Map();
+var normalizeOrder = function normalizeOrder(entry) {
+  return _objectSpread2(_objectSpread2({}, (entry === null || entry === void 0 ? void 0 : entry.header) || entry), {}, {
+    details: (entry === null || entry === void 0 ? void 0 : entry.details) || []
+  });
+};
+var getOrderListSingleton$3 = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$9.has(orderNo)) {
+    var promise = extendRequest('/qy/gdfw/ttx/erp/orderDetail', {
+      method: 'post',
+      data: {
+        sourceOrderCode: orderNo
+      }
+    }).then(function (response) {
+      var data = response === null || response === void 0 ? void 0 : response.data;
+      return Array.isArray(data) ? data.map(normalizeOrder) : [];
+    });
+    singletonMap$9.set(orderNo, promise);
+    promise.finally(function () {
+      setTimeout(function () {
+        return singletonMap$9.delete(orderNo);
+      }, 10000);
+    });
+  }
+  return singletonMap$9.get(orderNo);
+};
+var ttxUtils = {
+  getOrderListSingleton: getOrderListSingleton$3
+};
+
+var singletonMap$a = new Map();
 var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
   var cacheKey = "".concat(params.orderNo, "_").concat(params.shopId);
-  if (!singletonMap$9.has(cacheKey)) {
+  if (!singletonMap$a.has(cacheKey)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
         // 清空掉错误的请求记录
-        singletonMap$9.delete(cacheKey);
+        singletonMap$a.delete(cacheKey);
         reject(err);
       };
       extendRequest('/qy/gdfw/order/queryTradeAfterSaleList', {
@@ -27115,28 +27928,28 @@ var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
           resolve(res.data || []);
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$9.delete(cacheKey);
+            singletonMap$a.delete(cacheKey);
           }, 1000 * 10);
         } else {
           doReject(res);
         }
       }).catch(doReject);
     });
-    singletonMap$9.set(cacheKey, p);
+    singletonMap$a.set(cacheKey, p);
   }
-  return singletonMap$9.get(cacheKey);
+  return singletonMap$a.get(cacheKey);
 };
 var platformUtils = {
   getAfterSalesOrderList: getAfterSalesOrderList
 };
 
-var singletonMap$a = new Map();
-var getOrderListSingleton$3 = function getOrderListSingleton(orderNo) {
-  if (!singletonMap$a.has(orderNo)) {
+var singletonMap$b = new Map();
+var getOrderListSingleton$4 = function getOrderListSingleton(orderNo) {
+  if (!singletonMap$b.has(orderNo)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
         // 清空掉错误的请求记录
-        singletonMap$a.delete(orderNo);
+        singletonMap$b.delete(orderNo);
         reject(err);
       };
       extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
@@ -27162,24 +27975,23 @@ var getOrderListSingleton$3 = function getOrderListSingleton(orderNo) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$a.delete(orderNo);
+            singletonMap$b.delete(orderNo);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$a.set(orderNo, p);
+    singletonMap$b.set(orderNo, p);
   }
-  return singletonMap$a.get(orderNo);
+  return singletonMap$b.get(orderNo);
 };
 var kmUtils = {
-  getOrderListSingleton: getOrderListSingleton$3
+  getOrderListSingleton: getOrderListSingleton$4
 };
 
 var _excluded$k = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"],
-  _excluded2 = ["shopCode"],
-  _excluded3 = ["doOrders", "isSplit", "billNo", "billType", "billTag", "sysStatus"];
+  _excluded2 = ["shopCode"];
 var columnsMap = {
   BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
@@ -27192,7 +28004,8 @@ var columnsMap = {
   JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
   WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
   PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns,
-  DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
+  DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns,
+  TTX_SYSTEM_ORDER: TTX_SYSTEM_ORDER_CONFIG.columns
 };
 var rowKeyMap = {
   BS_SYSTEM_ORDER: 'billNo',
@@ -27206,7 +28019,8 @@ var rowKeyMap = {
   JKY_SYSTEM_ORDER: 'tradeNo',
   WDT_RETURN_BILL_NO: 'refundNo',
   PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId',
-  DXD_SYSTEM_ORDER: 'billNo'
+  DXD_SYSTEM_ORDER: 'billNo',
+  TTX_SYSTEM_ORDER: 'code'
 };
 var RADIO_TABLE_KEYS = ['PLATFORM_AFTER_SALES_ORDER'];
 var index$2 = (function (props) {
@@ -27272,6 +28086,8 @@ var index$2 = (function (props) {
         getJkyOrderList(value.orderNo);
       } else if (type === 'DXD_SYSTEM_ORDER') {
         getDxdOrderList(value.orderNo);
+      } else if (type === 'TTX_SYSTEM_ORDER') {
+        getTtxOrderList(value.orderNo);
       } else if (type === 'PLATFORM_AFTER_SALES_ORDER') {
         value.shopId && getPlatformAfterSalesOrderList(value.orderNo, value.shopId);
       }
@@ -27347,6 +28163,14 @@ var index$2 = (function (props) {
         false: '否'
       };
     }
+    if (type === 'TTX_SYSTEM_ORDER') {
+      map['internalOrderType'] = _objectSpread2({}, TTX_INTERNAL_ORDER_TYPE_MAP);
+      map['status'] = _objectSpread2({}, TTX_STATUS_MAP);
+      map['split'] = {
+        '1': '拆单',
+        '0': ''
+      };
+    }
     return map;
   }, [type]);
   // 过滤后的表格数据 - 根据选中字段和关键词模糊匹配（不区分大小写）
@@ -27694,44 +28518,17 @@ var index$2 = (function (props) {
       return _regeneratorRuntime().wrap(function _callee11$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
-            dxdUtils.getOrderListSingleton(orderNo).then(function (trades) {
-              var formatDxdOrders = (trades || []).reduce(function (prv, trade) {
-                var _ref15 = trade || {},
-                  _ref15$doOrders = _ref15.doOrders,
-                  doOrders = _ref15$doOrders === void 0 ? [] : _ref15$doOrders,
-                  isSplit = _ref15.isSplit,
-                  billNo = _ref15.billNo,
-                  billType = _ref15.billType,
-                  billTag = _ref15.billTag,
-                  sysStatus = _ref15.sysStatus,
-                  restTrade = _objectWithoutProperties(_ref15, _excluded3);
-                if (!doOrders.length) {
-                  prv.push(_objectSpread2(_objectSpread2({}, restTrade), {}, {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag,
-                    sysStatus: sysStatus,
-                    isSplit: isSplit,
-                    rowKey: billNo
-                  }));
-                  return prv;
-                }
-                doOrders.forEach(function (doOrder, index) {
-                  var currentOrderNo = doOrder === null || doOrder === void 0 ? void 0 : doOrder.orderNo;
-                  prv.push(_objectSpread2(_objectSpread2(_objectSpread2({}, restTrade), doOrder), {}, {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag,
-                    sysStatus: sysStatus,
-                    isSplit: isSplit,
-                    rowKey: currentOrderNo ? "".concat(billNo, "_").concat(currentOrderNo) : "".concat(billNo, "_").concat(index)
-                  }));
+            dxdUtils.getOrderListSingleton(orderNo).then(function (trade) {
+              var _trade$doOrders;
+              var data = (_trade$doOrders = trade.doOrders) === null || _trade$doOrders === void 0 ? void 0 : _trade$doOrders.map(function (order) {
+                return _objectSpread2(_objectSpread2({}, order), {}, {
+                  billNo: order.orderNo,
+                  billType: (trade === null || trade === void 0 ? void 0 : trade.split) ? '拆分订单' : '普通订单'
                 });
-                return prv;
-              }, []);
+              });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
-                orders: formatDxdOrders,
-                showOrderInfo: formatDxdOrders
+                orders: data || [],
+                showOrderInfo: data || []
               }));
             });
             onceRef.current = false;
@@ -27745,6 +28542,34 @@ var index$2 = (function (props) {
       return _ref14.apply(this, arguments);
     };
   }();
+  var getTtxOrderList = /*#__PURE__*/function () {
+    var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(orderNo) {
+      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
+          case 0:
+            ttxUtils.getOrderListSingleton(orderNo).then(function (data) {
+              var orders = (data || []).map(function (order) {
+                return _objectSpread2(_objectSpread2({}, order), {}, {
+                  code: order.code || order.orderCode || order.orderNo,
+                  billNo: order.code || order.orderCode || order.orderNo
+                });
+              });
+              _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
+                orders: orders,
+                showOrderInfo: orders
+              }));
+            });
+            onceRef.current = false;
+          case 2:
+          case "end":
+            return _context12.stop();
+        }
+      }, _callee12);
+    }));
+    return function getTtxOrderList(_x13) {
+      return _ref15.apply(this, arguments);
+    };
+  }();
   var rowKey = rowKeyMap[type] || 'billNo';
   var handleRadioChange = function handleRadioChange(record) {
     var _value$selectIds;
@@ -28219,16 +29044,16 @@ var orderSubFormConstants = {
 };
 
 var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
-var singletonMap$b = new Map();
-var getOrderListSingleton$4 = function getOrderListSingleton(parmas) {
+var singletonMap$c = new Map();
+var getOrderListSingleton$5 = function getOrderListSingleton(parmas) {
   var orderNo = parmas.orderNo,
     shopId = parmas.shopId;
   var key = "".concat(orderNo, "-").concat(shopId);
-  if (!singletonMap$b.has(key)) {
+  if (!singletonMap$c.has(key)) {
     var p = new Promise(function (resolve, reject) {
       var doReject = function doReject(err) {
         // 清空掉错误的请求记录
-        singletonMap$b.delete(key);
+        singletonMap$c.delete(key);
         reject(err);
       };
       extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
@@ -28244,16 +29069,16 @@ var getOrderListSingleton$4 = function getOrderListSingleton(parmas) {
           }
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {
-            singletonMap$b.delete(key);
+            singletonMap$c.delete(key);
           }, 1000 * 10);
         } else {
           doReject(data);
         }
       }).catch(doReject);
     });
-    singletonMap$b.set(key, p);
+    singletonMap$c.set(key, p);
   }
-  return singletonMap$b.get(key);
+  return singletonMap$c.get(key);
 };
 var renderEditItem = function renderEditItem(_ref) {
   var item = _ref.item,
@@ -28385,7 +29210,7 @@ var renderDetailItem = function renderDetailItem(_ref2) {
   return Component;
 };
 var utils = {
-  getOrderListSingleton: getOrderListSingleton$4,
+  getOrderListSingleton: getOrderListSingleton$5,
   renderEditItem: renderEditItem,
   renderDetailItem: renderDetailItem
 };
@@ -28393,7 +29218,7 @@ var utils = {
 var getOrderSubformColumns$1 = orderSubFormConstants.getOrderSubformColumns;
 var renderEditItem$1 = utils.renderEditItem,
   renderDetailItem$1 = utils.renderDetailItem,
-  getOrderListSingleton$5 = utils.getOrderListSingleton;
+  getOrderListSingleton$6 = utils.getOrderListSingleton;
 var OrderSubForm = function OrderSubForm(props) {
   var _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
@@ -28595,7 +29420,7 @@ var OrderSubForm = function OrderSubForm(props) {
     var JOIN_SHOP = shopList === null || shopList === void 0 ? void 0 : shopList.find(function (item) {
       return !item.notJoin && item.shopId == shopId;
     });
-    return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$5({
+    return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$6({
       orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
       shopId: shopId
     }).then(function (data) {
@@ -28692,6 +29517,9 @@ var isErpType$1 = {
   },
   isDxd: function isDxd(type) {
     return ['DXD_GOODS', 'DXD_SUPPLIERS'].includes(type);
+  },
+  isTtx: function isTtx(type) {
+    return ['TTX_GOODS'].includes(type);
   }
 };
 var processAllOrders = function processAllOrders(_ref) {
@@ -28726,7 +29554,13 @@ var processAllOrders = function processAllOrders(_ref) {
     });
   } else if (isErpType$1.isDxd(type)) {
     // DXD 选品用出库订单 doOrders（每项含 skus[]）
-    newList = (data === null || data === void 0 ? void 0 : data.doOrders) || [];
+    newList = processDxdOrders({
+      data: data
+    });
+  } else if (isErpType$1.isTtx(type)) {
+    newList = processTtxOrders({
+      data: data
+    });
   } else {
     newList = processDefaultOrders({
       data: data
@@ -28773,8 +29607,32 @@ var processWlnOrders = function processWlnOrders(_ref6) {
   var data = _ref6.data;
   return (data === null || data === void 0 ? void 0 : data.orders) || [];
 };
-var processDefaultOrders = function processDefaultOrders(_ref7) {
+var processDxdOrders = function processDxdOrders(_ref7) {
+  var _data$doOrders;
   var data = _ref7.data;
+  var _ref8 = data || {},
+    isSplit = _ref8.isSplit,
+    billNo = _ref8.billNo,
+    billType = _ref8.billType,
+    billTag = _ref8.billTag,
+    sysStatus = _ref8.sysStatus;
+  var trades = (_data$doOrders = data.doOrders) === null || _data$doOrders === void 0 ? void 0 : _data$doOrders.map(function (item) {
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      billNo: billNo,
+      billType: billType,
+      billTag: billTag,
+      isSplit: isSplit,
+      sysStatus: sysStatus
+    });
+  });
+  return trades;
+};
+var processTtxOrders = function processTtxOrders(_ref9) {
+  var data = _ref9.data;
+  return Array.isArray(data) ? data : [];
+};
+var processDefaultOrders = function processDefaultOrders(_ref10) {
+  var data = _ref10.data;
   return data || [];
 };
 
@@ -29063,6 +29921,23 @@ var componentMap$2 = {
       changeShopCode: 'dxdSuppliersChangeShopCode'
     }
   },
+  TTX_GOODS: {
+    type: 'ttx',
+    key: 'ttxGoods',
+    name: '通天晓',
+    orderNo: 'code',
+    goodDetailOrderNo: 'code',
+    hiddenErpGoodsBtn: true,
+    eventNameMap: {
+      type: 'ttxType',
+      updateGoodsHandle: updateTtxGoodsHandle,
+      selectListReturn: 'ttxSelectListReturn',
+      selectList: 'ttxSelectList',
+      changeShopCode: 'ttxChangeShopCode',
+      deleteGood: 'ttxDeleteGood'
+    },
+    getOrderList: ttxUtils.getOrderListSingleton
+  },
   WLN_GOODS: {
     type: 'jky',
     key: 'wlnGoods',
@@ -29129,13 +30004,13 @@ var componentMap$2 = {
 var CommonGoods = function CommonGoods(props) {
   var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7, _componentMap$compTyp8;
   var value = props.value,
-    rawDisabled = props.disabled,
+    disabled = props.disabled,
     onChange = props.onChange,
     compType = props.type;
   // DXD_SUPPLIERS 纯镜像 DXD_GOODS（由 FormRender useWatch 联动同步增删），禁用独立增删
-  var disabled = rawDisabled || compType === 'DXD_SUPPLIERS';
   // console.log('value?.orders', value?.orders);
   // 合并单订单会包含","
+  var notAllowedOperation = ['DXD_SUPPLIERS'].includes(compType);
   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) {
     var _order$componentMap$c;
     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(',');
@@ -29493,7 +30368,6 @@ var CommonGoods = function CommonGoods(props) {
         orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
         type: compType
       });
-      console.log('list---', list);
       onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
         allOrders: list || []
       }));
@@ -29523,6 +30397,7 @@ var CommonGoods = function CommonGoods(props) {
     selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
     showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
     showErpGoodsBtn: !((_componentMap$compTyp8 = componentMap$2[compType]) === null || _componentMap$compTyp8 === void 0 ? void 0 : _componentMap$compTyp8.hiddenErpGoodsBtn),
+    notAllowedOperation: notAllowedOperation,
     tradeGoods: {
       originDataSource: originDataSource,
       getDataSourceAsync: getDataSourceAsync,
@@ -33021,10 +33896,11 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
   JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
   JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
   WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
-  DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
+  DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns,
+  TTX_SYSTEM_ORDER: TTX_SYSTEM_ORDER_CONFIG.columns
 };
 var FIELD_COLUMNS_MAP = {
   PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
 };
 
-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 };
+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, MAX_COLUMN_WIDTH, MIN_COLUMN_WIDTH, 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, YouzanStar, 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$b as getTtxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap, resolveColumnWidth };