@kmkf-fe-packages/kmkf-work-order-service-component 2.0.18 → 2.0.19-beta.0

package/README.md

@@ -40,7 +40,7 @@ Build library via `father`,
 $ npm run build
 ```
 
-1112221111
+111222111111
 
 ## 企业工单工单项目抽离模块
 

package/dist/esm/FlowTemplateDetailV2/common.js

@@ -46,7 +46,7 @@ export var FLOW_STATUS_V2 = {
   RETURNING: '回退中'
 };
 //不能回填的组件type
-export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE'];
+export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE'];
 export var verifyHandle = function verifyHandle(data, componentDtoList) {
   var _componentDtoList$fin, _componentDtoList$fin2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
   var res = {

package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.d.ts

@@ -7,6 +7,7 @@ declare type CurrentNodeProps = {
     readonly?: boolean;
     onOpenWangWang?: (nick: string, id: string) => void;
     onUpdateRemark?: (remark: string, flag: string) => void;
+    onJumpPage?: (val: any) => void;
     onReminder?: (type: string) => void;
     flowTemplateId: string;
     flowWorkOrderId?: string;

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

@@ -64,7 +64,8 @@ var CurrentNode = function CurrentNode(props, ref) {
     flowTemplateId = props.flowTemplateId,
     flowWorkOrderId = props.flowWorkOrderId,
     queryRemarkList = props.queryRemarkList,
-    autoSubmit = props.autoSubmit;
+    autoSubmit = props.autoSubmit,
+    onJumpPage = props.onJumpPage;
   var _useContext = useContext(Context),
     dispatch = _useContext.dispatch;
   // 是否是编辑状态
@@ -315,6 +316,7 @@ var CurrentNode = function CurrentNode(props, ref) {
     shopId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo22 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo22 === void 0 ? void 0 : _currentNodeDetail$wo22.shopId) || plat.shopId || defaultShopId,
     accountName: plat === null || plat === void 0 ? void 0 : plat.accountName,
     onOpenWangWang: onOpenWangWang,
+    onJumpPage: onJumpPage,
     onUpdateRemark: onUpdateRemark,
     currentNodeTid: currentNodeTid,
     form: form,

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.d.ts

@@ -24,6 +24,7 @@ declare type FormRenderProps = {
     form: FormInstance;
     currentNodeTid: string;
     onOpenWangWang?: (nick: string, id: string) => void;
+    onJumpPage?: (val: any) => void;
     onUpdateRemark?: (remark: string, flag: string) => void;
     handleChangeTradeId?: (p: string) => void;
     canModifyPayment?: boolean;

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

@@ -72,7 +72,8 @@ var FormRender = function FormRender(props, ref) {
     _props$isErpUse = props.isErpUse,
     isErpUse = _props$isErpUse === void 0 ? false : _props$isErpUse,
     _props$autoSubmit = props.autoSubmit,
-    autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit;
+    autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit,
+    onJumpPage = props.onJumpPage;
   var shopIdToUniqueKeyMap = useMemo(function () {
     var json = {};
     shopList.forEach(function (shop) {
@@ -1120,7 +1121,8 @@ var FormRender = function FormRender(props, ref) {
       templateDetail: templateDetail,
       disabled: look,
       displayConfig: get(templateDetail, 'flowTemplateConfig.showHideRule.rules', []),
-      isPreRender: false
+      isPreRender: false,
+      onJumpPage: onJumpPage
     }));
     // TODO: 这里只是为了把前置组件的值能够set到当前form表单中去
     // TODO: 为什么不直接把前置和当前放在同一个form里面呢？因为放在同一个里面会有必填校验等逻辑，前置节点在当前表单中只是做展示，但是还必须有控制显隐功能
@@ -1236,7 +1238,8 @@ var FormRender = function FormRender(props, ref) {
           templateDetail: templateDetail,
           disabled: true,
           displayConfig: finalDisplayConfig,
-          isPreRender: true
+          isPreRender: true,
+          onJumpPage: onJumpPage
         })(t);
       });
     });

package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts

@@ -7,6 +7,7 @@ interface NodeItem {
     flowWorkOrderId?: string;
     shopList: any[];
     onOpenWangWang?: (nick: string, id: string) => void;
+    onJumpPage?: (val: any) => void;
     queryRemarkList: () => void;
     openCloseCallback?: () => void;
     handler: string;

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

@@ -51,7 +51,8 @@ var NodeItem = function NodeItem(props) {
     _props$visibleType = props.visibleType,
     visibleType = _props$visibleType === void 0 ? '' : _props$visibleType,
     nodeIsAuto = props.nodeIsAuto,
-    flowTemplateKey = props.flowTemplateKey;
+    flowTemplateKey = props.flowTemplateKey,
+    onJumpPage = props.onJumpPage;
   var _useContext = useContext(Context),
     dispatch = _useContext.dispatch;
   var plat = useSelector(selectPlatInfo);
@@ -290,6 +291,7 @@ var NodeItem = function NodeItem(props) {
     accountName: plat.accountName,
     form: form,
     onOpenWangWang: onOpenWangWang,
+    onJumpPage: onJumpPage,
     look: !editing || flowStatus === FlowStatus.STOPPING,
     shopId: data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : (_data$data18$workOrde = _data$data18.workOrder) === null || _data$data18$workOrde === void 0 ? void 0 : _data$data18$workOrde.shopId,
     formProps: {

package/dist/esm/FlowTemplateDetailV2/constant.js

@@ -1,2 +1,2 @@
 // 切换当前店铺时，以下组件字段需要清空
-export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', '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_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS'];
+export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', '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_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'];

package/dist/esm/FlowTemplateDetailV2/index.js

@@ -1259,6 +1259,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       nodeName: flowRecord.nodeName,
       shopList: shopList,
       onOpenWangWang: onOpenWangWang,
+      onJumpPage: onJumpPage,
       queryRemarkList: queryRemarkList,
       handler: flowRecord.operator,
       canWithdraw: canWithdraw,
@@ -1279,6 +1280,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     readonly: readonly,
     onOpenWangWang: onOpenWangWang,
     onUpdateRemark: onUpdateRemark,
+    onJumpPage: onJumpPage,
     onReminder: handleReminder,
     queryRemarkList: queryRemarkList,
     autoSubmit: autoSubmit

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/constant.js

@@ -87,7 +87,8 @@ export var DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING = {
   NEW_PAYMENT_STATUS: 'newPaymentStatus',
   BUSINESS_ORDER_NO: 'businessOrderNo',
   PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
-  BASIC_MULT_SELECT: 'basicMultSelect'
+  BASIC_MULT_SELECT: 'basicMultSelect',
+  ORDER_TYPE: 'erpOrderType'
 };
 export var DEFAULT_ARRAY_COMPONENT_TYPE_FIELD_MAPPING = {
   RATE: 'rate',
@@ -272,6 +273,12 @@ export var SUBMIT_COMPONENT_RETURN_GOODS_MAP = {
     returnTypeKey: 'wdtReturnType',
     returnGoodsKey: 'wdtReturnGoods',
     shopCodeKey: 'shopCode'
+  },
+  GY_RETURN_GOODS: {
+    returnTypeKey: 'gyReturnType',
+    returnGoodsKey: 'gyReturnGoods',
+    gySystemOrderNoKey: 'gySystemOrderNo',
+    shopCodeKey: 'shopCode'
   }
 };
 export var SUBMIT_COMPONENT_SYSTEM_ORDER_MAP = {

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

@@ -153,7 +153,7 @@ var handleLogisticsInterception = function handleLogisticsInterception(_ref14) {
   var addContent = _ref14.addContent,
     getNowData = _ref14.getNowData;
   return function (item) {
-    ['interceptCompany', 'interceptCode', 'interceptSenderMobile', 'interceptType', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsApiStatus'].map(function (key) {
+    ['interceptCompany', 'interceptCode', 'interceptSenderMobile', 'interceptType', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsApiStatus', 'interceptLogisticsUserKCode', 'interceptLogisticsUserSecretKey'].map(function (key) {
       addContent(key, getNowData("".concat(item.uniqueKey, ".").concat(key), ''));
     });
     addContent('interceptProvince', getNowData("".concat(item.uniqueKey, ".interceptAddress[0]"), ''));
@@ -553,9 +553,25 @@ var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref38) {
     addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey, (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey]) || '');
   };
 };
-var handleBsPosting = function handleBsPosting(_ref39) {
+var handleGYReturnGoods = function handleGYReturnGoods(_ref39) {
   var addContent = _ref39.addContent,
     getNowData = _ref39.getNowData;
+  return function (item) {
+    var currentReturn = getNowData(item.uniqueKey, {});
+    var compType = item.workOrderComponentType;
+    addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].returnTypeKey, currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].returnTypeKey]);
+    addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].returnGoodsKey, currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].returnGoodsKey]);
+    addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].gySystemOrderNoKey, (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].gySystemOrderNoKey]) || '');
+    // addContent(
+    //   SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey,
+    //   currentReturn?.[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey] || '',
+    // );
+  };
+};
+
+var handleBsPosting = function handleBsPosting(_ref40) {
+  var addContent = _ref40.addContent,
+    getNowData = _ref40.getNowData;
   return function (item) {
     ['bsPostingProvince', 'bsPostingCity', 'bsPostingDistrict'].map(function (key, index) {
       addContent(key, getNowData("".concat(item.uniqueKey, ".postingAddress[").concat(index, "]"), ''));
@@ -565,9 +581,9 @@ var handleBsPosting = function handleBsPosting(_ref39) {
     addContent('bsPostingReceiverMobile', getNowData("".concat(item.uniqueKey, ".postingReceiverMobile"), ''));
   };
 };
-var handleSystemOrder = function handleSystemOrder(_ref40) {
-  var addContent = _ref40.addContent,
-    getNowData = _ref40.getNowData;
+var handleSystemOrder = function handleSystemOrder(_ref41) {
+  var addContent = _ref41.addContent,
+    getNowData = _ref41.getNowData;
   return function (item) {
     var selectIds = getNowData("".concat(item.uniqueKey, ".selectIds"), '');
     var showOrderInfo = getNowData("".concat(item.uniqueKey, ".showOrderInfo"), []);
@@ -581,16 +597,16 @@ var handleSystemOrder = function handleSystemOrder(_ref40) {
     }));
   };
 };
-var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref41) {
-  var addContent = _ref41.addContent,
-    getNowData = _ref41.getNowData;
+var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref42) {
+  var addContent = _ref42.addContent,
+    getNowData = _ref42.getNowData;
   return function (item) {
     addContent('buyerMessageNotice', getNowData(item.uniqueKey, '未通知'));
   };
 };
-var handleBsDeliveryNo = function handleBsDeliveryNo(_ref42) {
-  var addContent = _ref42.addContent,
-    getNowData = _ref42.getNowData;
+var handleBsDeliveryNo = function handleBsDeliveryNo(_ref43) {
+  var addContent = _ref43.addContent,
+    getNowData = _ref43.getNowData;
   return function (item) {
     var deliveryNoList = getNowData(item.uniqueKey, []);
     addContent('deliveryNoList', deliveryNoList);
@@ -599,9 +615,9 @@ var handleBsDeliveryNo = function handleBsDeliveryNo(_ref42) {
     }));
   };
 };
-var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref43) {
-  var addContent = _ref43.addContent,
-    getNowData = _ref43.getNowData;
+var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref44) {
+  var addContent = _ref44.addContent,
+    getNowData = _ref44.getNowData;
   return function (item) {
     var returnGoodsTradeItemList = getNowData(item.uniqueKey, []);
     addContent('returnGoodsTradeItemList', returnGoodsTradeItemList);
@@ -610,9 +626,9 @@ var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref43) {
     }));
   };
 };
-var handleErpTradeId = function handleErpTradeId(_ref44) {
-  var addContent = _ref44.addContent,
-    getNowData = _ref44.getNowData;
+var handleErpTradeId = function handleErpTradeId(_ref45) {
+  var addContent = _ref45.addContent,
+    getNowData = _ref45.getNowData;
   return function (item) {
     var tradeItemList = getNowData(item.uniqueKey, []);
     addContent('tradeItemList', tradeItemList);
@@ -621,18 +637,18 @@ var handleErpTradeId = function handleErpTradeId(_ref44) {
     }));
   };
 };
-var handleWlnGoods = function handleWlnGoods(_ref45) {
-  var addContent = _ref45.addContent,
-    getNowData = _ref45.getNowData;
+var handleWlnGoods = function handleWlnGoods(_ref46) {
+  var addContent = _ref46.addContent,
+    getNowData = _ref46.getNowData;
   return function (item) {
     var wlnGoods = getNowData(item.uniqueKey, {});
     addContent('wlnGoods', wlnGoods.wlnGoods);
     addContent('shopCode', (wlnGoods === null || wlnGoods === void 0 ? void 0 : wlnGoods.shopCode) || '');
   };
 };
-var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref46) {
-  var addContent = _ref46.addContent,
-    getNowData = _ref46.getNowData;
+var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref47) {
+  var addContent = _ref47.addContent,
+    getNowData = _ref47.getNowData;
   return function (item) {
     ['bsE3SystemOrderNo', 'bsE3ReissueType', 'bsE3ReissueMemo', 'bsE3ReissueGoods'].map(function (key) {
       if (key === 'bsE3ReissueGoods') {
@@ -643,24 +659,24 @@ var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref46) {
     });
   };
 };
-var handleDefault = function handleDefault(_ref47) {
-  var addContent = _ref47.addContent,
-    getNowData = _ref47.getNowData;
+var handleDefault = function handleDefault(_ref48) {
+  var addContent = _ref48.addContent,
+    getNowData = _ref48.getNowData;
   return function (item) {
     addContent(V.camelCase(item.workOrderComponentType), getNowData(item.uniqueKey, ''));
   };
 };
-var handleStatusField = function handleStatusField(_ref48) {
-  var addContent = _ref48.addContent,
-    getNowData = _ref48.getNowData;
+var handleStatusField = function handleStatusField(_ref49) {
+  var addContent = _ref49.addContent,
+    getNowData = _ref49.getNowData;
   return function (item) {
     addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].status, getNowData("".concat(item.uniqueKey, ".status"), ''));
     addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].reason, getNowData("".concat(item.uniqueKey, ".reason"), ''));
   };
 };
-var handleGoodStatus = function handleGoodStatus(_ref49) {
-  var addContent = _ref49.addContent,
-    getNowData = _ref49.getNowData;
+var handleGoodStatus = function handleGoodStatus(_ref50) {
+  var addContent = _ref50.addContent,
+    getNowData = _ref50.getNowData;
   return function (item) {
     addContent(SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].list, getNowData("".concat(item.uniqueKey), []));
     addContent(SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].status, getNowData("".concat(item.uniqueKey), []).map(function (item) {
@@ -668,13 +684,13 @@ var handleGoodStatus = function handleGoodStatus(_ref49) {
     }));
   };
 };
-var processComponent = function processComponent(_ref50) {
-  var params = _ref50.params,
-    nowData = _ref50.nowData,
-    updateFlag = _ref50.updateFlag,
-    detail = _ref50.detail,
-    accountName = _ref50.accountName,
-    getValueByField = _ref50.getValueByField;
+var processComponent = function processComponent(_ref51) {
+  var params = _ref51.params,
+    nowData = _ref51.nowData,
+    updateFlag = _ref51.updateFlag,
+    detail = _ref51.detail,
+    accountName = _ref51.accountName,
+    getValueByField = _ref51.getValueByField;
   return function (item) {
     var contentVoList = [];
     var uniqueKeyPrefix = "".concat(item.uniqueKey, "_");
@@ -721,6 +737,7 @@ var processComponent = function processComponent(_ref50) {
       case 'BUSINESS_ORDER_NO':
       case 'PAYMENT_VOUCHER_CODE':
       case 'BASIC_MULT_SELECT':
+      case 'ORDER_TYPE':
         wrapFn(handleOnlyAddContent);
         break;
       case 'RATE':
@@ -868,6 +885,9 @@ var processComponent = function processComponent(_ref50) {
       case 'WDT_RETURN_GOODS':
         wrapFn(handleBsOrWdtReturnGoods);
         break;
+      case 'GY_RETURN_GOODS':
+        wrapFn(handleGYReturnGoods);
+        break;
       case 'BS_POSTING':
         wrapFn(handleBsPosting);
         break;

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

@@ -51,6 +51,7 @@ var workTypeKeys = {
   DATETIME: 'dateTime',
   TEXTAREA: 'textarea',
   SELECT: 'select',
+  ORDER_TYPE: 'erpOrderType',
   SYSTEM_ORDER_NO: 'systemOrderNo',
   NEW_PAYMENT_STATUS: 'newPaymentStatus',
   BUSINESS_ORDER_NO: 'businessOrderNo',
@@ -372,15 +373,15 @@ export var orderBack = /*#__PURE__*/function () {
               orders: []
             });
             jstInfo.jstLogistics = [{
-              logisticsCode: ""
+              logisticsCode: ''
             }];
             jstInfo.jstSendGood = [{
               sendId: '',
               sendName: ''
             }];
             jstInfo.jstSupply = [{
-              supplyName: "",
-              supplyId: ""
+              supplyName: '',
+              supplyId: ''
             }];
             jstInfo.jstItemSelectThird = [];
           }
@@ -480,7 +481,6 @@ export var orderBack = /*#__PURE__*/function () {
             }
           }
           // console.log('orderback', values);
-
           form.setFieldsValue(_objectSpread(_objectSpread(_objectSpread({}, formValue), values), {}, {
             fixed_field_buyerOpenUid: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid,
             shopId: shopId
@@ -819,6 +819,7 @@ export var reversalFormValues = function reversalFormValues() {
       case 'WDT_RETURN_GOODS':
       case 'WDT_EXCHANGE_GOODS':
       case 'GY_REISSUE_GOODS':
+      case 'GY_RETURN_GOODS':
       case 'JST_REISSUE_GOODS':
       case 'JST_RETURN_GOODS':
         prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];

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

@@ -245,7 +245,7 @@ var processLogisticsInterception = function processLogisticsInterception(getValu
     address = every(address, function (item) {
       return !item;
     }) ? [] : address;
-    var subFields = ['interceptCompany', 'interceptCode', 'interceptType', 'interceptSenderMobile', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus'];
+    var subFields = ['interceptCompany', 'interceptCode', 'interceptType', 'interceptSenderMobile', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsUserKCode', 'interceptLogisticsUserSecretKey'];
     var map = subFields.reduce(function (cur, nxt) {
       return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
     }, {});
@@ -681,6 +681,12 @@ var processBsOrWdtReturnGoods = function processBsOrWdtReturnGoods(getValue) {
         returnGoodsKey: 'wdtReturnGoods',
         shopCodeKey: 'shopCode'
       },
+      GY_RETURN_GOODS: {
+        returnTypeKey: 'gyReturnType',
+        returnGoodsKey: 'gyReturnGoods',
+        gySystemOrderNo: 'gySystemOrderNo',
+        shopCodeKey: 'shopCode'
+      },
       JST_RETURN_GOODS: {
         returnTypeKey: 'jstReturnType',
         returnGoodsKey: 'jstReturnGoods',
@@ -742,6 +748,11 @@ var processBuyerMessageNotice = function processBuyerMessageNotice(getValue) {
     return _defineProperty({}, nex.uniqueKey, getValue("".concat(nex.uniqueKey, "_buyerMessageNotice")) || (config === null || config === void 0 ? void 0 : config.select));
   };
 };
+var processOrderType = function processOrderType(getValue) {
+  return function (nex, config) {
+    return _defineProperty({}, nex.uniqueKey, getValue("".concat(nex.uniqueKey, "_erpOrderType")) || (config === null || config === void 0 ? void 0 : config.select));
+  };
+};
 var processErpTradeId = function processErpTradeId(getValue) {
   return function (nex, config) {
     var SYSTEM_ORDER_MAP = {
@@ -825,6 +836,16 @@ var processGyReissueGoods = function processGyReissueGoods(templateColumns) {
     };
   };
 };
+var processGyReturnGoods = function processGyReturnGoods(getValue) {
+  return function (nex, config) {
+    return _defineProperty({}, nex.uniqueKey, {
+      gyReturnType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_gyReturnType")), ['1']),
+      gyReturnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_gyReturnGoods")), []),
+      shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
+      gySystemOrderNo: getValue("".concat(nex.uniqueKey, "_gySystemOrderNo"))
+    });
+  };
+};
 var processJstReissueGoods = function processJstReissueGoods(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
@@ -873,14 +894,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref60;
-    return _ref60 = {}, _defineProperty(_ref60, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref60, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref60;
+    var _ref62;
+    return _ref62 = {}, _defineProperty(_ref62, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref62, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref62;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref61;
-    return _ref61 = {}, _defineProperty(_ref61, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref61, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref61;
+    var _ref63;
+    return _ref63 = {}, _defineProperty(_ref63, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref63, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref63;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -1004,6 +1025,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       JST_SYSTEM_ORDER: processErpSystemOrder,
       GY_SYSTEM_ORDER: processErpSystemOrder,
       BUYER_MESSAGE_NOTICE: processBuyerMessageNotice,
+      ORDER_TYPE: processOrderType,
       RETURN_GOODS_TRADE_ID: processErpTradeId,
       BS_DELIVERY_NO: processErpTradeId,
       REISSUE_TRADE_ID: processErpTradeId,
@@ -1012,6 +1034,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       WLN_GOODS: processWlnGoods,
       WDT_REISSUE_GOODS: processWdtReissueGoods(templateColumns),
       GY_REISSUE_GOODS: processGyReissueGoods(templateColumns),
+      GY_RETURN_GOODS: processGyReturnGoods,
       JST_REISSUE_GOODS: processJstReissueGoods(templateColumns),
       LABEL: processLabel,
       MEMBER_LEVEL: processMemberLevel,

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>;

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({

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.0.18",
+  "version": "2.0.19-beta.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "sync": "yarn build && yalc push",
     "build": "yarn run lint && father build",
     "deploy": "npm run docs:build && npm run docs:deploy",
     "docs:build": "dumi build",
@@ -18,6 +17,7 @@
     "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
     "pub": "npm publish --registry=https://registry.npmjs.org/",
     "start": "dumi dev",
+    "sync": "yarn build && yalc push",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "2.0.18",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.18",
-    "@kmkf-fe-packages/services-components": "2.0.18",
+    "@kmkf-fe-packages/basic-components": "2.0.19-beta.0",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.19-beta.0",
+    "@kmkf-fe-packages/services-components": "2.0.19-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": "6b9ac6412c233e92616caf732da997ece8ae946e",
+  "gitHead": "336ada02cb6f2c70056928879798475bf880d389",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }