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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.esm.js CHANGED
@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
3
3
  import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
4
4
  import request, { extend as extend$1 } from 'umi-request';
5
5
  import { CopyToClipboard } from 'react-copy-to-clipboard';
6
- import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
6
+ import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
7
7
  import every from 'lodash/every';
8
8
  import maxBy from 'lodash/maxBy';
9
9
  import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
@@ -7816,6 +7816,22 @@ var Province = function Province(props) {
7816
7816
  };
7817
7817
 
7818
7818
  var TextArea$1 = Input.TextArea;
7819
+ /**
7820
+ * 直辖市省份名称映射(带"市" → 不带"市")
7821
+ * 接口返回的 province 可能带"市"(如"重庆市"),但省市区下拉数据一级节点不带"市"(如"重庆"),
7822
+ * 此处做单向转换确保匹配。
7823
+ */
7824
+ var MUNICIPALITY_PROVINCE_MAP = {
7825
+ '北京市': '北京',
7826
+ '天津市': '天津',
7827
+ '上海市': '上海',
7828
+ '重庆市': '重庆'
7829
+ };
7830
+ /** 直辖市省份名称去"市"处理,普通省份保持原值 */
7831
+ var normalizeMunicipalityProvince = function normalizeMunicipalityProvince(province) {
7832
+ if (!province) return province;
7833
+ return MUNICIPALITY_PROVINCE_MAP[province] || province;
7834
+ };
7819
7835
  var ParseLogistics = function ParseLogistics(props) {
7820
7836
  var onChange = props.onChange,
7821
7837
  _props$selfCalibratio = props.selfCalibration;
@@ -7855,11 +7871,10 @@ var ParseLogistics = function ParseLogistics(props) {
7855
7871
  }
7856
7872
  }).then(function (res) {
7857
7873
  var data = res.data;
7858
- // 如果是通过内部校准添加的姓名和手机号,则去除
7859
- // if (needCalibration) {
7860
- // data.name = '';
7861
- // data.phone = '';
7862
- // }
7874
+ // 规范化直辖市省份名称,兼容接口带"市"、数据不带"市"的情况
7875
+ if (data === null || data === void 0 ? void 0 : data.province) {
7876
+ data.province = normalizeMunicipalityProvince(data.province);
7877
+ }
7863
7878
  onChange === null || onChange === void 0 ? void 0 : onChange(data);
7864
7879
  }).catch(function (e) {
7865
7880
  handleAIIdentify(fullAddress);
@@ -7885,6 +7900,10 @@ var ParseLogistics = function ParseLogistics(props) {
7885
7900
  }
7886
7901
  }).then(function (res) {
7887
7902
  var data = res.data;
7903
+ // 规范化直辖市省份名称,兼容接口带"市"、数据不带"市"的情况
7904
+ if (data === null || data === void 0 ? void 0 : data.province) {
7905
+ data.province = normalizeMunicipalityProvince(data.province);
7906
+ }
7888
7907
  onChange === null || onChange === void 0 ? void 0 : onChange(data);
7889
7908
  }).catch(function (e) {
7890
7909
  console.log(e);
@@ -8156,7 +8175,8 @@ var updateWorkTypeKeys = {
8156
8175
  REPAIR_ORDER_ID: 'repairOrderId',
8157
8176
  PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
8158
8177
  ACTUAL_RECEIPT_PAYMENT: 'actualReceiptPayment',
8159
- WDT_SHOP: 'shopCode'
8178
+ WDT_SHOP: 'shopCode',
8179
+ DXD_SHOP: 'shopCode'
8160
8180
  };
8161
8181
  var systemOrderMap = {
8162
8182
  BS_SYSTEM_ORDER: {
@@ -8203,6 +8223,11 @@ var systemOrderMap = {
8203
8223
  no: 'wdtReturnBillNo',
8204
8224
  ids: 'wdtReturnBillSelectIds',
8205
8225
  order: 'wdtReturnBillShowOrder'
8226
+ },
8227
+ DXD_SYSTEM_ORDER: {
8228
+ no: 'dxdSystemOrderNo',
8229
+ ids: 'dxdSystemSelectIds',
8230
+ order: 'dxdSystemShowOrder'
8206
8231
  }
8207
8232
  };
8208
8233
  //直接将key component 添加到 transformWorkOrderData中的componentProcessors
@@ -8809,6 +8834,60 @@ var processJkyGoods = function processJkyGoods(templateColumns) {
8809
8834
  };
8810
8835
  };
8811
8836
  };
8837
+ var processDxdGoods = function processDxdGoods(templateColumns) {
8838
+ return function (getValue) {
8839
+ return function (nex, config) {
8840
+ var _values = {
8841
+ dxdGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_dxdGoods")), []),
8842
+ shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
8843
+ };
8844
+ var selectIds = [];
8845
+ var orderNo = '';
8846
+ var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8847
+ return col.workOrderComponentType === 'TRADE_ID_INPUT';
8848
+ });
8849
+ if (tradeId) {
8850
+ orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
8851
+ }
8852
+ var dxdSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8853
+ return col.workOrderComponentType === 'DXD_SYSTEM_ORDER';
8854
+ });
8855
+ if (dxdSystemOrder) {
8856
+ selectIds = jsonParseSecurity(getValue("".concat(dxdSystemOrder.uniqueKey, "_").concat(systemOrderMap[dxdSystemOrder.workOrderComponentType].ids)), []);
8857
+ }
8858
+ _values.selectIds = selectIds;
8859
+ _values.orderNo = orderNo;
8860
+ return _defineProperty({}, nex.uniqueKey, _values);
8861
+ };
8862
+ };
8863
+ };
8864
+ var processDxdSuppliers = function processDxdSuppliers(templateColumns) {
8865
+ return function (getValue) {
8866
+ return function (nex, config) {
8867
+ var _values = {
8868
+ dxdSuppliers: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_dxdSuppliers")), []),
8869
+ shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
8870
+ };
8871
+ var selectIds = [];
8872
+ var orderNo = '';
8873
+ var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8874
+ return col.workOrderComponentType === 'TRADE_ID_INPUT';
8875
+ });
8876
+ if (tradeId) {
8877
+ orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
8878
+ }
8879
+ var dxdSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
8880
+ return col.workOrderComponentType === 'DXD_SYSTEM_ORDER';
8881
+ });
8882
+ if (dxdSystemOrder) {
8883
+ selectIds = jsonParseSecurity(getValue("".concat(dxdSystemOrder.uniqueKey, "_").concat(systemOrderMap[dxdSystemOrder.workOrderComponentType].ids)), []);
8884
+ }
8885
+ _values.selectIds = selectIds;
8886
+ _values.orderNo = orderNo;
8887
+ return _defineProperty({}, nex.uniqueKey, _values);
8888
+ };
8889
+ };
8890
+ };
8812
8891
  var processWdtGoods = function processWdtGoods(templateColumns) {
8813
8892
  return function (getValue) {
8814
8893
  return function (nex, config) {
@@ -9138,6 +9217,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
9138
9217
  no: 'wdtReturnBillNo',
9139
9218
  ids: 'wdtReturnBillSelectIds',
9140
9219
  order: 'wdtReturnBillShowOrder'
9220
+ },
9221
+ DXD_SYSTEM_ORDER: {
9222
+ no: 'dxdSystemOrderNo',
9223
+ ids: 'dxdSystemSelectIds',
9224
+ order: 'dxdSystemShowOrder'
9141
9225
  }
9142
9226
  };
9143
9227
  return _defineProperty({}, nex.uniqueKey, _objectSpread2({
@@ -9407,14 +9491,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
9407
9491
  };
9408
9492
  var processLabel = function processLabel(getValue) {
9409
9493
  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;
9494
+ var _ref79;
9495
+ 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
9496
  };
9413
9497
  };
9414
9498
  var processMemberLevel = function processMemberLevel(getValue) {
9415
9499
  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;
9500
+ var _ref80;
9501
+ 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
9502
  };
9419
9503
  };
9420
9504
  var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -9541,6 +9625,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9541
9625
  BS_GOODS: processBsGoods,
9542
9626
  WDT_GOODS: processWdtGoods(templateColumns),
9543
9627
  JKY_GOODS: processJkyGoods(templateColumns),
9628
+ DXD_GOODS: processDxdGoods(templateColumns),
9629
+ DXD_SUPPLIERS: processDxdSuppliers(templateColumns),
9544
9630
  WDT_AFTERSALE_GOODS: processWdtAftersaleGoods(templateColumns),
9545
9631
  JST_AFTERSALE_GOODS: processJstAftersaleGoods(templateColumns),
9546
9632
  BS_E3_GOODS: processBsE3Goods(templateColumns),
@@ -9567,6 +9653,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9567
9653
  BS_E3_SYSTEM_ORDER: processErpSystemOrder,
9568
9654
  JST_SYSTEM_ORDER: processErpSystemOrder,
9569
9655
  GY_SYSTEM_ORDER: processErpSystemOrder,
9656
+ DXD_SYSTEM_ORDER: processErpSystemOrder,
9570
9657
  BUYER_MESSAGE_NOTICE: processBuyerMessageNotice,
9571
9658
  ORDER_TYPE: processOrderType,
9572
9659
  REFUND_TYPE: processRefundType,
@@ -9610,6 +9697,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
9610
9697
  BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns),
9611
9698
  ACTUAL_RECEIPT_PAYMENT: processSingleField,
9612
9699
  WDT_SHOP: processSingleField,
9700
+ DXD_SHOP: processSingleField,
9613
9701
  KM_VIDEO: processKmVideo,
9614
9702
  WDT_TAGS: wdtTags,
9615
9703
  EXECUTE_ACTION_TYPE: processExecuteActionType,
@@ -14196,7 +14284,7 @@ var jstGoods = function jstGoods(props) {
14196
14284
  changeIndex = _useState2[0],
14197
14285
  setChangeIndex = _useState2[1]; //选中的包裹
14198
14286
  var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
14199
- var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln'].includes(platformType);
14287
+ var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy', 'jky', 'wln', 'dxd'].includes(platformType);
14200
14288
  var expressDateInstance = ExpressData.getInstance(platformType);
14201
14289
  var isSendGoodSavedId = isSelectName && !['jst', 'wln'].includes(platformType);
14202
14290
  useEffect(function () {
@@ -24388,7 +24476,160 @@ var getColumns$9 = function getColumns(_ref) {
24388
24476
  };
24389
24477
  };
24390
24478
 
24391
- var getColumns$a = function getColumns(_ref) {
24479
+ var getColumns$a = function getColumns() {
24480
+ var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
24481
+ disabled = _ref.disabled,
24482
+ updateDataHandle = _ref.updateDataHandle;
24483
+ return {
24484
+ // 大希地商品信息
24485
+ DXD_GOODS: [{
24486
+ dataIndex: 'skuName',
24487
+ title: 'SKU名称',
24488
+ width: 150,
24489
+ render: renderTextEllipsis
24490
+ }, {
24491
+ dataIndex: 'skuCode',
24492
+ title: 'SKU编码',
24493
+ width: 150,
24494
+ render: renderTextEllipsis
24495
+ }, {
24496
+ dataIndex: 'skuBarcode',
24497
+ title: 'SKU条码',
24498
+ width: 150,
24499
+ render: renderTextEllipsis
24500
+ }, {
24501
+ dataIndex: 'packageName',
24502
+ title: '套餐名称',
24503
+ width: 150,
24504
+ render: renderTextEllipsis
24505
+ }, {
24506
+ dataIndex: 'packageCode',
24507
+ title: '套餐编码',
24508
+ width: 150,
24509
+ render: renderTextEllipsis
24510
+ }, {
24511
+ dataIndex: 'platformItemId',
24512
+ title: '平台商品ID',
24513
+ width: 150,
24514
+ render: renderTextEllipsis
24515
+ }, {
24516
+ dataIndex: 'platformSkuId',
24517
+ title: '平台商品SKU ID',
24518
+ width: 150,
24519
+ render: renderTextEllipsis
24520
+ }, {
24521
+ dataIndex: 'quantity',
24522
+ title: '数量',
24523
+ width: 100,
24524
+ render: renderTextEllipsis
24525
+ }, {
24526
+ dataIndex: 'unit',
24527
+ title: '单位',
24528
+ width: 100,
24529
+ render: renderTextEllipsis
24530
+ }].map(function (item) {
24531
+ return _objectSpread2(_objectSpread2({}, item), {}, {
24532
+ align: 'center',
24533
+ ellipsis: true
24534
+ });
24535
+ }),
24536
+ // 大希地供应商商品信息
24537
+ DXD_SUPPLIERS: [{
24538
+ dataIndex: 'skuName',
24539
+ title: 'SKU名称',
24540
+ width: 150,
24541
+ render: renderTextEllipsis
24542
+ }, {
24543
+ dataIndex: 'skuCode',
24544
+ title: 'SKU编码',
24545
+ width: 150,
24546
+ render: renderTextEllipsis
24547
+ }, {
24548
+ dataIndex: 'skuBarcode',
24549
+ title: 'SKU条码',
24550
+ width: 150,
24551
+ render: renderTextEllipsis
24552
+ }, {
24553
+ dataIndex: 'supplierName',
24554
+ title: '供应商名称',
24555
+ width: 150,
24556
+ validator: function validator(_rule, value) {
24557
+ var title = '';
24558
+ if (((value === null || value === void 0 ? void 0 : value.dxdSuppliers) || []).some(function (goods) {
24559
+ var res = !(goods === null || goods === void 0 ? void 0 : goods.supplierCode);
24560
+ if (res) {
24561
+ title = (goods === null || goods === void 0 ? void 0 : goods.skuName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.skuName, "]") : '';
24562
+ }
24563
+ return res;
24564
+ })) {
24565
+ return Promise.reject("".concat(title, "\u4F9B\u5E94\u5546\u4E0D\u80FD\u4E3A\u7A7A"));
24566
+ }
24567
+ },
24568
+ render: function render(_val, record, index) {
24569
+ var options = DxdSuppliersData.getInstance().getSuppliersBySkuCode(record === null || record === void 0 ? void 0 : record.skuCode);
24570
+ return /*#__PURE__*/React.createElement(Select, {
24571
+ style: {
24572
+ width: '100%'
24573
+ },
24574
+ value: record === null || record === void 0 ? void 0 : record.supplierCode,
24575
+ options: options,
24576
+ allowClear: true,
24577
+ showSearch: true,
24578
+ optionFilterProp: "label",
24579
+ placeholder: "\u8BF7\u9009\u62E9\u4F9B\u5E94\u5546",
24580
+ onChange: function onChange(v) {
24581
+ var _opt$label;
24582
+ var opt = options.find(function (o) {
24583
+ return o.value === v;
24584
+ });
24585
+ updateDataHandle({
24586
+ supplierCode: v !== null && v !== void 0 ? v : '',
24587
+ supplierName: (_opt$label = opt === null || opt === void 0 ? void 0 : opt.label) !== null && _opt$label !== void 0 ? _opt$label : ''
24588
+ }, index);
24589
+ }
24590
+ });
24591
+ },
24592
+ conditionOptionsSetting: {
24593
+ dataType: 'weakenArray',
24594
+ getOptions: function getOptions() {
24595
+ return DxdSuppliersData.getInstance().supplierOptions || [];
24596
+ }
24597
+ }
24598
+ }, {
24599
+ dataIndex: 'supplierCode',
24600
+ title: '供应商编码',
24601
+ width: 150,
24602
+ render: renderTextEllipsis
24603
+ }, {
24604
+ dataIndex: 'packageName',
24605
+ title: '套餐名称',
24606
+ width: 150,
24607
+ render: renderTextEllipsis
24608
+ }, {
24609
+ dataIndex: 'packageCode',
24610
+ title: '套餐编码',
24611
+ width: 150,
24612
+ render: renderTextEllipsis
24613
+ }, {
24614
+ dataIndex: 'platformItemId',
24615
+ title: '平台商品ID',
24616
+ width: 150,
24617
+ render: renderTextEllipsis
24618
+ }, {
24619
+ dataIndex: 'platformSkuId',
24620
+ title: '平台商品SKU ID',
24621
+ width: 150,
24622
+ render: renderTextEllipsis
24623
+ }].map(function (item) {
24624
+ return _objectSpread2(_objectSpread2({}, item), {}, {
24625
+ align: 'center',
24626
+ ellipsis: true
24627
+ });
24628
+ })
24629
+ };
24630
+ };
24631
+
24632
+ var getColumns$b = function getColumns(_ref) {
24392
24633
  var _ref$text = _ref.text,
24393
24634
  text = _ref$text === void 0 ? '' : _ref$text,
24394
24635
  disabled = _ref.disabled,
@@ -24505,7 +24746,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
24505
24746
  disabled = _ref.disabled,
24506
24747
  updateHandle = _ref.updateHandle,
24507
24748
  updateDataHandle = _ref.updateDataHandle;
24508
- return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
24749
+ return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
24509
24750
  text: text,
24510
24751
  disabled: disabled,
24511
24752
  updateHandle: updateHandle
@@ -24549,8 +24790,13 @@ var getColumnsMap$1 = function getColumnsMap(args) {
24549
24790
  disabled: disabled,
24550
24791
  updateHandle: updateHandle,
24551
24792
  updateDataHandle: updateDataHandle
24793
+ })), getColumns$a({
24794
+ text: text,
24795
+ disabled: disabled,
24796
+ updateHandle: updateHandle,
24797
+ updateDataHandle: updateDataHandle
24552
24798
  })), {}, {
24553
- default: getColumns$a({
24799
+ default: getColumns$b({
24554
24800
  text: text,
24555
24801
  disabled: disabled,
24556
24802
  updateHandle: updateHandle
@@ -25118,6 +25364,7 @@ var systemOrderNoMap = {
25118
25364
  JY_REISSUE_GOODS: 'tradeNo',
25119
25365
  JKY_GOODS: 'tradeNo',
25120
25366
  JKY_REISSUE_GOODS: 'tradeNo',
25367
+ DXD_GOODS: 'orderNo',
25121
25368
  WLN_REISSUE_GOODS: 'tradeNo',
25122
25369
  KM_REISSUE_GOODS: 'sid',
25123
25370
  KM_RETURN_GOODS: 'sid',
@@ -25153,6 +25400,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
25153
25400
  _ref$isReloadSelectTa = _ref.isReloadSelectTable,
25154
25401
  isReloadSelectTable = _ref$isReloadSelectTa === void 0 ? false : _ref$isReloadSelectTa,
25155
25402
  validSystemOrderFn = _ref.validSystemOrderFn;
25403
+ console.log('systemOrders---', systemOrders);
25156
25404
  var _useState = useState(),
25157
25405
  _useState2 = _slicedToArray(_useState, 2),
25158
25406
  selectSystemNo = _useState2[0],
@@ -25378,6 +25626,12 @@ var getButtonText = function getButtonText() {
25378
25626
  if (['JKY_GOODS', 'JKY_REISSUE_GOODS'].includes(type)) {
25379
25627
  return '选择吉客云ERP商品';
25380
25628
  }
25629
+ if (['DXD_GOODS'].includes(type)) {
25630
+ return '选择大希地ERP商品';
25631
+ }
25632
+ if (['DXD_SUPPLIERS'].includes(type)) {
25633
+ return '选择大希地供应商商品';
25634
+ }
25381
25635
  if (['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(type)) {
25382
25636
  return '选择万里牛ERP商品';
25383
25637
  }
@@ -25441,7 +25695,7 @@ var GoodItem$1 = function GoodItem(props) {
25441
25695
  // const isShowSelectTradeGoods =
25442
25696
  // type !== 'JST_EXCHANGE_GOODS' || jstReturnGoods?.jstSystemOrderNo;
25443
25697
  // 判断是否为是否展示系统单筛选项
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;
25698
+ 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
25699
  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
25700
  var refModal = useRef();
25447
25701
  console.debug('表格数据', value);
@@ -25537,6 +25791,8 @@ var GoodItem$1 = function GoodItem(props) {
25537
25791
  case 'JY_REISSUE_GOODS':
25538
25792
  case 'JKY_GOODS':
25539
25793
  case 'JKY_REISSUE_GOODS':
25794
+ case 'DXD_GOODS':
25795
+ case 'DXD_SUPPLIERS':
25540
25796
  case 'WLN_REISSUE_GOODS':
25541
25797
  case 'SKX_GOODS':
25542
25798
  case 'SKX_RETURN_GOODS':
@@ -26800,13 +27056,55 @@ var jkyUtils = {
26800
27056
  };
26801
27057
 
26802
27058
  var singletonMap$8 = new Map();
27059
+ /**
27060
+ * 按 platformOrderNo 拉取大希地订单详情(/qy/gdfw/daxidi/erp/orderDetail)。
27061
+ * 返回订单原始数据结构:
27062
+ * { platformOrderNo, shopCode, shopName, split,
27063
+ * items: [{ platformItemId, platformSkuId, packageCode, packageName, quantity, skus: [{ skuCode, skuName, skuBarcode, quantity, unit }] }],
27064
+ * doOrders: [{ orderNo, warehouseCode, warehouseName, logisticsCode, logisticsName, coldChain, skus }] }
27065
+ * 不做 WDT 风格的 trades/billNo/billType 等转换,保留 DXD 原始结构由消费方按需处理。
27066
+ */
27067
+ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
27068
+ if (!singletonMap$8.has(orderNo)) {
27069
+ var p = new Promise(function (resolve, reject) {
27070
+ var doReject = function doReject(err) {
27071
+ // 清空掉错误的请求记录
27072
+ singletonMap$8.delete(orderNo);
27073
+ reject(err);
27074
+ };
27075
+ extendRequest('/qy/gdfw/daxidi/erp/orderDetail', {
27076
+ method: 'post',
27077
+ data: {
27078
+ platformOrderNo: orderNo
27079
+ }
27080
+ }).then(function (data) {
27081
+ if (data === null || data === void 0 ? void 0 : data.success) {
27082
+ resolve((data === null || data === void 0 ? void 0 : data.data) || {});
27083
+ // 延迟10秒清除,保证订单的时效性
27084
+ setTimeout(function () {
27085
+ singletonMap$8.delete(orderNo);
27086
+ }, 1000 * 10);
27087
+ } else {
27088
+ doReject(data);
27089
+ }
27090
+ }).catch(doReject);
27091
+ });
27092
+ singletonMap$8.set(orderNo, p);
27093
+ }
27094
+ return singletonMap$8.get(orderNo);
27095
+ };
27096
+ var dxdUtils = {
27097
+ getOrderListSingleton: getOrderListSingleton$2
27098
+ };
27099
+
27100
+ var singletonMap$9 = new Map();
26803
27101
  var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
26804
27102
  var cacheKey = "".concat(params.orderNo, "_").concat(params.shopId);
26805
- if (!singletonMap$8.has(cacheKey)) {
27103
+ if (!singletonMap$9.has(cacheKey)) {
26806
27104
  var p = new Promise(function (resolve, reject) {
26807
27105
  var doReject = function doReject(err) {
26808
27106
  // 清空掉错误的请求记录
26809
- singletonMap$8.delete(cacheKey);
27107
+ singletonMap$9.delete(cacheKey);
26810
27108
  reject(err);
26811
27109
  };
26812
27110
  extendRequest('/qy/gdfw/order/queryTradeAfterSaleList', {
@@ -26817,28 +27115,28 @@ var getAfterSalesOrderList = function getAfterSalesOrderList(params) {
26817
27115
  resolve(res.data || []);
26818
27116
  // 延迟10秒清除,保证订单的时效性
26819
27117
  setTimeout(function () {
26820
- singletonMap$8.delete(cacheKey);
27118
+ singletonMap$9.delete(cacheKey);
26821
27119
  }, 1000 * 10);
26822
27120
  } else {
26823
27121
  doReject(res);
26824
27122
  }
26825
27123
  }).catch(doReject);
26826
27124
  });
26827
- singletonMap$8.set(cacheKey, p);
27125
+ singletonMap$9.set(cacheKey, p);
26828
27126
  }
26829
- return singletonMap$8.get(cacheKey);
27127
+ return singletonMap$9.get(cacheKey);
26830
27128
  };
26831
27129
  var platformUtils = {
26832
27130
  getAfterSalesOrderList: getAfterSalesOrderList
26833
27131
  };
26834
27132
 
26835
- var singletonMap$9 = new Map();
26836
- var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
26837
- if (!singletonMap$9.has(orderNo)) {
27133
+ var singletonMap$a = new Map();
27134
+ var getOrderListSingleton$3 = function getOrderListSingleton(orderNo) {
27135
+ if (!singletonMap$a.has(orderNo)) {
26838
27136
  var p = new Promise(function (resolve, reject) {
26839
27137
  var doReject = function doReject(err) {
26840
27138
  // 清空掉错误的请求记录
26841
- singletonMap$9.delete(orderNo);
27139
+ singletonMap$a.delete(orderNo);
26842
27140
  reject(err);
26843
27141
  };
26844
27142
  extendRequest('/qy/gdfw/order/kmErpOrderDetail', {
@@ -26864,23 +27162,24 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
26864
27162
  }
26865
27163
  // 延迟10秒清除,保证订单的时效性
26866
27164
  setTimeout(function () {
26867
- singletonMap$9.delete(orderNo);
27165
+ singletonMap$a.delete(orderNo);
26868
27166
  }, 1000 * 10);
26869
27167
  } else {
26870
27168
  doReject(data);
26871
27169
  }
26872
27170
  }).catch(doReject);
26873
27171
  });
26874
- singletonMap$9.set(orderNo, p);
27172
+ singletonMap$a.set(orderNo, p);
26875
27173
  }
26876
- return singletonMap$9.get(orderNo);
27174
+ return singletonMap$a.get(orderNo);
26877
27175
  };
26878
27176
  var kmUtils = {
26879
- getOrderListSingleton: getOrderListSingleton$2
27177
+ getOrderListSingleton: getOrderListSingleton$3
26880
27178
  };
26881
27179
 
26882
27180
  var _excluded$k = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"],
26883
- _excluded2 = ["shopCode"];
27181
+ _excluded2 = ["shopCode"],
27182
+ _excluded3 = ["doOrders", "isSplit", "billNo", "billType", "billTag", "sysStatus"];
26884
27183
  var columnsMap = {
26885
27184
  BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
26886
27185
  KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
@@ -26892,7 +27191,8 @@ var columnsMap = {
26892
27191
  JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
26893
27192
  JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
26894
27193
  WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
26895
- PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
27194
+ PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns,
27195
+ DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
26896
27196
  };
26897
27197
  var rowKeyMap = {
26898
27198
  BS_SYSTEM_ORDER: 'billNo',
@@ -26905,7 +27205,8 @@ var rowKeyMap = {
26905
27205
  JY_SYSTEM_ORDER: 'tradeNo',
26906
27206
  JKY_SYSTEM_ORDER: 'tradeNo',
26907
27207
  WDT_RETURN_BILL_NO: 'refundNo',
26908
- PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId'
27208
+ PLATFORM_AFTER_SALES_ORDER: 'afterSaleOrderId',
27209
+ DXD_SYSTEM_ORDER: 'billNo'
26909
27210
  };
26910
27211
  var RADIO_TABLE_KEYS = ['PLATFORM_AFTER_SALES_ORDER'];
26911
27212
  var index$2 = (function (props) {
@@ -26969,6 +27270,8 @@ var index$2 = (function (props) {
26969
27270
  getJyOrderList(value.orderNo);
26970
27271
  } else if (type === 'JKY_SYSTEM_ORDER') {
26971
27272
  getJkyOrderList(value.orderNo);
27273
+ } else if (type === 'DXD_SYSTEM_ORDER') {
27274
+ getDxdOrderList(value.orderNo);
26972
27275
  } else if (type === 'PLATFORM_AFTER_SALES_ORDER') {
26973
27276
  value.shopId && getPlatformAfterSalesOrderList(value.orderNo, value.shopId);
26974
27277
  }
@@ -27028,6 +27331,22 @@ var index$2 = (function (props) {
27028
27331
  // deliveryStateName - 发货状态映射 (0: "未发货", 2: "全部发货")
27029
27332
  map['deliveryStateName'] = _objectSpread2({}, GY_DELIVERY_STATE_MAPPING);
27030
27333
  }
27334
+ // DXD_SYSTEM_ORDER 需要处理的字段
27335
+ if (type === 'DXD_SYSTEM_ORDER') {
27336
+ // billType - 订单类型映射(0: "普通订单", 1: "货到付款", ...)
27337
+ map['billType'] = _objectSpread2({}, KM_ORDER_TYPE_MAP);
27338
+ // sysStatus - 订单系统状态映射
27339
+ map['sysStatus'] = _objectSpread2({}, KM_ORDER_STATUS);
27340
+ // 布尔字段映射
27341
+ map['coldChain'] = {
27342
+ true: '是',
27343
+ false: '否'
27344
+ };
27345
+ map['split'] = {
27346
+ true: '是',
27347
+ false: '否'
27348
+ };
27349
+ }
27031
27350
  return map;
27032
27351
  }, [type]);
27033
27352
  // 过滤后的表格数据 - 根据选中字段和关键词模糊匹配(不区分大小写)
@@ -27370,6 +27689,62 @@ var index$2 = (function (props) {
27370
27689
  return _ref13.apply(this, arguments);
27371
27690
  };
27372
27691
  }();
27692
+ var getDxdOrderList = /*#__PURE__*/function () {
27693
+ var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(orderNo) {
27694
+ return _regeneratorRuntime().wrap(function _callee11$(_context11) {
27695
+ while (1) switch (_context11.prev = _context11.next) {
27696
+ case 0:
27697
+ dxdUtils.getOrderListSingleton(orderNo).then(function (trades) {
27698
+ var formatDxdOrders = (trades || []).reduce(function (prv, trade) {
27699
+ var _ref15 = trade || {},
27700
+ _ref15$doOrders = _ref15.doOrders,
27701
+ doOrders = _ref15$doOrders === void 0 ? [] : _ref15$doOrders,
27702
+ isSplit = _ref15.isSplit,
27703
+ billNo = _ref15.billNo,
27704
+ billType = _ref15.billType,
27705
+ billTag = _ref15.billTag,
27706
+ sysStatus = _ref15.sysStatus,
27707
+ restTrade = _objectWithoutProperties(_ref15, _excluded3);
27708
+ if (!doOrders.length) {
27709
+ prv.push(_objectSpread2(_objectSpread2({}, restTrade), {}, {
27710
+ billNo: billNo,
27711
+ billType: billType,
27712
+ billTag: billTag,
27713
+ sysStatus: sysStatus,
27714
+ isSplit: isSplit,
27715
+ rowKey: billNo
27716
+ }));
27717
+ return prv;
27718
+ }
27719
+ doOrders.forEach(function (doOrder, index) {
27720
+ var currentOrderNo = doOrder === null || doOrder === void 0 ? void 0 : doOrder.orderNo;
27721
+ prv.push(_objectSpread2(_objectSpread2(_objectSpread2({}, restTrade), doOrder), {}, {
27722
+ billNo: billNo,
27723
+ billType: billType,
27724
+ billTag: billTag,
27725
+ sysStatus: sysStatus,
27726
+ isSplit: isSplit,
27727
+ rowKey: currentOrderNo ? "".concat(billNo, "_").concat(currentOrderNo) : "".concat(billNo, "_").concat(index)
27728
+ }));
27729
+ });
27730
+ return prv;
27731
+ }, []);
27732
+ _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
27733
+ orders: formatDxdOrders,
27734
+ showOrderInfo: formatDxdOrders
27735
+ }));
27736
+ });
27737
+ onceRef.current = false;
27738
+ case 2:
27739
+ case "end":
27740
+ return _context11.stop();
27741
+ }
27742
+ }, _callee11);
27743
+ }));
27744
+ return function getDxdOrderList(_x12) {
27745
+ return _ref14.apply(this, arguments);
27746
+ };
27747
+ }();
27373
27748
  var rowKey = rowKeyMap[type] || 'billNo';
27374
27749
  var handleRadioChange = function handleRadioChange(record) {
27375
27750
  var _value$selectIds;
@@ -27844,16 +28219,16 @@ var orderSubFormConstants = {
27844
28219
  };
27845
28220
 
27846
28221
  var getSelectWidgetMap$1 = orderSubFormConstants.getSelectWidgetMap;
27847
- var singletonMap$a = new Map();
27848
- var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
28222
+ var singletonMap$b = new Map();
28223
+ var getOrderListSingleton$4 = function getOrderListSingleton(parmas) {
27849
28224
  var orderNo = parmas.orderNo,
27850
28225
  shopId = parmas.shopId;
27851
28226
  var key = "".concat(orderNo, "-").concat(shopId);
27852
- if (!singletonMap$a.has(key)) {
28227
+ if (!singletonMap$b.has(key)) {
27853
28228
  var p = new Promise(function (resolve, reject) {
27854
28229
  var doReject = function doReject(err) {
27855
28230
  // 清空掉错误的请求记录
27856
- singletonMap$a.delete(key);
28231
+ singletonMap$b.delete(key);
27857
28232
  reject(err);
27858
28233
  };
27859
28234
  extendRequest('/qy/gdfw/order/subOrderItemsDetail', {
@@ -27869,16 +28244,16 @@ var getOrderListSingleton$3 = function getOrderListSingleton(parmas) {
27869
28244
  }
27870
28245
  // 延迟10秒清除,保证订单的时效性
27871
28246
  setTimeout(function () {
27872
- singletonMap$a.delete(key);
28247
+ singletonMap$b.delete(key);
27873
28248
  }, 1000 * 10);
27874
28249
  } else {
27875
28250
  doReject(data);
27876
28251
  }
27877
28252
  }).catch(doReject);
27878
28253
  });
27879
- singletonMap$a.set(key, p);
28254
+ singletonMap$b.set(key, p);
27880
28255
  }
27881
- return singletonMap$a.get(key);
28256
+ return singletonMap$b.get(key);
27882
28257
  };
27883
28258
  var renderEditItem = function renderEditItem(_ref) {
27884
28259
  var item = _ref.item,
@@ -28010,7 +28385,7 @@ var renderDetailItem = function renderDetailItem(_ref2) {
28010
28385
  return Component;
28011
28386
  };
28012
28387
  var utils = {
28013
- getOrderListSingleton: getOrderListSingleton$3,
28388
+ getOrderListSingleton: getOrderListSingleton$4,
28014
28389
  renderEditItem: renderEditItem,
28015
28390
  renderDetailItem: renderDetailItem
28016
28391
  };
@@ -28018,7 +28393,7 @@ var utils = {
28018
28393
  var getOrderSubformColumns$1 = orderSubFormConstants.getOrderSubformColumns;
28019
28394
  var renderEditItem$1 = utils.renderEditItem,
28020
28395
  renderDetailItem$1 = utils.renderDetailItem,
28021
- getOrderListSingleton$4 = utils.getOrderListSingleton;
28396
+ getOrderListSingleton$5 = utils.getOrderListSingleton;
28022
28397
  var OrderSubForm = function OrderSubForm(props) {
28023
28398
  var _props$value = props.value,
28024
28399
  value = _props$value === void 0 ? {} : _props$value,
@@ -28220,7 +28595,7 @@ var OrderSubForm = function OrderSubForm(props) {
28220
28595
  var JOIN_SHOP = shopList === null || shopList === void 0 ? void 0 : shopList.find(function (item) {
28221
28596
  return !item.notJoin && item.shopId == shopId;
28222
28597
  });
28223
- return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$4({
28598
+ return (value === null || value === void 0 ? void 0 : value.orderNo) && shopId && JOIN_SHOP ? getOrderListSingleton$5({
28224
28599
  orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
28225
28600
  shopId: shopId
28226
28601
  }).then(function (data) {
@@ -28314,6 +28689,9 @@ var isErpType$1 = {
28314
28689
  },
28315
28690
  isJky: function isJky(type) {
28316
28691
  return ['JKY_GOODS'].includes(type);
28692
+ },
28693
+ isDxd: function isDxd(type) {
28694
+ return ['DXD_GOODS', 'DXD_SUPPLIERS'].includes(type);
28317
28695
  }
28318
28696
  };
28319
28697
  var processAllOrders = function processAllOrders(_ref) {
@@ -28346,6 +28724,9 @@ var processAllOrders = function processAllOrders(_ref) {
28346
28724
  data: data,
28347
28725
  orderNo: orderNo
28348
28726
  });
28727
+ } else if (isErpType$1.isDxd(type)) {
28728
+ // DXD 选品用出库订单 doOrders(每项含 skus[])
28729
+ newList = (data === null || data === void 0 ? void 0 : data.doOrders) || [];
28349
28730
  } else {
28350
28731
  newList = processDefaultOrders({
28351
28732
  data: data
@@ -28640,6 +29021,48 @@ var componentMap$2 = {
28640
29021
  },
28641
29022
  getOrderList: jkyUtils.getJkyOrderListSingleton
28642
29023
  },
29024
+ DXD_GOODS: {
29025
+ type: 'dxd',
29026
+ key: 'dxdGoods',
29027
+ name: '大希地',
29028
+ orderNo: 'srcTid',
29029
+ goodDetailOrderNo: 'srcTid',
29030
+ hiddenErpGoodsBtn: true,
29031
+ eventNameMap: {
29032
+ // pubsub 事件
29033
+ type: 'dxdType',
29034
+ // DXD 按自身数据格式(doOrders.skus)标准化商品,不复用 WDT
29035
+ updateGoodsHandle: updateDxdGoodsHandle,
29036
+ selectListReturn: 'dxdSelectListReturn',
29037
+ selectList: 'dxdSelectList',
29038
+ reissueSelectList: 'dxdReissueSelectList',
29039
+ reissueSelectListReturn: 'dxdReissueSelectListReturn',
29040
+ reissueDeleteGood: 'dxdReissueDeleteGood',
29041
+ changeShopCode: 'dxdChangeShopCode',
29042
+ reissueType: 'dxdReissueType',
29043
+ returnType: 'dxdReturnType',
29044
+ returnSelectListReturn: 'dxdReturnSelectListReturn',
29045
+ returnSelectList: 'dxdReturnSelectList',
29046
+ deleteGood: 'dxdDeleteGood',
29047
+ returnDeleteGood: 'dxdReturnDeleteGood',
29048
+ exchangeDeleteGood: 'dxdExchangeDeleteGood'
29049
+ },
29050
+ getOrderList: dxdUtils.getOrderListSingleton
29051
+ },
29052
+ DXD_SUPPLIERS: {
29053
+ type: 'dxd',
29054
+ key: 'dxdSuppliers',
29055
+ name: '大希地供应商',
29056
+ orderNo: 'srcTid',
29057
+ goodDetailOrderNo: 'srcTid',
29058
+ eventNameMap: {
29059
+ // pubsub 事件(用 dxdSuppliers 前缀,避免与 DXD_GOODS 的 dxd 前缀事件冲突)
29060
+ type: 'dxdSuppliersType',
29061
+ selectListReturn: 'dxdSuppliersSelectListReturn',
29062
+ selectList: 'dxdSuppliersSelectList',
29063
+ changeShopCode: 'dxdSuppliersChangeShopCode'
29064
+ }
29065
+ },
28643
29066
  WLN_GOODS: {
28644
29067
  type: 'jky',
28645
29068
  key: 'wlnGoods',
@@ -28704,11 +29127,13 @@ var componentMap$2 = {
28704
29127
  }
28705
29128
  };
28706
29129
  var CommonGoods = function CommonGoods(props) {
28707
- var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7;
29130
+ var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7, _componentMap$compTyp8;
28708
29131
  var value = props.value,
28709
- disabled = props.disabled,
29132
+ rawDisabled = props.disabled,
28710
29133
  onChange = props.onChange,
28711
29134
  compType = props.type;
29135
+ // DXD_SUPPLIERS 纯镜像 DXD_GOODS(由 FormRender useWatch 联动同步增删),禁用独立增删
29136
+ var disabled = rawDisabled || compType === 'DXD_SUPPLIERS';
28712
29137
  // console.log('value?.orders', value?.orders);
28713
29138
  // 合并单订单会包含","
28714
29139
  var showModeBtn = ((_componentMap$compTyp = componentMap$2[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.checkShowModeBtn) ? componentMap$2[compType].checkShowModeBtn(value) : !['BS_E3_GOODS'].includes(compType) && ((value === null || value === void 0 ? void 0 : value.orders) || []).some(function (order) {
@@ -29068,6 +29493,7 @@ var CommonGoods = function CommonGoods(props) {
29068
29493
  orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
29069
29494
  type: compType
29070
29495
  });
29496
+ console.log('list---', list);
29071
29497
  onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
29072
29498
  allOrders: list || []
29073
29499
  }));
@@ -29093,9 +29519,10 @@ var CommonGoods = function CommonGoods(props) {
29093
29519
  onModeChange: handleModeChange,
29094
29520
  showModeBtn: showModeBtn,
29095
29521
  isStrict: value === null || value === void 0 ? void 0 : value.isStrict,
29096
- systemOrders: value === null || value === void 0 ? void 0 : value.allOrders,
29522
+ systemOrders: (value === null || value === void 0 ? void 0 : value.systemOrders) || (value === null || value === void 0 ? void 0 : value.allOrders),
29097
29523
  selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
29098
29524
  showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
29525
+ showErpGoodsBtn: !((_componentMap$compTyp8 = componentMap$2[compType]) === null || _componentMap$compTyp8 === void 0 ? void 0 : _componentMap$compTyp8.hiddenErpGoodsBtn),
29099
29526
  tradeGoods: {
29100
29527
  originDataSource: originDataSource,
29101
29528
  getDataSourceAsync: getDataSourceAsync,
@@ -32593,10 +33020,11 @@ var SYSTEM_ORDER_COLUMNS_MAP = {
32593
33020
  JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
32594
33021
  JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
32595
33022
  JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
32596
- WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
33023
+ WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
33024
+ DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
32597
33025
  };
32598
33026
  var FIELD_COLUMNS_MAP = {
32599
33027
  PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
32600
33028
  };
32601
33029
 
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 };
33030
+ 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 };
@@ -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
+ };
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.5",
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.2",
24
24
  "ahooks": "^3.7.4",
25
25
  "ali-react-table": "2.6.1",
26
26
  "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
66
66
  "publishConfig": {
67
67
  "access": "public"
68
68
  },
69
- "gitHead": "c2da8778fd3ef4bdd878160b5b4d86a6fb4cbbf6"
69
+ "gitHead": "d2940af2e53941664024c54d7c2aa372a1df4476"
70
70
  }