@kmkf-fe-packages/kmkf-utils 2.2.13-beta.43 → 2.2.13-beta.47

package/dist/esm/utils/getSystemShowHead.js

@@ -2,7 +2,7 @@ var getSystemShowHead = function getSystemShowHead(_ref) {
   var columns = _ref.columns,
     showHeader = _ref.showHeader;
   var initBaseInfoColumns = columns || [];
-  var baseInfoColumns = [];
+  var baseInfoColumns = initBaseInfoColumns || [];
   var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
   var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
   if (isStringArray) {

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -63,6 +63,20 @@ export var tradeStatusMap = {
     105: "部分打款",
     110: "已完成",
     113: "异常发货"
+  },
+  web: {
+    4: "已取消（可恢复）",
+    5: "已取消",
+    25: "特殊单",
+    29: "预订单",
+    30: "待审核（已支付）",
+    35: "待财审",
+    50: "待发货",
+    51: "待推送",
+    52: "推送中",
+    53: "推送失败",
+    55: "已推送",
+    95: "已发货"
   }
 };
 export var WDT_SYSTEM_ORDER_CONFIG = {
@@ -147,6 +161,7 @@ export var updateWdtGoodsHandle = function updateWdtGoodsHandle() {
         item.goodId = item.goodsId;
         item.goodName = item.goodsName;
         item.goodNo = item.goodsNo;
+        item.orderPrice = item.orderPrice || item.price;
         item.canDelete = true;
         item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
         item.systemOrderNo = cur === null || cur === void 0 ? void 0 : cur.tradeNo;
@@ -386,9 +401,10 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tagName
+          billTag: item.tagName || item.tags // 网页版取tags，其他版本用tagName
         });
       }),
+
       selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
         return item.tradeNo;
       }) : [],
@@ -396,7 +412,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
         return {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tagName,
+          billTag: item.tagName || item.tags,
+          // 网页版取tags，其他版本用tagName
           tradeStatusValue: item.tradeStatusValue
         };
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.13-beta.43",
+  "version": "2.2.13-beta.47",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f67ba14c08ec0295f39da3b56255a5f37eac1788",
+  "gitHead": "a4edcbe9a776216b4948b3d344f64a52cf7b77b5",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }