@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13-beta.37 → 2.2.13-beta.39

package/dist/esm/FlowTemplateDetailV2/common.js

@@ -1,4 +1,5 @@
 import { NodeType } from "../model/flowTemplateDetail/types";
+import { intersection } from 'lodash';
 export var getTag = function getTag(item) {
   var tag = 'artificial'; // 人工节点
   // 先判断是什么节点类型 步骤/判断
@@ -66,6 +67,7 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
     assistantList = _ref.assistantList,
     _ref$userGroupList = _ref.userGroupList,
     userGroupList = _ref$userGroupList === void 0 ? [] : _ref$userGroupList;
+  console.log('currentUserHasOperatorAuth', currentUserKey, staffIds, operateDataPermission, handlerList, isAllStaff, assistantList, userGroupList);
   // handlerList为空数组是没有处理人，都可以处理
   if (Array.isArray(handlerList) && (handlerList === null || handlerList === void 0 ? void 0 : handlerList.length) === 0) {
     return true;
@@ -84,7 +86,11 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
   }
   //仅可处理同用户组的工单
   if (operateDataPermission === 'ONLY_THE_SAME_USER_GROUP') {
-    return userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.includes(currentUserKey);
+    //判断组用户中是否包含处理人
+    var handlerKeys = handlerList === null || handlerList === void 0 ? void 0 : handlerList.map(function (item) {
+      return item.userKey;
+    });
+    return intersection(userGroupList, handlerKeys).length !== 0;
   }
 
   // 只能处理分配到自己的任务

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

@@ -134,6 +134,8 @@ var getTradeInfoByBuyerId = function getTradeInfoByBuyerId(buyerId) {
       setTimeout(function () {
         reject(new Error('window.invokerSDK执行超时，未调用回调函数'));
       }, 30000);
+      // getTradeInfo 同步回调不再执行, 所以默认记录reqId
+      globalResolveMap.set(reqId, resolve);
       window.invokerSDK(jsonToBase64({
         cmd: 'getTradeInfo',
         param: {
@@ -143,7 +145,7 @@ var getTradeInfoByBuyerId = function getTradeInfoByBuyerId(buyerId) {
       }), function (cmd, res) {
         var jsonRes = JSON.parse(res);
         if (jsonRes.code === 200) {
-          globalResolveMap.set(reqId, resolve);
+          // globalResolveMap.set(reqId, resolve);
         } else {
           reject(jsonRes.msg || jsonRes);
         }

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

@@ -109,5 +109,6 @@ 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 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

@@ -628,6 +628,14 @@ export var queryTidByOutSid = function queryTidByOutSid(data) {
   });
 };
 
+// 获取skq订单商品详情
+export var skqOrderDetail = function skqOrderDetail(data) {
+  return request({
+    url: '/qy/gdfw/order/skqOrderDetail',
+    method: 'post',
+    data: data
+  });
+};
 //待处理节点工单(客服待办)
 export var nodeWorkOrderPending = function nodeWorkOrderPending(data) {
   return request({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.13-beta.37",
+  "version": "2.2.13-beta.39",
   "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.13-beta.37",
+    "@kmkf-fe-packages/basic-components": "2.2.13-beta.39",
     "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.32",
-    "@kmkf-fe-packages/services-components": "2.2.13-beta.37",
+    "@kmkf-fe-packages/services-components": "2.2.13-beta.39",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -74,7 +74,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3977215f50acaf734d943755b66458971d4451d7",
+  "gitHead": "72cf4aa05ae93f7182aa9b45c0fd9834ce356e08",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }