@kmkf-fe-packages/kmkf-work-order-service-component 2.2.27 → 2.2.29

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

@@ -23,9 +23,9 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useRef, useEffect, useMemo, forwardRef, useImperativeHandle, useContext } from 'react';
 import { ConfigProvider, Form, Space, Tag } from 'antd';
-import { useWhyDidYouUpdate } from 'ahooks';
+import { useWhyDidYouUpdate, useDebounceFn } from 'ahooks';
 import zhCN from 'antd/es/locale/zh_CN';
-import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, groupBy, find, isArray, debounce, isMatch, isEqual } from 'lodash';
+import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, groupBy, find, isArray, isMatch, isEqual } from 'lodash';
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
@@ -377,8 +377,7 @@ var FormRender = function FormRender(props, ref) {
       enterprisePaymentTid: orderNo,
       enterprisePaymentAlipayNo: enterprisePaymentAlipayNo
     }, templateDetail);
-    var formData = form.getFieldsValue(true);
-    handleWatchFormValueChange(undefined, formData);
+    handleWatchFormValueChange();
   };
   useEffect(function () {
     if (labelComponent && !isNull(record)) {
@@ -988,11 +987,7 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur
             });
           case 8:
-            if (!['SZF4ZGWZSNW6PYXMCIFEWBXT',
-            //test 测马奔腾
-            '6O47IBXFR26FJF4HUQ7WGO4H',
-            //prod 陈健企业工单
-            'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
+            if (!['TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
             ].includes(companyKey)) {
               _context6.next = 11;
               break;
@@ -1398,8 +1393,7 @@ var FormRender = function FormRender(props, ref) {
           if (currentTemplateAllComponentsDisplay.current[instance === null || instance === void 0 ? void 0 : instance.id] !== show) {
             // 发现组件从显示变成隐藏后，立即将其变成隐藏状态，执行计算组件逻辑的时候会使用到这个标示
             currentTemplateAllComponentsDisplay.current[instance === null || instance === void 0 ? void 0 : instance.id] = show;
-            var formData = form.getFieldsValue(true); // 获取所有表单值，包括组件隐藏的数据
-            handleWatchFormValueChange(undefined, formData);
+            handleWatchFormValueChange();
           }
           currentComponentDisplayStatus.current[instance === null || instance === void 0 ? void 0 : instance.id] = show;
           checkFillMapping(show, uniqueKey, workOrderComponentType);
@@ -1472,9 +1466,9 @@ var FormRender = function FormRender(props, ref) {
       return item.workOrderComponentType === 'NUMERICAL_CALCULATION';
     });
   }, [templateDetail]);
-  var handleWatchFormValueChange = function handleWatchFormValueChange(changedValues) {
-    var allValues = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var handleWatchFormValueChange = function handleWatchFormValueChange() {
     var componentShowMap = currentTemplateAllComponentsDisplay.current;
+    var allValues = form.getFieldsValue(true);
     var formValue = {};
     // FIXME: 计算组件存在，此处还可能出现性能问题
     if (calculationTypeComponentList.length > 0) {
@@ -1493,11 +1487,10 @@ var FormRender = function FormRender(props, ref) {
       changeValuesCacheOrderInfo(_objectSpread(_objectSpread({}, form.getFieldsValue()), formValue), templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList);
     });
   };
-  var debouncedHandleWatchFormValueChange = useMemo(function () {
-    return debounce(handleWatchFormValueChange, 150);
-  },
-  // 150ms防抖
-  [handleWatchFormValueChange]);
+  var _useDebounceFn = useDebounceFn(handleWatchFormValueChange, {
+      wait: 150
+    }),
+    debouncedHandleWatchFormValueChange = _useDebounceFn.run;
   var changeValuesCacheOrderInfo = throttle(function (value, tempLateList) {
     //如果店铺id不存在 不缓存
     if (!(value !== null && value !== void 0 && value.shopId)) return;

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

@@ -5,7 +5,7 @@ export declare const onBlurErpAfterSaleTradeId: ({ form, value, templateDetail,
     templateDetail: any;
     setKmLoading: (loading: boolean) => void;
 }) => Promise<void>;
-export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail, setKmLoading, componentOnBlur, onlyGetTid, needTradeIdOrderBack }: {
+export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail, setKmLoading, componentOnBlur, onlyGetTid, needTradeIdOrderBack, }: {
     form: FormInstance;
     value: string;
     templateDetail: any;
@@ -14,7 +14,7 @@ export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail,
     onlyGetTid?: boolean | undefined;
     needTradeIdOrderBack?: boolean | undefined;
 }) => Promise<any>;
-export declare const onBlurSkxOutboundNoticeNo: ({ form, value, templateDetail, componentOnBlur, onlyGetTid, needTradeIdOrderBack }: {
+export declare const onBlurSkxOutboundNoticeNo: ({ form, value, templateDetail, componentOnBlur, onlyGetTid, needTradeIdOrderBack, }: {
     form: FormInstance;
     value: string;
     templateDetail: any;

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

@@ -9,7 +9,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { orderBackKmVideoByLogisticsCode } from "../../../common/utils/orderBackKm";
 import { isNull, skxSystemOrderBackValues, skxReturnSystemOrderBackValues } from '@kmkf-fe-packages/kmkf-utils';
-import { queryTidByOutSid } from "../../../model/servers/api";
+import { queryTidByOutSid, queryTidByWdtOutSid } from "../../../model/servers/api";
 import { servers } from '@kmkf-fe-packages/kmkf-utils';
 export var onBlurErpAfterSaleTradeId = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
@@ -47,7 +47,7 @@ export var onBlurErpAfterSaleTradeId = /*#__PURE__*/function () {
 export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
     var _kmErpVideoComponent$2;
-    var form, value, templateDetail, setKmLoading, componentOnBlur, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, hasKm, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, companyUserConfig, oldValue, res, tradeId, blurPromise;
+    var form, value, templateDetail, setKmLoading, componentOnBlur, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, hasKm, hasWdt, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig2, _companyUserConfig2$p, _companyUserConfig2$p2, companyUserConfig, oldValue, res, tradeId, blurPromise;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -72,10 +72,11 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
           });
         case 6:
           if (!hasTradeIdComponent) {
-            _context2.next = 27;
+            _context2.next = 35;
             break;
           }
           hasKm = false;
+          hasWdt = false;
           try {
             userInfo = JSON.parse(localStorage.getItem('reduxData_userInfo') || '{}');
             if (isNull(userInfo)) {
@@ -86,6 +87,7 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
                 companyUserConfig = JSON.parse(companyUserConfig);
               }
               hasKm = (_companyUserConfig$pl = (_companyUserConfig = companyUserConfig) === null || _companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl2 = _companyUserConfig.plugins) === null || _companyUserConfig$pl2 === void 0 ? void 0 : (_companyUserConfig$pl3 = _companyUserConfig$pl2.km) === null || _companyUserConfig$pl3 === void 0 ? void 0 : _companyUserConfig$pl3.show) !== null && _companyUserConfig$pl !== void 0 ? _companyUserConfig$pl : false;
+              hasWdt = (_companyUserConfig$pl4 = (_companyUserConfig2 = companyUserConfig) === null || _companyUserConfig2 === void 0 ? void 0 : (_companyUserConfig2$p = _companyUserConfig2.plugins) === null || _companyUserConfig2$p === void 0 ? void 0 : (_companyUserConfig2$p2 = _companyUserConfig2$p.wdt) === null || _companyUserConfig2$p2 === void 0 ? void 0 : _companyUserConfig2$p2.show) !== null && _companyUserConfig$pl4 !== void 0 ? _companyUserConfig$pl4 : false;
             }
           } catch (error) {
             console.error(error);
@@ -98,50 +100,65 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
           //   hasKm,
           //   form,
           // });
-          if (hasKm) {
-            _context2.next = 11;
+          if (!(!hasKm && !hasWdt)) {
+            _context2.next = 12;
             break;
           }
           return _context2.abrupt("return");
-        case 11:
+        case 12:
           oldValue = form.getFieldValue('0eVTfMGEyd');
-          _context2.next = 14;
+          if (!hasWdt) {
+            _context2.next = 19;
+            break;
+          }
+          _context2.next = 16;
+          return queryTidByWdtOutSid({
+            outSid: value
+          });
+        case 16:
+          _context2.t0 = _context2.sent;
+          _context2.next = 22;
+          break;
+        case 19:
+          _context2.next = 21;
           return queryTidByOutSid({
             outSid: value
           });
-        case 14:
-          res = _context2.sent;
+        case 21:
+          _context2.t0 = _context2.sent;
+        case 22:
+          res = _context2.t0;
           tradeId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.tid;
           if (!onlyGetTid) {
-            _context2.next = 18;
+            _context2.next = 26;
             break;
           }
           return _context2.abrupt("return", tradeId);
-        case 18:
+        case 26:
           if (tradeId) {
-            _context2.next = 20;
+            _context2.next = 28;
             break;
           }
           return _context2.abrupt("return");
-        case 20:
+        case 28:
           form.setFieldsValue({
             m3ap1EvEyd: tradeId
           });
           if (!needTradeIdOrderBack) {
-            _context2.next = 25;
+            _context2.next = 33;
             break;
           }
           // 创建一个异步操作的Promise
           blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
-          _context2.next = 25;
+          _context2.next = 33;
           return blurPromise;
-        case 25:
+        case 33:
           // 所有异步操作完成后执行
           form.setFieldsValue({
             '0eVTfMGEyd': oldValue
           });
           return _context2.abrupt("return", res.data);
-        case 27:
+        case 35:
         case "end":
           return _context2.stop();
       }

package/dist/esm/WorkOrder/components/WorkOrderList/index.d.ts

@@ -2,8 +2,8 @@ import React from 'react';
 import './index.less';
 declare type OrderListProps = {
     tabActive: string;
-    deleteHeight?: number;
+    otherInfo?: any;
     onOpenWangWang?: (nick: string, id: string) => void;
 };
-declare const CustomizeWorkOrderList: ({ tabActive, onOpenWangWang, deleteHeight, }: OrderListProps) => React.JSX.Element;
+declare const CustomizeWorkOrderList: ({ tabActive, onOpenWangWang, otherInfo }: OrderListProps) => React.JSX.Element;
 export default CustomizeWorkOrderList;

package/dist/esm/WorkOrder/components/WorkOrderList/index.js

@@ -1,4 +1,7 @@
 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); }
@@ -133,8 +136,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
   var _nodesData$data, _nodesData$data$workO;
   var tabActive = _ref4.tabActive,
     onOpenWangWang = _ref4.onOpenWangWang,
-    _ref4$deleteHeight = _ref4.deleteHeight,
-    deleteHeight = _ref4$deleteHeight === void 0 ? 0 : _ref4$deleteHeight;
+    otherInfo = _ref4.otherInfo;
   var dispatch = useAppDispatch();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -234,7 +236,8 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
       }, form.getFieldsValue());
     }, {
       target: allRef,
-      reloadDeps: [currentBuyerChecked, shopList],
+      manual: true,
+      // reloadDeps: [currentBuyerChecked, shopList],
       isNoMore: function isNoMore(d) {
         var _d$list;
         return (d === null || d === void 0 ? void 0 : d.total) <= (d === null || d === void 0 ? void 0 : (_d$list = d.list) === null || _d$list === void 0 ? void 0 : _d$list.length);
@@ -254,7 +257,8 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
       }, form.getFieldsValue());
     }, {
       target: selfRef,
-      reloadDeps: [currentBuyerChecked, shopList],
+      manual: true,
+      // reloadDeps: [currentBuyerChecked, shopList],
       isNoMore: function isNoMore(d) {
         var _d$list2;
         return (d === null || d === void 0 ? void 0 : d.total) <= (d === null || d === void 0 ? void 0 : (_d$list2 = d.list) === null || _d$list2 === void 0 ? void 0 : _d$list2.length);
@@ -269,9 +273,6 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
     reload();
     selfReload();
   };
-  useEffect(function () {
-    dispatch(fetchCompanyUserList);
-  }, []);
   var queryPanelInfoHandle = function queryPanelInfoHandle(item) {
     if (!item) return;
     queryAllWorkOrderList('/qy/flow/queryFlowWorkOrders', {
@@ -311,7 +312,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
   var listHeight = useMemo(function () {
     var _platFormHeightMap;
     var wHeight = window.innerHeight;
-    var platFormHeightMap = (_platFormHeightMap = {}, _defineProperty(_platFormHeightMap, PlatForm.FXG, wHeight - 216 - height - searchHeight), _defineProperty(_platFormHeightMap, PlatForm.TB, wHeight - 205 - searchHeight), _defineProperty(_platFormHeightMap, "default", wHeight - 123 - height - searchHeight - deleteHeight), _platFormHeightMap);
+    var platFormHeightMap = (_platFormHeightMap = {}, _defineProperty(_platFormHeightMap, PlatForm.FXG, wHeight - 216 - height - searchHeight), _defineProperty(_platFormHeightMap, PlatForm.TB, wHeight - 205 - searchHeight), _defineProperty(_platFormHeightMap, "default", wHeight - 123 - height - searchHeight - ((otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.deleteHeight) || 0)), _platFormHeightMap);
     if (platFormHeightMap[platform]) {
       return platFormHeightMap[platform];
     } else {
@@ -319,6 +320,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
     }
   }, [open, height, searchHeight, platform, isTbZnkf]);
   useEffect(function () {
+    dispatch(fetchCompanyUserList);
     var handleResize = function handleResize() {
       if (templateRef.current) {
         setHeight(templateRef.current.scrollHeight); // 或者使用 clientHeight[citation:8]
@@ -352,6 +354,42 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
       }
     };
   }, []);
+  var initHandle = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(otherInfo, buyerId, orderNo) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!([6, 7].includes(otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.showFrom) && (otherInfo !== null && otherInfo !== void 0 && otherInfo.flowWorkOrderId || orderNo) || !buyerId)) {
+              _context.next = 6;
+              break;
+            }
+            form.setFieldsValue({
+              flowWorkOrderId: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.flowWorkOrderId) || '',
+              tid: orderNo
+            });
+            _context.next = 4;
+            return dispatch(setCurrentBuyerChecked(false));
+          case 4:
+            _context.next = 8;
+            break;
+          case 6:
+            _context.next = 8;
+            return dispatch(setCurrentBuyerChecked(true));
+          case 8:
+            searchList();
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function initHandle(_x2, _x3, _x4) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    initHandle(otherInfo, buyerId, orderNo);
+  }, [otherInfo, buyerId, orderNo]);
   var searchHandle = function searchHandle() {
     var templateList = form.getFieldValue('templateIdList');
     if (templateList && templateList.length) {
@@ -384,12 +422,31 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
   }, /*#__PURE__*/React.createElement(Col, null, platform !== PlatForm.WEB && /*#__PURE__*/React.createElement(Checkbox, {
     className: "custom_box_search_buyer",
     checked: currentBuyerChecked,
-    onChange: function onChange(e) {
-      if (!buyerId) {
-        return message.warning('请先选择买家，再查询工单!');
-      }
-      dispatch(setCurrentBuyerChecked(e.target.checked));
-    }
+    onChange: /*#__PURE__*/function () {
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (buyerId) {
+                _context2.next = 2;
+                break;
+              }
+              return _context2.abrupt("return", message.warning('请先选择买家，再查询工单!'));
+            case 2:
+              _context2.next = 4;
+              return dispatch(setCurrentBuyerChecked(e.target.checked));
+            case 4:
+              searchHandle();
+            case 5:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      return function (_x5) {
+        return _ref6.apply(this, arguments);
+      };
+    }()
   }, "\u5F53\u524D\u4E70\u5BB6")), /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("span", {
     className: "action_collapse",
     onClick: function onClick() {
@@ -504,9 +561,9 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
     dispatch(setFormModalVisible(false));
     queryPanelInfoHandle(record);
   };
-  var handleCreateWorkOrderByFlowId = function handleCreateWorkOrderByFlowId(_ref5) {
-    var logicFlowId = _ref5.id,
-      name = _ref5.name;
+  var handleCreateWorkOrderByFlowId = function handleCreateWorkOrderByFlowId(_ref7) {
+    var logicFlowId = _ref7.id,
+      name = _ref7.name;
     setTitle(name);
     dispatch(setLogicFlowId(logicFlowId));
     dispatch(setFlowWorkOrderId(''));

package/dist/esm/WorkOrder/index.js

@@ -20,7 +20,7 @@ import { Provider } from 'react-redux';
 import { useAppSelector, useAppDispatch } from "../model/hooks";
 import { fetchQueryCurrentCompanyUser } from "../model/workOrder";
 import { fetchLogicFlowList } from "../model/logicFlow";
-import { setCurrentBuyerChecked, showPayment } from "../model/customizeWorkOrder";
+import { showPayment } from "../model/customizeWorkOrder";
 import store from "../model/store";
 import { fetchLogOut, fetchxzLogOut } from "../model/login";
 import { Global } from '@kmkf-fe-packages/services-components';
@@ -106,13 +106,6 @@ var WorkOrder = function WorkOrder(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     visible = _useState6[0],
     setVisible = _useState6[1];
-  useEffect(function () {
-    if (buyerId) {
-      dispatch(setCurrentBuyerChecked(true));
-    } else {
-      dispatch(setCurrentBuyerChecked(false));
-    }
-  }, [buyerId]);
   useEffect(function () {
     //存储平台信息
     dispatch({
@@ -291,7 +284,7 @@ var WorkOrder = function WorkOrder(props) {
     src: avatarImg
   })) : null), /*#__PURE__*/React.createElement(OrderList, {
     tabActive: tabActive,
-    deleteHeight: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.deleteHeight) || 0,
+    otherInfo: otherInfo,
     onOpenWangWang: onOpenWangWang
   }), /*#__PURE__*/React.createElement(PaymentWorkOrderList, {
     tabActive: tabActive,

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

@@ -949,6 +949,11 @@ var processWlnGoods = function processWlnGoods(templateColumns) {
 var processWdtReissueGoods = function processWdtReissueGoods(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
+      if (['wdtReissueType', 'wdtReissueGoods', 'wdtSystemOrderNo'].every(function (key) {
+        return !getValue("".concat(nex.uniqueKey, "_").concat(key));
+      })) {
+        return;
+      }
       var orderNo = '';
       var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
         return col.workOrderComponentType === 'TRADE_ID_INPUT';

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

@@ -107,6 +107,7 @@ export declare const queryMemberLevel: (data: {
 }) => Promise<serverProps<Array<string>>>;
 export declare const queryShopByTid: (data: any) => Promise<any>;
 export declare const queryTidByOutSid: (data: any) => Promise<any>;
+export declare const queryTidByWdtOutSid: (data: any) => Promise<any>;
 export declare const skqOrderDetail: (data: any) => Promise<any>;
 export declare const nodeWorkOrderPending: (data: any) => Promise<any>;
 export declare const jyOrderDetail: (data: any) => Promise<any>;

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

@@ -384,9 +384,17 @@ export var getAlipayBillReceipt = function getAlipayBillReceipt(data) {
   });
 };
 // jst订单详情
+// export const jstOrderDetail: (data: any) => Promise<any> = (data: any) => {
+//   return request({
+//     url: '/qy/gdfw/order/jstOrderDetail',
+//     method: 'post',
+//     data,
+//     infoLevel: 'warning',
+//   });
+// };
 export var jstOrderDetail = function jstOrderDetail(data) {
   return request({
-    url: '/qy/gdfw/order/jstOrderDetail',
+    url: '/qy/gdfw/jst/erp/jstShopCode',
     method: 'post',
     data: data,
     infoLevel: 'warning'
@@ -618,6 +626,14 @@ export var queryTidByOutSid = function queryTidByOutSid(data) {
     data: data
   });
 };
+//通过快递单号获取订单号--旺店通
+export var queryTidByWdtOutSid = function queryTidByWdtOutSid(data) {
+  return request({
+    url: '/qy/gdfw/wdt/erp/queryTidByOutSid',
+    method: 'post',
+    data: data
+  });
+};
 
 // 获取skq订单商品详情
 export var skqOrderDetail = function skqOrderDetail(data) {

package/package.json

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