@kmkf-fe-packages/kmkf-work-order-service-component 1.19.3 → 1.19.4-beta.0

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js

@@ -29,7 +29,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
-INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail, queryLabelByTradeId } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull, LabelData } from '@kmkf-fe-packages/kmkf-utils';
@@ -648,6 +648,13 @@ var FormRender = function FormRender(props, ref) {
         form: form
       });
     }
+    if (workOrderComponentType === 'BS_E3_SYSTEM_ORDER') {
+      bsE3SystemOrderBackValues({
+        templateList: templateDetail,
+        value: value,
+        form: form
+      });
+    }
     if (logisticsMappingConfig && ['INPUT', 'EXPRESS_LOGISTICS_SELECT', 'BS_LOGISTICS'].includes(workOrderComponentType)) {
       setLogisticsInfo({
         logisticsMappingConfig: logisticsMappingConfig,
@@ -702,7 +709,7 @@ var FormRender = function FormRender(props, ref) {
     setShopId(val);
     // 清空表单字段
     var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
-      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SEND_GOOD'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
+      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SEND_GOOD', 'BS_E3_SYSTEM_ORDER'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
         cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
       }
       return cur;

package/dist/esm/Login/index.d.ts

@@ -3,6 +3,7 @@ export declare const COMMON_HOST = "https://kefu.kuaimai.com";
 export declare const HD_HOST = "https://kefuab.kuaimai.com";
 interface LoginProps {
     loginCallBack?: (val: any) => void;
+    clickImgCallBack?: () => void;
 }
 declare const ProviderLogin: (props: LoginProps) => React.JSX.Element;
 export default ProviderLogin;

package/dist/esm/Login/index.js

@@ -21,7 +21,8 @@ import styles from "./index.module.less";
 export var COMMON_HOST = 'https://kefu.kuaimai.com';
 export var HD_HOST = 'https://kefuab.kuaimai.com';
 var Login = function Login(props) {
-  var loginCallBack = props.loginCallBack;
+  var loginCallBack = props.loginCallBack,
+    clickImgCallBack = props.clickImgCallBack;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     name = _useState2[0],
@@ -248,7 +249,8 @@ var Login = function Login(props) {
     className: styles.logo
   }, /*#__PURE__*/React.createElement("img", {
     src: logo,
-    alt: "logo"
+    alt: "logo",
+    onClick: clickImgCallBack
   })), /*#__PURE__*/React.createElement(Form, {
     className: styles.container
   }, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {

package/dist/esm/LoginNew/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+export declare const COMMON_HOST = "https://kefu.kuaimai.com";
+export declare const HD_HOST = "https://kefuab.kuaimai.com";
+interface LoginProps {
+    loginCallBack?: (val: any) => void;
+}
+declare const ProviderLogin: (props: LoginProps) => React.JSX.Element;
+export default ProviderLogin;

package/dist/esm/LoginNew/index.js

@@ -0,0 +1,268 @@
+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); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useState, useMemo, useEffect } from 'react';
+import { Input, message, Form, Button } from 'antd';
+import md5 from 'js-md5';
+import { Provider } from 'react-redux';
+import store from "../model/store";
+import cache from "../common/cache";
+import { useAppDispatch } from "../model/hooks";
+import { fetchLoginNew, fetchShopList, setUserInfo } from "../model/login";
+import logo from "../assets/logo.svg";
+import styles from "./index.module.less";
+export var COMMON_HOST = 'https://kefu.kuaimai.com';
+export var HD_HOST = 'https://kefuab.kuaimai.com';
+var Login = function Login(props) {
+  var loginCallBack = props.loginCallBack;
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    name = _useState2[0],
+    setName = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    account = _useState4[0],
+    setAccount = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    password = _useState6[0],
+    setPassword = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    loading = _useState8[0],
+    setLoading = _useState8[1];
+  // 直接登陆模式
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    isDirectProcess = _useState10[0],
+    setDirectProcess = _useState10[1];
+  // 显示历史记录
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    showRecommendPwdList = _useState12[0],
+    setShowRecommendPwdList = _useState12[1];
+  var dispatch = useAppDispatch();
+  useEffect(function () {
+    localStorage.removeItem('kmkf_kmgd_cookie');
+    cache.setHost(COMMON_HOST);
+  }, []);
+  var processHistoryPwd = function processHistoryPwd(params) {
+    var historyList = cache.getHistoryList();
+    if (historyList.findIndex(function (item) {
+      return item.account === params.account;
+    }) < 0) {
+      historyList.unshift(params);
+    }
+    cache.setHistoryList(historyList);
+  };
+  var changeProcessHistoryPwd = function changeProcessHistoryPwd(params) {
+    var historyList = cache.getHistoryList();
+    historyList = historyList.filter(function (item) {
+      return item.account !== params.account;
+    });
+    historyList.unshift(params);
+    cache.setHistoryList(historyList);
+  };
+  var onCompanyChange = function onCompanyChange(val) {
+    if (isDirectProcess) {
+      setDirectProcess(false);
+      setPassword('');
+    }
+    setName(val);
+  };
+  var onAccountChange = function onAccountChange(val) {
+    if (isDirectProcess) {
+      setDirectProcess(false);
+      setPassword('');
+    }
+    setAccount(val);
+  };
+  var handleLoginClick = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var isDirect,
+        _args2 = arguments;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            isDirect = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : false;
+            if (name) {
+              _context2.next = 4;
+              break;
+            }
+            message.error('请输入公司名称');
+            return _context2.abrupt("return");
+          case 4:
+            if (account) {
+              _context2.next = 7;
+              break;
+            }
+            message.error('请输入登录账号');
+            return _context2.abrupt("return");
+          case 7:
+            if (password) {
+              _context2.next = 10;
+              break;
+            }
+            message.error('请输入密码');
+            return _context2.abrupt("return");
+          case 10:
+            try {
+              setLoading(true);
+              dispatch(fetchLoginNew({
+                name: name.trim(),
+                account: account.trim(),
+                password: isDirect ? password : md5(password),
+                pageReturnType: 'client_jump'
+              })).unwrap().then( /*#__PURE__*/function () {
+                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+                  var data, success, _data$companyUser;
+                  return _regeneratorRuntime().wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                        data = res.data, success = res.success; // console.log(data, success);
+                        if (isDirect) {
+                          processHistoryPwd({
+                            name: name,
+                            account: account,
+                            password: password
+                          });
+                        } else {
+                          changeProcessHistoryPwd({
+                            name: name,
+                            account: account,
+                            password: md5(password)
+                          });
+                        }
+                        if (!success) {
+                          _context.next = 10;
+                          break;
+                        }
+                        message.success('登录成功', 1.5);
+                        dispatch(setUserInfo(data === null || data === void 0 ? void 0 : data.companyUser));
+                        cache.setHost((data === null || data === void 0 ? void 0 : data.domain) || COMMON_HOST);
+                        cache.setCookie(data === null || data === void 0 ? void 0 : (_data$companyUser = data.companyUser) === null || _data$companyUser === void 0 ? void 0 : _data$companyUser.ckValue);
+                        _context.next = 9;
+                        return dispatch(fetchShopList());
+                      case 9:
+                        loginCallBack === null || loginCallBack === void 0 ? void 0 : loginCallBack({
+                          data: data
+                        });
+                      case 10:
+                        setLoading(false);
+                      case 11:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee);
+                }));
+                return function (_x2) {
+                  return _ref2.apply(this, arguments);
+                };
+              }()).catch(function () {
+                setLoading(false);
+              });
+            } catch (err) {
+              setLoading(false);
+              console.error(err);
+            }
+          case 11:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function handleLoginClick() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  var changeRecommendVisible = function changeRecommendVisible(flag) {
+    setTimeout(function () {
+      setShowRecommendPwdList(flag);
+    }, 500);
+  };
+  var handleSelectHistoryRecord = function handleSelectHistoryRecord(item) {
+    var itemName = item.name,
+      itemAccount = item.account,
+      itemPassword = item.password;
+    setName(itemName);
+    setAccount(itemAccount);
+    setPassword(itemPassword);
+    setDirectProcess(true);
+  };
+  var filteredHistoryList = useMemo(function () {
+    var historyList = cache.getHistoryList();
+    return historyList.filter(function (item) {
+      if (account) {
+        return item.account.includes(account);
+      }
+      return true;
+    });
+  }, [account]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.wrap
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.logo
+  }, /*#__PURE__*/React.createElement("img", {
+    src: logo,
+    alt: "logo"
+  })), /*#__PURE__*/React.createElement(Form, {
+    className: styles.container
+  }, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
+    value: name,
+    onChange: function onChange(e) {
+      return onCompanyChange(e.target.value);
+    },
+    placeholder: "\u8BF7\u8F93\u5165\u516C\u53F8\u540D\u79F0"
+  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement("div", {
+    className: styles.recomConWrap
+  }, /*#__PURE__*/React.createElement(Input, {
+    onFocus: function onFocus() {
+      return changeRecommendVisible(true);
+    },
+    onBlur: function onBlur() {
+      return changeRecommendVisible(false);
+    },
+    value: account,
+    onChange: function onChange(e) {
+      return onAccountChange(e.target.value);
+    },
+    placeholder: "\u8BF7\u8F93\u5165\u767B\u5F55\u8D26\u53F7"
+  }), showRecommendPwdList && filteredHistoryList.length > 0 && /*#__PURE__*/React.createElement("div", {
+    className: styles.recomListCon
+  }, /*#__PURE__*/React.createElement("ul", null, filteredHistoryList.map(function (item) {
+    return /*#__PURE__*/React.createElement("li", {
+      key: item.account,
+      className: styles.recomListItem,
+      onClick: function onClick() {
+        return handleSelectHistoryRecord(item);
+      }
+    }, /*#__PURE__*/React.createElement("div", null, "\u4F01\u4E1A\u540D\u79F0\uFF1A", item.name), /*#__PURE__*/React.createElement("div", null, "\u767B\u5F55\u8D26\u53F7:", item.account));
+  }))))), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
+    value: password,
+    type: "password",
+    onChange: function onChange(e) {
+      return setPassword(e.target.value);
+    },
+    placeholder: "\u8BF7\u8F93\u5165\u5BC6\u7801"
+  }))), /*#__PURE__*/React.createElement(Button, {
+    onClick: function onClick() {
+      return handleLoginClick(isDirectProcess);
+    },
+    type: "primary",
+    block: true,
+    loading: loading
+  }, "\u767B\u5F55"));
+};
+var ProviderLogin = function ProviderLogin(props) {
+  return /*#__PURE__*/React.createElement(Provider, {
+    store: store
+  }, /*#__PURE__*/React.createElement(Login, props));
+};
+export default ProviderLogin;

package/dist/esm/LoginNew/index.module.less

@@ -0,0 +1,45 @@
+.wrap {
+  width: 266px;
+  margin: auto;
+
+  .logo {
+    display: flex;
+    justify-content: center;
+    margin-top: 146px;
+  }
+
+  .container {
+    margin-top: 48px;
+
+    ul {
+      margin: 0px;
+      padding: 0;
+      list-style-type: none;
+    }
+  }
+}
+
+.recomConWrap {
+  position: relative;
+
+  .recomListCon {
+    position: absolute;
+    left: 28px;
+    z-index: 2;
+    width: 300px;
+    max-height: 160px;
+    overflow: auto;
+    background-color: #fff;
+
+    ul {
+      margin: 0px;
+      padding: 0;
+      list-style-type: none;
+    }
+
+    .recomListItem {
+      padding: 8px;
+      cursor: pointer;
+    }
+  }
+}

package/dist/esm/common/utils/tools.d.ts

@@ -97,6 +97,7 @@ export declare const deleteCacheOrder: ({ templateList, values, nodeId, flowTemp
     unDeleteOrderInfo: boolean;
 }) => void;
 export declare const bsSystemOrderBackValues: ({ templateList, value, form }: any) => void;
+export declare const bsE3SystemOrderBackValues: ({ templateList, value, form }: any) => void;
 export declare const wlnSystemOrderBackValues: ({ templateList, value, form }: any) => void;
 export declare const wdtSystemOrderBackValues: ({ templateList, value, form }: any) => void;
 export declare const getMappingConfigByTemplateDetail: (templateDetail: {

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

@@ -19,9 +19,9 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { get, every, maxBy, last, cloneDeep, isEqual, set } from 'lodash';
 import V from 'voca';
-import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail } from "../../model/servers/api";
+import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail } from "../../model/servers/api";
 import moment from 'moment';
