@kmkf-fe-packages/kmkf-work-order-service-component 0.24.2-beta.4 → 0.24.2-beta.6

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

@@ -84,7 +84,7 @@ var FormRender = function FormRender(props, ref) {
   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);
+      return ['LOGISTICS_TRAJECTORY_MORE', 'LOGISTICS_INTERCEPTION_MORE'].includes(item.workOrderComponentType) && ((_item$componentConfig = item.componentConfig) === null || _item$componentConfig === void 0 ? void 0 : _item$componentConfig.isOpen);
     });
   }, [templateDetail]);
   var finallyMappdingHideComponents = useRef(mappingConfig.hideComponents);

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

@@ -274,6 +274,53 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         content: get(nowData, "".concat(item.uniqueKey, ".interceptAddress[2]"), ''),
         name: item.name
       });
+    } else if (item.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
+      var logisticsInterceptionList = get(nowData, "".concat(item.uniqueKey), []);
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptList"),
+        content: logisticsInterceptionList,
+        name: item.name
+      }, {
+        uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptCompanyList"),
+        content: logisticsInterceptionList.filter(function (t) {
+          return t.interceptCompany;
+        }).map(function (t) {
+          return t.interceptCompany + '';
+        }),
+        name: item.name
+      }, {
+        uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptCodeList"),
+        content: logisticsInterceptionList.filter(function (t) {
+          return t.interceptCode;
+        }).map(function (t) {
+          return t.interceptCode + '';
+        }),
+        name: item.name
+      }, {
+        uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptTypeList"),
+        content: logisticsInterceptionList.filter(function (t) {
+          return t.interceptType;
+        }).map(function (t) {
+          return t.interceptType + '';
+        }),
+        name: item.name
+      }, {
+        uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptStatusList"),
+        content: logisticsInterceptionList.filter(function (t) {
+          return t.interceptLogisticsStatus;
+        }).map(function (t) {
+          return t.interceptLogisticsStatus + '';
+        }),
+        name: item.name
+      }, {
+        uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptSnapshotList"),
+        content: logisticsInterceptionList.filter(function (t) {
+          return t.interceptLogisticsSnapshot;
+        }).map(function (t) {
+          return t.interceptLogisticsSnapshot + '';
+        }),
+        name: item.name
+      });
     } else if (item.workOrderComponentType === 'PICTURE') {
       var _value$map;
       var host = cache.getHost() || window.location.origin;
@@ -1233,6 +1280,8 @@ var transDataSource = function transDataSource(templateColumns) {
           interceptLogisticsStatusOther: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsStatusOther")],
           interceptLogisticsSnapshot: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsSnapshot")]
         }));
+      } else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_logisticsInterceptList")], [])));
       } else if (nex.workOrderComponentType === 'LOGISTICS_TRAJECTORY') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
           trajectoryCompany: item.jsonMap["".concat(nex.uniqueKey, "_trajectoryCompany")],
@@ -1256,8 +1305,8 @@ var transDataSource = function transDataSource(templateColumns) {
         });
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList));
       } else if (nex.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
-        var _objectSpread41;
-        return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread41 = {}, _defineProperty(_objectSpread41, "".concat(nex.uniqueKey), {
+        var _objectSpread42;
+        return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread42 = {}, _defineProperty(_objectSpread42, "".concat(nex.uniqueKey), {
           enterprisePaymentAlipayNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")],
           enterprisePaymentAlipayNo: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")],
           enterprisePaymentBuyerNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")],
@@ -1265,7 +1314,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(_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));
+        }), _defineProperty(_objectSpread42, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")]), _defineProperty(_objectSpread42, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")]), _defineProperty(_objectSpread42, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")]), _defineProperty(_objectSpread42, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")]), _defineProperty(_objectSpread42, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")]), _defineProperty(_objectSpread42, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTime")]), _defineProperty(_objectSpread42, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]), _objectSpread42));
       } 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') {
@@ -1569,7 +1618,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, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread70, _cacheOrderInfo;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread71, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1803,7 +1852,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), {}, (_objectSpread70 = {}, _defineProperty(_objectSpread70, order_no, values), _defineProperty(_objectSpread70, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread70))));
+              sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread71 = {}, _defineProperty(_objectSpread71, order_no, values), _defineProperty(_objectSpread71, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread71))));
             }
           }
           // console.log('orderback', values);
@@ -2184,7 +2233,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', 'LOGISTICS_TRAJECTORY_MORE'].includes(item.workOrderComponentType);
+    return ['BS_GOODS', 'BS_DELIVERY_NO', 'BS_SEND_GOOD', 'BS_LOGISTICS', 'LOGISTICS_TRAJECTORY_MORE', 'LOGISTICS_INTERCEPTION_MORE'].includes(item.workOrderComponentType);
   });
   if (!(bsGoodsComponent !== null && bsGoodsComponent !== void 0 && bsGoodsComponent.length)) return;
   var bsGoodsValue = form.getFieldValue(bsGoodsComponent[0].uniqueKey);
@@ -2195,7 +2244,6 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
   var values = bsOrderBackFormValues(orderInfo, {
     componentDtoList: bsGoodsComponent
   });
-  console.log('bsSystemOrderBackValues', values);
   form.setFieldsValue(values);
 };
 
@@ -2334,31 +2382,67 @@ export var setLogisticsInfo = function setLogisticsInfo(_ref9) {
       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 (next.workOrderComponentType === 'LOGISTICS_TRAJECTORY_MORE') {
+        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: ''
+            };
+          });
+        }
+      } else if (next.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
+        if (companyType === 'INPUT') {
+          prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
+            interceptCompany: ExpressData.getInstance().getExpressCodeByName(value, false)
+          })];
+        } else if (companyType === 'EXPRESS_LOGISTICS_SELECT') {
+          prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
+            interceptCompany: value.company,
+            interceptCode: value.order
+          })];
+        } else if (companyType === 'BS_LOGISTICS') {
+          prv[next.uniqueKey] = value.map(function (item) {
+            return {
+              interceptCompany: item.logisticsCompany,
+              interceptCode: item.logisticsCode,
+              interceptType: undefined,
+              interceptSenderMobile: undefined,
+              interceptAddress: [],
+              interceptDetail: undefined,
+              interceptReceiverName: undefined,
+              interceptReceiverMobile: undefined,
+              interceptStatus: undefined,
+              interceptOther: undefined
+            };
+          });
+        }
       }
     }
     if (codeUniqueKey === uniqueKey && workOrderComponentType === codeType) {
-      if (companyType === 'INPUT') {
-        prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
-          trajectoryCode: value
-        })];
+      if (next.workOrderComponentType === 'LOGISTICS_TRAJECTORY_MORE') {
+        if (companyType === 'INPUT') {
+          prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
+            trajectoryCode: value
+          })];
+        }
+      } else if (next.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
+        if (companyType === 'INPUT') {
+          prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
+            interceptCode: value
+          })];
+        }
       }
     }
     return prv;

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.24.2-beta.4",
+  "version": "0.24.2-beta.6",
   "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.24.2-beta.4",
-    "@kmkf-fe-packages/kmkf-utils": "^0.24.2-beta.2",
-    "@kmkf-fe-packages/services-components": "^0.24.2-beta.4",
+    "@kmkf-fe-packages/basic-components": "^0.24.2-beta.6",
+    "@kmkf-fe-packages/kmkf-utils": "^0.24.2-beta.6",
+    "@kmkf-fe-packages/services-components": "^0.24.2-beta.6",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ca851ca3d887a798a4d9c03442454cdc865c2b38",
+  "gitHead": "4b415661234a5be4f908e20478b4ba076d4c11f3",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }