@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13 → 2.2.14-beta.1

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

@@ -1,5 +1,5 @@
 import { HasFilterHandle } from "./tools";
-import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, skxOrderDetail, skxReturnOrderDetail } from "../../model/servers/api";
+import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, skxOrderDetail, jyOrderDetail, skxReturnOrderDetail } from "../../model/servers/api";
 import { servers } from '@kmkf-fe-packages/kmkf-utils';
 var orderBackKeyListMap = {
   hasJst: ['JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'],
@@ -9,6 +9,7 @@ var orderBackKeyListMap = {
   hasBsE3: ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD'],
   hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'],
   hasGy: ['GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS'],
+  hasJy: ['JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS'],
   hasSkx: ['SKX_OUTBOUND_NOTICE_NO'],
   hasSkxReturn: ['SKX_RETURN_BILL_NO']
 };
@@ -77,6 +78,14 @@ export var orderBackMap = function orderBackMap(_ref) {
         });
       }
     },
+    hasJy: {
+      flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasJy),
+      promiseRequest: function promiseRequest() {
+        return jyOrderDetail({
+          billNo: order_no
+        });
+      }
+    },
     // 根据系统订单号反填，所以只要判断是否有系统订单号就行
     hasSkx: {
       flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasSkx),

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

@@ -482,6 +482,9 @@ var processErpLogistics = function processErpLogistics(getValue) {
       GY_LOGISTICS: {
         listKey: 'gyLogisticsList'
       },
+      JY_LOGISTICS: {
+        listKey: 'jyLogisticsList'
+      },
       SKX_LOGISTICS: {
         listKey: 'skxLogisticsList'
       },
@@ -517,6 +520,9 @@ var processErpSendGood = function processErpSendGood(getValue) {
       },
       GY_SEND_GOOD: {
         list: 'gySendGood'
+      },
+      JY_SEND_GOOD: {
+        list: 'jySendGood'
       }
     };
     var initValue = [{
@@ -696,6 +702,33 @@ var processSkxGoods = function processSkxGoods(getValue) {
     return _defineProperty({}, nex.uniqueKey, _values);
   };
 };
+var processJyGoods = function processJyGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var _values = {
+        jyGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jyGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
+      };
+      var selectIds = [];
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      var jySystemOrder = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'JY_SYSTEM_ORDER';
+      });
+      if (jySystemOrder) {
+        selectIds = jsonParseSecurity(getValue("".concat(jySystemOrder.uniqueKey, "_").concat(systemOrderMap[jySystemOrder.workOrderComponentType].ids)), []);
+      }
+      _values.selectIds = selectIds;
+      _values.orderNo = orderNo;
+      return _defineProperty({}, nex.uniqueKey, _values);
+    };
+  };
+};
 var processSkxReturnGoods = function processSkxReturnGoods(getValue) {
   return function (nex, config) {
     var _values = {
@@ -820,6 +853,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
         no: 'jstSystemOrderNo',
         ids: 'jstSystemSelectIds',
         order: 'jstSystemShowOrder'
+      },
+      JY_SYSTEM_ORDER: {
+        no: 'jySystemOrderNo',
+        ids: 'jySystemSelectIds',
+        order: 'jySystemShowOrder'
       }
     };
     return _defineProperty({}, nex.uniqueKey, {
@@ -845,6 +883,11 @@ var processErpOrderStatus = function processErpOrderStatus(getValue) {
     return _defineProperty({}, nex.uniqueKey, getValue("".concat(nex.uniqueKey, "_erpOrderStatus")) || (config === null || config === void 0 ? void 0 : config.select));
   };
 };
+var processJstOutboundStatus = function processJstOutboundStatus(getValue) {
+  return function (nex, config) {
+    return _defineProperty({}, nex.uniqueKey, getValue("".concat(nex.uniqueKey, "_jstOutboundStatus")) || (config === null || config === void 0 ? void 0 : config.select));
+  };
+};
 var processRefundType = function processRefundType(getValue) {
   return function (nex, config) {
     return _defineProperty({}, nex.uniqueKey, getValue("".concat(nex.uniqueKey, "_orderRefundType")) || (config === null || config === void 0 ? void 0 : config.select));
@@ -967,6 +1010,28 @@ var processKmReissueGoods = function processKmReissueGoods(templateColumns) {
     };
   };
 };
+var processJyReissueGoods = function processJyReissueGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      return _defineProperty({}, nex.uniqueKey, {
+        jySystemOrder: {
+          orderNo: orderNo
+        },
+        jyReissueType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jyReissueType")), !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? [config.initReason] : ['1']),
+        jyReissueGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jyReissueGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
+        jySystemOrderNo: getValue("".concat(nex.uniqueKey, "_jySystemOrderNo"))
+      });
+    };
+  };
+};
 var processGyReissueGoods = function processGyReissueGoods(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
@@ -1060,14 +1125,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref75;
-    return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref75;
+    var _ref78;
+    return _ref78 = {}, _defineProperty(_ref78, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref78, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref78;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref76;
-    return _ref76 = {}, _defineProperty(_ref76, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref76, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref76;
+    var _ref79;
+    return _ref79 = {}, _defineProperty(_ref79, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref79, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref79;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -1174,6 +1239,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       WLN_LOGISTICS: processErpLogistics,
       WDT_LOGISTICS: processErpLogistics,
       GY_LOGISTICS: processErpLogistics,
+      JY_LOGISTICS: processErpLogistics,
       BS_E3_LOGISTICS: processErpLogistics,
       KM_LOGISTICS: processErpLogistics,
       BS_SEND_GOOD: processErpSendGood,
@@ -1182,14 +1248,17 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_SEND_GOOD: processErpSendGood,
       KM_SEND_GOOD: processErpSendGood,
       GY_SEND_GOOD: processErpSendGood,
+      JY_SEND_GOOD: processErpSendGood,
       BS_POSTING: processBsPosting,
       BS_GOODS: processBsGoods,
       ORDER_SUBFORM: processOrderSubForm(templateColumns),
       WDT_GOODS: processWdtGoods(templateColumns),
       BS_E3_GOODS: processBsE3Goods(templateColumns),
       GY_GOODS: processGyGoods(templateColumns),
+      JY_GOODS: processJyGoods(templateColumns),
       KM_GOODS: processKmGoods(templateColumns),
       KM_REISSUE_GOODS: processKmReissueGoods(templateColumns),
+      JY_REISSUE_GOODS: processJyReissueGoods(templateColumns),
       JST_GOODS: processJstGoods(templateColumns),
       BS_REISSUE_GOODS: processBsReissueGoods,
       BS_EXCHANGE_GOODS: processBsExchangeGoods,
@@ -1205,9 +1274,11 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_SYSTEM_ORDER: processErpSystemOrder,
       JST_SYSTEM_ORDER: processErpSystemOrder,
       GY_SYSTEM_ORDER: processErpSystemOrder,
+      JY_SYSTEM_ORDER: processErpSystemOrder,
       BUYER_MESSAGE_NOTICE: processBuyerMessageNotice,
       ORDER_TYPE: processOrderType,
       ERP_ORDER_STATUS: processErpOrderStatus,
+      JST_OUTBOUND_STATUS: processJstOutboundStatus,
       REFUND_TYPE: processRefundType,
       RETURN_GOODS_TRADE_ID: processErpTradeId,
       BS_DELIVERY_NO: processErpTradeId,

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/index.d.ts

@@ -1,5 +1,6 @@
 export { default as WorkOrder } from './WorkOrder';
 export { default as Login } from './Login';
+export { default as LoginNew } from './LoginNew';
 export { default as SingleShopWorkOrder } from './SingleShopWorkOrder';
 export { default as FormRender } from './FormRender';
 export { default as FormRenderTemplateId } from './FormRenderTemplateId';

package/dist/esm/index.js

@@ -10,6 +10,7 @@
  */
 export { default as WorkOrder } from "./WorkOrder";
 export { default as Login } from "./Login";
+export { default as LoginNew } from "./LoginNew";
 export { default as SingleShopWorkOrder } from "./SingleShopWorkOrder";
 export { default as FormRender } from "./FormRender";
 export { default as FormRenderTemplateId } from "./FormRenderTemplateId";

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

@@ -40,6 +40,9 @@ export declare const queryMultiNodeAssistantInfo: (data: {
         name: string;
     }>;
 }>>;
+export declare const queryUserGroupList: (data: {
+    groupUkList: string[];
+}) => Promise<serverProps<Array<string>>>;
 export declare const forwardWorkOrder: (data: any) => Promise<serverProps<{
     failList: Array<{
         failReason: string;

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

@@ -106,6 +106,13 @@ export var queryMultiNodeAssistantInfo = function queryMultiNodeAssistantInfo(da
     data: data
   });
 };
+export var queryUserGroupList = function queryUserGroupList(data) {
+  return request({
+    url: '/qy/user/group/listBelongTheSameGroupUserKeys',
+    method: 'post',
+    data: data
+  });
+};
 
 // 转交
 export var forwardWorkOrder = function forwardWorkOrder(data) {

package/dist/esm/model/flowTemplateDetail/types.d.ts

@@ -42,6 +42,9 @@ export interface FlowTemplateDetailState {
     assistantMap: {
         [nodeId: string]: Array<Assistant>;
     };
+    userGroupMap: {
+        [nodeId: string]: Array<string>;
+    };
     remarkList: Array<Remark>;
     currentNode: CurrentNodeDetail;
     action: ActionType;

package/dist/esm/model/login.d.ts

@@ -27,6 +27,16 @@ export declare const fetchLogin: import("@reduxjs/toolkit").AsyncThunk<any, Logi
     fulfilledMeta?: unknown;
     rejectedMeta?: unknown;
 }>;
+export declare const fetchLoginNew: import("@reduxjs/toolkit").AsyncThunk<any, LoginParams, {
+    state?: unknown;
+    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
+    extra?: unknown;
+    rejectValue?: unknown;
+    serializedErrorType?: unknown;
+    pendingMeta?: unknown;
+    fulfilledMeta?: unknown;
+    rejectedMeta?: unknown;
+}>;
 export declare const fetchShopList: import("@reduxjs/toolkit").AsyncThunk<any, void, {
     state?: unknown;
     dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;

package/dist/esm/model/login.js

@@ -13,7 +13,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
  */
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
-import { grayWhiteListApi, login, queryShopList, logOut, xzLogin, xzLogOut } from "./servers/api";
+import { grayWhiteListApi, login, loginNew, queryShopList, logOut, xzLogin, xzLogOut } from "./servers/api";
 var initialState = {
   loading: false,
   // 登陆用户信息
@@ -77,80 +77,101 @@ export var fetchLogin = createAsyncThunk('login/login', /*#__PURE__*/function ()
     return _ref2.apply(this, arguments);
   };
 }());
-export var fetchShopList = createAsyncThunk('login/queryShopList', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+export var fetchLoginNew = createAsyncThunk('login/loginNew', /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
+    var response;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.next = 2;
+          return loginNew(data);
+        case 2:
+          response = _context3.sent;
+          return _context3.abrupt("return", response);
+        case 4:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function (_x3) {
+    return _ref3.apply(this, arguments);
+  };
+}());
+export var fetchShopList = createAsyncThunk('login/queryShopList', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
   var response;
-  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-    while (1) switch (_context3.prev = _context3.next) {
+  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+    while (1) switch (_context4.prev = _context4.next) {
       case 0:
-        _context3.next = 2;
+        _context4.next = 2;
         return queryShopList();
       case 2:
-        response = _context3.sent;
-        return _context3.abrupt("return", response.data);
+        response = _context4.sent;
+        return _context4.abrupt("return", response.data);
       case 4:
       case "end":
-        return _context3.stop();
+        return _context4.stop();
     }
-  }, _callee3);
+  }, _callee4);
 })));
-export var fetchLogOut = createAsyncThunk('login/logOut', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+export var fetchLogOut = createAsyncThunk('login/logOut', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
   var response;
-  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-    while (1) switch (_context4.prev = _context4.next) {
+  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+    while (1) switch (_context5.prev = _context5.next) {
       case 0:
-        _context4.next = 2;
+        _context5.next = 2;
         return logOut();
       case 2:
-        response = _context4.sent;
-        return _context4.abrupt("return", response);
+        response = _context5.sent;
+        return _context5.abrupt("return", response);
       case 4:
       case "end":
-        return _context4.stop();
+        return _context5.stop();
     }
-  }, _callee4);
+  }, _callee5);
 })));
 export var fetchxzLogin = createAsyncThunk('login/xzlogin', /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
+  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(data) {
     var response;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          _context5.next = 2;
+          _context6.next = 2;
           return xzLogin(data);
         case 2:
-          response = _context5.sent;
-          return _context5.abrupt("return", response);
+          response = _context6.sent;
+          return _context6.abrupt("return", response);
         case 4:
         case "end":
-          return _context5.stop();
+          return _context6.stop();
       }
-    }, _callee5);
+    }, _callee6);
   }));
-  return function (_x3) {
-    return _ref5.apply(this, arguments);
+  return function (_x4) {
+    return _ref6.apply(this, arguments);
   };
 }());
 export var fetchxzLogOut = createAsyncThunk('login/xzlogOut', /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(data) {
+  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(data) {
     var response;
-    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
         case 0:
           console.log('xzlogOut1');
-          _context6.next = 3;
+          _context7.next = 3;
           return xzLogOut(data);
         case 3:
-          response = _context6.sent;
+          response = _context7.sent;
           console.log('xzlogOut2');
-          return _context6.abrupt("return", response);
+          return _context7.abrupt("return", response);
         case 6:
         case "end":
-          return _context6.stop();
+          return _context7.stop();
       }
-    }, _callee6);
+    }, _callee7);
   }));
-  return function (_x4) {
-    return _ref6.apply(this, arguments);
+  return function (_x5) {
+    return _ref7.apply(this, arguments);
   };
 }());
 export var globalSlice = createSlice({
@@ -163,22 +184,22 @@ export var globalSlice = createSlice({
     closeLoading: function closeLoading(state) {
       state.loading = false;
     },
-    setUserInfo: function setUserInfo(state, _ref7) {
-      var payload = _ref7.payload;
+    setUserInfo: function setUserInfo(state, _ref8) {
+      var payload = _ref8.payload;
       state.userInfo = payload;
     },
-    setShopList: function setShopList(state, _ref8) {
-      var payload = _ref8.payload;
+    setShopList: function setShopList(state, _ref9) {
+      var payload = _ref9.payload;
       state.shopList = payload;
     },
-    setPlatform: function setPlatform(state, _ref9) {
-      var payload = _ref9.payload;
+    setPlatform: function setPlatform(state, _ref10) {
+      var payload = _ref10.payload;
       state.platform = payload;
     }
   },
   extraReducers: function extraReducers(builder) {
-    builder.addCase(fetchShopList.fulfilled, function (state, _ref10) {
-      var payload = _ref10.payload;
+    builder.addCase(fetchShopList.fulfilled, function (state, _ref11) {
+      var payload = _ref11.payload;
       state.shopList = payload.shopList;
     });
   }

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

@@ -51,8 +51,10 @@ export declare type LoginParams = {
     name: string;
     account: string;
     password: string;
+    pageReturnType?: string;
 };
 export declare const login: (data: LoginParams) => Promise<any>;
+export declare const loginNew: (data: LoginParams) => Promise<any>;
 export declare const queryShopList: () => Promise<any>;
 export declare const deleteWorkOrder: (data: any) => Promise<any>;
 export declare const getThirdOpenUidByOrderNo: (data: any) => Promise<any>;
@@ -107,4 +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

@@ -241,6 +241,15 @@ export var login = function login(data) {
     data: data
   });
 };
+
+//登陆-新
+export var loginNew = function loginNew(data) {
+  return request({
+    url: '/qy/gdfw/company/login/new',
+    method: 'post',
+    data: data
+  });
+};
 //获取店铺列表
 export var queryShopList = function queryShopList() {
   return request({
@@ -619,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({
@@ -626,4 +643,12 @@ export var nodeWorkOrderPending = function nodeWorkOrderPending(data) {
     method: 'post',
     data: data
   });
+};
+export var jyOrderDetail = function jyOrderDetail(data) {
+  return request({
+    url: '/qy/gdfw/order/jyOrderDetail',
+    method: 'post',
+    data: data,
+    infoLevel: 'warning'
+  });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.13",
+  "version": "2.2.14-beta.1",
   "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",
-    "@kmkf-fe-packages/kmkf-utils": "2.2.11",
-    "@kmkf-fe-packages/services-components": "2.2.13",
+    "@kmkf-fe-packages/basic-components": "2.2.13-beta.66",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.61",
+    "@kmkf-fe-packages/services-components": "2.2.13-beta.66",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -74,7 +74,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bda3806f7d08d735feda0badfc8e8235f1883ac1",
+  "gitHead": "c63d979d1d68cc3f7a5c9ba9c190b03be0b65a69",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CancelInterceptionModal/index.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-declare const CancelInterceptionModal: ({ submit }: {
-    submit: () => void;
-}) => React.JSX.Element;
-export default CancelInterceptionModal;

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CancelInterceptionModal/index.js

@@ -1,58 +0,0 @@
-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); }); }; }
-import React, { useCallback } from 'react';
-import { Modal } from 'antd';
-import { useSelector } from 'react-redux';
-import { debounce } from 'lodash';
-import { useAppDispatch } from "../../../../../model/hooks";
-import { fetchInterceptionWorkOrder } from "../../../../../model/workOrder";
-import { setCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder";
-import { selectCancelInterceptionModalVisible, selectorCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder/selector";
-var CancelInterceptionModal = function CancelInterceptionModal(_ref) {
-  var submit = _ref.submit;
-  var dispatch = useAppDispatch();
-  var cancelInterceptionModalVisible = useSelector(selectCancelInterceptionModalVisible);
-  var record = useSelector(selectorCurrentCustomizeRecord);
-  var handleCancel = function handleCancel() {
-    dispatch({
-      type: 'customizeWorkOrder/setCancelInterceptionModalVisible',
-      payload: false
-    });
-    dispatch(setCurrentCustomizeRecord({}));
-  };
-  var onInterception = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.prev = 0;
-          _context.next = 3;
-          return dispatch(fetchInterceptionWorkOrder({
-            uniqueKey: record === null || record === void 0 ? void 0 : record.id
-          })).unwrap();
-        case 3:
-          submit();
-          handleCancel();
-          _context.next = 10;
-          break;
-        case 7:
-          _context.prev = 7;
-          _context.t0 = _context["catch"](0);
-          console.log('e', _context.t0);
-        case 10:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[0, 7]]);
-  })), [record]);
-  return /*#__PURE__*/React.createElement(Modal, {
-    title: "\u53D6\u6D88\u62E6\u622A",
-    open: cancelInterceptionModalVisible,
-    okText: "\u786E\u5B9A",
-    cancelText: "\u53D6\u6D88",
-    onOk: debounce(onInterception, 300),
-    onCancel: handleCancel
-  }, /*#__PURE__*/React.createElement("div", null, "\u53D6\u6D88\u540E\u4E0D\u53EF\u518D\u6B21\u53D1\u8D77\u62E6\u622A\uFF0C\u786E\u8BA4\u53D6\u6D88\u5417\uFF1F"));
-};
-export default CancelInterceptionModal;

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import './index.less';
-declare function CustomizeWorkOrderCard(props: any): React.JSX.Element;
-export default CustomizeWorkOrderCard;