@kmkf-fe-packages/kmkf-work-order-service-component 1.23.0 → 1.23.2

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

@@ -227,6 +227,12 @@ export declare const selectOperateParams: (state: FlowTemplateDetailState) => {
     flowVersion: number;
     flowWorkOrderUpdateTime: string;
     workOrderUpdateTime: number;
+    maxPublishVersionTemplate: {
+        id: string;
+        name: string;
+        publishTime: number;
+        version: number;
+    };
 } | undefined;
 export declare const selectAddRemarkVisible: (state: FlowTemplateDetailState) => boolean;
 export declare const selectFlowStatus: (state: FlowTemplateDetailState) => import("../../model/flowTemplateDetail/types").FlowStatus | undefined;

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

@@ -17,6 +17,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { message } from 'antd';
 import { get, last, cloneDeep, isEqual, set } from 'lodash';
 import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail } from "../../model/servers/api";
 import moment from 'moment';
@@ -152,7 +153,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasKm, hasWdt, hasBsE3, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _kmOrders$orderDetail, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, paymentUniqueKey, cacheOrderInfo, _objectSpread3, _cacheOrderInfo;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasKm, hasWdt, hasBsE3, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _data$value3, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _kmOrders$orderDetail, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, _data$value2, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, paymentUniqueKey, cacheOrderInfo, _objectSpread3, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -272,7 +273,11 @@ export var orderBack = /*#__PURE__*/function () {
           wdtOrder = _yield$Promise$allSet2[4];
           bsE3Order = _yield$Promise$allSet2[5];
           kmOrder = _yield$Promise$allSet2[6];
-          orderInfo = (data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data) || {};
+          // TODO: 针对订单支付方式是微信还是支付宝，后端接口返回一个message用来提示使用
+          if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
+            message.warning(data === null || data === void 0 ? void 0 : (_data$value2 = data.value) === null || _data$value2 === void 0 ? void 0 : _data$value2.message);
+          }
+          orderInfo = (data === null || data === void 0 ? void 0 : (_data$value3 = data.value) === null || _data$value3 === void 0 ? void 0 : _data$value3.data) || {};
           jstInfo = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : (_jstOrder$value$data = _jstOrder$value.data) === null || _jstOrder$value$data === void 0 ? void 0 : _jstOrder$value$data.orders) || [];
           bsOrders = (bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data) || {};
           wlnOrders = (wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data) || {};
@@ -384,7 +389,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 71;
+            _context.next = 72;
             break;
           }
           list = detail['itemList'];
@@ -402,10 +407,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 61;
-          _context.next = 64;
+          _context.prev = 62;
+          _context.next = 65;
           return Promise.all(promises);
-        case 64:
+        case 65:
           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), {}, {
@@ -415,13 +420,13 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 71;
+          _context.next = 72;
           break;
-        case 68:
-          _context.prev = 68;
-          _context.t0 = _context["catch"](61);
+        case 69:
+          _context.prev = 69;
+          _context.t0 = _context["catch"](62);
           console.error('调用erp获取宝贝编码错误', _context.t0);
-        case 71:
+        case 72:
           // console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
@@ -453,17 +458,17 @@ export var orderBack = /*#__PURE__*/function () {
           // console.log('orderback', values);
           form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 82;
+          _context.next = 83;
           break;
-        case 79:
-          _context.prev = 79;
+        case 80:
+          _context.prev = 80;
           _context.t1 = _context["catch"](10);
           console.error(_context.t1);
-        case 82:
+        case 83:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[10, 79], [61, 68]]);
+    }, _callee, null, [[10, 80], [62, 69]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.23.0",
+  "version": "1.23.2",
   "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": "1.23.0",
-    "@kmkf-fe-packages/kmkf-utils": "1.23.0",
-    "@kmkf-fe-packages/services-components": "1.23.0",
+    "@kmkf-fe-packages/basic-components": "1.23.2",
+    "@kmkf-fe-packages/kmkf-utils": "1.23.2",
+    "@kmkf-fe-packages/services-components": "1.23.2",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "028a03082dde8236b1a0e20a8c970b6e5b5affb3",
+  "gitHead": "fb0d17c3136b7c2354ba16bc9855b5b0b0feecf1",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }