@kmkf-fe-packages/kmkf-work-order-service-component 2.0.43 → 2.0.45

package/dist/esm/common/utils/tools.js

@@ -266,7 +266,10 @@ export var orderBack = /*#__PURE__*/function () {
           if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
             message.warning(data === null || data === void 0 ? void 0 : (_data$value2 = data.value) === null || _data$value2 === void 0 ? void 0 : _data$value2.message);
           }
-          orderInfo = getBasicsOrderInfo(data === null || data === void 0 ? void 0 : (_data$value3 = data.value) === null || _data$value3 === void 0 ? void 0 : _data$value3.data, xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value);
+          orderInfo = getBasicsOrderInfo(data === null || data === void 0 ? void 0 : (_data$value3 = data.value) === null || _data$value3 === void 0 ? void 0 : _data$value3.data, xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value); //千牛端优先获取端上买家昵称
+          if ([PlatForm.TB].includes(plat.platform)) {
+            orderInfo.buyerNick = (plat === null || plat === void 0 ? void 0 : plat.buyerNick) || (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerNick);
+          }
           jstOrders = jstOrder !== null && jstOrder !== void 0 && (_jstOrder$value = jstOrder.value) !== null && _jstOrder$value !== void 0 && _jstOrder$value.data ? {
             orderList: jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value2 = jstOrder.value) === null || _jstOrder$value2 === void 0 ? void 0 : _jstOrder$value2.data
           } : {};
@@ -426,7 +429,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 90;
+            _context.next = 91;
             break;
           }
           list = detail['itemList'];
@@ -444,10 +447,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 80;
-          _context.next = 83;
+          _context.prev = 81;
+          _context.next = 84;
           return Promise.all(promises);
-        case 83:
+        case 84:
           erpPromiseList = _context.sent;
           detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -457,13 +460,13 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 90;
+          _context.next = 91;
           break;
-        case 87:
-          _context.prev = 87;
-          _context.t1 = _context["catch"](80);
+        case 88:
+          _context.prev = 88;
+          _context.t1 = _context["catch"](81);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 90:
+        case 91:
           // console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
@@ -508,17 +511,17 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 101;
+          _context.next = 102;
           break;
-        case 98:
-          _context.prev = 98;
+        case 99:
+          _context.prev = 99;
           _context.t2 = _context["catch"](19);
           console.error(_context.t2);
-        case 101:
+        case 102:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[3, 10], [19, 98], [80, 87]]);
+    }, _callee, null, [[3, 10], [19, 99], [81, 88]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.0.43",
+  "version": "2.0.45",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "2.0.43",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.43",
-    "@kmkf-fe-packages/services-components": "2.0.43",
+    "@kmkf-fe-packages/basic-components": "2.0.45",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.44",
+    "@kmkf-fe-packages/services-components": "2.0.45",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cbb6eee4be73f469df396bfb054a35aef63ce2dd",
+  "gitHead": "b62a1471a21f1afd5e43fabb4125da4884884aec",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }

package/dist/esm/GlobalContext/hook/dist/useGetHasErpData.js

@@ -1,52 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-var react_1 = require("react");
-var react_redux_1 = require("react-redux");
-var toolkit_1 = require("@reduxjs/toolkit");
-var getTemplate = function getTemplate(companyUserConfig) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
-  return JSON.stringify({
-    hasWln: (_c = (_b = (_a = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _a === void 0 ? void 0 : _a.wln) === null || _b === void 0 ? void 0 : _b.show) !== null && _c !== void 0 ? _c : false,
-    hasWdt: (_f = (_e = (_d = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _d === void 0 ? void 0 : _d.wdt) === null || _e === void 0 ? void 0 : _e.show) !== null && _f !== void 0 ? _f : false,
-    hasBs: (_j = (_h = (_g = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _g === void 0 ? void 0 : _g.bs) === null || _h === void 0 ? void 0 : _h.show) !== null && _j !== void 0 ? _j : false,
-    hasE3: (_m = (_l = (_k = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _k === void 0 ? void 0 : _k.bse3) === null || _l === void 0 ? void 0 : _l.show) !== null && _m !== void 0 ? _m : false,
-    hasJst: (_q = (_p = (_o = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _o === void 0 ? void 0 : _o.jst) === null || _p === void 0 ? void 0 : _p.show) !== null && _q !== void 0 ? _q : false,
-    hasGy: (_t = (_s = (_r = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : companyUserConfig.plugins) === null || _r === void 0 ? void 0 : _r.gy) === null || _s === void 0 ? void 0 : _s.show) !== null && _t !== void 0 ? _t : false
-  });
-};
-function useGetHasErpData() {
-  var companyUserConfig = react_redux_1.useSelector(toolkit_1.createSelector([function (state) {
-    var _a, _b, _c, _d;
-    console.log("state--useSelector", state);
-    /**
-     * pc main
-     * 端 workOrder
-     * **/
-    return (_d = (_b = (_a = state === null || state === void 0 ? void 0 : state.main) === null || _a === void 0 ? void 0 : _a.userInfo) !== null && _b !== void 0 ? _b : (_c = state === null || state === void 0 ? void 0 : state.workOrder) === null || _c === void 0 ? void 0 : _c.userInfo) !== null && _d !== void 0 ? _d : {};
-  }], function (state) {
-    var _a;
-    var companyUserConfig = (_a = state === null || state === void 0 ? void 0 : state.companyUserConfig) !== null && _a !== void 0 ? _a : {};
-    if (typeof companyUserConfig === "string") {
-      try {
-        companyUserConfig = JSON.parse(companyUserConfig);
-      } catch (e) {
-        console.error("companyUserConfig转换异常", companyUserConfig);
-        companyUserConfig = {};
-      }
-    }
-    return companyUserConfig;
-  }));
-  var _a = react_1.useState(getTemplate({})),
-    hasErpDataJson = _a[0],
-    setHasErpDataJson = _a[1];
-  react_1.useEffect(function () {
-    setHasErpDataJson(getTemplate(companyUserConfig));
-    console.log("companyUserConfig---", companyUserConfig);
-  }, [companyUserConfig]);
-  var hasErpData = react_1.useMemo(function () {
-    return JSON.parse(hasErpDataJson);
-  }, [hasErpDataJson]);
-  return hasErpData;
-}
-exports["default"] = useGetHasErpData;

package/dist/esm/GlobalContext/orderQuery/dist/useGetErpAddressData.js

@@ -1,180 +0,0 @@
-"use strict";
-
-var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-var __generator = this && this.__generator || function (thisArg, body) {
-  var _ = {
-      label: 0,
-      sent: function sent() {
-        if (t[0] & 1) throw t[1];
-        return t[1];
-      },
-      trys: [],
-      ops: []
-    },
-    f,
-    y,
-    t,
-    g;
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-    return this;
-  }), g;
-  function verb(n) {
-    return function (v) {
-      return step([n, v]);
-    };
-  }
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-    while (_) try {
-      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-      if (y = 0, t) op = [op[0] & 2, t.value];
-      switch (op[0]) {
-        case 0:
-        case 1:
-          t = op;
-          break;
-        case 4:
-          _.label++;
-          return {
-            value: op[1],
-            done: false
-          };
-        case 5:
-          _.label++;
-          y = op[1];
-          op = [0];
-          continue;
-        case 7:
-          op = _.ops.pop();
-          _.trys.pop();
-          continue;
-        default:
-          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-            _ = 0;
-            continue;
-          }
-          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-            _.label = op[1];
-            break;
-          }
-          if (op[0] === 6 && _.label < t[1]) {
-            _.label = t[1];
-            t = op;
-            break;
-          }
-          if (t && _.label < t[2]) {
-            _.label = t[2];
-            _.ops.push(op);
-            break;
-          }
-          if (t[2]) _.ops.pop();
-          _.trys.pop();
-          continue;
-      }
-      op = body.call(thisArg, _);
-    } catch (e) {
-      op = [6, e];
-      y = 0;
-    } finally {
-      f = t = 0;
-    }
-    if (op[0] & 5) throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-};
-exports.__esModule = true;
-var react_1 = require("react");
-var useGetHasErpData_1 = require("../hook/useGetHasErpData");
-var ahooks_1 = require("ahooks");
-var kmkf_utils_1 = require("@kmkf-fe-packages/kmkf-utils");
-function useGetErpAddressData(notJudgedErp) {
-  var _this = this;
-  var _a = react_1.useState("loading"),
-    globalState = _a[0],
-    setGlobalState = _a[1];
-  var hasErpData = useGetHasErpData_1["default"]();
-  ahooks_1.useUpdateEffect(function () {
-    asyncQueryData(hasErpData, notJudgedErp);
-  }, [hasErpData, notJudgedErp]);
-  var asyncQueryData = function asyncQueryData(hasErpData, notJudgedErp) {
-    return __awaiter(_this, void 0, void 0, function () {
-      var hasBs, hasWdt, hasGy, promises, e_1;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            hasBs = hasErpData.hasBs, hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy;
-            promises = [];
-            if (hasBs || notJudgedErp) promises.push(kmkf_utils_1.servers.queryBsAddressData);
-            if (hasWdt || notJudgedErp) promises.push(kmkf_utils_1.servers.queryWdtAddressData);
-            if (hasGy || notJudgedErp) promises.push(kmkf_utils_1.servers.queryGyAddressData);
-            _a.label = 1;
-          case 1:
-            _a.trys.push([1, 3,, 4]);
-            return [4 /*yield*/, Promise.all(promises.map(function (promise) {
-              return promise();
-            }))];
-          case 2:
-            _a.sent();
-            setGlobalState("success");
-            return [3 /*break*/, 4];
-          case 3:
-            e_1 = _a.sent();
-            setGlobalState("failed");
-            return [3 /*break*/, 4];
-          case 4:
-            return [2 /*return*/];
-        }
-      });
-    });
-  };
-
-  var onReload = function onReload() {
-    return __awaiter(_this, void 0, void 0, function () {
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            return [4 /*yield*/, asyncQueryData(hasErpData, notJudgedErp)];
-          case 1:
-            _a.sent();
-            return [2 /*return*/];
-        }
-      });
-    });
-  };
-
-  return [globalState, onReload];
-}
-exports["default"] = useGetErpAddressData;

package/dist/esm/GlobalContext/orderQuery/dist/useGetErpLogisticsCompany.js

@@ -1,186 +0,0 @@
-"use strict";
-
-var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-var __generator = this && this.__generator || function (thisArg, body) {
-  var _ = {
-      label: 0,
-      sent: function sent() {
-        if (t[0] & 1) throw t[1];
-        return t[1];
-      },
-      trys: [],
-      ops: []
-    },
-    f,
-    y,
-    t,
-    g;
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-    return this;
-  }), g;
-  function verb(n) {
-    return function (v) {
-      return step([n, v]);
-    };
-  }
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-    while (_) try {
-      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-      if (y = 0, t) op = [op[0] & 2, t.value];
-      switch (op[0]) {
-        case 0:
-        case 1:
-          t = op;
-          break;
-        case 4:
-          _.label++;
-          return {
-            value: op[1],
-            done: false
-          };
-        case 5:
-          _.label++;
-          y = op[1];
-          op = [0];
-          continue;
-        case 7:
-          op = _.ops.pop();
-          _.trys.pop();
-          continue;
-        default:
-          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-            _ = 0;
-            continue;
-          }
-          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-            _.label = op[1];
-            break;
-          }
-          if (op[0] === 6 && _.label < t[1]) {
-            _.label = t[1];
-            t = op;
-            break;
-          }
-          if (t && _.label < t[2]) {
-            _.label = t[2];
-            _.ops.push(op);
-            break;
-          }
-          if (t[2]) _.ops.pop();
-          _.trys.pop();
-          continue;
-      }
-      op = body.call(thisArg, _);
-    } catch (e) {
-      op = [6, e];
-      y = 0;
-    } finally {
-      f = t = 0;
-    }
-    if (op[0] & 5) throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-};
-exports.__esModule = true;
-var react_1 = require("react");
-var useGetHasErpData_1 = require("../hook/useGetHasErpData");
-var ahooks_1 = require("ahooks");
-var api_1 = require("../../../service/api");
-function useGetErpLogisticsCompany(notJudgedErp) {
-  var _this = this;
-  var _a = react_1.useState("loading"),
-    globalState = _a[0],
-    setGlobalState = _a[1];
-  var hasErpData = useGetHasErpData_1["default"]();
-  ahooks_1.useUpdateEffect(function () {
-    asyncQueryData(hasErpData, notJudgedErp);
-  }, [hasErpData, notJudgedErp]);
-  var asyncQueryData = function asyncQueryData(hasErpData, notJudgedErp) {
-    return __awaiter(_this, void 0, void 0, function () {
-      var hasWdt, hasE3, hasJst, hasWln, promises, e_1;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln;
-            promises = [api_1.queryKMLogisticsCompany];
-            if (hasWdt || notJudgedErp) promises.push(api_1.queryWdtLogisticsCompany);
-            if (hasE3 || notJudgedErp) promises.push(api_1.queryBsE3LogisticsCompany);
-            if (hasJst || notJudgedErp) promises.push(api_1.queryJSTLogisticsCompany);
-            if (hasWln || notJudgedErp) promises.push(api_1.queryWLNLogisticsCompany);
-            if (!hasWdt && !hasE3 && !hasJst && !hasWln && !notJudgedErp) {
-              setGlobalState("success");
-              return [2 /*return*/];
-            }
-
-            _a.label = 1;
-          case 1:
-            _a.trys.push([1, 3,, 4]);
-            return [4 /*yield*/, Promise.all(promises.map(function (promise) {
-              return promise();
-            }))];
-          case 2:
-            _a.sent();
-            setGlobalState("success");
-            return [3 /*break*/, 4];
-          case 3:
-            e_1 = _a.sent();
-            setGlobalState("failed");
-            return [3 /*break*/, 4];
-          case 4:
-            return [2 /*return*/];
-        }
-      });
-    });
-  };
-
-  var onReload = function onReload() {
-    return __awaiter(_this, void 0, void 0, function () {
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            return [4 /*yield*/, asyncQueryData(hasErpData, notJudgedErp)];
-          case 1:
-            _a.sent();
-            return [2 /*return*/];
-        }
-      });
-    });
-  };
-
-  return [globalState, onReload];
-}
-exports["default"] = useGetErpLogisticsCompany;