@kmkf-fe-packages/basic-components 2.10.9-beta.1 → 2.10.9-beta.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.esm.js CHANGED
@@ -3,12 +3,13 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
3
3
  import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
4
4
  import request, { extend as extend$1 } from 'umi-request';
5
5
  import { CopyToClipboard } from 'react-copy-to-clipboard';
6
- import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
6
+ import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
7
7
  import every from 'lodash/every';
8
8
  import maxBy from 'lodash/maxBy';
9
9
  import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
10
10
  import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
11
11
  import zhCN from 'antd/lib/locale/zh_CN';
12
+ import Monitor from 'kmkf-monitor';
12
13
  import pubsub from 'pubsub-js';
13
14
  import { internals, useTablePipeline, features, BaseTable } from 'ali-react-table';
14
15
  import zh_CN from 'antd/lib/locale-provider/zh_CN';
@@ -7816,6 +7817,22 @@ var Province = function Province(props) {
7816
7817
  };
7817
7818
 
7818
7819
  var TextArea$1 = Input.TextArea;
7820
+ /**
7821
+ * 直辖市省份名称映射(带"市" → 不带"市")
7822
+ * 接口返回的 province 可能带"市"(如"重庆市"),但省市区下拉数据一级节点不带"市"(如"重庆"),
7823
+ * 此处做单向转换确保匹配。
7824
+ */
7825
+ var MUNICIPALITY_PROVINCE_MAP = {
7826
+ '北京市': '北京',
7827
+ '天津市': '天津',
7828
+ '上海市': '上海',
7829
+ '重庆市': '重庆'
7830
+ };
7831
+ /** 直辖市省份名称去"市"处理,普通省份保持原值 */
7832
+ var normalizeMunicipalityProvince = function normalizeMunicipalityProvince(province) {
7833
+ if (!province) return province;
7834
+ return MUNICIPALITY_PROVINCE_MAP[province] || province;
7835
+ };
7819
7836
  var ParseLogistics = function ParseLogistics(props) {
7820
7837
  var onChange = props.onChange,
7821
7838
  _props$selfCalibratio = props.selfCalibration;
@@ -7855,11 +7872,10 @@ var ParseLogistics = function ParseLogistics(props) {
7855
7872
  }
7856
7873
  }).then(function (res) {
7857
7874
  var data = res.data;
7858
- // 如果是通过内部校准添加的姓名和手机号,则去除
7859
- // if (needCalibration) {
7860
- // data.name = '';
7861
- // data.phone = '';
7862
- // }
7875
+ // 规范化直辖市省份名称,兼容接口带"市"、数据不带"市"的情况
7876
+ if (data === null || data === void 0 ? void 0 : data.province) {
7877
+ data.province = normalizeMunicipalityProvince(data.province);
7878
+ }
7863
7879
  onChange === null || onChange === void 0 ? void 0 : onChange(data);
7864
7880
  }).catch(function (e) {
7865
7881
  handleAIIdentify(fullAddress);
@@ -7885,6 +7901,10 @@ var ParseLogistics = function ParseLogistics(props) {
7885
7901
  }
7886
7902
  }).then(function (res) {
7887
7903
  var data = res.data;
7904
+ // 规范化直辖市省份名称,兼容接口带"市"、数据不带"市"的情况
7905
+ if (data === null || data === void 0 ? void 0 : data.province) {
7906
+ data.province = normalizeMunicipalityProvince(data.province);
7907
+ }
7888
7908
  onChange === null || onChange === void 0 ? void 0 : onChange(data);
7889
7909
  }).catch(function (e) {
7890
7910
  console.log(e);
@@ -8156,7 +8176,8 @@ var updateWorkTypeKeys = {
8156
8176
  REPAIR_ORDER_ID: 'repairOrderId',
8157
8177
  PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
8158
8178
  ACTUAL_RECEIPT_PAYMENT: 'actualReceiptPayment',
8159
- WDT_SHOP: 'shopCode'
8179
+ WDT_SHOP: 'shopCode',
8180
+ DXD_SHOP: 'shopCode'
8160
8181
  };
8161
8182
  var systemOrderMap = {
8162
8183
  BS_SYSTEM_ORDER: {
@@ -8203,6 +8224,11 @@ var systemOrderMap = {
8203
8224
  no: 'wdtReturnBillNo',
8204
8225
  ids: 'wdtReturnBillSelectIds',
8205
8226
  order: 'wdtReturnBillShowOrder'
8227
+ },
8228
+ DXD_SYSTEM_ORDER: {
8229
+ no: 'dxdSystemOrderNo',
8230
+ ids: 'dxdSystemSelectIds',
8231
+ order: 'dxdSystemShowOrder'
8206
8232
  }
8207
8233
  };
8208
8234
  //直接将key component 添加到 transformWorkOrderData中的componentProcessors
@@ -8670,6 +8696,7 @@ var processSceneStatus = function processSceneStatus(getValue) {
8670
8696
  BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
8671
8697
  MSG_STATUS: 'msgStatusValues',
8672
8698
  WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
8699
+ DXD_WAREHOUSING_STATUS: 'dxdInStockStatusItemList',
8673
8700
  JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
8674
8701
  JST_WAREHOUSING_STATUS: 'jstInStockStatusItemList',
8675
8702
  WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList',
@@ -8701,6 +8728,9 @@ var processErpLogistics = function processErpLogistics(getValue) {
8701
8728
  },
8702
8729
  SKX_LOGISTICS: {
8703
8730
  listKey: 'skxLogisticsList'
8731
+ },
8732
+ DXD_LOGISTICS: {
8733
+ listKey: 'dxdLogisticsList'
8704
8734
  }
8705
8735
  };
8706
8736
  var initValue = [{
@@ -8809,6 +8839,60 @@ var processJkyGoods = function processJkyGoods(templateColumns) {
8809
8839
  };
8810
8840
  };
8811
8841
  };
8842
+ var processDxdGoods = function processDxdGoods(templateColumns) {
8843
+ return function (getValue) {
8844
+ return function (nex, config) {
8845
+ var _values = {
8846
+ dxdGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_dxdGoods")), []),
8847
+ shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
8848
+ };
8849
+ var selectIds = [];
8850
+ var orderNo = '';
8851
+ var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8852
+ return col.workOrderComponentType === 'TRADE_ID_INPUT';
8853
+ });
8854
+ if (tradeId) {
8855
+ orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
8856
+ }
8857
+ var dxdSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8858
+ return col.workOrderComponentType === 'DXD_SYSTEM_ORDER';
8859
+ });
8860
+ if (dxdSystemOrder) {
8861
+ selectIds = jsonParseSecurity(getValue("".concat(dxdSystemOrder.uniqueKey, "_").concat(systemOrderMap[dxdSystemOrder.workOrderComponentType].ids)), []);
8862
+ }
8863
+ _values.selectIds = selectIds;
8864
+ _values.orderNo = orderNo;
8865
+ return _defineProperty({}, nex.uniqueKey, _values);
8866
+ };
8867
+ };
8868
+ };
8869
+ var processDxdSuppliers = function processDxdSuppliers(templateColumns) {
8870
+ return function (getValue) {
8871
+ return function (nex, config) {
8872
+ var _values = {
8873
+ dxdSuppliers: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_dxdSuppliers")), []),
8874
+ shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
8875
+ };
8876
+ var selectIds = [];
8877
+ var orderNo = '';
8878
+ var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8879
+ return col.workOrderComponentType === 'TRADE_ID_INPUT';
8880
+ });
8881
+ if (tradeId) {
8882
+ orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
8883
+ }
8884
+ var dxdSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8885
+ return col.workOrderComponentType === 'DXD_SYSTEM_ORDER';
8886
+ });
8887
+ if (dxdSystemOrder) {
8888
+ selectIds = jsonParseSecurity(getValue("".concat(dxdSystemOrder.uniqueKey, "_").concat(systemOrderMap[dxdSystemOrder.workOrderComponentType].ids)), []);
8889
+ }
8890
+ _values.selectIds = selectIds;
8891
+ _values.orderNo = orderNo;
8892
+ return _defineProperty({}, nex.uniqueKey, _values);
8893
+ };
8894
+ };
8895
+ };
8812
8896
  var processWdtGoods = function processWdtGoods(templateColumns) {
8813
8897
  return function (getValue) {
8814
8898
  return function (nex, config) {
@@ -9138,6 +9222,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
9138
9222
  no: 'wdtReturnBillNo',
9139
9223
  ids: 'wdtReturnBillSelectIds',
9140
9224
  order: 'wdtReturnBillShowOrder'
9225
+ },
9226
+ DXD_SYSTEM_ORDER: {
9227
+ no: 'dxdSystemOrderNo',
9228
+ ids: 'dxdSystemSelectIds',
9229
+ order: 'dxdSystemShowOrder'
9141
9230
  }
9142
9231
  };
9143
9232
  return _defineProperty({}, nex.uniqueKey, _objectSpread2({
@@ -9407,14 +9496,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
9407
9496
  };
9408
9497
  var processLabel = function processLabel(getValue) {
9409
9498
  return function (nex, config) {
9410
- var _ref77;
9411
- return _ref77 = {}, _defineProperty(_ref77, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref77, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref77;
9499
+ var _ref79;
9500
+ return _ref79 = {}, _defineProperty(_ref79, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref79, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref79;
9412
9501
  };
9413
9502
  };
9414
9503
  var processMemberLevel = function processMemberLevel(getValue) {
9415
9504
  return function (nex, config) {
9416
- var _ref78;
9417
- return _ref78 = {}, _defineProperty(_ref78, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref78, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref78;
9505
+ var _ref80;
9506
+ return _ref80 = {}, _defineProperty(_ref80, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref80, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref80;
9418
9507
  };
9419
9508
  };
9420
9509
  var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9520,6 +9609,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9520
9609
  BS_E3_WAREHOUSING_STATUS: processSceneStatus,
9521
9610
  MSG_STATUS: processSceneStatus,
9522
9611
  WDT_WAREHOUSING_STATUS: processSceneStatus,
9612
+ DXD_WAREHOUSING_STATUS: processSceneStatus,
9523
9613
  WLN_WAREHOUSING_STATUS: processSceneStatus,
9524
9614
  JKY_WAREHOUSING_STATUS: processSceneStatus,
9525
9615
  JST_WAREHOUSING_STATUS: processSceneStatus,
@@ -9530,6 +9620,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9530
9620
  GY_LOGISTICS: processErpLogistics,
9531
9621
  BS_E3_LOGISTICS: processErpLogistics,
9532
9622
  KM_LOGISTICS: processErpLogistics,
9623
+ DXD_LOGISTICS: processErpLogistics,
9533
9624
  BS_SEND_GOOD: processErpSendGood,
9534
9625
  WLN_SEND_GOOD: processErpSendGood,
9535
9626
  WDT_SEND_GOOD: processErpSendGood,
@@ -9541,6 +9632,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9541
9632
  BS_GOODS: processBsGoods,
9542
9633
  WDT_GOODS: processWdtGoods(templateColumns),
9543
9634
  JKY_GOODS: processJkyGoods(templateColumns),
9635
+ DXD_GOODS: processDxdGoods(templateColumns),
9636
+ DXD_SUPPLIERS: processDxdSuppliers(templateColumns),
9544
9637
  WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
9545
9638
  JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
9546
9639
  BS_E3_GOODS: processBsE3Goods(templateColumns),
@@ -9567,6 +9660,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9567
9660
  BS_E3_SYSTEM_ORDER: processErpSystemOrder,
9568
9661
  JST_SYSTEM_ORDER: processErpSystemOrder,
9569
9662
  GY_SYSTEM_ORDER: processErpSystemOrder,
9663
+ DXD_SYSTEM_ORDER: processErpSystemOrder,
9570
9664
  BUYER_MESSAGE_NOTICE: processBuyerMessageNotice,
9571
9665
  ORDER_TYPE: processOrderType,
9572
9666
  REFUND_TYPE: processRefundType,
@@ -9610,6 +9704,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9610
9704
  BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns),
9611
9705
  ACTUAL_RECEIPT_PAYMENT: processSingleField,
9612
9706
  WDT_SHOP: processSingleField,
9707
+ DXD_SHOP: processSingleField,
9613
9708
  KM_VIDEO: processKmVideo,
9614
9709
  WDT_TAGS: wdtTags,
9615
9710
  EXECUTE_ACTION_TYPE: processExecuteActionType,
@@ -14190,13 +14285,14 @@ var jstGoods = function jstGoods(props) {
14190
14285
  _props$platformType = props.platformType,
14191
14286
  platformType = _props$platformType === void 0 ? 'default' : _props$platformType,
14192
14287
  onlyShowFieldSelect = props.onlyShowFieldSelect,
14193
- logisticsCompanyFormType = props.logisticsCompanyFormType;
14288
+ logisticsCompanyFormType = props.logisticsCompanyFormType,
14289
+ form = props.form;
14194
14290
  var _useState = useState(0),
14195
14291
  _useState2 = _slicedToArray(_useState, 2),
14196
14292
  changeIndex = _useState2[0],
14197
14293
  setChangeIndex = _useState2[1]; //选中的包裹
14198
14294
  var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
14199
- var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln'].includes(platformType);
14295
+ var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln', 'dxd'].includes(platformType);
14200
14296
  var expressDateInstance = ExpressData.getInstance(platformType);
14201
14297
  var isSendGoodSavedId = isSelectName && !['jst', 'wln'].includes(platformType);
14202
14298
  useEffect(function () {
@@ -14205,6 +14301,28 @@ var jstGoods = function jstGoods(props) {
14205
14301
  onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
14206
14302
  }
14207
14303
  }, [value, type]);
14304
+ useEffect(function () {
14305
+ //丢失sendSnapshotName,未找到具体原因,兜底处理
14306
+ if (type === 3 && isSendGoodSavedId && value && value.length && value.some(function (item) {
14307
+ return !item.sendSnapshotName;
14308
+ }) && value.every(function (item) {
14309
+ return item.sendId;
14310
+ })) {
14311
+ var orderNo = form === null || form === void 0 ? void 0 : form.getFieldValue('m3ap1EvEyd');
14312
+ console.log('发货仓走兜底处理-oldValue--', orderNo, cloneDeep(value));
14313
+ var newValue = cloneDeep(value).map(function (item) {
14314
+ if (item.sendSnapshotName || !item.sendId) return item;
14315
+ return _objectSpread2(_objectSpread2({}, item), {}, {
14316
+ sendSnapshotName: SendDataCenter.getInstance(platformType).getSendNameByCode(item.sendId)
14317
+ });
14318
+ });
14319
+ Monitor.automaticReport({
14320
+ message: "\u53D1\u8D27\u4ED3\u8D70\u515C\u5E95\u5904\u7406-".concat(orderNo || '', "-oldValue-").concat(JSON.stringify(cloneDeep(value)), ",newValue-").concat(JSON.stringify(cloneDeep(newValue)))
14321
+ });
14322
+ console.log('发货仓走兜底处理-newValue--', orderNo, cloneDeep(newValue));
14323
+ onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
14324
+ }
14325
+ }, [JSON.stringify(value || []), type]);
14208
14326
  useEffect(function () {
14209
14327
  if (changeIndex > (value === null || value === void 0 ? void 0 : value.length) - 1) {
14210
14328
  setChangeIndex(0);
@@ -24388,7 +24506,160 @@ var getColumns$9 = function getColumns(_ref) {
24388
24506
  };
24389
24507
  };
24390
24508
 
24391
- var getColumns$a = function getColumns(_ref) {
24509
+ var getColumns$a = function getColumns() {
24510
+ var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
24511
+ disabled = _ref.disabled,
24512
+ updateDataHandle = _ref.updateDataHandle;
24513
+ return {
24514
+ // 大希地商品信息
24515
+ DXD_GOODS: [{
24516
+ dataIndex: 'skuName',
24517
+ title: 'SKU名称',
24518
+ width: 150,
24519
+ render: renderTextEllipsis
24520
+ }, {
24521
+ dataIndex: 'skuCode',
24522
+ title: 'SKU编码',
24523
+ width: 150,
24524
+ render: renderTextEllipsis
24525
+ }, {
24526
+ dataIndex: 'skuBarcode',
24527
+ title: 'SKU条码',
24528
+ width: 150,
24529
+ render: renderTextEllipsis
24530
+ }, {
24531
+ dataIndex: 'packageName',
24532
+ title: '套餐名称',
24533
+ width: 150,
24534
+ render: renderTextEllipsis
24535
+ }, {
24536
+ dataIndex: 'packageCode',
24537
+ title: '套餐编码',
24538
+ width: 150,
24539
+ render: renderTextEllipsis
24540
+ }, {
24541
+ dataIndex: 'platformItemId',
24542
+ title: '平台商品ID',
24543
+ width: 150,
24544
+ render: renderTextEllipsis
24545
+ }, {
24546
+ dataIndex: 'platformSkuId',
24547
+ title: '平台商品SKU ID',
24548
+ width: 150,
24549
+ render: renderTextEllipsis
24550
+ }, {
24551
+ dataIndex: 'quantity',
24552
+ title: '数量',
24553
+ width: 100,
24554
+ render: renderTextEllipsis
24555
+ }, {
24556
+ dataIndex: 'unit',
24557
+ title: '单位',
24558
+ width: 100,
24559
+ render: renderTextEllipsis
24560
+ }].map(function (item) {
24561
+ return _objectSpread2(_objectSpread2({}, item), {}, {
24562
+ align: 'center',
24563
+ ellipsis: true
24564
+ });
24565
+ }),
24566
+ // 大希地供应商商品信息
24567
+ DXD_SUPPLIERS: [{
24568
+ dataIndex: 'skuName',
24569
+ title: 'SKU名称',
24570
+ width: 150,
24571
+ render: renderTextEllipsis
24572
+ }, {
24573
+ dataIndex: 'skuCode',
24574
+ title: 'SKU编码',
24575
+ width: 150,
24576
+ render: renderTextEllipsis
24577
+ }, {
24578
+ dataIndex: 'skuBarcode',
24579
+ title: 'SKU条码',
24580
+ width: 150,
24581
+ render: renderTextEllipsis
24582
+ }, {
24583
+ dataIndex: 'supplierName',
24584
+ title: '供应商名称',
24585
+ width: 150,
24586
+ validator: function validator(_rule, value) {
24587
+ var title = '';
24588
+ if (((value === null || value === void 0 ? void 0 : value.dxdSuppliers) || []).some(function (goods) {
24589
+ var res = !(goods === null || goods === void 0 ? void 0 : goods.supplierCode);
24590
+ if (res) {
24591
+ title = (goods === null || goods === void 0 ? void 0 : goods.skuName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.skuName, "]") : '';
24592
+ }
24593
+ return res;
24594
+ })) {
24595
+ return Promise.reject("".concat(title, "\u4F9B\u5E94\u5546\u4E0D\u80FD\u4E3A\u7A7A"));
24596
+ }
24597
+ },
24598
+ render: function render(_val, record, index) {
24599
+ var options = DxdSuppliersData.getInstance().getSuppliersBySkuCode(record === null || record === void 0 ? void 0 : record.skuCode);
24600
+ return !disabled ? /*#__PURE__*/React.createElement(Select, {
24601
+ style: {
24602
+ width: '100%'
24603
+ },
24604
+ value: record === null || record === void 0 ? void 0 : record.supplierCode,
24605
+ options: options,
24606
+ allowClear: true,
24607
+ showSearch: true,
24608
+ optionFilterProp: "label",
24609
+ placeholder: "\u8BF7\u9009\u62E9\u4F9B\u5E94\u5546",
24610
+ onChange: function onChange(v) {
24611
+ var _opt$label;
24612
+ var opt = options.find(function (o) {
24613
+ return o.value === v;
24614
+ });
24615
+ updateDataHandle({
24616
+ supplierCode: v !== null && v !== void 0 ? v : '',
24617
+ supplierName: (_opt$label = opt === null || opt === void 0 ? void 0 : opt.label) !== null && _opt$label !== void 0 ? _opt$label : ''
24618
+ }, index);
24619
+ }
24620
+ }) : DxdSuppliersData.getInstance().getSupplierNameByCode(record === null || record === void 0 ? void 0 : record.supplierCode);
24621
+ },
24622
+ conditionOptionsSetting: {
24623
+ dataType: 'weakenArray',
24624
+ getOptions: function getOptions() {
24625
+ return DxdSuppliersData.getInstance().supplierOptions || [];
24626
+ }
24627
+ }
24628
+ }, {
24629
+ dataIndex: 'supplierCode',
24630
+ title: '供应商编码',
24631
+ width: 150,
24632
+ render: renderTextEllipsis
24633
+ }, {
24634
+ dataIndex: 'packageName',
24635
+ title: '套餐名称',
24636
+ width: 150,
24637
+ render: renderTextEllipsis
24638
+ }, {
24639
+ dataIndex: 'packageCode',
24640
+ title: '套餐编码',
24641
+ width: 150,
24642
+ render: renderTextEllipsis
24643
+ }, {
24644
+ dataIndex: 'platformItemId',
24645
+ title: '平台商品ID',
24646
+ width: 150,
24647
+ render: renderTextEllipsis
24648
+ }, {
24649
+ dataIndex: 'platformSkuId',
24650
+ title: '平台商品SKU ID',
24651
+ width: 150,
24652
+ render: renderTextEllipsis
24653
+ }].map(function (item) {
24654
+ return _objectSpread2(_objectSpread2({}, item), {}, {
24655
+ align: 'center',
24656
+ ellipsis: true
24657
+ });
24658
+ })
24659
+ };
24660
+ };
24661
+
24662
+ var getColumns$b = function getColumns(_ref) {
24392
24663
  var _ref$text = _ref.text,
24393
24664
  text = _ref$text === void 0 ? '' : _ref$text,
24394
24665
  disabled = _ref.disabled,
@@ -24505,7 +24776,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
24505
24776
  disabled = _ref.disabled,
24506
24777
  updateHandle = _ref.updateHandle,
24507
24778
  updateDataHandle = _ref.updateDataHandle;
24508
- return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
24779
+ return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
24509
24780
  text: text,
24510
24781
  disabled: disabled,
24511
24782
  updateHandle: updateHandle
@@ -24549,8 +24820,13 @@ var getColumnsMap$1 = function getColumnsMap(args) {
24549
24820
  disabled: disabled,
24550
24821
  updateHandle: updateHandle,
24551
24822
  updateDataHandle: updateDataHandle
24823
+ })), getColumns$a({
24824
+ text: text,
24825
+ disabled: disabled,
24826
+ updateHandle: updateHandle,
24827
+ updateDataHandle: updateDataHandle
24552
24828
  })), {}, {
24553
- default: getColumns$a({
24829
+ default: getColumns$b({
24554
24830
  text: text,
24555
24831
  disabled: disabled,
24556
24832
  updateHandle: updateHandle
@@ -25118,6 +25394,7 @@ var systemOrderNoMap = {
25118
25394
  JY_REISSUE_GOODS: 'tradeNo',
25119
25395
  JKY_GOODS: 'tradeNo',
25120
25396
  JKY_REISSUE_GOODS: 'tradeNo',
25397
+ DXD_GOODS: 'orderNo',
25121
25398
  WLN_REISSUE_GOODS: 'tradeNo',
25122
25399
  KM_REISSUE_GOODS: 'sid',
25123
25400
  KM_RETURN_GOODS: 'sid',
@@ -25378,6 +25655,12 @@ var getButtonText = function getButtonText() {
25378
25655
  if (['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type)) {
25379
25656
  return '选择吉客云ERP商品';
25380
25657
  }
25658
+ if (['DXD_GOODS'].includes(type)) {
25659
+ return '选择大希地ERP商品';
25660
+ }
25661
+ if (['DXD_SUPPLIERS'].includes(type)) {
25662
+ return '选择大希地供应商商品';
25663
+ }
25381
25664
  if (['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(type)) {
25382
25665
  return '选择万里牛ERP商品';
25383
25666
  }
@@ -25418,6 +25701,8 @@ var GoodItem$1 = function GoodItem(props) {
25418
25701
  otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
25419
25702
  _props$canUpdateNumbe = props.canUpdateNumber,
25420
25703
  canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
25704
+ _props$notAllowedOper = props.notAllowedOperation,
25705
+ notAllowedOperation = _props$notAllowedOper === void 0 ? false : _props$notAllowedOper,
25421
25706
  shopCode = props.shopCode,
25422
25707
  _props$companyKey = props.companyKey,
25423
25708
  companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
@@ -25441,7 +25726,7 @@ var GoodItem$1 = function GoodItem(props) {
25441
25726
  // const isShowSelectTradeGoods =
25442
25727
  // type !== 'JST_EXCHANGE_GOODS' || jstReturnGoods?.jstSystemOrderNo;
25443
25728
  // 判断是否为是否展示系统单筛选项
25444
- var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
25729
+ var isShowSelect = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'DXD_GOODS', 'DXD_SUPPLIERS', 'WLN_REISSUE_GOODS', 'GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS'].includes(type) || false;
25445
25730
  var isReissueType = type && ['GY_REISSUE_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'JY_REISSUE_GOODS', 'JKY_REISSUE_GOODS', 'WLN_REISSUE_GOODS'].includes(type) || false;
25446
25731
  var refModal = useRef();
25447
25732
  console.debug('表格数据', value);
@@ -25537,6 +25822,8 @@ var GoodItem$1 = function GoodItem(props) {
25537
25822
  case 'JY_REISSUE_GOODS':
25538
25823
  case 'JKY_GOODS':
25539
25824
  case 'JKY_REISSUE_GOODS':
25825
+ case 'DXD_GOODS':
25826
+ case 'DXD_SUPPLIERS':
25540
25827
  case 'WLN_REISSUE_GOODS':
25541
25828
  case 'SKX_GOODS':
25542
25829
  case 'SKX_RETURN_GOODS':
@@ -25624,14 +25911,14 @@ var GoodItem$1 = function GoodItem(props) {
25624
25911
  render: function render(val, record, index) {
25625
25912
  return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
25626
25913
  index: index,
25627
- hoveredRowIndex: !disabled && (record.canDelete || canDelete) ? hoveredRowIndex : null,
25914
+ hoveredRowIndex: !disabled && !notAllowedOperation && (record.canDelete || canDelete) ? hoveredRowIndex : null,
25628
25915
  handleClick: function handleClick() {
25629
25916
  return handleDelete(record, index);
25630
25917
  }
25631
25918
  });
25632
25919
  }
25633
25920
  }].concat(_toConsumableArray(baseInfoColumns));
25634
- if (!disabled) {
25921
+ if (!disabled && !notAllowedOperation) {
25635
25922
  columnList.push({
25636
25923
  dataIndex: '',
25637
25924
  title: "\u64CD\u4F5C",
@@ -25673,22 +25960,6 @@ var GoodItem$1 = function GoodItem(props) {
25673
25960
  }
25674
25961
  }].concat(_toConsumableArray(list));
25675
25962
  }, [showHeader, value, disabled, hoveredRowIndex]);
25676
- var orderColumns = useMemo(function () {
25677
- var columns = COLUMNS_MAP('', {
25678
- operate: false,
25679
- disabled: true
25680
- })(type);
25681
- return [{
25682
- dataIndex: '',
25683
- title: '序号',
25684
- align: 'center',
25685
- ellipsis: true,
25686
- width: 50,
25687
- render: function render(val, record, index) {
25688
- return /*#__PURE__*/React.createElement("span", null, index + 1);
25689
- }
25690
- }].concat(_toConsumableArray(columns));
25691
- }, []);
25692
25963
  var onSubmit = function onSubmit(list) {
25693
25964
  var newList = processGoods$1({
25694
25965
  list: list,
@@ -25728,7 +25999,7 @@ var GoodItem$1 = function GoodItem(props) {
25728
25999
  var validSystemOrder = useMemo(function () {
25729
26000
  return ['GY_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'KM_REISSUE_GOODS'].includes(type) && !hasSelectedSystemOrder;
25730
26001
  }, [type, hasSelectedSystemOrder]);
25731
- return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
26002
+ return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && !notAllowedOperation && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
25732
26003
  style: {
25733
26004
  float: 'right'
25734
26005
  }
@@ -26800,13 +27071,55 @@ var jkyUtils = {
26800
27071
  };
26801
27072
 
26802
27073
  var singletonMap$8 = new Map();
27074
+ /**
27075
+ * 按 platformOrderNo 拉取大希地订单详情(/qy/gdfw/daxidi/erp/orderDetail)。
27076
+ * 返回订单原始数据结构:
27077
+ * { platformOrderNo, shopCode, shopName, split,
27078
+ * items: [{ platformItemId, platformSkuId, packageCode, packageName, quantity, skus: [{ skuCode, skuName, skuBarcode, quantity, unit }] }],
27079
+ * doOrders: [{ orderNo, warehouseCode, warehouseName, logisticsCode, logisticsName, coldChain, skus }] }
27080
+ * 不做 WDT 风格的 trades/billNo/billType 等转换,保留 DXD 原始结构由消费方按需处理。
27081
+ */
27082
+ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
27083
+ if (!singletonMap$8.has(orderNo)) {
27084
+ var p = new Promise(function (resolve, reject) {
27085
+ var doReject = function doReject(err) {
27086
+ // 清空掉错误的请求记录
27087
+ singletonMap$8.delete(orderNo);
27088
+ reject(err);
27089
+ };
27090
+ extendRequest('/qy/gdfw/daxidi/erp/orderDetail', {
27091
+ method: 'post',
27092
+ data: {
27093
+ platformOrderNo: orderNo
27094
+ }
27095
+ }).then(function (data) {
27096
+ if (data === null || data === void 0 ? void 0 : data.success) {
27097
+ resolve((data === null || data === void 0 ? void 0 : data.data) || {});
27098
+ // 延迟10秒清除,保证订单的时效性
27099
+ setTimeout(function () {
27100
+ singletonMap$8.delete(orderNo);
27101
+ }, 1000 * 10);
27102
+ } else {
27103
+ doReject(data);
27104
+ }
27105
+ }).catch(doReject);
27106
+ });
27107
+ singletonMap$8.set(orderNo, p);
27108
+ }
27109
+ return singletonMap$8.get(orderNo);
27110
+ };
27111
+ var dxdUtils = {
27112
+ getOrderListSingleton: getOrderListSingleton$2
27113
+ };
27114
+
27115
+ var singletonMap$9 = new Map();
26803
27116
  var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
26804
27117
  var cacheKey = "".concat(params.orderNo, "_").concat(params.shopId);
26805
- if (!singletonMap$8.has(cacheKey)) {
27118
+ if (!singletonMap$9.has(cacheKey)) {
26806
27119
  var p = new Promise(function (resolve, reject) {
26807
27120
  var doReject = function doReject(err) {
26808
27121
  // 清空掉错误的请求记录
26809
- singletonMap$8.delete(cacheKey);
27122
+ singletonMap$9.delete(cacheKey);
26810
27123
  reject(err);
26811
27124
  };
26812
27125
  extendRequest('/qy/gdfw/order/queryTradeAfterSaleList', {
@@ -26817,28 +27130,28 @@ var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
26817
27130
  resolve(res.data || []);
26818
27131
  // 延迟10秒清除,保证订单的时效性
26819
27132
  setTimeout(function () {
26820
- singletonMap$8.delete(cacheKey);
27133
+ singletonMap$9.delete(cacheKey);
26821
27134
  }, 1000 * 10);
26822
27135
  } else {
26823
27136
  doReject(res);
26824
27137
  }
26825
27138
  }).catch(doReject);
26826
27139
  });
26827
- singletonMap$8.set(cacheKey, p);
27140
+ singletonMap$9.set(cacheKey, p);
26828
27141
  }
26829
- return singletonMap$8.get(cacheKey);
27142
+ return singletonMap$9.get(cacheKey);
26830
27143
  };
26831
27144
  var platformUtils = {
26832
27145
  getAfterSalesOrderList: getAfterSalesOrderList
26833
27146
  };
26834
27147
 
26835
- var singletonMap$9 = new Map();
26836
- var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
26837
- if (!singletonMap$9.has(orderNo)) {
27148
+ var singletonMap$a = new Map();
27149
+ var getOrderListSingleton$3 = function getOrderListSingleton(orderNo) {
27150
+ if (!singletonMap$a.has(orderNo)) {
26838
27151
  var p = new Promise(function (resolve, reject) {
26839
27152
  var doReject = function doReject(err) {
26840
27153
  // 清空掉错误的请求记录
26841
- singletonMap$9.delete(orderNo);
27154
+ singletonMap$a.delete(orderNo);
26842
27155
  reject(err);
26843
27156
  };
26844
27157
  extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
@@ -26864,19 +27177,19 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
26864
27177
  }
26865
27178
  // 延迟10秒清除,保证订单的时效性
26866
27179
  setTimeout(function () {
26867
- singletonMap$9.delete(orderNo);
27180
+ singletonMap$a.delete(orderNo);
26868
27181
  }, 1000 * 10);
26869
27182
  } else {
26870
27183
  doReject(data);
26871
27184
  }
26872
27185
  }).catch(doReject);
26873
27186
  });
26874
- singletonMap$9.set(orderNo, p);
27187
+ singletonMap$a.set(orderNo, p);
26875
27188
  }
26876
- return singletonMap$9.get(orderNo);
27189
+ return singletonMap$a.get(orderNo);
26877
27190
  };
26878
27191
  var kmUtils = {
26879
- getOrderListSingleton: getOrderListSingleton$2
27192
+ getOrderListSingleton: getOrderListSingleton$3
26880
27193
  };
26881
27194
 
26882
27195
  var _excluded$k = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"],
@@ -26892,7 +27205,8 @@ var columnsMap = {
26892
27205
  JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
26893
27206
  JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
26894
27207
  WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
26895
- PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
27208
+ PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns,
27209
+ DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
26896
27210
  };
26897
27211
  var rowKeyMap = {
26898
27212
  BS_SYSTEM_ORDER: 'billNo',
@@ -26905,7 +27219,8 @@ var rowKeyMap = {
26905
27219
  JY_SYSTEM_ORDER: 'tradeNo',
26906
27220
  JKY_SYSTEM_ORDER: 'tradeNo',
26907
27221
  WDT_RETURN_BILL_NO: 'refundNo',
26908
- PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId'
27222
+ PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId',
27223
+ DXD_SYSTEM_ORDER: 'billNo'
26909
27224
  };
26910
27225
  var RADIO_TABLE_KEYS = ['PLATFORM_AFTER_SALES_ORDER'];
26911
27226
  var index$2 = (function (props) {
@@ -26969,6 +27284,8 @@ var index$2 = (function (props) {
26969
27284
  getJyOrderList(value.orderNo);
26970
27285
  } else if (type === 'JKY_SYSTEM_ORDER') {
26971
27286
  getJkyOrderList(value.orderNo);
27287
+ } else if (type === 'DXD_SYSTEM_ORDER') {
27288
+ getDxdOrderList(value.orderNo);
26972
27289
  } else if (type === 'PLATFORM_AFTER_SALES_ORDER') {
26973
27290
  value.shopId && getPlatformAfterSalesOrderList(value.orderNo, value.shopId);
26974
27291
  }
@@ -27028,6 +27345,22 @@ var index$2 = (function (props) {
27028
27345
  // deliveryStateName - 发货状态映射 (0: "未发货", 2: "全部发货")
27029
27346
  map['deliveryStateName'] = _objectSpread2({}, GY_DELIVERY_STATE_MAPPING);
27030
27347
  }
27348
+ // DXD_SYSTEM_ORDER 需要处理的字段
27349
+ if (type === 'DXD_SYSTEM_ORDER') {
27350
+ // billType - 订单类型映射(0: "普通订单", 1: "货到付款", ...)
27351
+ map['billType'] = _objectSpread2({}, KM_ORDER_TYPE_MAP);
27352
+ // sysStatus - 订单系统状态映射
27353
+ map['sysStatus'] = _objectSpread2({}, KM_ORDER_STATUS);
27354
+ // 布尔字段映射
27355
+ map['coldChain'] = {
27356
+ true: '是',
27357
+ false: '否'
27358
+ };
27359
+ map['split'] = {
27360
+ true: '是',
27361
+ false: '否'
27362
+ };
27363
+ }
27031
27364
  return map;
27032
27365
  }, [type]);
27033
27366
  // 过滤后的表格数据 - 根据选中字段和关键词模糊匹配(不区分大小写)
@@ -27370,6 +27703,35 @@ var index$2 = (function (props) {
27370
27703
  return _ref13.apply(this, arguments);
27371
27704
  };
27372
27705
  }();
27706
+ var getDxdOrderList = /*#__PURE__*/function () {
27707
+ var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(orderNo) {
27708
+ return _regeneratorRuntime().wrap(function _callee11$(_context11) {
27709
+ while (1) switch (_context11.prev = _context11.next) {
27710
+ case 0:
27711
+ dxdUtils.getOrderListSingleton(orderNo).then(function (trade) {
27712
+ var _trade$doOrders;
27713
+ var data = (_trade$doOrders = trade.doOrders) === null || _trade$doOrders === void 0 ? void 0 : _trade$doOrders.map(function (order) {
27714
+ return _objectSpread2(_objectSpread2({}, order), {}, {
27715
+ billNo: order.orderNo,
27716
+ billType: (trade === null || trade === void 0 ? void 0 : trade.split) ? '拆分订单' : '普通订单'
27717
+ });
27718
+ });
27719
+ _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
27720
+ orders: data || [],
27721
+ showOrderInfo: data || []
27722
+ }));
27723
+ });
27724
+ onceRef.current = false;
27725
+ case 2:
27726
+ case "end":
27727
+ return _context11.stop();
27728
+ }
27729
+ }, _callee11);
27730
+ }));
27731
+ return function getDxdOrderList(_x12) {
27732
+ return _ref14.apply(this, arguments);
27733
+ };
27734
+ }();
27373
27735
  var rowKey = rowKeyMap[type] || 'billNo';
27374
27736
  var handleRadioChange = function handleRadioChange(record) {
27375
27737
  var _value$selectIds;
@@ -27844,16 +28206,16 @@ var orderSubFormConstants = {
27844
28206
  };
27845
28207
 
27846
28208
  var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
27847
- var singletonMap$a = new Map();
27848
- var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
28209
+ var singletonMap$b = new Map();
28210
+ var getOrderListSingleton$4 = function getOrderListSingleton(parmas) {
27849
28211
  var orderNo = parmas.orderNo,
27850
28212
  shopId = parmas.shopId;
27851
28213
  var key = "".concat(orderNo, "-").concat(shopId);
27852
- if (!singletonMap$a.has(key)) {
28214
+ if (!singletonMap$b.has(key)) {
27853
28215
  var p = new Promise(function (resolve, reject) {
27854
28216
  var doReject = function doReject(err) {
27855
28217
  // 清空掉错误的请求记录
27856
- singletonMap$a.delete(key);
28218
+ singletonMap$b.delete(key);
27857
28219
  reject(err);
27858
28220
  };
27859
28221
  extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
@@ -27869,16 +28231,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
27869
28231
  }
27870
28232
  // 延迟10秒清除,保证订单的时效性
27871
28233
  setTimeout(function () {
27872
- singletonMap$a.delete(key);
28234
+ singletonMap$b.delete(key);
27873
28235
  }, 1000 * 10);
27874
28236
  } else {
27875
28237
  doReject(data);
27876
28238
  }
27877
28239
  }).catch(doReject);
27878
28240
  });
27879
- singletonMap$a.set(key, p);
28241
+ singletonMap$b.set(key, p);
27880
28242
  }
27881
- return singletonMap$a.get(key);
28243
+ return singletonMap$b.get(key);
27882
28244
  };
27883
28245
  var renderEditItem = function renderEditItem(_ref) {
27884
28246
  var item = _ref.item,
@@ -28010,7 +28372,7 @@ var renderDetailItem = function renderDetailItem(_ref2) {
28010
28372
  return Component;
28011
28373
  };
28012
28374
  var utils = {
28013
- getOrderListSingleton: getOrderListSingleton$3,
28375
+ getOrderListSingleton: getOrderListSingleton$4,
28014
28376
  renderEditItem: renderEditItem,
28015
28377
  renderDetailItem: renderDetailItem
28016
28378
  };
@@ -28018,7 +28380,7 @@ var utils = {
28018
28380
  var getOrderSubformColumns$1 = orderSubFormConstants.getOrderSubformColumns;
28019
28381
  var renderEditItem$1 = utils.renderEditItem,
28020
28382
  renderDetailItem$1 = utils.renderDetailItem,
28021
- getOrderListSingleton$4 = utils.getOrderListSingleton;
28383
+ getOrderListSingleton$5 = utils.getOrderListSingleton;
28022
28384
  var OrderSubForm = function OrderSubForm(props) {
28023
28385
  var _props$value = props.value,
28024
28386
  value = _props$value === void 0 ? {} : _props$value,
@@ -28220,7 +28582,7 @@ var OrderSubForm = function OrderSubForm(props) {
28220
28582
  var JOIN_SHOP = shopList === null || shopList === void 0 ? void 0 : shopList.find(function (item) {
28221
28583
  return !item.notJoin && item.shopId == shopId;
28222
28584
  });
28223
- return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$4({
28585
+ return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$5({
28224
28586
  orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
28225
28587
  shopId: shopId
28226
28588
  }).then(function (data) {
@@ -28314,6 +28676,9 @@ var isErpType$1 = {
28314
28676
  },
28315
28677
  isJky: function isJky(type) {
28316
28678
  return ['JKY_GOODS'].includes(type);
28679
+ },
28680
+ isDxd: function isDxd(type) {
28681
+ return ['DXD_GOODS', 'DXD_SUPPLIERS'].includes(type);
28317
28682
  }
28318
28683
  };
28319
28684
  var processAllOrders = function processAllOrders(_ref) {
@@ -28346,6 +28711,11 @@ var processAllOrders = function processAllOrders(_ref) {
28346
28711
  data: data,
28347
28712
  orderNo: orderNo
28348
28713
  });
28714
+ } else if (isErpType$1.isDxd(type)) {
28715
+ // DXD 选品用出库订单 doOrders(每项含 skus[])
28716
+ newList = processDxdOrders({
28717
+ data: data
28718
+ });
28349
28719
  } else {
28350
28720
  newList = processDefaultOrders({
28351
28721
  data: data
@@ -28392,8 +28762,28 @@ var processWlnOrders = function processWlnOrders(_ref6) {
28392
28762
  var data = _ref6.data;
28393
28763
  return (data === null || data === void 0 ? void 0 : data.orders) || [];
28394
28764
  };
28395
- var processDefaultOrders = function processDefaultOrders(_ref7) {
28765
+ var processDxdOrders = function processDxdOrders(_ref7) {
28766
+ var _data$doOrders;
28396
28767
  var data = _ref7.data;
28768
+ var _ref8 = data || {},
28769
+ isSplit = _ref8.isSplit,
28770
+ billNo = _ref8.billNo,
28771
+ billType = _ref8.billType,
28772
+ billTag = _ref8.billTag,
28773
+ sysStatus = _ref8.sysStatus;
28774
+ var trades = (_data$doOrders = data.doOrders) === null || _data$doOrders === void 0 ? void 0 : _data$doOrders.map(function (item) {
28775
+ return _objectSpread2(_objectSpread2({}, item), {}, {
28776
+ billNo: billNo,
28777
+ billType: billType,
28778
+ billTag: billTag,
28779
+ isSplit: isSplit,
28780
+ sysStatus: sysStatus
28781
+ });
28782
+ });
28783
+ return trades;
28784
+ };
28785
+ var processDefaultOrders = function processDefaultOrders(_ref9) {
28786
+ var data = _ref9.data;
28397
28787
  return data || [];
28398
28788
  };
28399
28789
 
@@ -28640,6 +29030,48 @@ var componentMap$2 = {
28640
29030
  },
28641
29031
  getOrderList: jkyUtils.getJkyOrderListSingleton
28642
29032
  },
29033
+ DXD_GOODS: {
29034
+ type: 'dxd',
29035
+ key: 'dxdGoods',
29036
+ name: '大希地',
29037
+ orderNo: 'srcTid',
29038
+ goodDetailOrderNo: 'srcTid',
29039
+ hiddenErpGoodsBtn: true,
29040
+ eventNameMap: {
29041
+ // pubsub 事件
29042
+ type: 'dxdType',
29043
+ // DXD 按自身数据格式(doOrders.skus)标准化商品,不复用 WDT
29044
+ updateGoodsHandle: updateDxdGoodsHandle,
29045
+ selectListReturn: 'dxdSelectListReturn',
29046
+ selectList: 'dxdSelectList',
29047
+ reissueSelectList: 'dxdReissueSelectList',
29048
+ reissueSelectListReturn: 'dxdReissueSelectListReturn',
29049
+ reissueDeleteGood: 'dxdReissueDeleteGood',
29050
+ changeShopCode: 'dxdChangeShopCode',
29051
+ reissueType: 'dxdReissueType',
29052
+ returnType: 'dxdReturnType',
29053
+ returnSelectListReturn: 'dxdReturnSelectListReturn',
29054
+ returnSelectList: 'dxdReturnSelectList',
29055
+ deleteGood: 'dxdDeleteGood',
29056
+ returnDeleteGood: 'dxdReturnDeleteGood',
29057
+ exchangeDeleteGood: 'dxdExchangeDeleteGood'
29058
+ },
29059
+ getOrderList: dxdUtils.getOrderListSingleton
29060
+ },
29061
+ DXD_SUPPLIERS: {
29062
+ type: 'dxd',
29063
+ key: 'dxdSuppliers',
29064
+ name: '大希地供应商',
29065
+ orderNo: 'srcTid',
29066
+ goodDetailOrderNo: 'srcTid',
29067
+ eventNameMap: {
29068
+ // pubsub 事件(用 dxdSuppliers 前缀,避免与 DXD_GOODS 的 dxd 前缀事件冲突)
29069
+ type: 'dxdSuppliersType',
29070
+ selectListReturn: 'dxdSuppliersSelectListReturn',
29071
+ selectList: 'dxdSuppliersSelectList',
29072
+ changeShopCode: 'dxdSuppliersChangeShopCode'
29073
+ }
29074
+ },
28643
29075
  WLN_GOODS: {
28644
29076
  type: 'jky',
28645
29077
  key: 'wlnGoods',
@@ -28704,13 +29136,15 @@ var componentMap$2 = {
28704
29136
  }
28705
29137
  };
28706
29138
  var CommonGoods = function CommonGoods(props) {
28707
- var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7;
29139
+ var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7, _componentMap$compTyp8;
28708
29140
  var value = props.value,
28709
29141
  disabled = props.disabled,
28710
29142
  onChange = props.onChange,
28711
29143
  compType = props.type;
29144
+ // DXD_SUPPLIERS 纯镜像 DXD_GOODS(由 FormRender useWatch 联动同步增删),禁用独立增删
28712
29145
  // console.log('value?.orders', value?.orders);
28713
29146
  // 合并单订单会包含","
29147
+ var notAllowedOperation = ['DXD_SUPPLIERS'].includes(compType);
28714
29148
  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) {
28715
29149
  var _order$componentMap$c;
28716
29150
  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(',');
@@ -29093,9 +29527,11 @@ var CommonGoods = function CommonGoods(props) {
29093
29527
  onModeChange: handleModeChange,
29094
29528
  showModeBtn: showModeBtn,
29095
29529
  isStrict: value === null || value === void 0 ? void 0 : value.isStrict,
29096
- systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
29530
+ systemOrders: (value === null || value === void 0 ? void 0 : value.systemOrders) || (value === null || value === void 0 ? void 0 : value.allOrders),
29097
29531
  selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
29098
29532
  showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
29533
+ showErpGoodsBtn: !((_componentMap$compTyp8 = componentMap$2[compType]) === null || _componentMap$compTyp8 === void 0 ? void 0 : _componentMap$compTyp8.hiddenErpGoodsBtn),
29534
+ notAllowedOperation: notAllowedOperation,
29099
29535
  tradeGoods: {
29100
29536
  originDataSource: originDataSource,
29101
29537
  getDataSourceAsync: getDataSourceAsync,
@@ -32593,10 +33029,11 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
32593
33029
  JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
32594
33030
  JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
32595
33031
  JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
32596
- WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
33032
+ WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
33033
+ DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
32597
33034
  };
32598
33035
  var FIELD_COLUMNS_MAP = {
32599
33036
  PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
32600
33037
  };
32601
33038
 
32602
- export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasImage, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, FIELD_COLUMNS_MAP, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$9 as getJkyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap };
33039
+ 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 };
@@ -45,6 +45,7 @@ interface BsGoodsProps {
45
45
  systemOrders?: any[];
46
46
  selectedSystemOrders?: any[];
47
47
  isReloadSelectTable?: boolean;
48
+ notAllowedOperation?: boolean;
48
49
  validSystemOrderFn?: () => boolean | undefined;
49
50
  }
50
51
  type MakeRequired<T, K extends keyof T> = {
@@ -0,0 +1,3 @@
1
+ import { GetColumnsBaseInfoMapFnType } from './columnsBaseInfoMap';
2
+ declare const getColumns: GetColumnsBaseInfoMapFnType;
3
+ export default getColumns;
@@ -6,4 +6,5 @@ export { default as getKmColumns } from './km';
6
6
  export { default as getJyColumns } from './jy';
7
7
  export { default as getSkxColumns } from './skx';
8
8
  export { default as getJkyColumns } from './jky';
9
+ export { default as getDxdColumns } from './dxd';
9
10
  export { default as orderSubFormConstants } from './orderSubForm';
@@ -110,6 +110,34 @@ declare const SYSTEM_ORDER_COLUMNS_MAP: {
110
110
  ellipsis: boolean;
111
111
  disabled: boolean;
112
112
  })[];
113
+ DXD_SYSTEM_ORDER: ({
114
+ dataIndex: string;
115
+ title: string;
116
+ width: number;
117
+ render?: undefined;
118
+ renderExport?: undefined;
119
+ conditionOptionsSetting?: undefined;
120
+ } | {
121
+ dataIndex: string;
122
+ title: string;
123
+ width: number;
124
+ render: (val: boolean) => "否" | "是";
125
+ renderExport: (val: boolean) => "否" | "是";
126
+ conditionOptionsSetting: {
127
+ dataType: string;
128
+ getOptions: () => {
129
+ value: boolean;
130
+ label: string;
131
+ }[];
132
+ };
133
+ } | {
134
+ dataIndex: string;
135
+ title: string;
136
+ width: number;
137
+ render: (val: boolean) => "否" | "是";
138
+ renderExport: (val: boolean) => "否" | "是";
139
+ conditionOptionsSetting?: undefined;
140
+ })[];
113
141
  };
114
142
  export declare const FIELD_COLUMNS_MAP: {
115
143
  PLATFORM_AFTER_SALES_ORDER: any[];
@@ -0,0 +1,3 @@
1
+ export declare const dxdUtils: {
2
+ getOrderListSingleton: (orderNo: string) => Promise<any>;
3
+ };
@@ -1,4 +1,5 @@
1
1
  import React from 'react';
2
+ import { FormInstance } from 'antd';
2
3
  import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
3
4
  interface JstGoodsProps {
4
5
  value: any[];
@@ -12,6 +13,7 @@ interface JstGoodsProps {
12
13
  onlyShowFieldSelect: boolean;
13
14
  expressDateInstance: InstanceType<typeof ExpressData>;
14
15
  logisticsCompanyFormType?: string;
16
+ form?: FormInstance;
15
17
  }
16
18
  declare const jstGoods: (props: Partial<JstGoodsProps>) => React.JSX.Element;
17
19
  export default jstGoods;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "2.10.9-beta.1",
3
+ "version": "2.10.9-beta.12",
4
4
  "description": "> TODO: description",
5
5
  "homepage": "",
6
6
  "license": "ISC",
@@ -20,7 +20,7 @@
20
20
  "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
21
21
  },
22
22
  "dependencies": {
23
- "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.0",
23
+ "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.12",
24
24
  "ahooks": "^3.7.4",
25
25
  "ali-react-table": "2.6.1",
26
26
  "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
66
66
  "publishConfig": {
67
67
  "access": "public"
68
68
  },
69
- "gitHead": "c2da8778fd3ef4bdd878160b5b4d86a6fb4cbbf6"
69
+ "gitHead": "5a0d12c8caf0912d82e12ed94e64afd3ff746c65"
70
70
  }