@kmkf-fe-packages/kmkf-work-order-service-component 2.0.55 → 2.0.57

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

@@ -14,6 +14,8 @@ export var updateWorkTypeKeys = {
   //发货时间
   TRADE_CLOSING_DATETIME: 'tradeClosingDateTime',
   //成交时间
+  TRADE_SIGNING_DATETIME: 'tradeSigningDateTime',
+  // 签收时间
   ACTUAL_PAYMENT: 'actualPayment',
   SYSTEM_ORDER_NO: 'systemOrderNo',
   BS_SIGNING_TIME: 'bsSigningTime',
@@ -79,6 +81,8 @@ export var DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING = {
   //发货时间
   TRADE_CLOSING_DATETIME: 'tradeClosingDateTime',
   //成交时间
+  TRADE_SIGNING_DATETIME: 'tradeSigningDateTime',
+  // 签收时间
   INPUT: 'input',
   DATETIME: 'dateTime',
   TEXTAREA: 'textarea',

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

@@ -731,6 +731,7 @@ var processComponent = function processComponent(_ref52) {
       case 'TRADE_PAYMENT_DATETIME':
       case 'TRADE_DELIVERY_DATETIME':
       case 'TRADE_CLOSING_DATETIME':
+      case 'TRADE_SIGNING_DATETIME':
       case 'INPUT':
       case 'DATETIME':
       case 'TEXTAREA':

package/dist/esm/common/utils/tools.d.ts

@@ -59,6 +59,7 @@ export declare const getReplaceWarnValues: (templateDetail: {
 }) => any;
 export declare const HasFilterHandle: (templateDetail: any, filterList: string[]) => any;
 export declare const HasErpItemSelectHandle: (templateDetail?: any) => any;
+export declare const HasTradeSigningDatetime: (templateDetail?: any) => any;
 export declare const platformMap: any;
 declare type SubmitParams = {
     update: boolean;

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

@@ -48,6 +48,8 @@ var workTypeKeys = {
   //发货时间
   TRADE_CLOSING_DATETIME: 'tradeClosingDateTime',
   //成交时间
+  TRADE_SIGNING_DATETIME: 'tradeSigningDateTime',
+  // 签收时间
   INPUT: 'input',
   DATETIME: 'dateTime',
   TEXTAREA: 'textarea',
@@ -133,7 +135,7 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _data$value, _data$value3, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, paymentUniqueKey;
+    var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _data$value, _data$value3, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -475,7 +477,43 @@ export var orderBack = /*#__PURE__*/function () {
           _context.t1 = _context["catch"](87);
           console.error('调用erp获取宝贝编码错误', _context.t1);
         case 97:
-          // console.log('detail', detail);
+          // 判断是否存在签收时间组件
+          hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
+          if (!hasSigningDatetime) {
+            _context.next = 113;
+            break;
+          }
+          if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
+            _context.next = 112;
+            break;
+          }
+          _context.prev = 100;
+          _context.next = 103;
+          return request({
+            url: '/qy/logistics/logisticsSignTime',
+            method: 'post',
+            data: {
+              shopId: shopId,
+              cpCode: orderInfo.expressLogisticsCompany,
+              mailNo: orderInfo.expressLogisticsCode
+            }
+          });
+        case 103:
+          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 = 110;
+          break;
+        case 107:
+          _context.prev = 107;
+          _context.t2 = _context["catch"](100);
+          console.error('调用签收时间错误', _context.t2);
+        case 110:
+          _context.next = 113;
+          break;
+        case 112:
+          detail['tradeSigningDateTime'] = '';
+        case 113:
+          console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
             order_no: order_no,
@@ -519,21 +557,21 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 108;
+          _context.next = 125;
           break;
-        case 105:
-          _context.prev = 105;
-          _context.t2 = _context["catch"](25);
-          console.error(_context.t2);
-        case 108:
-          _context.prev = 108;
+        case 122:
+          _context.prev = 122;
+          _context.t3 = _context["catch"](25);
+          console.error(_context.t3);
+        case 125:
+          _context.prev = 125;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(108);
-        case 111:
+          return _context.finish(125);
+        case 128:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 12, 15, 18], [25, 105, 108, 111], [87, 94]]);
+    }, _callee, null, [[5, 12, 15, 18], [25, 122, 125, 128], [87, 94], [100, 107]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -661,6 +699,14 @@ export var HasErpItemSelectHandle = function HasErpItemSelectHandle() {
     return ['ITEM_SELECT_THIRD'].includes(item.workOrderComponentType);
   });
 };
+export var HasTradeSigningDatetime = function HasTradeSigningDatetime() {
+  var templateDetail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+    componentDtoList: []
+  };
+  return templateDetail.componentDtoList.some(function (item) {
+    return ['TRADE_SIGNING_DATETIME'].includes(item.workOrderComponentType);
+  });
+};
 export var platformMap = {
   tb: '淘宝',
   fxg: '抖音',

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

@@ -1084,6 +1084,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       TRADE_PAYMENT_DATETIME: processSingleField,
       TRADE_DELIVERY_DATETIME: processSingleField,
       TRADE_CLOSING_DATETIME: processSingleField,
+      TRADE_SIGNING_DATETIME: processSingleField,
       ACTUAL_PAYMENT: processSingleField,
       SYSTEM_ORDER_NO: processSingleField,
       BS_SIGNING_TIME: processSingleField,

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

@@ -1,3 +1,9 @@
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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); }
 /*
  * @Description:
  * @Author: litian
@@ -6,6 +12,8 @@
  * @LastEditTime: 2022-11-08 13:58:05
  */
 import request from "./request";
+import { tradeStatusMap } from '@kmkf-fe-packages/kmkf-utils';
+
 //获取灰度白名
 export var grayWhiteList = function grayWhiteList() {
   return request({
@@ -396,6 +404,19 @@ export var wdtOrderDetail = function wdtOrderDetail(data) {
     method: 'post',
     data: data,
     infoLevel: 'warning'
+  }).then(function (res) {
+    if (res !== null && res !== void 0 && res.success) {
+      var _res$data, _res$data$trades;
+      if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data$trades = _res$data.trades) !== null && _res$data$trades !== void 0 && _res$data$trades.length) {
+        res.data.trades = res.data.trades.map(function (item) {
+          var _tradeStatusMap$res$d;
+          return _objectSpread(_objectSpread({}, item), {}, {
+            tradeStatusValue: tradeStatusMap === null || tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$res$d = tradeStatusMap[res.data.version]) === null || _tradeStatusMap$res$d === void 0 ? void 0 : _tradeStatusMap$res$d[item.tradeStatus]
+          });
+        });
+      }
+    }
+    return res;
   });
 };
 // 百胜E3订单详情

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.0.55",
+  "version": "2.0.57",
   "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.0.55",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.55",
-    "@kmkf-fe-packages/services-components": "2.0.55",
+    "@kmkf-fe-packages/basic-components": "2.0.57",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.57",
+    "@kmkf-fe-packages/services-components": "2.0.57",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "17280f003e2ecbdc5dd3316b1196c6b10d78c0f4",
+  "gitHead": "35082852f84a4850071c5789da827e0084eedd67",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }