@kmkf-fe-packages/kmkf-utils 2.7.2 → 2.7.3-beta.0

package/README.md

@@ -1 +1 @@
-112311112
+1123111123

package/dist/esm/constants/constant.js

@@ -124,7 +124,7 @@ export var SYMBOL = {
   BETWEEN: "between",
   EQ: "eq"
 };
-export var hasAddNullComponent = ["RADIO", "SELECT", "CHECKBOX", "BASIC_MULT_SELECT", "FLOW_TAG", "WAREHOUSING_STATUS", "BS_E3_WAREHOUSING_STATUS", "ADJUST_WORK_ORDER_STATUS", "ERP_REMARK", "REISSUE_STATUS", "INVOICE_STATUS", "INVOICING_STATUS", "MSG_STATUS", "AGREE_REFUND_STATUS", "REPAIR_ORDER_STATUS", "ERP_AFTER_SALE_STATUS", "REJECT_REFUND_STATUS", "LOGISTICS_INTERCEPTION", "AGREE_RETURN_GOODS_STATUS", "REJECT_RETURN_GOODS_STATUS", "RETURN_EXCHANGE_GOODS_REVIEW_STATUS", "GY_PAYMENT_METHOD"];
+export var hasAddNullComponent = ["RADIO", "SELECT", "CHECKBOX", "BASIC_MULT_SELECT", "FLOW_TAG", "WAREHOUSING_STATUS", "BS_E3_WAREHOUSING_STATUS", "ADJUST_WORK_ORDER_STATUS", "ERP_REMARK", "REISSUE_STATUS", "INVOICE_STATUS", "INVOICING_STATUS", "MSG_STATUS", "AGREE_REFUND_STATUS", "REPAIR_ORDER_STATUS", "ERP_AFTER_SALE_STATUS", "ERP_AFTER_SALES_ORDER_REVIEW_STATUS", "REJECT_REFUND_STATUS", "LOGISTICS_INTERCEPTION", "AGREE_RETURN_GOODS_STATUS", "REJECT_RETURN_GOODS_STATUS", "RETURN_EXCHANGE_GOODS_REVIEW_STATUS", "GY_PAYMENT_METHOD"];
 export var SelectInputComponent = ["INPUT", "TEXTAREA", "SHOP_NAME_INPUT", "BUYER_NICK_INPUT", "RECEIVER_NAME_INPUT", "REMARK_INPUT", "RETURN_GOODS_STATUS", "EXCHANGE_STATUS", "BS_LOGISTICS", "WLN_LOGISTICS", "WDT_LOGISTICS", "KM_LOGISTICS", "GY_LOGISTICS", "JST_LOGISTICS", "AFTER_SALES_ORDER_ID"];
 
 // 表单默认值

package/dist/esm/constants/msgTypeMapping.js

@@ -21,6 +21,7 @@ var msgTypeCh = {
   logistics: "中通/圆通/申通售后群消息",
   negotiate: "协商售后",
   QN_LOGISTICS_INTERCEPTION: "物流拦截（平台）",
-  GET_SYS_ORDER_INFO: "聚水潭同步系统订单信息"
+  GET_SYS_ORDER_INFO: "聚水潭同步系统订单信息",
+  JST_ADD_MANUAL_ORDER: "聚水潭新增手工订单"
 };
 export default msgTypeCh;

package/dist/esm/servers/WLN/index.d.ts

@@ -1 +1,2 @@
 export * from './logisticsData';
+export * from './warehouseData';

package/dist/esm/servers/WLN/index.js

@@ -1 +1,2 @@
-export * from "./logisticsData";
+export * from "./logisticsData";
+export * from "./warehouseData";

package/dist/esm/servers/WLN/warehouseData.d.ts

@@ -0,0 +1,7 @@
+declare type WarehouseType = {
+    disabled: boolean;
+    label: string;
+    value: string;
+};
+export declare const getWarehouseDataAsync: () => Promise<WarehouseType[]>;
+export default getWarehouseDataAsync;

package/dist/esm/servers/WLN/warehouseData.js

