@kmkf-fe-packages/basic-components 2.10.9-beta.7 → 2.10.9-beta.9

package/dist/index.esm.js

@@ -8726,6 +8726,9 @@ var processErpLogistics = function processErpLogistics(getValue) {
       },
       SKX_LOGISTICS: {
         listKey: 'skxLogisticsList'
+      },
+      DXD_LOGISTICS: {
+        listKey: 'dxdLogisticsList'
       }
     };
     var initValue = [{
@@ -9614,6 +9617,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       GY_LOGISTICS: processErpLogistics,
       BS_E3_LOGISTICS: processErpLogistics,
       KM_LOGISTICS: processErpLogistics,
+      DXD_LOGISTICS: processErpLogistics,
       BS_SEND_GOOD: processErpSendGood,
       WLN_SEND_GOOD: processErpSendGood,
       WDT_SEND_GOOD: processErpSendGood,
@@ -24567,7 +24571,7 @@ var getColumns$a = function getColumns() {
       },
       render: function render(_val, record, index) {
         var options = DxdSuppliersData.getInstance().getSuppliersBySkuCode(record === null || record === void 0 ? void 0 : record.skuCode);
-        return /*#__PURE__*/React.createElement(Select, {
+        return !disabled ? /*#__PURE__*/React.createElement(Select, {
           style: {
             width: '100%'
           },
@@ -24587,7 +24591,7 @@ var getColumns$a = function getColumns() {
               supplierName: (_opt$label = opt === null || opt === void 0 ? void 0 : opt.label) !== null && _opt$label !== void 0 ? _opt$label : ''
             }, index);
           }
-        });
+        }) : DxdSuppliersData.getInstance().getSupplierNameByCode(record === null || record === void 0 ? void 0 : record.supplierCode);
       },
       conditionOptionsSetting: {
         dataType: 'weakenArray',
@@ -25400,7 +25404,6 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     _ref$isReloadSelectTa = _ref.isReloadSelectTable,
     isReloadSelectTable = _ref$isReloadSelectTa === void 0 ? false : _ref$isReloadSelectTa,
     validSystemOrderFn = _ref.validSystemOrderFn;
-  console.log('systemOrders---', systemOrders);
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     selectSystemNo = _useState2[0],
@@ -25672,6 +25675,8 @@ var GoodItem$1 = function GoodItem(props) {
     otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
     _props$canUpdateNumbe = props.canUpdateNumber,
     canUpdateNumber = _props$canUpdateNumbe === void 0 ? false : _props$canUpdateNumbe,
+    _props$notAllowedOper = props.notAllowedOperation,
+    notAllowedOperation = _props$notAllowedOper === void 0 ? false : _props$notAllowedOper,
     shopCode = props.shopCode,
     _props$companyKey = props.companyKey,
     companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
@@ -25880,14 +25885,14 @@ var GoodItem$1 = function GoodItem(props) {
       render: function render(val, record, index) {
         return /*#__PURE__*/React.createElement(HoverTableRowDeleteIcon, {
           index: index,
-          hoveredRowIndex: !disabled && (record.canDelete || canDelete) ? hoveredRowIndex : null,
+          hoveredRowIndex: !disabled && !notAllowedOperation && (record.canDelete || canDelete) ? hoveredRowIndex : null,
           handleClick: function handleClick() {
             return handleDelete(record, index);
           }
         });
       }
     }].concat(_toConsumableArray(baseInfoColumns));
-    if (!disabled) {
+    if (!disabled && !notAllowedOperation) {
       columnList.push({
         dataIndex: '',
         title: "\u64CD\u4F5C",
@@ -25929,22 +25934,6 @@ var GoodItem$1 = function GoodItem(props) {
       }
     }].concat(_toConsumableArray(list));
   }, [showHeader, value, disabled, hoveredRowIndex]);
-  var orderColumns = useMemo(function () {
-    var columns = COLUMNS_MAP('', {
-      operate: false,
-      disabled: true
-    })(type);
-    return [{
-      dataIndex: '',
-      title: '序号',
-      align: 'center',
-      ellipsis: true,
-      width: 50,
-      render: function render(val, record, index) {
-        return /*#__PURE__*/React.createElement("span", null, index + 1);
-      }
-    }].concat(_toConsumableArray(columns));
-  }, []);
   var onSubmit = function onSubmit(list) {
     var newList = processGoods$1({
       list: list,
@@ -25984,7 +25973,7 @@ var GoodItem$1 = function GoodItem(props) {
   var validSystemOrder = useMemo(function () {
     return ['GY_REISSUE_GOODS', 'WDT_REISSUE_GOODS', 'BS_E3_REISSUE_GOODS', 'JST_REISSUE_GOODS', 'KM_REISSUE_GOODS'].includes(type) && !hasSelectedSystemOrder;
   }, [type, hasSelectedSystemOrder]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && !notAllowedOperation && (showChangeBtn ? /*#__PURE__*/React.createElement("div", {
     style: {
       float: 'right'
     }
@@ -27178,8 +27167,7 @@ var kmUtils = {
 };
 
 var _excluded$k = ["billNo", "billType", "billTag", "tradeTagName", "deliveryState", "vipCode", "shopCode", "cancel"],
-  _excluded2 = ["shopCode"],
-  _excluded3 = ["doOrders", "isSplit", "billNo", "billType", "billTag", "sysStatus"];
+  _excluded2 = ["shopCode"];
 var columnsMap = {
   BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
   KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
@@ -27694,44 +27682,17 @@ var index$2 = (function (props) {
       return _regeneratorRuntime().wrap(function _callee11$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
-            dxdUtils.getOrderListSingleton(orderNo).then(function (trades) {
-              var formatDxdOrders = (trades || []).reduce(function (prv, trade) {
-                var _ref15 = trade || {},
-                  _ref15$doOrders = _ref15.doOrders,
-                  doOrders = _ref15$doOrders === void 0 ? [] : _ref15$doOrders,
-                  isSplit = _ref15.isSplit,
-                  billNo = _ref15.billNo,
-                  billType = _ref15.billType,
-                  billTag = _ref15.billTag,
-                  sysStatus = _ref15.sysStatus,
-                  restTrade = _objectWithoutProperties(_ref15, _excluded3);
-                if (!doOrders.length) {
-                  prv.push(_objectSpread2(_objectSpread2({}, restTrade), {}, {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag,
-                    sysStatus: sysStatus,
-                    isSplit: isSplit,
-                    rowKey: billNo
-                  }));
-                  return prv;
-                }
-                doOrders.forEach(function (doOrder, index) {
-                  var currentOrderNo = doOrder === null || doOrder === void 0 ? void 0 : doOrder.orderNo;
-                  prv.push(_objectSpread2(_objectSpread2(_objectSpread2({}, restTrade), doOrder), {}, {
-                    billNo: billNo,
-                    billType: billType,
-                    billTag: billTag,
-                    sysStatus: sysStatus,
-                    isSplit: isSplit,
-                    rowKey: currentOrderNo ? "".concat(billNo, "_").concat(currentOrderNo) : "".concat(billNo, "_").concat(index)
-                  }));
+            dxdUtils.getOrderListSingleton(orderNo).then(function (trade) {
+              var _trade$doOrders;
+              var data = (_trade$doOrders = trade.doOrders) === null || _trade$doOrders === void 0 ? void 0 : _trade$doOrders.map(function (order) {
+                return _objectSpread2(_objectSpread2({}, order), {}, {
+                  billNo: order.orderNo,
+                  billType: (trade === null || trade === void 0 ? void 0 : trade.split) ? '拆分订单' : '普通订单'
                 });
-                return prv;
-              }, []);
+              });
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
-                orders: formatDxdOrders,
-                showOrderInfo: formatDxdOrders
+                orders: data || [],
+                showOrderInfo: data || []
               }));
             });
             onceRef.current = false;
@@ -28726,7 +28687,9 @@ var processAllOrders = function processAllOrders(_ref) {
     });
   } else if (isErpType$1.isDxd(type)) {
     // DXD 选品用出库订单 doOrders（每项含 skus[]）
-    newList = (data === null || data === void 0 ? void 0 : data.doOrders) || [];
+    newList = processDxdOrders({
+      data: data
+    });
   } else {
     newList = processDefaultOrders({
       data: data
@@ -28773,8 +28736,28 @@ var processWlnOrders = function processWlnOrders(_ref6) {
   var data = _ref6.data;
   return (data === null || data === void 0 ? void 0 : data.orders) || [];
 };
-var processDefaultOrders = function processDefaultOrders(_ref7) {
+var processDxdOrders = function processDxdOrders(_ref7) {
+  var _data$doOrders;
   var data = _ref7.data;
+  var _ref8 = data || {},
+    isSplit = _ref8.isSplit,
+    billNo = _ref8.billNo,
+    billType = _ref8.billType,
+    billTag = _ref8.billTag,
+    sysStatus = _ref8.sysStatus;
+  var trades = (_data$doOrders = data.doOrders) === null || _data$doOrders === void 0 ? void 0 : _data$doOrders.map(function (item) {
+    return _objectSpread2(_objectSpread2({}, item), {}, {
+      billNo: billNo,
+      billType: billType,
+      billTag: billTag,
+      isSplit: isSplit,
+      sysStatus: sysStatus
+    });
+  });
+  return trades;
+};
+var processDefaultOrders = function processDefaultOrders(_ref9) {
+  var data = _ref9.data;
   return data || [];
 };
 
@@ -29129,13 +29112,13 @@ var componentMap$2 = {
 var CommonGoods = function CommonGoods(props) {
   var _componentMap$compTyp, _withInfo$current3, _withInfo$current4, _componentMap$compTyp7, _componentMap$compTyp8;
   var value = props.value,
-    rawDisabled = props.disabled,
+    disabled = props.disabled,
     onChange = props.onChange,
     compType = props.type;
   // DXD_SUPPLIERS 纯镜像 DXD_GOODS（由 FormRender useWatch 联动同步增删），禁用独立增删
-  var disabled = rawDisabled || compType === 'DXD_SUPPLIERS';
   // console.log('value?.orders', value?.orders);
   // 合并单订单会包含","
+  var notAllowedOperation = ['DXD_SUPPLIERS'].includes(compType);
   var showModeBtn = ((_componentMap$compTyp = componentMap$2[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.checkShowModeBtn) ? componentMap$2[compType].checkShowModeBtn(value) : !['BS_E3_GOODS'].includes(compType) && ((value === null || value === void 0 ? void 0 : value.orders) || []).some(function (order) {
     var _order$componentMap$c;
     return order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$2[compType].orderNo]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.includes(',');
@@ -29493,7 +29476,6 @@ var CommonGoods = function CommonGoods(props) {
         orderNo: value === null || value === void 0 ? void 0 : value.orderNo,
         type: compType
       });
-      console.log('list---', list);
       onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
         allOrders: list || []
       }));
@@ -29523,6 +29505,7 @@ var CommonGoods = function CommonGoods(props) {
     selectedSystemOrders: value === null || value === void 0 ? void 0 : value.orders,
     showChangeBtn: (_componentMap$compTyp7 = componentMap$2[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.showChangeBtn,
     showErpGoodsBtn: !((_componentMap$compTyp8 = componentMap$2[compType]) === null || _componentMap$compTyp8 === void 0 ? void 0 : _componentMap$compTyp8.hiddenErpGoodsBtn),
+    notAllowedOperation: notAllowedOperation,
     tradeGoods: {
       originDataSource: originDataSource,
       getDataSourceAsync: getDataSourceAsync,

package/dist/src/bs/component/GoodItem/index.d.ts

@@ -45,6 +45,7 @@ interface BsGoodsProps {
     systemOrders?: any[];
     selectedSystemOrders?: any[];
     isReloadSelectTable?: boolean;
+    notAllowedOperation?: boolean;
     validSystemOrderFn?: () => boolean | undefined;
 }
 type MakeRequired<T, K extends keyof T> = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.10.9-beta.7",
+  "version": "2.10.9-beta.9",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.7",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.9",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d6558dcf8b927261d593339672116955a666008d"
+  "gitHead": "f72c7170af0b9874ff0e5a8bad984943478b0c42"
 }