@kmkf-fe-packages/kmkf-work-order-service-component 2.2.44-beta.1 → 2.2.44-beta.11

package/dist/esm/FlowTemplateDetailV2/common.js

@@ -27,7 +27,8 @@ export var getFlowOperate = {
   REMINDER: '催单',
   AI_BUILD: 'AI自动建单',
   CANCEL_REMINDER: '取消催单',
-  AUTO_TASK_RETRY: '自动任务重试'
+  AUTO_TASK_RETRY: '自动任务重试',
+  JUMP: '跳过'
 };
 export var FLOW_STATUS_V2 = {
   WAIT_COMMIT: '待提交',

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

@@ -296,7 +296,7 @@ var CurrentNode = function CurrentNode(props, ref) {
               onOk: function () {
                 var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
                   var _currentNodeDetail$no21;
-                  var _yield$skipNode, success, _controllerRef$curren3;
+                  var _yield$skipNode, success;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
@@ -316,12 +316,15 @@ var CurrentNode = function CurrentNode(props, ref) {
                         if (success) {
                           message.success('跳过成功');
                           queryRemarkList();
-                          dispatch(fetchPanelInfo({
-                            flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
-                            flowWorkOrderId: flowWorkOrderId
-                          }, {
-                            signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren3 = controllerRef.current) === null || _controllerRef$curren3 === void 0 ? void 0 : _controllerRef$curren3.signal
-                          }));
+                          setTimeout(function () {
+                            var _controllerRef$curren3;
+                            dispatch(fetchPanelInfo({
+                              flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
+                              flowWorkOrderId: flowWorkOrderId
+                            }, {
+                              signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren3 = controllerRef.current) === null || _controllerRef$curren3 === void 0 ? void 0 : _controllerRef$curren3.signal
+                            }));
+                          }, 100);
                         }
                       case 5:
                       case "end":

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

@@ -189,7 +189,9 @@ var FormRender = function FormRender(props, ref) {
       });
       var transData = calcWorkOrderList([record], preNodeComponentDtoList);
       preNodeForm.setFieldsValue(_objectSpread({}, get(transData, '0', {})));
-      record.preCreateAndNotModified && fillByShopId(get(transData, '0', {}).shopId);
+      if (record.preCreateAndNotModified || record.notAutoFillWithFirstSubmit) {
+        fillByShopId(get(transData, '0', {}).shopId);
+      }
     }
   }, [record]);
   // 过滤打款组件订单与支付宝账号重复校验结果
@@ -1407,7 +1409,7 @@ var FormRender = function FormRender(props, ref) {
         newComponentConfig['disabled'] = componentCanEdit;
       }
       if (workOrderComponentType === 'ENTERPRISE_PAYMENT') {
-        newComponentConfig['disabled'] = disabled || !canModifyPayment;
+        newComponentConfig['disabled'] = disabled || componentCanEdit || !canModifyPayment;
       }
       if (['RADIO', 'SELECT', 'MULT_SELECT'].includes(workOrderComponentType)) {
         var _mappingConfig$readon;

package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts

@@ -236,6 +236,7 @@ export declare const selectCurrentNodeDetail: (state: FlowTemplateDetailState) =
                 }[];
             } | undefined;
         } | undefined;
+        uniqueKey: string;
     } | undefined;
 } | undefined;
 export declare const selectTid: (state: FlowTemplateDetailState) => string;

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

@@ -184,6 +184,10 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
     var _JSON$parse, _JSON$parse$plugins, _JSON$parse$plugins$w;
     return ((_JSON$parse = JSON.parse(state.workOrder.userInfo.companyUserConfig || '{}')) === null || _JSON$parse === void 0 ? void 0 : (_JSON$parse$plugins = _JSON$parse.plugins) === null || _JSON$parse$plugins === void 0 ? void 0 : (_JSON$parse$plugins$w = _JSON$parse$plugins.wdt) === null || _JSON$parse$plugins$w === void 0 ? void 0 : _JSON$parse$plugins$w.show) || false;
   });
+  var hasBindJst = useAppSelector(function (state) {
+    var _JSON$parse2, _JSON$parse2$plugins, _JSON$parse2$plugins$;
+    return ((_JSON$parse2 = JSON.parse(state.workOrder.userInfo.companyUserConfig || '{}')) === null || _JSON$parse2 === void 0 ? void 0 : (_JSON$parse2$plugins = _JSON$parse2.plugins) === null || _JSON$parse2$plugins === void 0 ? void 0 : (_JSON$parse2$plugins$ = _JSON$parse2$plugins.jst) === null || _JSON$parse2$plugins$ === void 0 ? void 0 : _JSON$parse2$plugins$.show) || false;
+  });
   var hasSuperAdminRole = useAppSelector(function (state) {
     return state.workOrder.userInfo.hasSuperAdminRole;
   });
@@ -667,7 +671,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
       shopId: shopId,
       userKey: userKey,
       companyKey: companyKey,
-      bindERP: bindERP || hasBindWdt,
+      bindERP: bindERP || hasBindWdt || hasBindJst,
       hasSuperAdminRole: hasSuperAdminRole
     },
     otherInfo: _objectSpread(_objectSpread({}, otherInfo), {}, {

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

@@ -601,7 +601,7 @@ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref44) {
     if (item.workOrderComponentType !== 'GY_REISSUE_GOODS') {
       addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].shopCode, (reissue === null || reissue === void 0 ? void 0 : reissue.shopCode) || '');
     }
-    if (item.workOrderComponentType === 'WDT_REISSUE_GOODS' || item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'JST_RETURN_GOODS' || item.workOrderComponentType === 'GY_REISSUE_GOODS' || item.workOrderComponentType === 'KM_REISSUE_GOODS' || item.workOrderComponentType === 'JY_REISSUE_GOODS') {
+    if (item.workOrderComponentType === 'WDT_REISSUE_GOODS' || item.workOrderComponentType === 'JST_REISSUE_GOODS' || item.workOrderComponentType === 'JST_RETURN_GOODS' || item.workOrderComponentType === 'GY_REISSUE_GOODS' || item.workOrderComponentType === 'KM_REISSUE_GOODS' || item.workOrderComponentType === 'JY_REISSUE_GOODS' || item.workOrderComponentType === 'JKY_REISSUE_GOODS') {
       addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderNo, (reissue === null || reissue === void 0 ? void 0 : reissue[SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].systemOrderNo]) || '');
     }
     // 管易补发商品信息vipCode/shopCode未复现出丢失情况，兜底措施
@@ -1043,6 +1043,7 @@ var processComponent = function processComponent(_ref60) {
       case 'JST_RETURN_GOODS':
       case 'KM_REISSUE_GOODS':
       case 'JY_REISSUE_GOODS':
+      case 'JKY_REISSUE_GOODS':
         wrapFn(handleBsOrWdtReissueGoods);
         break;
       case 'BS_RETURN_GOODS':

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

@@ -295,6 +295,7 @@ export var orderBack = /*#__PURE__*/function () {
           } else {
             promise.push(Promise.resolve([]));
           }
+          console.log('promise', promise);
           // 旺店通售后订单数据获取
           wdtReturnBillNoComponent = templateDetail.componentDtoList.find(function (item) {
             return item.workOrderComponentType === 'WDT_RETURN_BILL_NO';
@@ -308,9 +309,9 @@ export var orderBack = /*#__PURE__*/function () {
           }
 
           //需按照orderBackMap中的顺序结构
-          _context.next = 40;
+          _context.next = 41;
           return Promise.allSettled(promise);
-        case 40:
+        case 41:
           _yield$Promise$allSet = _context.sent;
           _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 16);
           data = _yield$Promise$allSet2[0];
@@ -615,7 +616,7 @@ export var orderBack = /*#__PURE__*/function () {
           pushGyLog('detail', detail);
           //抖音数据特殊处理
           if (!orderInfo) {
-            _context.next = 148;
+            _context.next = 149;
             break;
           }
           if (shopSourceStr === 'FXG') {
@@ -627,7 +628,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 132;
+            _context.next = 133;
             break;
           }
           list = detail['itemList'];
@@ -645,10 +646,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 122;
-          _context.next = 125;
+          _context.prev = 123;
+          _context.next = 126;
           return Promise.all(promises);
-        case 125:
+        case 126:
           erpPromiseList = _context.sent;
           detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -658,25 +659,25 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 132;
+          _context.next = 133;
           break;
-        case 129:
-          _context.prev = 129;
-          _context.t1 = _context["catch"](122);
+        case 130:
+          _context.prev = 130;
+          _context.t1 = _context["catch"](123);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 132:
+        case 133:
           // 判断是否存在签收时间组件
           hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
           if (!hasSigningDatetime) {
-            _context.next = 148;
+            _context.next = 149;
             break;
           }
           if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
-            _context.next = 147;
+            _context.next = 148;
             break;
           }
-          _context.prev = 135;
-          _context.next = 138;
+          _context.prev = 136;
+          _context.next = 139;
           return request({
             url: '/qy/logistics/logisticsSignTime',
             method: 'post',
@@ -686,21 +687,21 @@ export var orderBack = /*#__PURE__*/function () {
               mailNo: orderInfo.expressLogisticsCode
             }
           });
-        case 138:
+        case 139:
           signDatetime = _context.sent;
           detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
-          _context.next = 145;
+          _context.next = 146;
           break;
-        case 142:
-          _context.prev = 142;
-          _context.t2 = _context["catch"](135);
+        case 143:
+          _context.prev = 143;
+          _context.t2 = _context["catch"](136);
           console.error('调用签收时间错误', _context.t2);
-        case 145:
-          _context.next = 148;
+        case 146:
+          _context.next = 149;
           break;
-        case 147:
-          detail['tradeSigningDateTime'] = '';
         case 148:
+          detail['tradeSigningDateTime'] = '';
+        case 149:
           values = orderBackFormValues({
             detail: detail,
             _get_order_fail_: !orderInfo,
@@ -753,21 +754,21 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 160;
+          _context.next = 161;
           break;
-        case 157:
-          _context.prev = 157;
+        case 158:
+          _context.prev = 158;
           _context.t3 = _context["catch"](27);
           console.error(_context.t3);
-        case 160:
-          _context.prev = 160;
+        case 161:
+          _context.prev = 161;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(160);
-        case 163:
+          return _context.finish(161);
+        case 164:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[7, 14, 17, 20], [27, 157, 160, 163], [122, 129], [135, 142]]);
+    }, _callee, null, [[7, 14, 17, 20], [27, 158, 161, 164], [123, 130], [136, 143]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -1110,6 +1111,7 @@ export var reversalFormValues = function reversalFormValues() {
       case 'JST_RETURN_GOODS':
       case 'KM_REISSUE_GOODS':
       case 'JY_REISSUE_GOODS':
+      case 'JKY_REISSUE_GOODS':
         prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
         break;
       case 'BS_DELIVERY_NO':

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

@@ -1,5 +1,5 @@
 import { HasFilterHandle } from "./tools";
-import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, skxOrderDetail, jyOrderDetail, skxReturnOrderDetail } from "../../model/servers/api";
+import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, jkyOrderDetail, 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'],
@@ -104,6 +104,14 @@ export var orderBackMap = function orderBackMap(_ref) {
           tid: order_no
         });
       }
+    },
+    hasJky: {
+      flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasJky),
+      promiseRequest: function promiseRequest() {
+        return jkyOrderDetail({
+          sourceTradeNos: order_no
+        });
+      }
     }
   };
 };

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

@@ -1130,6 +1130,28 @@ var processJyReissueGoods = function processJyReissueGoods(templateColumns) {
     };
   };
 };
+var processJkyReissueGoods = function processJkyReissueGoods(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, {
+        jkySystemOrder: {
+          orderNo: orderNo
+        },
+        jkyReissueType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jkyReissueType")), !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? [config.initReason] : ['1']),
+        jkyReissueGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_jkyReissueGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
+        jkySystemOrderNo: getValue("".concat(nex.uniqueKey, "_jkySystemOrderNo"))
+      });
+    };
+  };
+};
 var processGyReissueGoods = function processGyReissueGoods(templateColumns) {
   return function (getValue) {
     return function (nex, config) {
@@ -1223,14 +1245,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref81;
-    return _ref81 = {}, _defineProperty(_ref81, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref81, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref81;
+    var _ref82;
+    return _ref82 = {}, _defineProperty(_ref82, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref82, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref82;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref82;
-    return _ref82 = {}, _defineProperty(_ref82, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref82, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref82;
+    var _ref83;
+    return _ref83 = {}, _defineProperty(_ref83, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref83, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref83;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -1363,6 +1385,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       KM_GOODS: processKmGoods(templateColumns),
       KM_REISSUE_GOODS: processKmReissueGoods(templateColumns),
       JY_REISSUE_GOODS: processJyReissueGoods(templateColumns),
+      JKY_REISSUE_GOODS: processJkyReissueGoods(templateColumns),
       JST_GOODS: processJstGoods(templateColumns),
       BS_REISSUE_GOODS: processBsReissueGoods,
       BS_EXCHANGE_GOODS: processBsExchangeGoods,

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

@@ -80,6 +80,7 @@ export declare const bsOrderDetail: (data: any) => Promise<any>;
 export declare const wdtOrderDetail: (data: any) => Promise<any>;
 export declare const bsE3OrderDetail: (data: any) => Promise<any>;
 export declare const kmOrderDetail: (data: any) => Promise<serverProps<any>>;
+export declare const jkyOrderDetail: (data: any) => Promise<serverProps<any>>;
 export declare const gyOrderDetail: (data: any) => Promise<any>;
 export declare const skxOrderDetail: (data: any) => Promise<any>;
 export declare const skxReturnOrderDetail: (data: any) => Promise<any>;

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

@@ -459,6 +459,14 @@ export var kmOrderDetail = function kmOrderDetail(data) {
     infoLevel: 'warning'
   });
 };
+export var jkyOrderDetail = function jkyOrderDetail(data) {
+  return request({
+    url: '/qy/gdfw/jky/erp/trade/fullInfo',
+    method: 'post',
+    data: data,
+    infoLevel: 'warning'
+  });
+};
 
 // 管易订单详情
 export var gyOrderDetail = function gyOrderDetail(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.44-beta.1",
+  "version": "2.2.44-beta.11",
   "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.44-beta.1",
-    "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.0",
-    "@kmkf-fe-packages/services-components": "2.2.44-beta.1",
+    "@kmkf-fe-packages/basic-components": "2.2.44-beta.9",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.9",
+    "@kmkf-fe-packages/services-components": "2.2.44-beta.9",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c00744d32f63b39594689fb8310b85ff10662f4c",
+  "gitHead": "d9bbe8ab60c4a74ddafd5bacd396f20a5719012d",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }