@kmkf-fe-packages/kmkf-work-order-service-component 1.19.7 → 1.19.8-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -300,6 +300,8 @@ var FormRender = function FormRender(props, ref) {
300
300
  enterprisePaymentTid: orderNo,
301
301
  enterprisePaymentAlipayNo: enterprisePaymentAlipayNo
302
302
  }, templateDetail);
303
+ var formData = form.getFieldsValue(true);
304
+ handleWatchFormValueChange(undefined, formData);
303
305
  };
304
306
  useEffect(function () {
305
307
  if (labelComponent && !isNull(record)) {
@@ -695,7 +697,7 @@ var FormRender = function FormRender(props, ref) {
695
697
  setShopId(val);
696
698
  // 清空表单字段
697
699
  var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
698
- 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)) {
700
+ 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', 'BS_E3_REISSUE_GOODS'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
699
701
  cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
700
702
  }
701
703
  return cur;
@@ -3,6 +3,7 @@ export declare const COMMON_HOST = "https://kefu.kuaimai.com";
3
3
  export declare const HD_HOST = "https://kefuab.kuaimai.com";
4
4
  interface LoginProps {
5
5
  loginCallBack?: (val: any) => void;
6
+ clickImgCallBack?: () => void;
6
7
  }
7
8
  declare const ProviderLogin: (props: LoginProps) => React.JSX.Element;
8
9
  export default ProviderLogin;
@@ -21,7 +21,8 @@ import styles from "./index.module.less";
21
21
  export var COMMON_HOST = 'https://kefu.kuaimai.com';
22
22
  export var HD_HOST = 'https://kefuab.kuaimai.com';
23
23
  var Login = function Login(props) {
24
- var loginCallBack = props.loginCallBack;
24
+ var loginCallBack = props.loginCallBack,
25
+ clickImgCallBack = props.clickImgCallBack;
25
26
  var _useState = useState(''),
26
27
  _useState2 = _slicedToArray(_useState, 2),
27
28
  name = _useState2[0],
@@ -248,7 +249,8 @@ var Login = function Login(props) {
248
249
  className: styles.logo
249
250
  }, /*#__PURE__*/React.createElement("img", {
250
251
  src: logo,
251
- alt: "logo"
252
+ alt: "logo",
253
+ onClick: clickImgCallBack
252
254
  })), /*#__PURE__*/React.createElement(Form, {
253
255
  className: styles.container
254
256
  }, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
@@ -0,0 +1,8 @@
1
+ import React from 'react';
2
+ export declare const COMMON_HOST = "https://kefu.kuaimai.com";
3
+ export declare const HD_HOST = "https://kefuab.kuaimai.com";
4
+ interface LoginProps {
5
+ loginCallBack?: (val: any) => void;
6
+ }
7
+ declare const ProviderLogin: (props: LoginProps) => React.JSX.Element;
8
+ export default ProviderLogin;
@@ -0,0 +1,268 @@
1
+ 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); }
2
+ 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; }
3
+ 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); } }
4
+ 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); }); }; }
5
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
6
+ 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."); }
7
+ 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); }
8
+ 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; }
9
+ 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; } }
10
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
+ import React, { useState, useMemo, useEffect } from 'react';
12
+ import { Input, message, Form, Button } from 'antd';
13
+ import md5 from 'js-md5';
14
+ import { Provider } from 'react-redux';
15
+ import store from "../model/store";
16
+ import cache from "../common/cache";
17
+ import { useAppDispatch } from "../model/hooks";
18
+ import { fetchLoginNew, fetchShopList, setUserInfo } from "../model/login";
19
+ import logo from "../assets/logo.svg";
20
+ import styles from "./index.module.less";
21
+ export var COMMON_HOST = 'https://kefu.kuaimai.com';
22
+ export var HD_HOST = 'https://kefuab.kuaimai.com';
23
+ var Login = function Login(props) {
24
+ var loginCallBack = props.loginCallBack;
25
+ var _useState = useState(''),
26
+ _useState2 = _slicedToArray(_useState, 2),
27
+ name = _useState2[0],
28
+ setName = _useState2[1];
29
+ var _useState3 = useState(''),
30
+ _useState4 = _slicedToArray(_useState3, 2),
31
+ account = _useState4[0],
32
+ setAccount = _useState4[1];
33
+ var _useState5 = useState(''),
34
+ _useState6 = _slicedToArray(_useState5, 2),
35
+ password = _useState6[0],
36
+ setPassword = _useState6[1];
37
+ var _useState7 = useState(false),
38
+ _useState8 = _slicedToArray(_useState7, 2),
39
+ loading = _useState8[0],
40
+ setLoading = _useState8[1];
41
+ // 直接登陆模式
42
+ var _useState9 = useState(false),
43
+ _useState10 = _slicedToArray(_useState9, 2),
44
+ isDirectProcess = _useState10[0],
45
+ setDirectProcess = _useState10[1];
46
+ // 显示历史记录
47
+ var _useState11 = useState(false),
48
+ _useState12 = _slicedToArray(_useState11, 2),
49
+ showRecommendPwdList = _useState12[0],
50
+ setShowRecommendPwdList = _useState12[1];
51
+ var dispatch = useAppDispatch();
52
+ useEffect(function () {
53
+ localStorage.removeItem('kmkf_kmgd_cookie');
54
+ cache.setHost(COMMON_HOST);
55
+ }, []);
56
+ var processHistoryPwd = function processHistoryPwd(params) {
57
+ var historyList = cache.getHistoryList();
58
+ if (historyList.findIndex(function (item) {
59
+ return item.account === params.account;
60
+ }) < 0) {
61
+ historyList.unshift(params);
62
+ }
63
+ cache.setHistoryList(historyList);
64
+ };
65
+ var changeProcessHistoryPwd = function changeProcessHistoryPwd(params) {
66
+ var historyList = cache.getHistoryList();
67
+ historyList = historyList.filter(function (item) {
68
+ return item.account !== params.account;
69
+ });
70
+ historyList.unshift(params);
71
+ cache.setHistoryList(historyList);
72
+ };
73
+ var onCompanyChange = function onCompanyChange(val) {
74
+ if (isDirectProcess) {
75
+ setDirectProcess(false);
76
+ setPassword('');
77
+ }
78
+ setName(val);
79
+ };
80
+ var onAccountChange = function onAccountChange(val) {
81
+ if (isDirectProcess) {
82
+ setDirectProcess(false);
83
+ setPassword('');
84
+ }
85
+ setAccount(val);
86
+ };
87
+ var handleLoginClick = /*#__PURE__*/function () {
88
+ var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
89
+ var isDirect,
90
+ _args2 = arguments;
91
+ return _regeneratorRuntime().wrap(function _callee2$(_context2) {
92
+ while (1) switch (_context2.prev = _context2.next) {
93
+ case 0:
94
+ isDirect = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : false;
95
+ if (name) {
96
+ _context2.next = 4;
97
+ break;
98
+ }
99
+ message.error('请输入公司名称');
100
+ return _context2.abrupt("return");
101
+ case 4:
102
+ if (account) {
103
+ _context2.next = 7;
104
+ break;
105
+ }
106
+ message.error('请输入登录账号');
107
+ return _context2.abrupt("return");
108
+ case 7:
109
+ if (password) {
110
+ _context2.next = 10;
111
+ break;
112
+ }
113
+ message.error('请输入密码');
114
+ return _context2.abrupt("return");
115
+ case 10:
116
+ try {
117
+ setLoading(true);
118
+ dispatch(fetchLoginNew({
119
+ name: name.trim(),
120
+ account: account.trim(),
121
+ password: isDirect ? password : md5(password),
122
+ pageReturnType: 'client_jump'
123
+ })).unwrap().then( /*#__PURE__*/function () {
124
+ var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
125
+ var data, success, _data$companyUser;
126
+ return _regeneratorRuntime().wrap(function _callee$(_context) {
127
+ while (1) switch (_context.prev = _context.next) {
128
+ case 0:
129
+ data = res.data, success = res.success; // console.log(data, success);
130
+ if (isDirect) {
131
+ processHistoryPwd({
132
+ name: name,
133
+ account: account,
134
+ password: password
135
+ });
136
+ } else {
137
+ changeProcessHistoryPwd({
138
+ name: name,
139
+ account: account,
140
+ password: md5(password)
141
+ });
142
+ }
143
+ if (!success) {
144
+ _context.next = 10;
145
+ break;
146
+ }
147
+ message.success('登录成功', 1.5);
148
+ dispatch(setUserInfo(data === null || data === void 0 ? void 0 : data.companyUser));
149
+ cache.setHost((data === null || data === void 0 ? void 0 : data.domain) || COMMON_HOST);
150
+ cache.setCookie(data === null || data === void 0 ? void 0 : (_data$companyUser = data.companyUser) === null || _data$companyUser === void 0 ? void 0 : _data$companyUser.ckValue);
151
+ _context.next = 9;
152
+ return dispatch(fetchShopList());
153
+ case 9:
154
+ loginCallBack === null || loginCallBack === void 0 ? void 0 : loginCallBack({
155
+ data: data
156
+ });
157
+ case 10:
158
+ setLoading(false);
159
+ case 11:
160
+ case "end":
161
+ return _context.stop();
162
+ }
163
+ }, _callee);
164
+ }));
165
+ return function (_x2) {
166
+ return _ref2.apply(this, arguments);
167
+ };
168
+ }()).catch(function () {
169
+ setLoading(false);
170
+ });
171
+ } catch (err) {
172
+ setLoading(false);
173
+ console.error(err);
174
+ }
175
+ case 11:
176
+ case "end":
177
+ return _context2.stop();
178
+ }
179
+ }, _callee2);
180
+ }));
181
+ return function handleLoginClick() {
182
+ return _ref.apply(this, arguments);
183
+ };
184
+ }();
185
+ var changeRecommendVisible = function changeRecommendVisible(flag) {
186
+ setTimeout(function () {
187
+ setShowRecommendPwdList(flag);
188
+ }, 500);
189
+ };
190
+ var handleSelectHistoryRecord = function handleSelectHistoryRecord(item) {
191
+ var itemName = item.name,
192
+ itemAccount = item.account,
193
+ itemPassword = item.password;
194
+ setName(itemName);
195
+ setAccount(itemAccount);
196
+ setPassword(itemPassword);
197
+ setDirectProcess(true);
198
+ };
199
+ var filteredHistoryList = useMemo(function () {
200
+ var historyList = cache.getHistoryList();
201
+ return historyList.filter(function (item) {
202
+ if (account) {
203
+ return item.account.includes(account);
204
+ }
205
+ return true;
206
+ });
207
+ }, [account]);
208
+ return /*#__PURE__*/React.createElement("div", {
209
+ className: styles.wrap
210
+ }, /*#__PURE__*/React.createElement("div", {
211
+ className: styles.logo
212
+ }, /*#__PURE__*/React.createElement("img", {
213
+ src: logo,
214
+ alt: "logo"
215
+ })), /*#__PURE__*/React.createElement(Form, {
216
+ className: styles.container
217
+ }, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
218
+ value: name,
219
+ onChange: function onChange(e) {
220
+ return onCompanyChange(e.target.value);
221
+ },
222
+ placeholder: "\u8BF7\u8F93\u5165\u516C\u53F8\u540D\u79F0"
223
+ })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement("div", {
224
+ className: styles.recomConWrap
225
+ }, /*#__PURE__*/React.createElement(Input, {
226
+ onFocus: function onFocus() {
227
+ return changeRecommendVisible(true);
228
+ },
229
+ onBlur: function onBlur() {
230
+ return changeRecommendVisible(false);
231
+ },
232
+ value: account,
233
+ onChange: function onChange(e) {
234
+ return onAccountChange(e.target.value);
235
+ },
236
+ placeholder: "\u8BF7\u8F93\u5165\u767B\u5F55\u8D26\u53F7"
237
+ }), showRecommendPwdList && filteredHistoryList.length > 0 && /*#__PURE__*/React.createElement("div", {
238
+ className: styles.recomListCon
239
+ }, /*#__PURE__*/React.createElement("ul", null, filteredHistoryList.map(function (item) {
240
+ return /*#__PURE__*/React.createElement("li", {
241
+ key: item.account,
242
+ className: styles.recomListItem,
243
+ onClick: function onClick() {
244
+ return handleSelectHistoryRecord(item);
245
+ }
246
+ }, /*#__PURE__*/React.createElement("div", null, "\u4F01\u4E1A\u540D\u79F0\uFF1A", item.name), /*#__PURE__*/React.createElement("div", null, "\u767B\u5F55\u8D26\u53F7:", item.account));
247
+ }))))), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
248
+ value: password,
249
+ type: "password",
250
+ onChange: function onChange(e) {
251
+ return setPassword(e.target.value);
252
+ },
253
+ placeholder: "\u8BF7\u8F93\u5165\u5BC6\u7801"
254
+ }))), /*#__PURE__*/React.createElement(Button, {
255
+ onClick: function onClick() {
256
+ return handleLoginClick(isDirectProcess);
257
+ },
258
+ type: "primary",
259
+ block: true,
260
+ loading: loading
261
+ }, "\u767B\u5F55"));
262
+ };
263
+ var ProviderLogin = function ProviderLogin(props) {
264
+ return /*#__PURE__*/React.createElement(Provider, {
265
+ store: store
266
+ }, /*#__PURE__*/React.createElement(Login, props));
267
+ };
268
+ export default ProviderLogin;
@@ -0,0 +1,45 @@
1
+ .wrap {
2
+ width: 266px;
3
+ margin: auto;
4
+
5
+ .logo {
6
+ display: flex;
7
+ justify-content: center;
8
+ margin-top: 146px;
9
+ }
10
+
11
+ .container {
12
+ margin-top: 48px;
13
+
14
+ ul {
15
+ margin: 0px;
16
+ padding: 0;
17
+ list-style-type: none;
18
+ }
19
+ }
20
+ }
21
+
22
+ .recomConWrap {
23
+ position: relative;
24
+
25
+ .recomListCon {
26
+ position: absolute;
27
+ left: 28px;
28
+ z-index: 2;
29
+ width: 300px;
30
+ max-height: 160px;
31
+ overflow: auto;
32
+ background-color: #fff;
33
+
34
+ ul {
35
+ margin: 0px;
36
+ padding: 0;
37
+ list-style-type: none;
38
+ }
39
+
40
+ .recomListItem {
41
+ padding: 8px;
42
+ cursor: pointer;
43
+ }
44
+ }
45
+ }
@@ -1051,6 +1051,24 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
1051
1051
  }),
1052
1052
  name: item.name
1053
1053
  });
1054
+ } else if (['BS_E3_REISSUE_GOODS'].includes(item.workOrderComponentType)) {
1055
+ contentVoList.push({
1056
+ uniqueKey: "".concat(item.uniqueKey, "_bsE3SystemOrderNo"),
1057
+ content: get(nowData, "".concat(item.uniqueKey, ".bsE3SystemOrderNo"), ''),
1058
+ name: item.name
1059
+ }, {
1060
+ uniqueKey: "".concat(item.uniqueKey, "_bsE3ReissueType"),
1061
+ content: get(nowData, "".concat(item.uniqueKey, ".bsE3ReissueType"), ''),
1062
+ name: item.name
1063
+ }, {
1064
+ uniqueKey: "".concat(item.uniqueKey, "_bsE3ReissueMemo"),
1065
+ content: get(nowData, "".concat(item.uniqueKey, ".bsE3ReissueMemo"), ''),
1066
+ name: item.name
1067
+ }, {
1068
+ uniqueKey: "".concat(item.uniqueKey, "_bsE3ReissueGoods"),
1069
+ content: get(nowData, "".concat(item.uniqueKey, ".bsE3ReissueGoods"), ''),
1070
+ name: item.name
1071
+ });
1054
1072
  } else if (item.workOrderComponentType === 'BUYER_MESSAGE_NOTICE') {
1055
1073
  var _nowData$item$uniqueK;
1056
1074
  contentVoList.push({
@@ -1223,7 +1241,7 @@ export var orderBack = /*#__PURE__*/function () {
1223
1241
  return !item.notJoin && item.shopId == shopId;
1224
1242
  }); //判断是否有百胜组件 有就请求bs订单接口
1225
1243
  hasBs = HasFilterHandle(templateDetail, ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO']); //判断是否有旺店通组件 有就请求wdt订单接口
1226
- hasWdt = HasFilterHandle(templateDetail, ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD'
1244
+ hasWdt = HasFilterHandle(templateDetail, ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_REISSUE_GOODS'
1227
1245
  // 'WDT_SIGNING_TIME',
1228
1246
  // 'WDT_SEND_TIME',
1229
1247
  // 'WDT_TRADE_PAYMENT_TIME',
@@ -1233,9 +1251,9 @@ export var orderBack = /*#__PURE__*/function () {
1233
1251
  // 'WDT_POSTING',
1234
1252
  // 'WDT_DELIVERY_NO',
1235
1253
  ]); // 判断是否有旺店通组件 有就请求bsE3订单接口
1236
- hasBsE3 = HasFilterHandle(templateDetail, ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS']); //判断是否有万里牛组件 有就请求wln订单接口
1254
+ hasBsE3 = HasFilterHandle(templateDetail, ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS']); //判断是否有万里牛组件 有就请求wln订单接口
1237
1255
  hasWln = HasFilterHandle(templateDetail, ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']); //如果不是对接店铺且百胜组件都没有
1238
- if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt)) {
1256
+ if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt && !hasBsE3)) {
1239
1257
  _context.next = 8;
1240
1258
  break;
1241
1259
  }
@@ -1346,6 +1364,7 @@ export var orderBack = /*#__PURE__*/function () {
1346
1364
  componentList: templateDetail.componentDtoList,
1347
1365
  orderNo: order_no
1348
1366
  }), form);
1367
+ console.debug('bsE3Info', bsE3Info);
1349
1368
  wdtInfo = wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
1350
1369
  componentList: templateDetail.componentDtoList,
1351
1370
  orderNo: order_no
@@ -1422,7 +1441,7 @@ export var orderBack = /*#__PURE__*/function () {
1422
1441
  hasSelectItem = HasErpItemSelectHandle(templateDetail);
1423
1442
  erpPromiseList = [];
1424
1443
  if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
1425
- _context.next = 64;
1444
+ _context.next = 65;
1426
1445
  break;
1427
1446
  }
1428
1447
  list = detail['itemList'];
@@ -1440,10 +1459,10 @@ export var orderBack = /*#__PURE__*/function () {
1440
1459
  resolve({});
1441
1460
  });
1442
1461
  });
1443
- _context.prev = 54;
1444
- _context.next = 57;
1462
+ _context.prev = 55;
1463
+ _context.next = 58;
1445
1464
  return Promise.all(promises);
1446
- case 57:
1465
+ case 58:
1447
1466
  erpPromiseList = _context.sent;
1448
1467
  detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
1449
1468
  return _objectSpread(_objectSpread({}, item), {}, {
@@ -1453,13 +1472,13 @@ export var orderBack = /*#__PURE__*/function () {
1453
1472
  })
1454
1473
  });
1455
1474
  });
1456
- _context.next = 64;
1475
+ _context.next = 65;
1457
1476
  break;
1458
- case 61:
1459
- _context.prev = 61;
1460
- _context.t0 = _context["catch"](54);
1477
+ case 62:
1478
+ _context.prev = 62;
1479
+ _context.t0 = _context["catch"](55);
1461
1480
  console.error('调用erp获取宝贝编码错误', _context.t0);
1462
- case 64:
1481
+ case 65:
1463
1482
  // console.log('detail', detail);
1464
1483
  values = orderBackFormValues({
1465
1484
  detail: detail,
@@ -1493,17 +1512,17 @@ export var orderBack = /*#__PURE__*/function () {
1493
1512
  // console.log('orderback', values);
1494
1513
  form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
1495
1514
  callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
1496
- _context.next = 75;
1515
+ _context.next = 76;
1497
1516
  break;
1498
- case 72:
1499
- _context.prev = 72;
1517
+ case 73:
1518
+ _context.prev = 73;
1500
1519
  _context.t1 = _context["catch"](9);
1501
1520
  console.error(_context.t1);
1502
- case 75:
1521
+ case 76:
1503
1522
  case "end":
1504
1523
  return _context.stop();
1505
1524
  }
1506
- }, _callee, null, [[9, 72], [54, 61]]);
1525
+ }, _callee, null, [[9, 73], [55, 62]]);
1507
1526
  }));
1508
1527
  return function orderBack(_x) {
1509
1528
  return _ref2.apply(this, arguments);
@@ -669,6 +669,27 @@ var processSingleField = function processSingleField(getValue) {
669
669
  return _defineProperty({}, nex.uniqueKey, getValue("".concat(nex.uniqueKey, "_").concat(updateWorkTypeKeys[nex.workOrderComponentType])));
670
670
  };
671
671
  };
672
+ var processBsE3ReissueGoods = function processBsE3ReissueGoods(templateColumns) {
673
+ return function (getValue) {
674
+ return function (nex, config) {
675
+ var orderNo = '';
676
+ var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
677
+ return col.workOrderComponentType === 'TRADE_ID_INPUT';
678
+ });
679
+ if (tradeId) {
680
+ orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
681
+ }
682
+ return _defineProperty({}, nex.uniqueKey, {
683
+ bsE3SystemOrder: {
684
+ orderNo: orderNo
685
+ },
686
+ bsE3SystemOrderNo: getValue("".concat(nex.uniqueKey, "_bsE3SystemOrderNo")),
687
+ bsE3ReissueType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsE3ReissueType")), ['1']),
688
+ bsE3ReissueGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_bsE3ReissueGoods")), [])
689
+ });
690
+ };
691
+ };
692
+ };
672
693
  var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
673
694
  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'edit';
674
695
  return function (item) {
@@ -771,7 +792,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
771
792
  BS_DEPOSIT: processSingleField,
772
793
  NEW_PAYMENT_STATUS: processSingleField,
773
794
  BUSINESS_ORDER_NO: processSingleField,
774
- PAYMENT_VOUCHER_CODE: processSingleField
795
+ PAYMENT_VOUCHER_CODE: processSingleField,
796
+ BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns)
775
797
  };
776
798
  return templateColumns.reduce(function (cur, nex) {
777
799
  var config = type === 'init' ? nex.componentConfig : {};
@@ -1,5 +1,6 @@
1
1
  export { default as WorkOrder } from './WorkOrder';
2
2
  export { default as Login } from './Login';
3
+ export { default as LoginNew } from './LoginNew';
3
4
  export { default as SingleShopWorkOrder } from './SingleShopWorkOrder';
4
5
  export { default as FormRender } from './FormRender';
5
6
  export { default as FormRenderTemplateId } from './FormRenderTemplateId';
package/dist/esm/index.js CHANGED
@@ -10,6 +10,7 @@
10
10
  */
11
11
  export { default as WorkOrder } from "./WorkOrder";
12
12
  export { default as Login } from "./Login";
13
+ export { default as LoginNew } from "./LoginNew";
13
14
  export { default as SingleShopWorkOrder } from "./SingleShopWorkOrder";
14
15
  export { default as FormRender } from "./FormRender";
15
16
  export { default as FormRenderTemplateId } from "./FormRenderTemplateId";
@@ -27,6 +27,16 @@ export declare const fetchLogin: import("@reduxjs/toolkit").AsyncThunk<any, Logi
27
27
  fulfilledMeta?: unknown;
28
28
  rejectedMeta?: unknown;
29
29
  }>;
30
+ export declare const fetchLoginNew: import("@reduxjs/toolkit").AsyncThunk<any, LoginParams, {
31
+ state?: unknown;
32
+ dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
33
+ extra?: unknown;
34
+ rejectValue?: unknown;
35
+ serializedErrorType?: unknown;
36
+ pendingMeta?: unknown;
37
+ fulfilledMeta?: unknown;
38
+ rejectedMeta?: unknown;
39
+ }>;
30
40
  export declare const fetchShopList: import("@reduxjs/toolkit").AsyncThunk<any, void, {
31
41
  state?: unknown;
32
42
  dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
@@ -13,7 +13,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
13
13
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
14
14
  */
15
15
  import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
16
- import { grayWhiteListApi, login, queryShopList, logOut } from "./servers/api";
16
+ import { grayWhiteListApi, login, loginNew, queryShopList, logOut } from "./servers/api";
17
17
  var initialState = {
18
18
  loading: false,
19
19
  // 登陆用户信息
@@ -77,37 +77,58 @@ export var fetchLogin = createAsyncThunk('login/login', /*#__PURE__*/function ()
77
77
  return _ref2.apply(this, arguments);
78
78
  };
79
79
  }());
80
- export var fetchShopList = createAsyncThunk('login/queryShopList', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
80
+ export var fetchLoginNew = createAsyncThunk('login/loginNew', /*#__PURE__*/function () {
81
+ var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
82
+ var response;
83
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
84
+ while (1) switch (_context3.prev = _context3.next) {
85
+ case 0:
86
+ _context3.next = 2;
87
+ return loginNew(data);
88
+ case 2:
89
+ response = _context3.sent;
90
+ return _context3.abrupt("return", response);
91
+ case 4:
92
+ case "end":
93
+ return _context3.stop();
94
+ }
95
+ }, _callee3);
96
+ }));
97
+ return function (_x3) {
98
+ return _ref3.apply(this, arguments);
99
+ };
100
+ }());
101
+ export var fetchShopList = createAsyncThunk('login/queryShopList', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
81
102
  var response;
82
- return _regeneratorRuntime().wrap(function _callee3$(_context3) {
83
- while (1) switch (_context3.prev = _context3.next) {
103
+ return _regeneratorRuntime().wrap(function _callee4$(_context4) {
104
+ while (1) switch (_context4.prev = _context4.next) {
84
105
  case 0:
85
- _context3.next = 2;
106
+ _context4.next = 2;
86
107
  return queryShopList();
87
108
  case 2:
88
- response = _context3.sent;
89
- return _context3.abrupt("return", response.data);
109
+ response = _context4.sent;
110
+ return _context4.abrupt("return", response.data);
90
111
  case 4:
91
112
  case "end":
92
- return _context3.stop();
113
+ return _context4.stop();
93
114
  }
94
- }, _callee3);
115
+ }, _callee4);
95
116
  })));
96
- export var fetchLogOut = createAsyncThunk('login/logOut', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
117
+ export var fetchLogOut = createAsyncThunk('login/logOut', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
97
118
  var response;
98
- return _regeneratorRuntime().wrap(function _callee4$(_context4) {
99
- while (1) switch (_context4.prev = _context4.next) {
119
+ return _regeneratorRuntime().wrap(function _callee5$(_context5) {
120
+ while (1) switch (_context5.prev = _context5.next) {
100
121
  case 0:
101
- _context4.next = 2;
122
+ _context5.next = 2;
102
123
  return logOut();
103
124
  case 2:
104
- response = _context4.sent;
105
- return _context4.abrupt("return", response.data);
125
+ response = _context5.sent;
126
+ return _context5.abrupt("return", response.data);
106
127
  case 4:
107
128
  case "end":
108
- return _context4.stop();
129
+ return _context5.stop();
109
130
  }
110
- }, _callee4);
131
+ }, _callee5);
111
132
  })));
112
133
  export var globalSlice = createSlice({
113
134
  name: 'login',
@@ -119,22 +140,22 @@ export var globalSlice = createSlice({
119
140
  closeLoading: function closeLoading(state) {
120
141
  state.loading = false;
121
142
  },
122
- setUserInfo: function setUserInfo(state, _ref5) {
123
- var payload = _ref5.payload;
143
+ setUserInfo: function setUserInfo(state, _ref6) {
144
+ var payload = _ref6.payload;
124
145
  state.userInfo = payload;
125
146
  },
126
- setShopList: function setShopList(state, _ref6) {
127
- var payload = _ref6.payload;
147
+ setShopList: function setShopList(state, _ref7) {
148
+ var payload = _ref7.payload;
128
149
  state.shopList = payload;
129
150
  },
130
- setPlatform: function setPlatform(state, _ref7) {
131
- var payload = _ref7.payload;
151
+ setPlatform: function setPlatform(state, _ref8) {
152
+ var payload = _ref8.payload;
132
153
  state.platform = payload;
133
154
  }
134
155
  },
135
156
  extraReducers: function extraReducers(builder) {
136
- builder.addCase(fetchShopList.fulfilled, function (state, _ref8) {
137
- var payload = _ref8.payload;
157
+ builder.addCase(fetchShopList.fulfilled, function (state, _ref9) {
158
+ var payload = _ref9.payload;
138
159
  state.shopList = payload.shopList;
139
160
  });
140
161
  }
@@ -36,8 +36,10 @@ export declare type LoginParams = {
36
36
  name: string;
37
37
  account: string;
38
38
  password: string;
39
+ pageReturnType?: string;
39
40
  };
40
41
  export declare const login: (data: LoginParams) => Promise<any>;
42
+ export declare const loginNew: (data: LoginParams) => Promise<any>;
41
43
  export declare const queryShopList: () => Promise<any>;
42
44
  export declare const deleteWorkOrder: (data: any) => Promise<any>;
43
45
  export declare const getThirdOpenUidByOrderNo: (data: any) => Promise<any>;
@@ -217,6 +217,15 @@ export var login = function login(data) {
217
217
  data: data
218
218
  });
219
219
  };
220
+
221
+ //登陆-新
222
+ export var loginNew = function loginNew(data) {
223
+ return request({
224
+ url: '/qy/gdfw/company/login/new',
225
+ method: 'post',
226
+ data: data
227
+ });
228
+ };
220
229
  //获取店铺列表
221
230
  export var queryShopList = function queryShopList() {
222
231
  return request({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "1.19.7",
3
+ "version": "1.19.8-beta.0",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,9 +32,9 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "1.19.7",
36
- "@kmkf-fe-packages/kmkf-utils": "1.19.7",
37
- "@kmkf-fe-packages/services-components": "1.19.7",
35
+ "@kmkf-fe-packages/basic-components": "1.19.8-beta.0",
36
+ "@kmkf-fe-packages/kmkf-utils": "1.19.8-beta.0",
37
+ "@kmkf-fe-packages/services-components": "1.19.8-beta.0",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
73
73
  "publishConfig": {
74
74
  "access": "public"
75
75
  },
76
- "gitHead": "20c9be5e764ec7009d3224a211fc8d3e5c39e5af",
76
+ "gitHead": "e4f6b5f6a88454228c9d3f95a50aa0fe7cdd55ea",
77
77
  "gitHooks": {
78
78
  "pre-commit": "lint-staged"
79
79
  }