@kmkf-fe-packages/kmkf-utils 2.0.57 → 2.0.59

package/README.md

@@ -1 +1 @@
-11231111
+112311111

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

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

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

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

package/dist/esm/servers/GY/logisticsData.d.ts

@@ -0,0 +1,6 @@
+declare type LogisticsType = {
+    label: string;
+    value: string;
+};
+export declare const getLogisticsDataAsync: () => Promise<LogisticsType[]>;
+export default getLogisticsDataAsync;

package/dist/esm/servers/GY/logisticsData.js

@@ -0,0 +1,42 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+import request from "../../request";
+var queryGYLogisticsList = function queryGYLogisticsList() {
+  return request({
+    url: "/qy/gdfw/gy/erp/getLogisticsList",
+    method: "post",
+    data: {}
+  });
+};
+export var getLogisticsDataAsync = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var result, list, logisticsList;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return queryGYLogisticsList();
+        case 2:
+          result = _context.sent;
+          list = [];
+          logisticsList = (result === null || result === void 0 ? void 0 : result.data) || [];
+          logisticsList === null || logisticsList === void 0 ? void 0 : logisticsList.map(function (item) {
+            list.push({
+              label: item.logisticsName,
+              value: item.logisticsCode
+            });
+          });
+          return _context.abrupt("return", list);
+        case 7:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getLogisticsDataAsync() {
+    return _ref.apply(this, arguments);
+  };
+}();
+export default getLogisticsDataAsync;

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

@@ -32,6 +32,7 @@ export declare const gyOrderTransform: (detail: any, form: any) => {
     };
     shopCode: any;
     vipCode: any;
+    gyLogistics: any;
     gySendGood: any;
 };
 export declare const gyOrderBackFormValues: (detail?: any, templateDetail?: any, testIndex?: number) => any;

package/dist/esm/utils/gyOrderBackFormValues.js

@@ -83,32 +83,35 @@ export var updateGyGoodsHandle = function updateGyGoodsHandle() {
 var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList, form) {
   var _newList;
   if (type === "logistics") {
-    //管易物流信息组件先不做
-    // const currentCom = comList?.find?.(
-    //   (item) => item.workOrderComponentType === "GY_LOGISTICS"
-    // );
-    // const notOrderBack = currentCom?.componentConfig?.notOrderBack || false;
-    // if (notOrderBack) {
-    //   let currentValue = form.getFieldValue(currentCom.uniqueKey);
-    //   currentValue = currentValue?.length
-    //     ? currentValue
-    //     : [{ logisticsCode: "", logisticsCompany: "" }];
-    //   return currentValue;
-    // }
-  } else if (type === "send") {
     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 === "GY_SEND_GOOD";
+      return item.workOrderComponentType === "GY_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 === "GY_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 currentValue;
+      return _currentValue2;
     }
   }
   var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
@@ -120,19 +123,29 @@ var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList
         skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
       };
     });
-    var params = {
-      items: items
-    };
     if (type === "logistics") {
-      // params.logisticsCompany = next?.shippingCode;
-      // params.logisticsCode = next?.shippingSn;
+      // 管易的单个系统子订单存在拆单，会包含多个物流信息
+      var deliveryList = ((next === null || next === void 0 ? void 0 : next.deliveryList) || []).map(function (t) {
+        return {
+          items: items,
+          logisticsCompanyName: t === null || t === void 0 ? void 0 : t.expressName,
+          logisticsCompany: t === null || t === void 0 ? void 0 : t.expressCode,
+          logisticsCode: t === null || t === void 0 ? void 0 : t.mailNo
+        };
+      });
+      prv.push.apply(prv, _toConsumableArray(deliveryList));
+      // params.logisticsCompany = next?.expressName;
+      // params.logisticsCode = next?.mailNo;
     } else if (type === "send") {
+      var params = {
+        items: items
+      };
       params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
       //下拉框，取id
       params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
       params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
+      prv.push(params);
     }
-    prv.push(params);
     return prv;
   }, []);
   if (!((_newList = newList) !== null && _newList !== void 0 && _newList.length)) {
@@ -228,12 +241,7 @@ export var gyOrderTransform = function gyOrderTransform(detail, form) {
     vipCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find4 = currentTrades.find) === null || _currentTrades$find4 === void 0 ? void 0 : (_currentTrades$find4$ = _currentTrades$find4.call(currentTrades, function (item) {
       return item.vipCode;
     })) === null || _currentTrades$find4$ === void 0 ? void 0 : _currentTrades$find4$.vipCode) || null,
-    // gyLogistics: updateGyItemListHandle(
-    //   currentTrades,
-    //   "logistics",
-    //   componentList || [],
-    //   form
-    // ),
+    gyLogistics: updateGyItemListHandle(currentTrades, "logistics", componentList || [], form),
     gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.0.57",
+  "version": "2.0.59",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "35082852f84a4850071c5789da827e0084eedd67",
+  "gitHead": "7068cde2c7d4d8654bf05bc65e17f7bcd775122a",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }