@kmkf-fe-packages/kmkf-work-order-service-component 0.23.0 → 0.24.0-alpha.0

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

@@ -28,7 +28,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle } fro
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
-INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, setLogisticsInfo } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, getExpression, formatDisplayConfig, BsAddressData } from '@kmkf-fe-packages/kmkf-utils';
@@ -79,6 +79,12 @@ var FormRender = function FormRender(props, ref) {
   var mappingConfig = useMemo(function () {
     return getMappingConfigByTemplateDetail(templateDetail);
   }, [templateDetail]);
+  var logisticsMappingConfig = useMemo(function () {
+    return templateDetail.componentDtoList.filter(function (item) {
+      var _item$componentConfig;
+      return item.workOrderComponentType === 'LOGISTICS_TRAJECTORY_MORE' && ((_item$componentConfig = item.componentConfig) === null || _item$componentConfig === void 0 ? void 0 : _item$componentConfig.isOpen);
+    });
+  }, [templateDetail]);
   var finallyMappdingHideComponents = useRef(mappingConfig.hideComponents);
   var _useState = useState(mappingConfig.hideComponents),
     _useState2 = _slicedToArray(_useState, 2),
@@ -539,6 +545,15 @@ var FormRender = function FormRender(props, ref) {
         form: form
       });
     }
+    if (logisticsMappingConfig && ['INPUT', 'EXPRESS_LOGISTICS_SELECT', 'BS_LOGISTICS'].includes(workOrderComponentType)) {
+      setLogisticsInfo({
+        logisticsMappingConfig: logisticsMappingConfig,
+        uniqueKey: uniqueKey,
+        workOrderComponentType: workOrderComponentType,
+        value: value,
+        form: form
+      });
+    }
   };
 
   //组件失焦事件
@@ -706,8 +721,8 @@ var FormRender = function FormRender(props, ref) {
   };
   var newRenderColumnItem = function newRenderColumnItem(effects) {
     return function (item) {
-      var _item$componentConfig = item.componentConfig,
-        componentConfig = _item$componentConfig === void 0 ? {} : _item$componentConfig,
+      var _item$componentConfig2 = item.componentConfig,
+        componentConfig = _item$componentConfig2 === void 0 ? {} : _item$componentConfig2,
         workOrderComponentType = item.workOrderComponentType,
         uniqueKey = item.uniqueKey,
         name = item.name;

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

@@ -129,4 +129,5 @@ export declare const getMappingConfigByTemplateDetail: (templateDetail: {
     hideComponents: string[];
 };
 export declare const transformWorkOrderDetail: (detail: any) => any;
+export declare const setLogisticsInfo: ({ logisticsMappingConfig, uniqueKey, workOrderComponentType, value, form, }: any) => void;
 export {};

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

@@ -728,6 +728,34 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
           name: item.name
         });
       });
+    } else if (item.workOrderComponentType === 'LOGISTICS_TRAJECTORY_MORE') {
+      var trajectoryList = get(nowData, "".concat(item.uniqueKey), []);
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_trajectoryList"),
+        content: trajectoryList,
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_trajectoryMoreCompany"),
+        content: trajectoryList.map(function (item) {
+          return item.trajectoryCompany;
+        }),
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_trajectoryMoreCode"),
+        content: trajectoryList.map(function (item) {
+          return item.trajectoryCode;
+        }),
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_trajectoryMoreSnapshot"),
+        content: trajectoryList.map(function (item) {
+          return item.trajectorySnapshot;
+        }),
+        name: item.name
+      });
     } else if (item.workOrderComponentType === 'BS_GOODS') {
       var bsGoods = get(nowData, "".concat(item.uniqueKey), {});
       contentVoList.push({
@@ -1165,6 +1193,8 @@ var transDataSource = function transDataSource(templateColumns) {
           trajectorySnapshot: item.jsonMap["".concat(nex.uniqueKey, "_trajectorySnapshot")],
           trajectoryPhone: item.jsonMap["".concat(nex.uniqueKey, "_trajectoryPhone")]
         }));
+      } else if (nex.workOrderComponentType === 'LOGISTICS_TRAJECTORY_MORE') {
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_trajectoryList")], [])));
       } else if (nex.workOrderComponentType === 'ITEM_SELECT') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_itemList")], [])));
       } else if (nex.workOrderComponentType === 'ITEM_ENCODE') {
@@ -1179,8 +1209,8 @@ var transDataSource = function transDataSource(templateColumns) {
         });
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList));
       } else if (nex.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
-        var _objectSpread40;
-        return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread40 = {}, _defineProperty(_objectSpread40, "".concat(nex.uniqueKey), {
+        var _objectSpread41;
+        return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread41 = {}, _defineProperty(_objectSpread41, "".concat(nex.uniqueKey), {
           enterprisePaymentAlipayNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")],
           enterprisePaymentAlipayNo: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")],
           enterprisePaymentBuyerNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")],
@@ -1188,7 +1218,7 @@ var transDataSource = function transDataSource(templateColumns) {
           enterprisePaymentRefundFee: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")],
           enterprisePaymentStatus: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")],
           enterprisePaymentTid: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]
-        }), _defineProperty(_objectSpread40, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")]), _defineProperty(_objectSpread40, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")]), _defineProperty(_objectSpread40, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")]), _defineProperty(_objectSpread40, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")]), _defineProperty(_objectSpread40, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")]), _defineProperty(_objectSpread40, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTime")]), _defineProperty(_objectSpread40, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]), _objectSpread40));
+        }), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTime")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]), _objectSpread41));
       } else if (nex.workOrderComponentType === 'SYSTEM_ORDER_NO') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_systemOrderNo")]));
       } else if (nex.workOrderComponentType === 'JST_LOGISTICS') {
@@ -1467,7 +1497,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, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, orderInfo, jstInfo, bsOrders, wlnOrders, bsInfo, wlnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread68, _cacheOrderInfo;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, orderInfo, jstInfo, bsOrders, wlnOrders, bsInfo, wlnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread69, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1669,7 +1699,7 @@ export var orderBack = /*#__PURE__*/function () {
               sessionStorage.setItem('cacheOmsOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, cacheOrderInfo), {}, _defineProperty({}, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))))));
             } else {
               _cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
-              sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread68 = {}, _defineProperty(_objectSpread68, order_no, values), _defineProperty(_objectSpread68, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread68))));
+              sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread69 = {}, _defineProperty(_objectSpread69, order_no, values), _defineProperty(_objectSpread69, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread69))));
             }
           }
           // console.log('orderback', values);
@@ -2045,7 +2075,7 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var bsGoodsComponent = (_templateList$compone = templateList.componentDtoList) === null || _templateList$compone === void 0 ? void 0 : _templateList$compone.filter(function (item) {
-    return ['BS_GOODS', 'BS_DELIVERY_NO', 'BS_SEND_GOOD', 'BS_LOGISTICS'].includes(item.workOrderComponentType);
+    return ['BS_GOODS', 'BS_DELIVERY_NO', 'BS_SEND_GOOD', 'BS_LOGISTICS', 'LOGISTICS_TRAJECTORY_MORE'].includes(item.workOrderComponentType);
   });
   if (!(bsGoodsComponent !== null && bsGoodsComponent !== void 0 && bsGoodsComponent.length)) return;
   var bsGoodsValue = form.getFieldValue(bsGoodsComponent[0].uniqueKey);
@@ -2056,6 +2086,7 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
   var values = bsOrderBackFormValues(orderInfo, {
     componentDtoList: bsGoodsComponent
   });
+  console.log('bsSystemOrderBackValues', values);
   form.setFieldsValue(values);
 };
 
@@ -2153,4 +2184,52 @@ export var transformWorkOrderDetail = function transformWorkOrderDetail(detail)
     }
     return prv;
   }, {});
+};
+
+// 返填物流轨迹信息
+export var setLogisticsInfo = function setLogisticsInfo(_ref8) {
+  var logisticsMappingConfig = _ref8.logisticsMappingConfig,
+    uniqueKey = _ref8.uniqueKey,
+    workOrderComponentType = _ref8.workOrderComponentType,
+    value = _ref8.value,
+    form = _ref8.form;
+  var values = logisticsMappingConfig.reduce(function (prv, next) {
+    var logisticsValues = form.getFieldValue(next.uniqueKey);
+    var componentConfig = next.componentConfig;
+    var _componentConfig$logi = componentConfig.logisticsMapping,
+      companyUniqueKey = _componentConfig$logi.companyUniqueKey,
+      companyType = _componentConfig$logi.companyType,
+      codeUniqueKey = _componentConfig$logi.codeUniqueKey,
+      codeType = _componentConfig$logi.codeType;
+    if (companyUniqueKey === uniqueKey && workOrderComponentType === companyType) {
+      if (companyType === 'INPUT') {
+        prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
+          trajectoryCompany: ExpressData.getInstance().getExpressCodeByName(value, true)
+        })];
+      } else if (companyType === 'EXPRESS_LOGISTICS_SELECT') {
+        prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
+          trajectoryCompany: value.company,
+          trajectoryCode: value.order
+        })];
+      } else if (companyType === 'BS_LOGISTICS') {
+        prv[next.uniqueKey] = value.map(function (item) {
+          return {
+            trajectoryCompany: item.logisticsCompany,
+            trajectoryCode: item.logisticsCode,
+            trajectorySnapshot: '',
+            trajectoryPhone: ''
+          };
+        });
+      }
+    }
+    if (codeUniqueKey === uniqueKey && workOrderComponentType === codeType) {
+      if (companyType === 'INPUT') {
+        prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
+          trajectoryCode: value
+        })];
+      }
+    }
+    return prv;
+  }, {});
+  form.setFieldsValue(values);
 };

package/dist/esm/model/logicFlow/selector.d.ts

@@ -6,7 +6,6 @@ export declare const selectFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectGroupFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "0.23.0",
+  "version": "0.24.0-alpha.0",
   "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": "^0.23.0",
-    "@kmkf-fe-packages/kmkf-utils": "^0.23.0",
-    "@kmkf-fe-packages/services-components": "^0.23.0",
+    "@kmkf-fe-packages/basic-components": "^0.24.0-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.24.0-alpha.0",
+    "@kmkf-fe-packages/services-components": "^0.24.0-alpha.0",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -74,7 +74,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3cb10adaa8b97dc93ca4af9dc833041bd45f0116",
+  "gitHead": "3e66526d6aec8eda3092f7c721baef086729337b",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }