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

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/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.28",
   "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.28",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.28",
+    "@kmkf-fe-packages/services-components": "2.2.28",
     "@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": "2e9500bbcbdd5a1ac6f32998d9ec75566c1782c2",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }