@kmkf-fe-packages/kmkf-work-order-service-component 0.26.0-alpha.2 → 0.26.0-alpha.3

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

@@ -28,10 +28,10 @@ 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, setLogisticsInfo } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, 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, isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, getExpression, formatDisplayConfig, BsAddressData, WdtAddressData, isNull } from '@kmkf-fe-packages/kmkf-utils';
 import ShopName from "../ShopName";
 import { PlatForm } from "../../../model/flowTemplateDetail/types";
 import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
@@ -117,6 +117,7 @@ var FormRender = function FormRender(props, ref) {
   PlatData.getInstance();
   LogisticsAddressData.getInstance();
   BsAddressData.getInstance();
+  WdtAddressData.getInstance();
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     preNodeForm = _Form$useForm2[0];
@@ -132,7 +133,17 @@ var FormRender = function FormRender(props, ref) {
   // TODO: 前置节点form单独设置指
   useEffect(function () {
     if (!isEmpty(record)) {
-      var transData = calcWorkOrderList([record], (templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []);
+      var preNodeComponentDtoList = cloneDeep((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []);
+      var componentTemplateConfigVos = cloneDeep((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentTemplateConfigVos) || []);
+      preNodeComponentDtoList.forEach(function (item) {
+        var currentConfig = componentTemplateConfigVos.find(function (configItem) {
+          return configItem.componentUniqueKey === item.uniqueKey;
+        });
+        if (currentConfig !== null && currentConfig !== void 0 && currentConfig.config) {
+          item.componentConfig = currentConfig.config;
+        }
+      });
+      var transData = calcWorkOrderList([record], preNodeComponentDtoList);
       preNodeForm.setFieldsValue(_objectSpread({}, get(transData, '0', {})));
       fillByShopId(get(transData, '0', {}).shopId);
     }
@@ -515,6 +526,7 @@ var FormRender = function FormRender(props, ref) {
   //订单返填
   var changeHandle = function changeHandle(order_no) {
     if (!order_no) return;
+    console.log('[订单返填 changeHandle order_no ] >', order_no);
     orderBack({
       order_no: order_no,
       form: form,
@@ -547,6 +559,13 @@ var FormRender = function FormRender(props, ref) {
         form: form
       });
     }
+    if (workOrderComponentType === 'WDT_SYSTEM_ORDER') {
+      wdtSystemOrderBackValues({
+        templateList: templateDetail,
+        value: value,
+        form: form
+      });
+    }
     if (logisticsMappingConfig && ['INPUT', 'EXPRESS_LOGISTICS_SELECT', 'BS_LOGISTICS'].includes(workOrderComponentType)) {
       setLogisticsInfo({
         logisticsMappingConfig: logisticsMappingConfig,
@@ -596,7 +615,7 @@ var FormRender = function FormRender(props, ref) {
     setShopId(val);
     // 清空表单字段
     var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
-      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
+      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
         cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
       }
       return cur;
@@ -634,13 +653,14 @@ var FormRender = function FormRender(props, ref) {
     }
     //如果有bs组件 设置成初始值
     var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
-      return ['BS_LOGISTICS', 'BS_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'].includes(item.workOrderComponentType);
+      return ['BS_LOGISTICS', 'BS_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'].includes(item.workOrderComponentType);
     });
     if (hasBs) {
       var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
         switch (next.workOrderComponentType) {
           case 'BS_LOGISTICS':
           case 'WLN_LOGISTICS':
+          case 'WDT_LOGISTICS':
             prv[next.uniqueKey] = [{
               logisticsCompany: null,
               logisticsCode: null
@@ -648,6 +668,7 @@ var FormRender = function FormRender(props, ref) {
             break;
           case 'BS_SEND_GOOD':
           case 'WLN_SEND_GOOD':
+          case 'WDT_SEND_GOOD':
             prv[next.uniqueKey] = [{
               sendName: '',
               sendId: ''

package/dist/esm/FlowTemplateDetail/index.js

@@ -20,7 +20,7 @@ import { get, find, isEmpty } from 'lodash';
 import { useDispatch, useSelector, Provider, batch } from 'react-redux';
 import store from "../model/store";
 import zhCN from 'antd/es/locale/zh_CN';
-import { AddressData, ExpressData, ExpressInterceptData, PlatData, BsAddressData } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, ExpressInterceptData, PlatData, BsAddressData, WdtAddressData } from '@kmkf-fe-packages/kmkf-utils';
 import { calcWorkOrderList, deleteCacheOrder } from "../common/utils/tools";
 import { setPlat, fetchPanelInfo, fetchAllFlowOperateRecord, setAction, setVisibleRemarkList, setAddRemarkVisible, setLoading, setClearStore } from "../model/flowTemplateDetail";
 import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType } from "../model/flowTemplateDetail/selector";
@@ -144,6 +144,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     ExpressInterceptData.getInstance();
     PlatData.getInstance();
     BsAddressData.getInstance();
+    WdtAddressData.getInstance();
   };
   var onUpdateRemark = function onUpdateRemark(remark) {
     var flag = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';

package/dist/esm/WorkOrder/index.js

@@ -22,7 +22,7 @@ import { fetchQueryCurrentCompanyUser } from "../model/workOrder";
 import { fetchLogicFlowList } from "../model/logicFlow";
 import { setCurrentBuyerChecked, showPayment } from "../model/customizeWorkOrder";
 import store from "../model/store";
-import { AddressData, BsAddressData } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData } from '@kmkf-fe-packages/kmkf-utils';
 import OrderList from "./components/WorkOrderList";
 import Reminder from "./components/Reminder";
 import PaymentWorkOrderList from "./components/PaymentWorkOrderList";
@@ -113,6 +113,7 @@ var WorkOrder = function WorkOrder(props) {
     // ExpressData.getInstance();
     AddressData.getInstance().initData();
     BsAddressData.getInstance().initData();
+    WdtAddressData.getInstance().initData();
     // ExpressInterceptData.getInstance();
   };
   //判断是否店铺是否授权

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

@@ -103,6 +103,7 @@ export declare const deleteCacheOrder: ({ templateList, values, nodeId, flowTemp
 }) => void;
 export declare const bsSystemOrderBackValues: ({ templateList, value, form }: any) => void;
 export declare const wlnSystemOrderBackValues: ({ templateList, value, form }: any) => void;
+export declare const wdtSystemOrderBackValues: ({ templateList, value, form }: any) => void;
 export declare const getMappingConfigByTemplateDetail: (templateDetail: {
     componentDtoList: any;
     uniqueKey: string;

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

@@ -19,9 +19,9 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { get, every, maxBy } from 'lodash';
 import V from 'voca';
-import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail } from "../../model/servers/api";
+import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail } from "../../model/servers/api";
 import moment from 'moment';
-import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
 import { cloneDeep, isEqual, set } from 'lodash';
 import Monitor from 'kmkf-monitor';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
@@ -644,7 +644,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         }),
         name: item.name
       });
-    } else if (['BS_LOGISTICS', 'WLN_LOGISTICS'].includes(item.workOrderComponentType)) {
+    } else if (['BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS'].includes(item.workOrderComponentType)) {
       var logisticsMap = {
         BS_LOGISTICS: {
           list: 'bsLogisticsList',
@@ -655,6 +655,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
           list: 'wlnLogisticsList',
           company: 'wlnLogisticsCompany',
           code: 'wlnLogisticsCode'
+        },
+        WDT_LOGISTICS: {
+          list: 'wdtLogisticsList',
+          company: 'wdtLogisticsCompany',
+          code: 'wdtLogisticsCode'
         }
       };
       var bsLogisticsList = get(nowData, "".concat(item.uniqueKey), []);
@@ -690,7 +695,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         }),
         name: item.name
       });
-    } else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD'].includes(item.workOrderComponentType)) {
+    } else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'].includes(item.workOrderComponentType)) {
       var sendGoodMap = {
         BS_SEND_GOOD: {
           list: 'bsSendGood',
@@ -701,6 +706,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
           list: 'wlnSendGood',
           id: 'wlnSendId',
           name: 'wlnSendName'
+        },
+        WDT_SEND_GOOD: {
+          list: 'wdtSendGood',
+          id: 'wdtSendId',
+          name: 'wdtSendName'
         }
       };
       var bsSendList = get(nowData, "".concat(item.uniqueKey), []);
@@ -764,16 +774,26 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         }),
         name: item.name
       });
-    } else if (item.workOrderComponentType === 'BS_GOODS') {
-      var bsGoods = get(nowData, "".concat(item.uniqueKey), {});
+    } else if (['BS_GOODS', 'WDT_GOODS'].includes(item.workOrderComponentType)) {
+      var gooodsMap = {
+        BS_GOODS: {
+          type: 'bsGoods',
+          shopCode: 'shopCode'
+        },
+        WDT_GOODS: {
+          type: 'wdtGoods',
+          shopCode: 'shopCode'
+        }
+      };
+      var goods = get(nowData, "".concat(item.uniqueKey), {});
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_bsGoods"),
-        content: bsGoods === null || bsGoods === void 0 ? void 0 : bsGoods.bsGoods,
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(gooodsMap[item.workOrderComponentType].type),
+        content: goods === null || goods === void 0 ? void 0 : goods[gooodsMap[item.workOrderComponentType].type],
         name: item.name
       });
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
-        content: (bsGoods === null || bsGoods === void 0 ? void 0 : bsGoods.shopCode) || '',
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(gooodsMap[item.workOrderComponentType].shopCode),
+        content: (goods === null || goods === void 0 ? void 0 : goods[gooodsMap[item.workOrderComponentType].shopCode]) || '',
         name: item.name
       });
     } else if (item.workOrderComponentType === 'BS_EXCHANGE_GOODS') {
@@ -826,21 +846,33 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
           name: item.name
         });
       }
-    } else if (item.workOrderComponentType === 'BS_REISSUE_GOODS') {
-      var bsReissue = get(nowData, "".concat(item.uniqueKey), {});
+    } else if (['BS_REISSUE_GOODS', 'WDT_REISSUE_GOODS'].includes(item.workOrderComponentType)) {
+      var reissueMap = {
+        BS_REISSUE_GOODS: {
+          type: 'bsReissueType',
+          goods: 'bsReissueGoods',
+          shopCode: 'shopCode'
+        },
+        WDT_REISSUE_GOODS: {
+          type: 'wdtReissueType',
+          goods: 'wdtReissueGoods',
+          shopCode: 'shopCode'
+        }
+      };
+      var reissue = get(nowData, "".concat(item.uniqueKey), {});
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_bsReissueType"),
-        content: bsReissue === null || bsReissue === void 0 ? void 0 : bsReissue.bsReissueType,
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(reissueMap[item.workOrderComponentType].type),
+        content: reissue === null || reissue === void 0 ? void 0 : reissue[reissueMap[item.workOrderComponentType].type],
         name: item.name
       });
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_bsReissueGoods"),
-        content: bsReissue === null || bsReissue === void 0 ? void 0 : bsReissue.bsReissueGoods,
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(reissueMap[item.workOrderComponentType].goods),
+        content: reissue === null || reissue === void 0 ? void 0 : reissue[reissueMap[item.workOrderComponentType].goods],
         name: item.name
       });
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
-        content: (bsReissue === null || bsReissue === void 0 ? void 0 : bsReissue.shopCode) || '',
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(reissueMap[item.workOrderComponentType].shopCode),
+        content: (reissue === null || reissue === void 0 ? void 0 : reissue.shopCode) || '',
         name: item.name
       });
     } else if (item.workOrderComponentType === 'BS_RETURN_GOODS') {
@@ -886,7 +918,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         content: get(nowData, "".concat(item.uniqueKey, ".postingReceiverMobile"), ''),
         name: item.name
       });
-    } else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER'].includes(item.workOrderComponentType)) {
+    } else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(item.workOrderComponentType)) {
       var systemOrderMap = {
         BS_SYSTEM_ORDER: {
           no: 'bsSystemOrderNo',
@@ -897,6 +929,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
           no: 'wlnSystemOrderNo',
           ids: 'wlnSystemSelectIds',
           order: 'wlnSystemShowOrder'
+        },
+        WDT_SYSTEM_ORDER: {
+          no: 'wdtSystemOrderNo',
+          ids: 'wdtSystemSelectIds',
+          order: 'wdtSystemShowOrder'
         }
       };
       var selectIds = get(nowData, "".concat(item.uniqueKey, ".selectIds"), '');
@@ -1068,9 +1105,12 @@ var transDataSource = function transDataSource(templateColumns) {
       } else if (nex.workOrderComponentType === 'FILE') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_file")], [])));
       } else if (nex.workOrderComponentType === 'POSTING') {
-        var address = [transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingProvince")]), transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingCity")])];
+        // PS: 旺店通收寄地址和其他的统一用code, 所以固定需要转，代码先保留
+        var needTrans = true;
+        // const needTrans = nex.componentConfig?.showField !== 'wdt'
+        var address = [needTrans ? transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingProvince")]) : item.jsonMap["".concat(nex.uniqueKey, "_postingProvince")], needTrans ? transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingCity")]) : item.jsonMap["".concat(nex.uniqueKey, "_postingCity")]];
         //兼容地址是只有省市的
-        var interceptDistrict = transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingDistrict")]);
+        var interceptDistrict = needTrans ? transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_postingDistrict")]) : item.jsonMap["".concat(nex.uniqueKey, "_postingDistrict")];
         interceptDistrict && address.push(interceptDistrict);
         address = every(address, function (item) {
           return !item;
@@ -1319,13 +1359,16 @@ var transDataSource = function transDataSource(templateColumns) {
           reason: '',
           systemOrderId: ''
         }])));
-      } else if (['BS_LOGISTICS', 'WLN_LOGISTICS'].includes(nex.workOrderComponentType)) {
+      } else if (['BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS'].includes(nex.workOrderComponentType)) {
         var LogisticsMap = {
           BS_LOGISTICS: {
             listKey: 'bsLogisticsList'
           },
           WLN_LOGISTICS: {
             listKey: 'wlnLogisticsList'
+          },
+          WDT_LOGISTICS: {
+            listKey: 'wdtLogisticsList'
           }
         };
         var _itemList7 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(LogisticsMap[nex.workOrderComponentType].listKey)], [{
@@ -1336,13 +1379,16 @@ var transDataSource = function transDataSource(templateColumns) {
           logisticsCompany: null,
           logisticsCode: null
         }]));
-      } else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD'].includes(nex.workOrderComponentType)) {
+      } else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'].includes(nex.workOrderComponentType)) {
         var sendGoodMap = {
           BS_SEND_GOOD: {
             list: 'bsSendGood'
           },
           WLN_SEND_GOOD: {
             list: 'wlnSendGood'
+          },
+          WDT_SEND_GOOD: {
+            list: 'wdtSendGood'
           }
         };
         var _itemList8 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(sendGoodMap[nex.workOrderComponentType].list)], [{
@@ -1367,11 +1413,19 @@ var transDataSource = function transDataSource(templateColumns) {
           postingReceiverName: item.jsonMap["".concat(nex.uniqueKey, "_bsPostingReceiverName")],
           postingReceiverMobile: item.jsonMap["".concat(nex.uniqueKey, "_bsPostingReceiverMobile")]
         }));
-      } else if (nex.workOrderComponentType === 'BS_GOODS') {
-        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
-          bsGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsGoods")], []),
-          shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
-        }));
+      } else if (['BS_GOODS', 'WDT_GOODS'].includes(nex.workOrderComponentType)) {
+        var _$concat;
+        var gooodsMap = {
+          BS_GOODS: {
+            type: 'bsGoods',
+            shopCode: 'shopCode'
+          },
+          WDT_GOODS: {
+            type: 'wdtGoods',
+            shopCode: 'shopCode'
+          }
+        };
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), (_$concat = {}, _defineProperty(_$concat, gooodsMap[nex.workOrderComponentType].type, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(gooodsMap[nex.workOrderComponentType].type)], [])), _defineProperty(_$concat, gooodsMap[nex.workOrderComponentType].shopCode, item.jsonMap["".concat(nex.uniqueKey, "_").concat(gooodsMap[nex.workOrderComponentType].shopCode)]), _$concat)));
       } else if (nex.workOrderComponentType === 'BS_REISSUE_GOODS') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
           bsReissueType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReissueType")], []),
@@ -1426,7 +1480,7 @@ var transDataSource = function transDataSource(templateColumns) {
           bsReturnGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnGoods")], []),
           shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
         }));
-      } else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
+      } else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
         var systemOrderMap = {
           BS_SYSTEM_ORDER: {
             no: 'bsSystemOrderNo',
@@ -1437,6 +1491,11 @@ var transDataSource = function transDataSource(templateColumns) {
             no: 'wlnSystemOrderNo',
             ids: 'wlnSystemSelectIds',
             order: 'wlnSystemShowOrder'
+          },
+          WDT_SYSTEM_ORDER: {
+            no: 'wdtSystemOrderNo',
+            ids: 'wdtSystemSelectIds',
+            order: 'wdtSystemShowOrder'
           }
         };
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
@@ -1484,6 +1543,12 @@ var transDataSource = function transDataSource(templateColumns) {
           wlnGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wlnGoods")], []),
           shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
         }));
+      } else if (nex.workOrderComponentType === 'WDT_REISSUE_GOODS') {
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
+          wdtReissueType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtReissueType")], []),
+          wdtReissueGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtReissueGoods")], []),
+          shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
+        }));
       }
     }, {});
   };
@@ -1505,7 +1570,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, _objectSpread69, _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, _objectSpread70, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1514,18 +1579,28 @@ export var orderBack = /*#__PURE__*/function () {
           JOIN_SHOP = shopList.find(function (item) {
             return !item.notJoin && item.shopId == shopId;
           }); //判断是否有百胜组件 有就请求bs订单接口
-          hasBs = HasFilterHandle(templateDetail, ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO']); //判断是否有万里牛组件 有就请求wln订单接口
+          hasBs = HasFilterHandle(templateDetail, ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO']); //判断是否有旺店通组件 有就请求wdt订单接口
+          hasWdt = HasFilterHandle(templateDetail, ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD'
+          // 'WDT_SIGNING_TIME',
+          // 'WDT_SEND_TIME',
+          // 'WDT_TRADE_PAYMENT_TIME',
+          // 'WDT_NET_RECEIPTS',
+          // 'WDT_PACKAGE_WEIGHT',
+          // 'WDT_DEPOSIT',
+          // 'WDT_POSTING',
+          // 'WDT_DELIVERY_NO',
+          ]); //判断是否有万里牛组件 有就请求wln订单接口
           hasWln = HasFilterHandle(templateDetail, ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']); //如果不是对接店铺且百胜组件都没有
-          if (!(!JOIN_SHOP && !hasBs && !hasWln)) {
-            _context.next = 6;
+          if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt)) {
+            _context.next = 7;
             break;
           }
           return _context.abrupt("return");
-        case 6:
+        case 7:
           _ref3 = shopList.find(function (item) {
             return item.shopId == shopId;
           }) || {}, shopSourceStr = _ref3.shopSourceStr, _ref3$thirdUserNick = _ref3.thirdUserNick, thirdUserNick = _ref3$thirdUserNick === void 0 ? '' : _ref3$thirdUserNick;
-          _context.prev = 7;
+          _context.prev = 8;
           promise = [];
           if (!JOIN_SHOP) {
             promise.push(new Promise(function (resolve) {
@@ -1576,21 +1651,32 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             }));
           }
-          _context.next = 16;
+          if (hasWdt) {
+            promise.push(wdtOrderDetail({
+              billNo: order_no
+            }));
+          } else {
+            promise.push(new Promise(function (resolve) {
+              resolve([]);
+            }));
+          }
+          _context.next = 18;
           return Promise.allSettled(promise);
-        case 16:
+        case 18:
           _yield$Promise$allSet = _context.sent;
-          _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 4);
+          _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 5);
           data = _yield$Promise$allSet2[0];
           jstOrder = _yield$Promise$allSet2[1];
           bsOrder = _yield$Promise$allSet2[2];
           wlnOrder = _yield$Promise$allSet2[3];
+          wdtOrder = _yield$Promise$allSet2[4];
           orderInfo = (data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.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) || {};
+          wdtOrders = (wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data) || {};
           Monitor.automaticReport({
-            message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, ", \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo), ",jst\u4FE1\u606F:").concat(JSON.stringify(jstInfo), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders))
+            message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, ", \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo), ",jst\u4FE1\u606F:").concat(JSON.stringify(jstInfo), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders), ",wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders))
           });
           if (plat !== null && plat !== void 0 && plat.subOrderNo) {
             bsOrders.orders = bsOrders.orders.filter(function (item) {
@@ -1599,6 +1685,7 @@ export var orderBack = /*#__PURE__*/function () {
           }
           bsInfo = bsOrderTransform(bsOrders || {});
           wlnInfo = wlnOrderTransform(wlnOrders || {});
+          wdtInfo = wdtOrderTransform(wdtOrders || {});
           if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
             bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
               bsGoods: []
@@ -1628,13 +1715,23 @@ export var orderBack = /*#__PURE__*/function () {
               sendName: ''
             }];
           }
+          // if (wdtOrders?.orders?.length > 1) {
+          //   wdtInfo.bsGoods = {
+          //     ...wdtInfo.bsGoods,
+          //     bsGoods: [],
+          //   };
+          //   wdtInfo.bsLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
+          //   wdtInfo.bsSendGood = [{ sendId: '', sendName: '' }];
+          //   wdtInfo.bsDeliveryNo = [{ deliveryNo: '' }];
+          // }
 
           //获取当前表单字段
           formValue = form.getFieldsValue();
           detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
             jstItemList: jstInfo,
             bsOrder: bsInfo,
-            wlnOrder: wlnInfo
+            wlnOrder: wlnInfo,
+            wdtOrder: wdtInfo
           }); //抖音数据特殊处理
           if (shopSourceStr === 'FXG') {
             detail = updateDYDetails(detail);
@@ -1645,7 +1742,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 50;
+            _context.next = 55;
             break;
           }
           list = detail['itemList'];
@@ -1663,10 +1760,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 40;
-          _context.next = 43;
+          _context.prev = 45;
+          _context.next = 48;
           return Promise.all(promises);
-        case 43:
+        case 48:
           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), {}, {
@@ -1676,13 +1773,13 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 50;
+          _context.next = 55;
           break;
-        case 47:
-          _context.prev = 47;
-          _context.t0 = _context["catch"](40);
+        case 52:
+          _context.prev = 52;
+          _context.t0 = _context["catch"](45);
           console.error('调用erp获取宝贝编码错误', _context.t0);
-        case 50:
+        case 55:
           // console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
@@ -1707,23 +1804,23 @@ 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), {}, (_objectSpread69 = {}, _defineProperty(_objectSpread69, order_no, values), _defineProperty(_objectSpread69, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread69))));
+              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))));
             }
           }
           // console.log('orderback', values);
           form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 59;
+          _context.next = 64;
           break;
-        case 56:
-          _context.prev = 56;
-          _context.t1 = _context["catch"](7);
+        case 61:
+          _context.prev = 61;
+          _context.t1 = _context["catch"](8);
           console.error(_context.t1);
-        case 59:
+        case 64:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[7, 56], [40, 47]]);
+    }, _callee, null, [[8, 61], [45, 52]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -2027,6 +2124,7 @@ export var reversalFormValues = function reversalFormValues() {
       case 'BS_REISSUE_GOODS':
       case 'BS_EXCHANGE_GOODS':
       case 'BS_RETURN_GOODS':
+      case 'WDT_REISSUE_GOODS':
         prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
         break;
       case 'BS_DELIVERY_NO':
@@ -2041,6 +2139,10 @@ export var reversalFormValues = function reversalFormValues() {
       case 'EXCHANGE_TRADE_ID':
         prv["".concat(next.uniqueKey, "_tradeItemList")] = JSON.stringify(values[next.uniqueKey] || []);
         break;
+      case 'WDT_GOODS':
+        prv["".concat(next.uniqueKey, "_wdtGoods")] = JSON.stringify(values[next.uniqueKey]['wdtGoods']);
+        prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
+        break;
     }
     return prv;
   }, {});
@@ -2121,6 +2223,29 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref7) {
   form.setFieldsValue(values);
 };
 
+// wdt商品信息返填
+export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref8) {
+  var _templateList$compone3;
+  var templateList = _ref8.templateList,
+    value = _ref8.value,
+    form = _ref8.form;
+  //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
+  if (!(value !== null && value !== void 0 && value.selectedRows)) return;
+  var wdtGoodsComponent = (_templateList$compone3 = templateList.componentDtoList) === null || _templateList$compone3 === void 0 ? void 0 : _templateList$compone3.filter(function (item) {
+    return ['WDT_GOODS', 'WDT_DELIVERY_NO', 'WDT_SEND_GOOD', 'WDT_LOGISTICS'].includes(item.workOrderComponentType);
+  });
+  if (!(wdtGoodsComponent !== null && wdtGoodsComponent !== void 0 && wdtGoodsComponent.length)) return;
+  var wdtGoodsValue = form.getFieldValue(wdtGoodsComponent[0].uniqueKey);
+  var orderInfo = wdtOrderTransform({
+    trades: value.selectedRows,
+    shopCode: wdtGoodsValue.shopCode
+  });
+  var values = wdtOrderBackFormValues(orderInfo, {
+    componentDtoList: wdtGoodsComponent
+  });
+  form.setFieldsValue(values);
+};
+
 // 获取映射关系
 export var getMappingConfigByTemplateDetail = function getMappingConfigByTemplateDetail(templateDetail) {
   var readonlyComponents = {};
@@ -2195,12 +2320,12 @@ export var transformWorkOrderDetail = function transformWorkOrderDetail(detail)
 };
 
 // 返填物流轨迹信息
-export var setLogisticsInfo = function setLogisticsInfo(_ref8) {
-  var logisticsMappingConfig = _ref8.logisticsMappingConfig,
-    uniqueKey = _ref8.uniqueKey,
-    workOrderComponentType = _ref8.workOrderComponentType,
-    value = _ref8.value,
-    form = _ref8.form;
+export var setLogisticsInfo = function setLogisticsInfo(_ref9) {
+  var logisticsMappingConfig = _ref9.logisticsMappingConfig,
+    uniqueKey = _ref9.uniqueKey,
+    workOrderComponentType = _ref9.workOrderComponentType,
+    value = _ref9.value,
+    form = _ref9.form;
   var values = logisticsMappingConfig.reduce(function (prv, next) {
     var logisticsValues = form.getFieldValue(next.uniqueKey);
     var componentConfig = next.componentConfig;

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

@@ -59,6 +59,7 @@ export declare const queryAllWorkOrderList: (s: string, data: any) => Promise<an
 export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
 export declare const jstOrderDetail: (data: any) => Promise<any>;
 export declare const bsOrderDetail: (data: any) => Promise<any>;
+export declare const wdtOrderDetail: (data: any) => Promise<any>;
 export declare const getRepeatWorkOrderList: (data: any) => Promise<any>;
 export declare const logisticsInterceptCancel: (data: any) => Promise<any>;
 export declare const queryLogisticsTrack: (data: any) => Promise<any>;

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

@@ -370,6 +370,16 @@ export var bsOrderDetail = function bsOrderDetail(data) {
   });
 };
 
+// wdt订单详情
+export var wdtOrderDetail = function wdtOrderDetail(data) {
+  return request({
+    url: '/qy/gdfw/order/wdtOrderDetail',
+    method: 'post',
+    data: data,
+    infoLevel: 'warning'
+  });
+};
+
 // 获取重复详情
 export var getRepeatWorkOrderList = function getRepeatWorkOrderList(data) {
   return request({

package/package.json

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