@@ -0,0 +1,32 @@
+import { fetchAll } from "../../utils";
+import request from "../../request";
+var queryWarehouseList = function queryWarehouseList(_ref) {
+  var pageNo = _ref.pageNo,
+    pageSize = _ref.pageSize;
+  return request({
+    url: "/qy/gdfw/wln/erp/warehouse/list",
+    method: "post",
+    data: {
+      pageNo: pageNo,
+      pageSize: pageSize
+    }
+  });
+};
+export var getWarehouseDataAsync = function getWarehouseDataAsync() {
+  return fetchAll("WLN_WAREHOUSE_DATA", queryWarehouseList, function (data) {
+    var list = [];
+    var warehouses = data || [];
+    warehouses.map(function (_ref2) {
+      var storageCode = _ref2.storageCode,
+        storageName = _ref2.storageName,
+        status = _ref2.status;
+      list.push({
+        label: storageName,
+        value: storageCode,
+        disabled: [0, 2].includes(status)
+      });
+    });
+    return list;
+  });
+};
+export default getWarehouseDataAsync;

package/dist/esm/utils/SendData.js

@@ -8,7 +8,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { BSE3, WDT, KM, GY, JST, JY, JKY } from "../servers/index";
+import { BSE3, WDT, KM, GY, JST, JY, JKY, WLN } from "../servers/index";
 var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
   var _this = this;
   _classCallCheck(this, SendData);
@@ -22,8 +22,7 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
         case 0:
           _context.next = 2;
           return (_this$service = _this.service) === null || _this$service === void 0 ? void 0 : _this$service.getWarehouseDataAsync().then(function (list) {
-            // console.log("发货仓数据---", this.platform, list);
-
+            console.log("发货仓数据---", _this.platform, list);
             _this.sendData = list;
           });
         case 2:
@@ -72,7 +71,8 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
     gy: GY,
     jst: JST,
     jy: JY,
-    jky: JKY
+    jky: JKY,
+    wln: WLN
   }[this.platform];
 });
 export var SendDataCenter = /*#__PURE__*/function () {

package/dist/esm/utils/orderBackFormValues.d.ts

@@ -17,9 +17,10 @@ interface OrderBackFormValuesI {
     formValue?: Record<string, unknown>;
     order_no?: string | null;
     detail: Record<string, unknown>;
-    fromQNCreateWorkOrderByOrderNo: boolean;
+    fromQNCreateWorkOrderByOrderNo?: boolean;
+    skipOrderBackUniqueKeys?: string[];
     _get_order_fail_?: boolean;
     shopId?: string;
 }
-declare const _default: ({ shopId, _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, }: OrderBackFormValuesI) => any;
+declare const _default: ({ shopId, _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, skipOrderBackUniqueKeys, }: OrderBackFormValuesI) => any;
 export default _default;

package/dist/esm/utils/orderBackFormValues.js

@@ -86,7 +86,9 @@ export default (function (_ref) {
     _ref$type = _ref.type,
     type = _ref$type === void 0 ? "add" : _ref$type,
     _ref$fromQNCreateWork = _ref.fromQNCreateWorkOrderByOrderNo,
-    fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork;
+    fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork,
+    _ref$skipOrderBackUni = _ref.skipOrderBackUniqueKeys,
+    skipOrderBackUniqueKeys = _ref$skipOrderBackUni === void 0 ? [] : _ref$skipOrderBackUni;
   var orderValues = !_get_order_fail_ ? ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
     var _next$componentConfig, _ref2, _detail$expressLogist, _detail$returnLogisti, _next$componentConfig2, _next$componentConfig3, _next$componentConfig4;
     var uniqueKey = next.uniqueKey;
@@ -94,7 +96,7 @@ export default (function (_ref) {
     var city = null,
       town = null;
     // console.log("--订单返填数据重组", next.workOrderComponentType);
-
+    if (skipOrderBackUniqueKeys.includes(uniqueKey)) return prv;
     switch (next.workOrderComponentType) {
       case "TRADE_ID_INPUT":
         prv[uniqueKey] = (_next$componentConfig = next.componentConfig) !== null && _next$componentConfig !== void 0 && _next$componentConfig.toUpperCase ? (_ref2 = order_no || detail["orderNo"]) === null || _ref2 === void 0 ? void 0 : _ref2.toUpperCase() : order_no || detail["orderNo"];

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -521,7 +521,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
     _detail$allOrders = detail.allOrders,
     allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
     _detail$wdtReturnOrde = detail.wdtReturnOrders,
-    wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde;
+    wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde,
+    matchLogisticsNo = detail.matchLogisticsNo;
   var wdtGoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "WDT_GOODS";
   });
@@ -532,6 +533,11 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
   var isStrict = wdtGoodsCom ? (_form$getFieldValue = form.getFieldValue(wdtGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
   var onlyOneSystemOrder = (detail === null || detail === void 0 ? void 0 : (_detail$trades2 = detail.trades) === null || _detail$trades2 === void 0 ? void 0 : _detail$trades2.length) === 1;
   var defaultOrder = currentTrades !== null && currentTrades !== void 0 && currentTrades[0] ? [currentTrades[0]] : [];
+  var matchedSystemOrderIds = matchLogisticsNo ? currentTrades.filter(function (item) {
+    return "".concat((item === null || item === void 0 ? void 0 : item.logisticsNo) || "").trim() === "".concat(matchLogisticsNo).trim();
+  }).map(function (item) {
+    return item.tradeNo;
+  }) : [];
   return {
     wdtSystemOrder: {
       //标记通过请求获取的值
@@ -546,7 +552,7 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
           logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
         });
       }),
-      selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
+      selectIds: matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? currentTrades.map(function (item) {
         return item.tradeNo;
       }) : [],
       showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {

package/dist/esm/utils/wlnOrderBackFormValues.d.ts

@@ -11,7 +11,7 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
 };
 export declare const updateWlnGoodsHandle: (orders?: any[]) => any;
 export declare const wlnOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
-export declare const wlnOrderTransform: (detail: any) => {
+export declare const wlnOrderTransform: (detail: any, form: any) => {
     wlnSystemOrder: {
         orderNo: any;
         orders: any;

package/dist/esm/utils/wlnOrderBackFormValues.js

@@ -32,6 +32,54 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
     title: "标记",
     dataIndex: "billTag",
     width: 150
+  }, {
+    title: "是否拆分订单",
+    dataIndex: "splitTrade",
+    width: 150
+  }, {
+    title: "是否售后订单",
+    dataIndex: "exchangeTrade",
+    width: 150
+  }, {
+    title: "是否有退款",
+    dataIndex: "hasRefund",
+    width: 150
+  }, {
+    title: "是否预售订单",
+    dataIndex: "preSale",
+    width: 150
+  }, {
+    title: "合并前系统单号",
+    dataIndex: "mergeUids",
+    width: 150
+  }, {
+    title: "快递公司名称",
+    dataIndex: "logisticName",
+    width: 150
+  }, {
+    title: "快递公司编码",
+    dataIndex: "logisticCode",
+    width: 150
+  }, {
+    title: "快递单号",
+    dataIndex: "expressCode",
+    width: 150
+  }, {
+    title: "发货仓名称",
+    dataIndex: "storageName",
+    width: 150
+  }, {
+    title: "发货仓编码",
+    dataIndex: "storageCode",
+    width: 150
+  }, {
+    title: "单据处理状态",
+    dataIndex: "processStatus",
+    width: 150
+  }, {
+    title: "线上单号",
+    dataIndex: "tpTid",
+    width: 150
   }]
 };
 export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
@@ -68,8 +116,39 @@ export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
   }, []);
   return list;
 };
-var updateWlnItemListHandle = function updateWlnItemListHandle(list, type) {
+var updateWlnItemListHandle = function updateWlnItemListHandle(list, type, comList, form) {
   var _newList;
+  if (type === "logistics") {
+    var _comList$find, _currentCom$component;
+    var currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find = comList.find) === null || _comList$find === void 0 ? void 0 : _comList$find.call(comList, function (item) {
+      return item.workOrderComponentType === "WLN_LOGISTICS";
+    });
+    var notOrderBack = (currentCom === null || currentCom === void 0 ? void 0 : (_currentCom$component = currentCom.componentConfig) === null || _currentCom$component === void 0 ? void 0 : _currentCom$component.notOrderBack) || false;
+    if (notOrderBack) {
+      var _currentValue;
+      var currentValue = form.getFieldValue(currentCom.uniqueKey);
+      currentValue = (_currentValue = currentValue) !== null && _currentValue !== void 0 && _currentValue.length ? currentValue : [{
+        logisticsCode: "",
+        logisticsCompany: ""
+      }];
+      return currentValue;
+    }
+  } else if (type === "send") {
+    var _comList$find2, _currentCom$component2;
+    var _currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find2 = comList.find) === null || _comList$find2 === void 0 ? void 0 : _comList$find2.call(comList, function (item) {
+      return item.workOrderComponentType === "WLN_SEND_GOOD";
+    });
+    var _notOrderBack = (_currentCom === null || _currentCom === void 0 ? void 0 : (_currentCom$component2 = _currentCom.componentConfig) === null || _currentCom$component2 === void 0 ? void 0 : _currentCom$component2.notOrderBack) || false;
+    if (_notOrderBack) {
+      var _currentValue3;
+      var _currentValue2 = form.getFieldValue(_currentCom.uniqueKey);
+      _currentValue2 = (_currentValue3 = _currentValue2) !== null && _currentValue3 !== void 0 && _currentValue3.length ? _currentValue2 : [{
+        sendId: "",
+        sendName: ""
+      }];
+      return _currentValue2;
+    }
+  }
   var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
     var items = (next.items || []).map(function (t) {
       return {
@@ -161,8 +240,36 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
   }, {});
 };
 //wln订单信息转换
-export var wlnOrderTransform = function wlnOrderTransform(detail) {
-  var _detail$orders, _ref, _detail$orders2, _detail$orders2$;
+export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
+  var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _detail$orders, _ref, _detail$orders2, _detail$orders2$;
+  console.log("\uD83D\uDE80 ~ wlnOrderBackFormValues.ts:265 ~ wlnOrderTransform ~ detail:", detail);
+  var _detail$allOrders = detail.allOrders,
+    allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
+    orderNo = detail.orderNo,
+    _detail$trades = detail.trades,
+    currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
+    componentList = detail.componentList;
+  var filterCurrentTrades = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.filter(function (trade) {
+    return !trade.cancel;
+  });
+  var wlnGoodsCom = (componentList || []).find(function (com) {
+    return com.workOrderComponentType === "WLN_GOODS";
+  });
+  var wlnReissueCom = (componentList || []).find(function (com) {
+    return com.workOrderComponentType === "WLN_REISSUE_GOODS";
+  });
+  var isStrict = wlnGoodsCom ? (_form$getFieldValue = form.getFieldValue(wlnGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
+  var onlyOneSystemOrder = (filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.length) === 1;
+  var isReissueDefaultSelect = !!(wlnReissueCom !== null && wlnReissueCom !== void 0 && (_wlnReissueCom$compon = wlnReissueCom.componentConfig) !== null && _wlnReissueCom$compon !== void 0 && _wlnReissueCom$compon.showDefaultSelect);
+  var wlnGoodsOrderBackGoodsLevel = wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen === void 0 ? void 0 : _wlnGoodsCom$componen.orderBackGoodsLevel;
+  var wlnReissueGoodsOrderBackGoodsLevel = wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon2 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon2 === void 0 ? void 0 : _wlnReissueCom$compon2.orderBackGoodsLevel;
+  console.log('**** ', {
+    isStrict: isStrict,
+    onlyOneSystemOrder: onlyOneSystemOrder,
+    isReissueDefaultSelect: isReissueDefaultSelect,
+    wlnGoodsOrderBackGoodsLevel: wlnGoodsOrderBackGoodsLevel,
+    wlnReissueGoodsOrderBackGoodsLevel: wlnReissueGoodsOrderBackGoodsLevel
+  });
   return {
     wlnSystemOrder: {
       orderNo: detail === null || detail === void 0 ? void 0 : detail.tradeNo,
@@ -189,7 +296,7 @@ export var wlnOrderTransform = function wlnOrderTransform(detail) {
       wlnGoods: updateWlnGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders),
       allOrders: detail === null || detail === void 0 ? void 0 : detail.allOrders
     },
-    wlnLogistics: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics"),
-    wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send")
+    wlnLogistics: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
+    wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.7.2",
+  "version": "2.7.3-beta.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0935ddda3b736925b7e9cf3d6df86c85ef2f8048",
+  "gitHead": "8c80641421cc67b5f77f17fbe4db443014610338",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }