@kmkf-fe-packages/kmkf-work-order-service-component 2.0.76 → 2.0.78

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

@@ -216,6 +216,20 @@ export declare const selectCurrentNodeDetail: (state: FlowTemplateDetailState) =
             deleted?: boolean | undefined;
         }[] | undefined;
     };
+    flowEventData?: {
+        eventData?: {
+            businessStatus?: {
+                businessKey: string;
+                businessStatus: number;
+                businessStatusDesc: string;
+                remark: string;
+            }[] | undefined;
+            otherBusinessData?: {
+                ruleName?: string | undefined;
+                passConditionList?: string[] | undefined;
+            } | undefined;
+        } | undefined;
+    } | undefined;
 } | undefined;
 export declare const selectTid: (state: FlowTemplateDetailState) => string;
 export declare const selectShopUniqueKey: (state: FlowTemplateDetailState) => string;

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 { fetchLogOut, fetchxzLogOut } from "../model/login";
+import { fetchxzLogOut } from "../model/login";
 import { Global } from '@kmkf-fe-packages/services-components';
 import moment from 'moment';
 import { LogoutOutlined } from '@ant-design/icons';
@@ -189,17 +189,33 @@ var WorkOrder = function WorkOrder(props) {
         cancelText: '取消',
         onOk: function onOk() {
           var parsed = getHashParams();
-          // console.log(parsed);
-          platform === PlatForm.XIAOZHI ? dispatch(fetchxzLogOut({
+          // if (platform === PlatForm.XIAOZHI) {
+          dispatch(fetchxzLogOut({
             thirdUserId: parsed === null || parsed === void 0 ? void 0 : parsed.thirdUserId,
             platform: parsed === null || parsed === void 0 ? void 0 : parsed.platform,
             taobaoNick: parsed === null || parsed === void 0 ? void 0 : parsed.taobaoNick,
             subUserNick: parsed === null || parsed === void 0 ? void 0 : parsed.subUserNick
-          })) : dispatch(fetchLogOut());
-          onEmpowerCallback === null || onEmpowerCallback === void 0 ? void 0 : onEmpowerCallback();
+          })).unwrap().then(function (res) {
+            var success = res.success;
+            if (success) {
+              console.log('xzlogOut3');
+              onEmpowerCallback === null || onEmpowerCallback === void 0 ? void 0 : onEmpowerCallback();
+            }
+          });
+          // } else {
+          // dispatch(fetchLogOut())
+          //   .unwrap()
+          //   .then((res: { success: boolean }) => {
+          //     const { success } = res;
+          //     if (success) {
+          //       onEmpowerCallback?.();
+          //     }
+          //   });
+          // }
         }
       });
     };
+
     return /*#__PURE__*/React.createElement("div", {
       className: "userInfo"
     }, /*#__PURE__*/React.createElement("div", {

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

@@ -137,7 +137,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, _kmVideoComponent$com, _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, kmVideoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, kmVideoOrder, _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;
+    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, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _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, kmVideoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, kmVideoOrder, _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:
@@ -290,56 +290,58 @@ export var orderBack = /*#__PURE__*/function () {
           if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
             message.warning(data === null || data === void 0 ? void 0 : (_data$value2 = data.value) === null || _data$value2 === void 0 ? void 0 : _data$value2.message);
           }
-          orderInfo = getBasicsOrderInfo(data === null || data === void 0 ? void 0 : (_data$value3 = data.value) === null || _data$value3 === void 0 ? void 0 : _data$value3.data, xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value); //千牛端优先获取端上买家昵称
-          if ([PlatForm.TB].includes(plat.platform)) {
+          orderInfo = ((data === null || data === void 0 ? void 0 : (_data$value3 = data.value) === null || _data$value3 === void 0 ? void 0 : _data$value3.data) || (xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value)) && getBasicsOrderInfo(data === null || data === void 0 ? void 0 : (_data$value4 = data.value) === null || _data$value4 === void 0 ? void 0 : _data$value4.data, xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value); //千牛端优先获取端上买家昵称
+          if ([PlatForm.TB].includes(plat.platform) && orderInfo) {
             orderInfo.buyerNick = (plat === null || plat === void 0 ? void 0 : plat.buyerNick) || (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerNick);
           }
-          jstOrders = jstOrder !== null && jstOrder !== void 0 && (_jstOrder$value = jstOrder.value) !== null && _jstOrder$value !== void 0 && _jstOrder$value.data ? {
+          jstOrders = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : _jstOrder$value.data) && {
             orderList: jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value2 = jstOrder.value) === null || _jstOrder$value2 === void 0 ? void 0 : _jstOrder$value2.data
-          } : {};
-          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) || {};
-          bsE3Orders = (bsE3Order === null || bsE3Order === void 0 ? void 0 : (_bsE3Order$value = bsE3Order.value) === null || _bsE3Order$value === void 0 ? void 0 : _bsE3Order$value.data) || {};
-          kmOrders = (kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data) || {};
-          gyOrders = (gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data) || [];
-          bsE3Orders.orderList = filterBsE3Orders(bsE3Orders, order_no);
-          wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
-          kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
-          gyOrders.trades = filterGyOrders(gyOrders, order_no);
-          jstOrders.trades = filterJstOrders(jstOrders, order_no);
+          } || null;
+          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;
+          bsE3Orders = bsE3Order === null || bsE3Order === void 0 ? void 0 : (_bsE3Order$value = bsE3Order.value) === null || _bsE3Order$value === void 0 ? void 0 : _bsE3Order$value.data;
+          kmOrders = kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data;
+          gyOrders = gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data;
+          if (bsE3Orders) bsE3Orders.orderList = filterBsE3Orders(bsE3Orders, order_no);
+          if (wdtOrders) wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
+          if (kmOrders) kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
+          if (gyOrders) gyOrders.trades = filterGyOrders(gyOrders, order_no);
+          if (jstOrders) jstOrders.trades = filterJstOrders(jstOrders, order_no);
           pushGyLog('gyOrders', gyOrders);
           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(jstOrders), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders), ",wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders), ",\n      bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders), ", km\u4FE1\u606F:").concat(JSON.stringify(kmOrders), ",\u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders))
+            message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\n        \u5E97\u94FAid:").concat(shopId, ",\n        \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo || {}), ",\n        jst\u4FE1\u606F:").concat(JSON.stringify(jstOrders || {}), ",\n        bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders || {}), ",\n        wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders || {}), ",\n        wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders || {}), ",\n        bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders || {}), ",\n        km\u4FE1\u606F:").concat(JSON.stringify(kmOrders || {}), ",\n        \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n      ")
           });
-          if (plat !== null && plat !== void 0 && plat.subOrderNo) {
+          if (bsOrders && plat !== null && plat !== void 0 && plat.subOrderNo) {
             bsOrders.orders = bsOrders.orders.filter(function (item) {
               return item.billNo === plat.subOrderNo;
             });
           }
-          bsInfo = bsOrderTransform({
+          bsInfo = bsOrders && bsOrderTransform({
             detail: bsOrders || {}
           });
-          wlnInfo = wlnOrderTransform(wlnOrders || {});
-          bsE3Info = bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
+          wlnInfo = wlnOrders && wlnOrderTransform(wlnOrders || {});
+          bsE3Info = bsE3Orders && bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
-          wdtInfo = wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
+          wdtInfo = wdtOrders && wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
-          kmInfo = kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
+          kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
             order_no: order_no,
             componentList: templateDetail.componentDtoList
           }), form);
-          kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
-          gyInfo = gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
+          if (kmInfo) {
+            kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
+          }
+          gyInfo = gyOrders && gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
           pushGyLog('gyInfo', gyInfo);
-          jstInfo = jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
+          jstInfo = jstOrders && jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
@@ -443,7 +445,7 @@ export var orderBack = /*#__PURE__*/function () {
 
           //获取当前表单字段
           formValue = form.getFieldsValue();
-          detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
+          detail = _objectSpread(_objectSpread({}, orderInfo || {}), {}, {
             jstOrder: jstInfo,
             bsOrder: bsInfo,
             wlnOrder: wlnInfo,
@@ -454,6 +456,10 @@ export var orderBack = /*#__PURE__*/function () {
           });
           pushGyLog('detail', detail);
           //抖音数据特殊处理
+          if (!orderInfo) {
+            _context.next = 118;
+            break;
+          }
           if (shopSourceStr === 'FXG') {
             detail = updateDYDetails(detail);
           } else if (shopSourceStr === 'SPH' || shopSourceStr === 'WXXD') {
@@ -463,7 +469,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 101;
+            _context.next = 102;
             break;
           }
           list = detail['itemList'];
@@ -481,10 +487,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 91;
-          _context.next = 94;
+          _context.prev = 92;
+          _context.next = 95;
           return Promise.all(promises);
-        case 94:
+        case 95:
           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), {}, {
@@ -494,25 +500,25 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 101;
+          _context.next = 102;
           break;
-        case 98:
-          _context.prev = 98;
-          _context.t1 = _context["catch"](91);
+        case 99:
+          _context.prev = 99;
+          _context.t1 = _context["catch"](92);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 101:
+        case 102:
           // 判断是否存在签收时间组件
           hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
           if (!hasSigningDatetime) {
-            _context.next = 117;
+            _context.next = 118;
             break;
           }
           if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
-            _context.next = 116;
+            _context.next = 117;
             break;
           }
-          _context.prev = 104;
-          _context.next = 107;
+          _context.prev = 105;
+          _context.next = 108;
           return request({
             url: '/qy/logistics/logisticsSignTime',
             method: 'post',
@@ -522,23 +528,24 @@ export var orderBack = /*#__PURE__*/function () {
               mailNo: orderInfo.expressLogisticsCode
             }
           });
-        case 107:
+        case 108:
           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 = 114;
+          _context.next = 115;
           break;
-        case 111:
-          _context.prev = 111;
-          _context.t2 = _context["catch"](104);
+        case 112:
+          _context.prev = 112;
+          _context.t2 = _context["catch"](105);
           console.error('调用签收时间错误', _context.t2);
-        case 114:
-          _context.next = 117;
+        case 115:
+          _context.next = 118;
           break;
-        case 116:
-          detail['tradeSigningDateTime'] = '';
         case 117:
+          detail['tradeSigningDateTime'] = '';
+        case 118:
           values = orderBackFormValues({
             detail: detail,
+            _get_order_fail_: !orderInfo,
             order_no: order_no,
             formValue: formValue,
             templateDetail: templateDetail,
@@ -580,21 +587,21 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 128;
+          _context.next = 129;
           break;
-        case 125:
-          _context.prev = 125;
+        case 126:
+          _context.prev = 126;
           _context.t3 = _context["catch"](25);
           console.error(_context.t3);
-        case 128:
-          _context.prev = 128;
+        case 129:
+          _context.prev = 129;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(128);
-        case 131:
+          return _context.finish(129);
+        case 132:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 12, 15, 18], [25, 125, 128, 131], [91, 98], [104, 111]]);
+    }, _callee, null, [[5, 12, 15, 18], [25, 126, 129, 132], [92, 99], [105, 112]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);

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

@@ -160,6 +160,11 @@ var processPicturePro = function processPicturePro(getValue) {
     }) : (config === null || config === void 0 ? void 0 : config.pictureProList) || []);
   };
 };
+var wdtTags = function wdtTags(getValue) {
+  return function (nex, config) {
+    return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wdtTags")), []));
+  };
+};
 var processBasicMultSelect = function processBasicMultSelect(getValue) {
   return function (nex, config) {
     var v = getValue("".concat(nex.uniqueKey, "_basicMultSelect"));
@@ -210,20 +215,20 @@ var processSubForm = function processSubForm(getValue) {
 };
 var processExpressLogisticsSelect = function processExpressLogisticsSelect(getValue) {
   return function (nex, config) {
-    var _ref22;
-    return _ref22 = {}, _defineProperty(_ref22, nex.uniqueKey, {
+    var _ref23;
+    return _ref23 = {}, _defineProperty(_ref23, nex.uniqueKey, {
       company: getValue("".concat(nex.uniqueKey, "_expressLogisticsCompany")),
       order: getValue("".concat(nex.uniqueKey, "_expressLogisticsCode"))
-    }), _defineProperty(_ref22, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), getValue("".concat(nex.uniqueKey, "_expressLogisticsCompany"))), _defineProperty(_ref22, "".concat(nex.uniqueKey, "_expressLogisticsCode"), getValue("".concat(nex.uniqueKey, "_expressLogisticsCode"))), _ref22;
+    }), _defineProperty(_ref23, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), getValue("".concat(nex.uniqueKey, "_expressLogisticsCompany"))), _defineProperty(_ref23, "".concat(nex.uniqueKey, "_expressLogisticsCode"), getValue("".concat(nex.uniqueKey, "_expressLogisticsCode"))), _ref23;
   };
 };
 var processReturnLogisticsSelect = function processReturnLogisticsSelect(getValue) {
   return function (nex, config) {
-    var _ref23;
-    return _ref23 = {}, _defineProperty(_ref23, nex.uniqueKey, {
+    var _ref24;
+    return _ref24 = {}, _defineProperty(_ref24, nex.uniqueKey, {
       company: getValue("".concat(nex.uniqueKey, "_returnLogisticsCompany")),
       order: getValue("".concat(nex.uniqueKey, "_returnLogisticsCode"))
-    }), _defineProperty(_ref23, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), getValue("".concat(nex.uniqueKey, "_returnLogisticsCompany"))), _defineProperty(_ref23, "".concat(nex.uniqueKey, "_returnLogisticsCode"), getValue("".concat(nex.uniqueKey, "_returnLogisticsCode"))), _ref23;
+    }), _defineProperty(_ref24, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), getValue("".concat(nex.uniqueKey, "_returnLogisticsCompany"))), _defineProperty(_ref24, "".concat(nex.uniqueKey, "_returnLogisticsCode"), getValue("".concat(nex.uniqueKey, "_returnLogisticsCode"))), _ref24;
   };
 };
 var processRemarkInput = function processRemarkInput(getValue) {
@@ -238,25 +243,25 @@ var processRemarkInput = function processRemarkInput(getValue) {
 };
 var processStatus = function processStatus(getValue) {
   return function (nex, config) {
-    var _ref25;
+    var _ref26;
     var customerService = getValue("".concat(nex.uniqueKey, "_customerService"));
-    return _ref25 = {}, _defineProperty(_ref25, nex.uniqueKey, {
+    return _ref26 = {}, _defineProperty(_ref26, nex.uniqueKey, {
       status: getValue("".concat(nex.uniqueKey, "_status")) || (config === null || config === void 0 ? void 0 : config.status),
       customerService: jsonParseSecurity(customerService, customerService)
-    }), _defineProperty(_ref25, "".concat(nex.uniqueKey, "_processTime"), getValue('processTime')), _defineProperty(_ref25, "".concat(nex.uniqueKey, "_lastProcessingTime"), getValue('lastProcessingTime')), _ref25;
+    }), _defineProperty(_ref26, "".concat(nex.uniqueKey, "_processTime"), getValue('processTime')), _defineProperty(_ref26, "".concat(nex.uniqueKey, "_lastProcessingTime"), getValue('lastProcessingTime')), _ref26;
   };
 };
 var processOrdinaryInvoice = function processOrdinaryInvoice(getValue) {
   return function (nex, config) {
-    var _ref26;
+    var _ref27;
     var ordinaryMoney = getValue("".concat(nex.uniqueKey, "_ordinaryMoney"));
     var ordinarySerial = getValue("".concat(nex.uniqueKey, "_ordinarySerial"));
     var ordinaryTaitou = getValue("".concat(nex.uniqueKey, "_ordinaryTaitou"));
-    return _ref26 = {}, _defineProperty(_ref26, nex.uniqueKey, {
+    return _ref27 = {}, _defineProperty(_ref27, nex.uniqueKey, {
       ordinaryMoney: ordinaryMoney,
       ordinarySerial: ordinarySerial,
       ordinaryTaitou: ordinaryTaitou
-    }), _defineProperty(_ref26, "".concat(nex.uniqueKey, "_ordinaryMoney"), ordinaryMoney ? Number(ordinaryMoney).toFixed(2) : null), _defineProperty(_ref26, "".concat(nex.uniqueKey, "_ordinarySerial"), ordinarySerial), _defineProperty(_ref26, "".concat(nex.uniqueKey, "_ordinaryTaitou"), ordinaryTaitou), _ref26;
+    }), _defineProperty(_ref27, "".concat(nex.uniqueKey, "_ordinaryMoney"), ordinaryMoney ? Number(ordinaryMoney).toFixed(2) : null), _defineProperty(_ref27, "".concat(nex.uniqueKey, "_ordinarySerial"), ordinarySerial), _defineProperty(_ref27, "".concat(nex.uniqueKey, "_ordinaryTaitou"), ordinaryTaitou), _ref27;
   };
 };
 var processLogisticsInterception = function processLogisticsInterception(getValue) {
@@ -313,12 +318,12 @@ var processItemSelectThird = function processItemSelectThird(getValue) {
 };
 var processEnterPrisePayment = function processEnterPrisePayment(getValue) {
   return function (nex, config) {
-    var _ref33;
+    var _ref34;
     var subFields = ['enterprisePaymentAlipayNick', 'enterprisePaymentAlipayNo', 'enterprisePaymentBuyerNick', 'enterprisePaymentBuyerOpenUid', 'enterprisePaymentRefundFee', 'enterprisePaymentStatus', 'enterprisePaymentTid'];
     var map = subFields.reduce(function (cur, nxt) {
       return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
     }, {});
-    return _ref33 = {}, _defineProperty(_ref33, nex.uniqueKey, map), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentStatus"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTime"))), _defineProperty(_ref33, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTid"))), _ref33;
+    return _ref34 = {}, _defineProperty(_ref34, nex.uniqueKey, map), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentStatus"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTime"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTid"))), _ref34;
   };
 };
 var processJstLogistics = function processJstLogistics(getValue) {
@@ -994,14 +999,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
 };
 var processLabel = function processLabel(getValue) {
   return function (nex, config) {
-    var _ref69;
-    return _ref69 = {}, _defineProperty(_ref69, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref69, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref69;
+    var _ref70;
+    return _ref70 = {}, _defineProperty(_ref70, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref70, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref70;
   };
 };
 var processMemberLevel = function processMemberLevel(getValue) {
   return function (nex, config) {
-    var _ref70;
-    return _ref70 = {}, _defineProperty(_ref70, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref70, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref70;
+    var _ref71;
+    return _ref71 = {}, _defineProperty(_ref71, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref71, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref71;
   };
 };
 var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -1170,7 +1175,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns),
       ACTUAL_RECEIPT_PAYMENT: processSingleField,
       WDT_SHOP: processSingleField,
-      KM_VIDEO: processKmVideo
+      KM_VIDEO: processKmVideo,
+      WDT_TAGS: wdtTags
     };
     return templateColumns.reduce(function (cur, nex) {
       var _componentProcessors;

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

@@ -6,6 +6,7 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectorDealerModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectorCompanyUserList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").CompanyUserListI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").CompanyUserListI[], {
     clearCache: () => void;
 }> & {
@@ -45,6 +48,7 @@ export declare const selectorSelectedCompanyUserList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {
@@ -58,6 +62,7 @@ export declare const selectorModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -71,6 +76,7 @@ export declare const selectorLogModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -84,6 +90,7 @@ export declare const selectorFormModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -97,6 +104,7 @@ export declare const selectorTemplateId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -110,6 +118,7 @@ export declare const selectorLogicFlowId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -123,6 +132,7 @@ export declare const selectorFlowWorkOrderId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -136,6 +146,7 @@ export declare const selectorCurrentShopId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -149,6 +160,7 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -162,6 +174,7 @@ export declare const selectorCurrentBuyerChecked: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -175,6 +188,7 @@ export declare const selectorAllTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").ComponentColumnsT[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").ComponentColumnsT[], {
     clearCache: () => void;
 }> & {
@@ -188,6 +202,7 @@ export declare const selectRepeatVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -201,6 +216,7 @@ export declare const selectRepeatWorkOrderConditions: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").ConditionsT) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").ConditionsT, {
     clearCache: () => void;
 }> & {
@@ -214,6 +230,7 @@ export declare const selectCancelInterceptionModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -227,6 +244,7 @@ export declare const selectShowPayment: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

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

@@ -6,6 +6,7 @@ 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;
 }> & {
@@ -19,6 +20,7 @@ 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;
 }> & {
@@ -32,6 +34,7 @@ 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/dist/esm/model/login.js

@@ -102,7 +102,7 @@ export var fetchLogOut = createAsyncThunk('login/logOut', /*#__PURE__*/_asyncToG
         return logOut();
       case 2:
         response = _context4.sent;
-        return _context4.abrupt("return", response.data);
+        return _context4.abrupt("return", response);
       case 4:
       case "end":
         return _context4.stop();
@@ -136,12 +136,14 @@ export var fetchxzLogOut = createAsyncThunk('login/xzlogOut', /*#__PURE__*/funct
     return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          _context6.next = 2;
+          console.log('xzlogOut1');
+          _context6.next = 3;
           return xzLogOut(data);
-        case 2:
+        case 3:
           response = _context6.sent;
-          return _context6.abrupt("return", response.data);
-        case 4:
+          console.log('xzlogOut2');
+          return _context6.abrupt("return", response);
+        case 6:
         case "end":
           return _context6.stop();
       }