-import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, filterWdtOrders, unTransField, transMultSelectOptions } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, bsE3OrderTransform, wlnOrderTransform, wdtOrderTransform, filterBsE3Orders, filterWdtOrders, unTransField, transMultSelectOptions } from '@kmkf-fe-packages/kmkf-utils';
 import Monitor from 'kmkf-monitor';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
 import cache from "../cache";
@@ -871,7 +871,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         }),
         name: item.name
       });
-    } else if (['BS_GOODS', 'WDT_GOODS'].includes(item.workOrderComponentType)) {
+    } else if (['BS_GOODS', 'WDT_GOODS', 'BS_E3_GOODS'].includes(item.workOrderComponentType)) {
       var gooodsMap = {
         BS_GOODS: {
           type: 'bsGoods',
@@ -880,6 +880,10 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         WDT_GOODS: {
           type: 'wdtGoods',
           shopCode: 'shopCode'
+        },
+        BS_E3_GOODS: {
+          type: 'bsE3Goods',
+          shopCode: 'shopCode'
         }
       };
       var goods = get(nowData, "".concat(item.uniqueKey), {});
@@ -1048,26 +1052,16 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         content: get(nowData, "".concat(item.uniqueKey, ".postingReceiverMobile"), ''),
         name: item.name
       });
-    } else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(item.workOrderComponentType)) {
-      var systemOrderMap = {
-        BS_SYSTEM_ORDER: {
-          no: 'bsSystemOrderNo',
-          ids: 'bsSystemSelectIds',
-          order: 'bsSystemShowOrder'
-        },
-        WLN_SYSTEM_ORDER: {
-          no: 'wlnSystemOrderNo',
-          ids: 'wlnSystemSelectIds',
-          order: 'wlnSystemShowOrder'
-        },
-        WDT_SYSTEM_ORDER: {
-          no: 'wdtSystemOrderNo',
-          ids: 'wdtSystemSelectIds',
-          order: 'wdtSystemShowOrder'
-        }
-      };
+    } else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER', 'BS_E3_SYSTEM_ORDER'].includes(item.workOrderComponentType)) {
       var selectIds = get(nowData, "".concat(item.uniqueKey, ".selectIds"), '');
       var showOrderInfo = get(nowData, "".concat(item.uniqueKey, ".showOrderInfo"), []);
+      var type = item.workOrderComponentType;
+      var keyMap = {
+        BS_SYSTEM_ORDER: 'billNo',
+        WLN_SYSTEM_ORDER: 'billNo',
+        WDT_SYSTEM_ORDER: 'billNo',
+        BS_E3_SYSTEM_ORDER: 'orderSn'
+      };
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_").concat(systemOrderMap[item.workOrderComponentType].no),
         content: get(nowData, "".concat(item.uniqueKey, ".orderNo"), ''),
@@ -1080,7 +1074,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         uniqueKey: "".concat(item.uniqueKey, "_").concat(systemOrderMap[item.workOrderComponentType].order),
         content: showOrderInfo.map(function (item) {
           return _objectSpread(_objectSpread({}, item), {}, {
-            select: (selectIds || []).includes(item.billNo)
+            select: (selectIds || []).includes(item === null || item === void 0 ? void 0 : item[keyMap[type]])
           });
         }),
         name: item.name
@@ -1208,6 +1202,28 @@ export var formatPictures = function formatPictures(pictures) {
 var transTextToNumber = function transTextToNumber(value) {
   return value ? +value : value;
 };
+var systemOrderMap = {
+  BS_SYSTEM_ORDER: {
+    no: 'bsSystemOrderNo',
+    ids: 'bsSystemSelectIds',
+    order: 'bsSystemShowOrder'
+  },
+  WLN_SYSTEM_ORDER: {
+    no: 'wlnSystemOrderNo',
+    ids: 'wlnSystemSelectIds',
+    order: 'wlnSystemShowOrder'
+  },
+  WDT_SYSTEM_ORDER: {
+    no: 'wdtSystemOrderNo',
+    ids: 'wdtSystemSelectIds',
+    order: 'wdtSystemShowOrder'
+  },
+  BS_E3_SYSTEM_ORDER: {
+    no: 'bsE3SystemOrderNo',
+    ids: 'bsE3SystemSelectIds',
+    order: 'bsE3SystemShowOrder'
+  }
+};
 var transDataSource = function transDataSource(templateColumns) {
   var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'edit';
   return function (item) {
@@ -1524,8 +1540,8 @@ var transDataSource = function transDataSource(templateColumns) {
           postingReceiverName: item.jsonMap["".concat(nex.uniqueKey, "_bsPostingReceiverName")],
           postingReceiverMobile: item.jsonMap["".concat(nex.uniqueKey, "_bsPostingReceiverMobile")]
         }));
-      } else if (['BS_GOODS', 'WDT_GOODS'].includes(nex.workOrderComponentType)) {
-        var _$concat;
+      } else if (['BS_GOODS', 'WDT_GOODS', 'BS_E3_GOODS'].includes(nex.workOrderComponentType)) {
+        var _values2;
         var gooodsMap = {
           BS_GOODS: {
             type: 'bsGoods',
@@ -1534,9 +1550,50 @@ var transDataSource = function transDataSource(templateColumns) {
           WDT_GOODS: {
             type: 'wdtGoods',
             shopCode: 'shopCode'
+          },
+          BS_E3_GOODS: {
+            type: 'bsE3Goods',
+            shopCode: 'shopCode'
           }
         };
-        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), (_$concat = {}, _defineProperty(_$concat, gooodsMap[nex.workOrderComponentType].type, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(gooodsMap[nex.workOrderComponentType].type)], [])), _defineProperty(_$concat, gooodsMap[nex.workOrderComponentType].shopCode, item.jsonMap["".concat(nex.uniqueKey, "_").concat(gooodsMap[nex.workOrderComponentType].shopCode)]), _$concat)));
+        var _values = (_values2 = {}, _defineProperty(_values2, gooodsMap[nex.workOrderComponentType].type, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(gooodsMap[nex.workOrderComponentType].type)], [])), _defineProperty(_values2, gooodsMap[nex.workOrderComponentType].shopCode, item.jsonMap["".concat(nex.uniqueKey, "_").concat(gooodsMap[nex.workOrderComponentType].shopCode)]), _values2);
+        if (nex.workOrderComponentType === 'WDT_GOODS') {
+          var selectIds = [];
+          var orderNo = '';
+          var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+            return col.workOrderComponentType === 'TRADE_ID_INPUT';
+          });
+          if (tradeId) {
+            orderNo = item.jsonMap["".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType])];
+          }
+          var wdtSystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+            return col.workOrderComponentType === 'WDT_SYSTEM_ORDER';
+          });
+          if (wdtSystemOrder) {
+            selectIds = jsonParseSecurity(item.jsonMap["".concat(wdtSystemOrder.uniqueKey, "_").concat(systemOrderMap[wdtSystemOrder.workOrderComponentType].ids)], []);
+          }
+          _values.selectIds = selectIds;
+          _values.orderNo = orderNo;
+        }
+        if (nex.workOrderComponentType === 'BS_E3_GOODS') {
+          var _selectIds = [];
+          var _orderNo = '';
+          var _tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+            return col.workOrderComponentType === 'TRADE_ID_INPUT';
+          });
+          if (_tradeId) {
+            _orderNo = item.jsonMap["".concat(_tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[_tradeId.workOrderComponentType])];
+          }
+          var bsE3SystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+            return col.workOrderComponentType === 'BS_E3_SYSTEM_ORDER';
+          });
+          if (bsE3SystemOrder) {
+            _selectIds = jsonParseSecurity(item.jsonMap["".concat(bsE3SystemOrder.uniqueKey, "_").concat(systemOrderMap[bsE3SystemOrder.workOrderComponentType].ids)], []);
+          }
+          _values.selectIds = _selectIds;
+          _values.orderNo = _orderNo;
+        }
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _values));
       } else if (nex.workOrderComponentType === 'BS_REISSUE_GOODS') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
           bsReissueType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReissueType")], []),
@@ -1591,7 +1648,7 @@ var transDataSource = function transDataSource(templateColumns) {
           shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
         }));
       } else if (['BS_RETURN_GOODS', 'WDT_RETURN_GOODS'].includes(nex.workOrderComponentType)) {
-        var _$concat2;
+        var _$concat;
         var compType = nex.workOrderComponentType;
         var returnGoodsMap = {
           BS_RETURN_GOODS: {
@@ -1605,9 +1662,9 @@ var transDataSource = function transDataSource(templateColumns) {
             shopCodeKey: 'shopCode'
           }
         };
-        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), (_$concat2 = {}, _defineProperty(_$concat2, returnGoodsMap[compType].returnTypeKey, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].returnTypeKey)], [])), _defineProperty(_$concat2, returnGoodsMap[compType].returnGoodsKey, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].returnGoodsKey)], [])), _defineProperty(_$concat2, returnGoodsMap[compType].shopCodeKey, item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].shopCodeKey)]), _$concat2)));
-      } else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
-        var systemOrderMap = {
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), (_$concat = {}, _defineProperty(_$concat, returnGoodsMap[compType].returnTypeKey, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].returnTypeKey)], [])), _defineProperty(_$concat, returnGoodsMap[compType].returnGoodsKey, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].returnGoodsKey)], [])), _defineProperty(_$concat, returnGoodsMap[compType].shopCodeKey, item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].shopCodeKey)]), _$concat)));
+      } else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER', 'BS_E3_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
+        var _systemOrderMap = {
           BS_SYSTEM_ORDER: {
             no: 'bsSystemOrderNo',
             ids: 'bsSystemSelectIds',
@@ -1622,13 +1679,18 @@ var transDataSource = function transDataSource(templateColumns) {
             no: 'wdtSystemOrderNo',
             ids: 'wdtSystemSelectIds',
             order: 'wdtSystemShowOrder'
+          },
+          BS_E3_SYSTEM_ORDER: {
+            no: 'bsE3SystemOrderNo',
+            ids: 'bsE3SystemSelectIds',
+            order: 'bsE3SystemShowOrder'
           }
         };
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
-          orderNo: item.jsonMap["".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].no)],
+          orderNo: item.jsonMap["".concat(nex.uniqueKey, "_").concat(_systemOrderMap[nex.workOrderComponentType].no)],
           orders: [],
-          selectIds: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].ids)], []),
-          showOrderInfo: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(systemOrderMap[nex.workOrderComponentType].order)], [])
+          selectIds: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(_systemOrderMap[nex.workOrderComponentType].ids)], []),
+          showOrderInfo: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(_systemOrderMap[nex.workOrderComponentType].order)], [])
         }));
       } else if (nex.workOrderComponentType === 'BUYER_MESSAGE_NOTICE') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_buyerMessageNotice")] || (config === null || config === void 0 ? void 0 : config.select)));
@@ -1663,7 +1725,17 @@ var transDataSource = function transDataSource(templateColumns) {
           shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
         }));
       } else if (nex.workOrderComponentType === 'WDT_REISSUE_GOODS') {
+        var _orderNo2 = '';
+        var _tradeId2 = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+          return col.workOrderComponentType === 'TRADE_ID_INPUT';
+        });
+        if (_tradeId2) {
+          _orderNo2 = item.jsonMap["".concat(_tradeId2.uniqueKey, "_").concat(updateWorkTypeKeys[_tradeId2.workOrderComponentType])];
+        }
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
+          wdtSystemOrder: {
+            orderNo: _orderNo2
+          },
           wdtReissueType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtReissueType")], ['1']),
           wdtReissueGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtReissueGoods")], []),
           shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")],
@@ -1695,7 +1767,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, _wdtOrders$trades, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread59, _cacheOrderInfo;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasBsE3, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsE3Orders, bsInfo, wlnInfo, bsE3Info, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread59, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1714,18 +1786,19 @@ export var orderBack = /*#__PURE__*/function () {
           // 'WDT_DEPOSIT',
           // 'WDT_POSTING',
           // 'WDT_DELIVERY_NO',
-          ]); //判断是否有万里牛组件 有就请求wln订单接口
+          ]); // 判断是否有旺店通组件 有就请求bsE3订单接口
+          hasBsE3 = HasFilterHandle(templateDetail, ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS']); //判断是否有万里牛组件 有就请求wln订单接口
           hasWln = HasFilterHandle(templateDetail, ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']); //如果不是对接店铺且百胜组件都没有
           if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt)) {
-            _context.next = 7;
+            _context.next = 8;
             break;
           }
           return _context.abrupt("return");
-        case 7:
+        case 8:
           _ref3 = shopList.find(function (item) {
             return item.shopId == shopId;
           }) || {}, shopSourceStr = _ref3.shopSourceStr, _ref3$thirdUserNick = _ref3.thirdUserNick, thirdUserNick = _ref3$thirdUserNick === void 0 ? '' : _ref3$thirdUserNick;
-          _context.prev = 8;
+          _context.prev = 9;
           promise = [];
           if (!JOIN_SHOP) {
             promise.push(new Promise(function (resolve) {
@@ -1785,21 +1858,33 @@ export var orderBack = /*#__PURE__*/function () {
               resolve([]);
             }));
           }
-          _context.next = 18;
+          if (hasBsE3) {
+            promise.push(bsE3OrderDetail({
+              billNo: order_no
+            }));
+          } else {
+            promise.push(new Promise(function (resolve) {
+              resolve([]);
+            }));
+          }
+          _context.next = 20;
           return Promise.allSettled(promise);
-        case 18:
+        case 20:
           _yield$Promise$allSet = _context.sent;
-          _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 5);
+          _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 6);
           data = _yield$Promise$allSet2[0];
           jstOrder = _yield$Promise$allSet2[1];
           bsOrder = _yield$Promise$allSet2[2];
           wlnOrder = _yield$Promise$allSet2[3];
           wdtOrder = _yield$Promise$allSet2[4];
+          bsE3Order = _yield$Promise$allSet2[5];
           orderInfo = (data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data) || {};
           jstInfo = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : (_jstOrder$value$data = _jstOrder$value.data) === null || _jstOrder$value$data === void 0 ? void 0 : _jstOrder$value$data.orders) || [];
           bsOrders = (bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data) || {};
           wlnOrders = (wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data) || {};
           wdtOrders = (wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data) || {};
+          bsE3Orders = (bsE3Order === null || bsE3Order === void 0 ? void 0 : (_bsE3Order$value = bsE3Order.value) === null || _bsE3Order$value === void 0 ? void 0 : _bsE3Order$value.data) || {};
+          bsE3Orders.orderList = filterBsE3Orders(bsE3Orders, order_no);
           wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
           Monitor.automaticReport({
             message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, ", \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo), ",jst\u4FE1\u606F:").concat(JSON.stringify(jstInfo), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders), ",wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders))
@@ -1810,10 +1895,15 @@ export var orderBack = /*#__PURE__*/function () {
             });
           }
           bsInfo = bsOrderTransform(bsOrders || {});
-          wlnInfo = wlnOrderTransform(wlnOrders || {}); // const wdtInfo = wdtOrderTransform(wdtOrders || {});
+          wlnInfo = wlnOrderTransform(wlnOrders || {});
+          bsE3Info = bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
+            componentList: templateDetail.componentDtoList,
+            orderNo: order_no
+          }), form);
           wdtInfo = wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
-            componentList: templateDetail.componentDtoList
-          }), form, order_no);
+            componentList: templateDetail.componentDtoList,
+            orderNo: order_no
+          }), form);
           if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
             bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
               bsGoods: []
@@ -1830,6 +1920,15 @@ export var orderBack = /*#__PURE__*/function () {
               deliveryNo: ''
             }];
           }
+          if ((bsE3Orders === null || bsE3Orders === void 0 ? void 0 : (_bsE3Orders$orderList = bsE3Orders.orderList) === null || _bsE3Orders$orderList === void 0 ? void 0 : _bsE3Orders$orderList.length) > 1) {
+            bsE3Info.bsE3Goods = _objectSpread(_objectSpread({}, bsE3Info.bsE3Goods), {}, {
+              bsE3Goods: []
+            });
+            // bsInfo.bsLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
+            // bsInfo.bsSendGood = [{ sendId: '', sendName: '' }];
+            // bsInfo.bsDeliveryNo = [{ deliveryNo: '' }];
+          }
+
           if ((wlnOrders === null || wlnOrders === void 0 ? void 0 : (_wlnOrders$orders = wlnOrders.orders) === null || _wlnOrders$orders === void 0 ? void 0 : _wlnOrders$orders.length) > 1) {
             wlnInfo.wlnGoods = _objectSpread(_objectSpread({}, wlnInfo.wlnGoods), {}, {
               wlnGoods: []
@@ -1845,7 +1944,8 @@ export var orderBack = /*#__PURE__*/function () {
           }
           if ((wdtOrders === null || wdtOrders === void 0 ? void 0 : (_wdtOrders$trades = wdtOrders.trades) === null || _wdtOrders$trades === void 0 ? void 0 : _wdtOrders$trades.length) > 1) {
             wdtInfo.wdtGoods = _objectSpread(_objectSpread({}, wdtInfo.wdtGoods), {}, {
-              wdtGoods: []
+              wdtGoods: [],
+              orders: []
             });
             wdtInfo.wdtLogistics = [{
               logisticsCompany: null,
@@ -1864,7 +1964,8 @@ export var orderBack = /*#__PURE__*/function () {
             jstItemList: jstInfo,
             bsOrder: bsInfo,
             wlnOrder: wlnInfo,
-            wdtOrder: wdtInfo
+            wdtOrder: wdtInfo,
+            bsE3Order: bsE3Info
           }); //抖音数据特殊处理
           if (shopSourceStr === 'FXG') {
             detail = updateDYDetails(detail);
@@ -1875,7 +1976,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 57;
+            _context.next = 64;
             break;
           }
           list = detail['itemList'];
@@ -1893,10 +1994,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 47;
-          _context.next = 50;
+          _context.prev = 54;
+          _context.next = 57;
           return Promise.all(promises);
-        case 50:
+        case 57:
           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), {}, {
@@ -1906,13 +2007,13 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 57;
+          _context.next = 64;
           break;
-        case 54:
-          _context.prev = 54;
-          _context.t0 = _context["catch"](47);
+        case 61:
+          _context.prev = 61;
+          _context.t0 = _context["catch"](54);
           console.error('调用erp获取宝贝编码错误', _context.t0);
-        case 57:
+        case 64:
           // console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
@@ -1921,7 +2022,10 @@ export var orderBack = /*#__PURE__*/function () {
             templateDetail: templateDetail,
             type: type,
             fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo
-          }); //新建的情况下订单返填不能清空打款信息
+          });
+          console.log('formValue', formValue);
+          console.log('values', values);
+          //新建的情况下订单返填不能清空打款信息
           if (type !== 'edit') {
             paymentUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList.find(function (item) {
               return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
@@ -1943,17 +2047,17 @@ export var orderBack = /*#__PURE__*/function () {
           // console.log('orderback', values);
           form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 66;
+          _context.next = 75;
           break;
-        case 63:
-          _context.prev = 63;
-          _context.t1 = _context["catch"](8);
+        case 72:
+          _context.prev = 72;
+          _context.t1 = _context["catch"](9);
           console.error(_context.t1);
-        case 66:
+        case 75:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[8, 63], [47, 54]]);
+    }, _callee, null, [[9, 72], [54, 61]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -2278,6 +2382,10 @@ export var reversalFormValues = function reversalFormValues() {
         prv["".concat(next.uniqueKey, "_wdtGoods")] = JSON.stringify(values[next.uniqueKey]['wdtGoods']);
         prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
         break;
+      case 'BS_E3_GOODS':
+        prv["".concat(next.uniqueKey, "_bsE3Goods")] = JSON.stringify(values[next.uniqueKey]['_bsE3Goods']);
+        prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
+        break;
     }
     return prv;
   }, {});
@@ -2333,16 +2441,45 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
   });
   form.setFieldsValue(values);
 };
-
-//wln商品信息返填
-export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref7) {
-  var _templateList$compone2;
+// bs e3商品信息返填
+export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref7) {
+  var _templateList$compone2, _templateList$compone3;
   var templateList = _ref7.templateList,
     value = _ref7.value,
     form = _ref7.form;
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
-  var bsGoodsComponent = (_templateList$compone2 = templateList.componentDtoList) === null || _templateList$compone2 === void 0 ? void 0 : _templateList$compone2.filter(function (item) {
+  var bsE3GoodsComponent = (_templateList$compone2 = templateList.componentDtoList) === null || _templateList$compone2 === void 0 ? void 0 : _templateList$compone2.filter(function (item) {
+    return ['BS_E3_GOODS', 'LOGISTICS_TRAJECTORY_MORE', 'LOGISTICS_INTERCEPTION_MORE'].includes(item.workOrderComponentType);
+  });
+  if (!(bsE3GoodsComponent !== null && bsE3GoodsComponent !== void 0 && bsE3GoodsComponent.length)) return;
+  var tIdCom = (_templateList$compone3 = templateList.componentDtoList) === null || _templateList$compone3 === void 0 ? void 0 : _templateList$compone3.find(function (item) {
+    return item.workOrderComponentType === 'TRADE_ID_INPUT';
+  });
+  var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
+  var bsE3GoodsValue = form.getFieldValue(bsE3GoodsComponent[0].uniqueKey);
+  var orderInfo = bsE3OrderTransform({
+    orderList: value.selectedRows,
+    shopCode: bsE3GoodsValue.shopCode,
+    componentList: templateList.componentDtoList,
+    orderNo: orderNo
+  }, form);
+  var values = bsE3OrderBackFormValues(orderInfo, {
+    componentDtoList: bsE3GoodsComponent
+  });
+  console.log('values', values);
+  form.setFieldsValue(values);
+};
+
+//wln商品信息返填
+export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref8) {
+  var _templateList$compone4;
+  var templateList = _ref8.templateList,
+    value = _ref8.value,
+    form = _ref8.form;
+  //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
+  if (!(value !== null && value !== void 0 && value.selectedRows)) return;
+  var bsGoodsComponent = (_templateList$compone4 = templateList.componentDtoList) === null || _templateList$compone4 === void 0 ? void 0 : _templateList$compone4.filter(function (item) {
     return ['WLN_GOODS', 'WLN_SEND_GOOD', 'WLN_LOGISTICS'].includes(item.workOrderComponentType);
   });
   if (!(bsGoodsComponent !== null && bsGoodsComponent !== void 0 && bsGoodsComponent.length)) return;
@@ -2358,22 +2495,30 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref7) {
 };
 
 // wdt商品信息返填
-export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref8) {
-  var _templateList$compone3;
-  var templateList = _ref8.templateList,
-    value = _ref8.value,
-    form = _ref8.form;
+export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref9) {
+  var _templateList$compone5, _templateList$compone6;
+  var templateList = _ref9.templateList,
+    value = _ref9.value,
+    form = _ref9.form;
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
-  var wdtGoodsComponent = (_templateList$compone3 = templateList.componentDtoList) === null || _templateList$compone3 === void 0 ? void 0 : _templateList$compone3.filter(function (item) {
+  var wdtGoodsComponent = (_templateList$compone5 = templateList.componentDtoList) === null || _templateList$compone5 === void 0 ? void 0 : _templateList$compone5.filter(function (item) {
     return ['WDT_GOODS', 'WDT_DELIVERY_NO', 'WDT_SEND_GOOD', 'WDT_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
   });
   if (!(wdtGoodsComponent !== null && wdtGoodsComponent !== void 0 && wdtGoodsComponent.length)) return;
+  var tIdCom = (_templateList$compone6 = templateList.componentDtoList) === null || _templateList$compone6 === void 0 ? void 0 : _templateList$compone6.find(function (item) {
+    return item.workOrderComponentType === 'TRADE_ID_INPUT';
+  });
+  var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
+
+  // ??? 此处找到的第一个组件，value不一定包含shopCode，
+  // 后面使用的时候要注意，不清楚为什么这么写
   var wdtGoodsValue = form.getFieldValue(wdtGoodsComponent[0].uniqueKey);
   var orderInfo = wdtOrderTransform({
     trades: value.selectedRows,
     shopCode: wdtGoodsValue.shopCode,
-    componentList: templateList.componentDtoList
+    componentList: templateList.componentDtoList,
+    orderNo: orderNo
   }, form);
   var values = wdtOrderBackFormValues(orderInfo, {
     componentDtoList: wdtGoodsComponent
@@ -2522,12 +2667,12 @@ export var transformWorkOrderDetail = function transformWorkOrderDetail(detail)
 };
 
 // 返填物流轨迹信息
-export var setLogisticsInfo = function setLogisticsInfo(_ref9) {
-  var logisticsMappingConfig = _ref9.logisticsMappingConfig,
-    uniqueKey = _ref9.uniqueKey,
-    workOrderComponentType = _ref9.workOrderComponentType,
-    value = _ref9.value,
-    form = _ref9.form;
+export var setLogisticsInfo = function setLogisticsInfo(_ref10) {
+  var logisticsMappingConfig = _ref10.logisticsMappingConfig,
+    uniqueKey = _ref10.uniqueKey,
+    workOrderComponentType = _ref10.workOrderComponentType,
+    value = _ref10.value,
+    form = _ref10.form;
   var values = logisticsMappingConfig.reduce(function (prv, next) {
     var logisticsValues = form.getFieldValue(next.uniqueKey);
     var componentConfig = next.componentConfig;

package/dist/esm/index.d.ts

@@ -1,5 +1,6 @@
 export { default as WorkOrder } from './WorkOrder';
 export { default as Login } from './Login';
+export { default as LoginNew } from './LoginNew';
 export { default as SingleShopWorkOrder } from './SingleShopWorkOrder';
 export { default as FormRender } from './FormRender';
 export { default as FormRenderTemplateId } from './FormRenderTemplateId';

package/dist/esm/index.js

@@ -10,6 +10,7 @@
  */
 export { default as WorkOrder } from "./WorkOrder";
 export { default as Login } from "./Login";
+export { default as LoginNew } from "./LoginNew";
 export { default as SingleShopWorkOrder } from "./SingleShopWorkOrder";
 export { default as FormRender } from "./FormRender";
 export { default as FormRenderTemplateId } from "./FormRenderTemplateId";

package/dist/esm/model/login.d.ts

@@ -27,6 +27,16 @@ export declare const fetchLogin: import("@reduxjs/toolkit").AsyncThunk<any, Logi
     fulfilledMeta?: unknown;
     rejectedMeta?: unknown;
 }>;
+export declare const fetchLoginNew: import("@reduxjs/toolkit").AsyncThunk<any, LoginParams, {
+    state?: unknown;
+    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
+    extra?: unknown;
+    rejectValue?: unknown;
+    serializedErrorType?: unknown;
+    pendingMeta?: unknown;
+    fulfilledMeta?: unknown;
+    rejectedMeta?: unknown;
+}>;
 export declare const fetchShopList: import("@reduxjs/toolkit").AsyncThunk<any, void, {
     state?: unknown;
     dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;

package/dist/esm/model/login.js

@@ -13,7 +13,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
  */
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
-import { grayWhiteListApi, login, queryShopList, logOut } from "./servers/api";
+import { grayWhiteListApi, login, loginNew, queryShopList, logOut } from "./servers/api";
 var initialState = {
   loading: false,
   // 登陆用户信息
@@ -77,37 +77,58 @@ export var fetchLogin = createAsyncThunk('login/login', /*#__PURE__*/function ()
     return _ref2.apply(this, arguments);
   };
 }());
-export var fetchShopList = createAsyncThunk('login/queryShopList', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+export var fetchLoginNew = createAsyncThunk('login/loginNew', /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
+    var response;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.next = 2;
+          return loginNew(data);
+        case 2:
+          response = _context3.sent;
+          return _context3.abrupt("return", response);
+        case 4:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function (_x3) {
+    return _ref3.apply(this, arguments);
+  };
+}());
+export var fetchShopList = createAsyncThunk('login/queryShopList', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
   var response;
-  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-    while (1) switch (_context3.prev = _context3.next) {
+  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+    while (1) switch (_context4.prev = _context4.next) {
       case 0:
-        _context3.next = 2;
+        _context4.next = 2;
         return queryShopList();
       case 2:
-        response = _context3.sent;
-        return _context3.abrupt("return", response.data);
+        response = _context4.sent;
+        return _context4.abrupt("return", response.data);
       case 4:
       case "end":
-        return _context3.stop();
+        return _context4.stop();
     }
-  }, _callee3);
+  }, _callee4);
 })));
-export var fetchLogOut = createAsyncThunk('login/logOut', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+export var fetchLogOut = createAsyncThunk('login/logOut', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
   var response;
-  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-    while (1) switch (_context4.prev = _context4.next) {
+  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+    while (1) switch (_context5.prev = _context5.next) {
       case 0:
-        _context4.next = 2;
+        _context5.next = 2;
         return logOut();
       case 2:
-        response = _context4.sent;
-        return _context4.abrupt("return", response.data);
+        response = _context5.sent;
+        return _context5.abrupt("return", response.data);
       case 4:
       case "end":
-        return _context4.stop();
+        return _context5.stop();
     }
-  }, _callee4);
+  }, _callee5);
 })));
 export var globalSlice = createSlice({
   name: 'login',
@@ -119,22 +140,22 @@ export var globalSlice = createSlice({
     closeLoading: function closeLoading(state) {
       state.loading = false;
     },
-    setUserInfo: function setUserInfo(state, _ref5) {
-      var payload = _ref5.payload;
+    setUserInfo: function setUserInfo(state, _ref6) {
+      var payload = _ref6.payload;
       state.userInfo = payload;
     },
-    setShopList: function setShopList(state, _ref6) {
-      var payload = _ref6.payload;
+    setShopList: function setShopList(state, _ref7) {
+      var payload = _ref7.payload;
       state.shopList = payload;
     },
-    setPlatform: function setPlatform(state, _ref7) {
-      var payload = _ref7.payload;
+    setPlatform: function setPlatform(state, _ref8) {
+      var payload = _ref8.payload;
       state.platform = payload;
     }
   },
   extraReducers: function extraReducers(builder) {
-    builder.addCase(fetchShopList.fulfilled, function (state, _ref8) {
-      var payload = _ref8.payload;
+    builder.addCase(fetchShopList.fulfilled, function (state, _ref9) {
+      var payload = _ref9.payload;
       state.shopList = payload.shopList;
     });
   }

package/dist/esm/model/servers/api.d.ts

@@ -36,8 +36,10 @@ export declare type LoginParams = {
     name: string;
     account: string;
     password: string;
+    pageReturnType?: string;
 };
 export declare const login: (data: LoginParams) => Promise<any>;
+export declare const loginNew: (data: LoginParams) => Promise<any>;
 export declare const queryShopList: () => Promise<any>;
 export declare const deleteWorkOrder: (data: any) => Promise<any>;
 export declare const getThirdOpenUidByOrderNo: (data: any) => Promise<any>;
@@ -61,6 +63,7 @@ export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
 export declare const jstOrderDetail: (data: any) => Promise<any>;
 export declare const bsOrderDetail: (data: any) => Promise<any>;
 export declare const wdtOrderDetail: (data: any) => Promise<any>;
+export declare const bsE3OrderDetail: (data: any) => Promise<any>;
 export declare const getRepeatWorkOrderList: (data: any) => Promise<any>;
 export declare const logisticsInterceptCancel: (data: any) => Promise<any>;
 export declare const queryLogisticsTrack: (data: any) => Promise<any>;

package/dist/esm/model/servers/api.js

@@ -217,6 +217,15 @@ export var login = function login(data) {
     data: data
   });
 };
+
+//登陆-新
+export var loginNew = function loginNew(data) {
+  return request({
+    url: '/qy/gdfw/company/login/new',
+    method: 'post',
+    data: data
+  });
+};
 //获取店铺列表
 export var queryShopList = function queryShopList() {
   return request({
@@ -388,6 +397,15 @@ export var wdtOrderDetail = function wdtOrderDetail(data) {
     infoLevel: 'warning'
   });
 };
+// 百胜E3订单详情
+export var bsE3OrderDetail = function bsE3OrderDetail(data) {
+  return request({
+    url: '/qy/gdfw/order/bse3OrderDetail',
+    method: 'post',
+    data: data,
+    infoLevel: 'warning'
+  });
+};
 
 // 获取重复详情
 export var getRepeatWorkOrderList = function getRepeatWorkOrderList(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.19.3",
+  "version": "1.19.4-beta.0",
   "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": "1.19.3",
-    "@kmkf-fe-packages/kmkf-utils": "1.19.3",
-    "@kmkf-fe-packages/services-components": "1.19.3",
+    "@kmkf-fe-packages/basic-components": "1.19.4-beta.0",
+    "@kmkf-fe-packages/kmkf-utils": "1.19.4-beta.0",
+    "@kmkf-fe-packages/services-components": "1.19.4-beta.0",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bf004d2bdbe4e7a0ae5396217469f8b6bb24e691",
+  "gitHead": "028de42b869ce07e95ab7a7166bf487cfdf0f93a",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }