@kmkf-fe-packages/kmkf-work-order-service-component 2.0.54-beta.4 → 2.0.54-beta.41

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

@@ -30,7 +30,7 @@ import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
 INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
-import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel } from "../../../model/servers/api";
+import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel, queryTidByOutSid } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
 import ShopName from "../ShopName";
@@ -704,32 +704,51 @@ var FormRender = function FormRender(props, ref) {
   }();
 
   //订单返填
-  var changeHandle = function changeHandle(order_no) {
-    if (!order_no) return;
-    // console.log('[订单返填 changeHandle order_no ] >', order_no);
+  var changeHandle = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(order_no) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            if (order_no) {
+              _context4.next = 2;
+              break;
+            }
+            return _context4.abrupt("return");
+          case 2:
+            // console.log('[订单返填 changeHandle order_no ] >', order_no);
 
-    sessionStorage.setItem('order_no_test', order_no);
-    orderBack({
-      order_no: order_no,
-      form: form,
-      shopId: shopId,
-      shopList: shopList,
-      templateDetail: templateDetail,
-      type: workOrderId ? 'edit' : 'add',
-      callback: orderBackReplace,
-      fromQNCreateWorkOrderByOrderNo: false,
-      plat: plat,
-      callbackShopId: function callbackShopId(id) {
-        setIsOrderBackShopId(true);
-        setTimeout(function () {
-          setShopId(id);
-          fillByShopId(id);
-        }, 0);
-      },
-      callKey: 3,
-      setLoading: setLoading
-    });
-  };
+            sessionStorage.setItem('order_no_test', order_no);
+            _context4.next = 5;
+            return orderBack({
+              order_no: order_no,
+              form: form,
+              shopId: shopId,
+              shopList: shopList,
+              templateDetail: templateDetail,
+              type: workOrderId ? 'edit' : 'add',
+              callback: orderBackReplace,
+              fromQNCreateWorkOrderByOrderNo: false,
+              plat: plat,
+              callbackShopId: function callbackShopId(id) {
+                setIsOrderBackShopId(true);
+                setTimeout(function () {
+                  setShopId(id);
+                  fillByShopId(id);
+                }, 0);
+              },
+              callKey: 3,
+              setLoading: setLoading
+            });
+          case 5:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function changeHandle(_x8) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
   // 组件值变化
   var componentOnValueChange = function componentOnValueChange(uniqueKey, value, workOrderComponentType) {
     if (mappingConfig.config[uniqueKey]) {
@@ -798,41 +817,115 @@ var FormRender = function FormRender(props, ref) {
 
   //组件失焦事件
   var componentOnBlur = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(value, type) {
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(value, type) {
+      var hasTradeIdComponent, _res$data4, hasKm, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, companyUserConfig, oldValue, res, tradeId, blurPromise, promises;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
+            hasTradeIdComponent = templateDetail.componentDtoList.some(function (item) {
+              return item.workOrderComponentType === 'TRADE_ID_INPUT';
+            });
+            if (!(type === 'expressLogisticsCode' && hasTradeIdComponent)) {
+              _context5.next = 21;
+              break;
+            }
+            hasKm = false;
+            try {
+              userInfo = JSON.parse(localStorage.getItem('reduxData_userInfo') || '{}');
+              if (isNull(userInfo)) {
+                hasKm = true;
+              } else {
+                companyUserConfig = (_userInfo$companyUser = userInfo === null || userInfo === void 0 ? void 0 : userInfo.companyUserConfig) !== null && _userInfo$companyUser !== void 0 ? _userInfo$companyUser : {};
+                if (typeof companyUserConfig === 'string') {
+                  companyUserConfig = JSON.parse(companyUserConfig);
+                }
+                hasKm = (_companyUserConfig$pl = (_companyUserConfig = companyUserConfig) === null || _companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl2 = _companyUserConfig.plugins) === null || _companyUserConfig$pl2 === void 0 ? void 0 : (_companyUserConfig$pl3 = _companyUserConfig$pl2.km) === null || _companyUserConfig$pl3 === void 0 ? void 0 : _companyUserConfig$pl3.show) !== null && _companyUserConfig$pl !== void 0 ? _companyUserConfig$pl : false;
+              }
+            } catch (error) {
+              console.error(error);
+            }
+            console.log('---组件失焦事件--expressLogisticsCode', {
+              type: type,
+              value: value,
+              templateDetail: templateDetail,
+              hasTradeIdComponent: hasTradeIdComponent,
+              oldValue: form.getFieldsValue(),
+              hasKm: hasKm,
+              form: form
+            });
+            if (hasKm) {
+              _context5.next = 7;
+              break;
+            }
+            return _context5.abrupt("return");
+          case 7:
+            oldValue = form.getFieldValue('0eVTfMGEyd');
+            _context5.next = 10;
+            return queryTidByOutSid({
+              outSid: value
+            });
+          case 10:
+            res = _context5.sent;
+            tradeId = res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.tid;
+            if (tradeId) {
+              _context5.next = 14;
+              break;
+            }
+            return _context5.abrupt("return");
+          case 14:
+            form.setFieldsValue({
+              m3ap1EvEyd: tradeId
+            });
+            // 创建一个异步操作的Promise
+            blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
+            _context5.next = 18;
+            return blurPromise;
+          case 18:
+            // 所有异步操作完成后执行
+            console.log('[组件失焦事件]---set', oldValue);
+            form.setFieldsValue({
+              '0eVTfMGEyd': oldValue
+            });
+            return _context5.abrupt("return");
+          case 21:
+            // 收集所有需要执行的异步操作
+            promises = [];
             if (type === 'tradeId') {
-              queryLabels(value, form.getFieldValue('shopId'));
-              queryMemberLevels(value, form.getFieldValue('shopId'));
+              promises.push(queryLabels(value, form.getFieldValue('shopId')));
+              promises.push(queryMemberLevels(value, form.getFieldValue('shopId')));
             }
             // 针对订单号组件进行当前订单查重校验
             if ((type === 'tradeId' || type === 'enterprisePaymentTid') && typeof handleChangeTradeId === 'function') {
-              handleChangeTradeId(value);
+              promises.push(handleChangeTradeId(value));
             }
             if (value) {
-              _context4.next = 6;
+              _context5.next = 28;
               break;
             }
             setReplaceValue(function (prev) {
               return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, type, 0));
             });
             replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), {}, _defineProperty({}, type, 0));
-            return _context4.abrupt("return");
-          case 6:
-            queryReplaceCount(_defineProperty({}, type, value), templateDetail);
+            return _context5.abrupt("return");
+          case 28:
+            promises.push(queryReplaceCount(_defineProperty({}, type, value), templateDetail));
             // TODO: ERP不走订单反弹逻辑
             if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
-              changeHandle(value);
+              promises.push(changeHandle(value));
             }
-          case 8:
+            // 等待所有异步操作完成
+            _context5.next = 32;
+            return Promise.all(promises);
+          case 32:
+            return _context5.abrupt("return", Promise.resolve());
+          case 33:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }));
-    return function componentOnBlur(_x8, _x9) {
-      return _ref5.apply(this, arguments);
+    return function componentOnBlur(_x9, _x10) {
+      return _ref6.apply(this, arguments);
     };
   }();
   // 切换店铺
@@ -880,7 +973,7 @@ var FormRender = function FormRender(props, ref) {
     }
     //如果有bs组件 设置成初始值
     var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
-      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD'].includes(item.workOrderComponentType);
+      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS'].includes(item.workOrderComponentType);
     });
     if (hasBs) {
       var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
@@ -890,6 +983,7 @@ var FormRender = function FormRender(props, ref) {
           case 'WDT_LOGISTICS':
           case 'KM_LOGISTICS':
           case 'BS_E3_LOGISTICS':
+          case 'GY_LOGISTICS':
             prv[next.uniqueKey] = [{
               logisticsCompany: null,
               logisticsCode: null
@@ -1035,9 +1129,9 @@ var FormRender = function FormRender(props, ref) {
       var newComponentConfig = _objectSpread(_objectSpread({}, componentConfig), {}, {
         disabled: disabled
       });
-      var _ref6 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
-        upgrade = _ref6.upgrade,
-        created = _ref6.created;
+      var _ref7 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
+        upgrade = _ref7.upgrade,
+        created = _ref7.created;
       if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID'].includes(workOrderComponentType)) {
         // 售后单id、补发单id和换货单id默认值是可见不可编辑（2）
         if (typeof upgrade !== 'number') {
@@ -1095,8 +1189,8 @@ var FormRender = function FormRender(props, ref) {
           shouldUpdate: function shouldUpdate() {
             return true; // TODO: 修复重复依赖的问题 https://tb.raycloud.com/task/64e4491e0b8b5c001e1099b9
           }
-        }, function (_ref7) {
-          var getFieldValue = _ref7.getFieldValue;
+        }, function (_ref8) {
+          var getFieldValue = _ref8.getFieldValue;
           var show = currentIdDependenceOtherFields === null || currentIdDependenceOtherFields === void 0 ? void 0 : currentIdDependenceOtherFields.reduce(function (cur, nxt) {
             // 如果有一项满足展示条件则展示
             if (cur) {

package/dist/esm/FlowTemplateDetailV2/constant.js

@@ -1,2 +1,2 @@
 // 切换当前店铺时，以下组件字段需要清空
-export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', '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', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'];
+export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', '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', 'WDT_RETURN_GOODS', 'WDT_SHOP', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'KM_LOGISTICS', 'KM_GOODS', 'KM_REISSUE_GOODS', 'BS_E3_SYSTEM_ORDER', 'JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS', 'BS_E3_REISSUE_GOODS', 'GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS'];

package/dist/esm/FlowTemplateDetailV2/index.js

@@ -26,8 +26,8 @@ import zhCN from 'antd/es/locale/zh_CN';
 import { calcWorkOrderList, deleteCacheOrder, submitParams } from "../common/utils/tools";
 import { useMemoizedFn } from 'ahooks';
 import moment from 'moment';
-import { fetchPanelInfo, fetchAllFlowOperateRecord } from "./store/reducers";
-import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectOrderBackLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType } from "./store/selector";
+import { fetchPanelInfo, fetchAllFlowOperateRecord, fetchCollectOrder } from "./store/reducers";
+import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectOrderBackLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType, selectFollow } from "./store/selector";
 import { NodeType, FlowStatus, FlowType } from "../model/flowTemplateDetail/types";
 import NodeItem from "./components/Item";
 import CurrentNode from "./components/CurrentNode";
@@ -97,6 +97,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   var withdrawWorkOrderDetail = useSelector(selectWithDrawOrder);
   var assistantMap = useSelector(selectNodeAssistantMap);
   var flowTemplateType = useSelector(selectFlowTemplateType);
+  var follow = useSelector(selectFollow);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -1225,6 +1226,12 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       }
     }, "v", operateParams === null || operateParams === void 0 ? void 0 : (_operateParams$maxPub2 = operateParams.maxPublishVersionTemplate) === null || _operateParams$maxPub2 === void 0 ? void 0 : _operateParams$maxPub2.version, "\u7248") : "v".concat(operateParams === null || operateParams === void 0 ? void 0 : (_operateParams$maxPub3 = operateParams.maxPublishVersionTemplate) === null || _operateParams$maxPub3 === void 0 ? void 0 : _operateParams$maxPub3.version, "\u7248"));
   };
+  var handleFollow = function handleFollow() {
+    dispatch(fetchCollectOrder({
+      flowWorkOrderId: flowWorkOrderId,
+      follow: !follow
+    }));
+  };
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading || orderBackLoading
   }, /*#__PURE__*/React.createElement("div", {
@@ -1234,7 +1241,10 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     styles: {
       marginRight: 5
     }
-  }), shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopName, "-"), /*#__PURE__*/React.createElement("span", null, flowWorkOrderId)), flowStatus && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
+  }), shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopName, "-"), /*#__PURE__*/React.createElement("span", null, flowWorkOrderId), /*#__PURE__*/React.createElement(Button, {
+    type: "link",
+    onClick: handleFollow
+  }, !follow ? '关注' : '已关注')), flowStatus && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     justify: 'space-between',
     className: "header"
   }, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {

package/dist/esm/FlowTemplateDetailV2/index.less

@@ -111,3 +111,11 @@
 .fillButton {
   display: contents;
 }
+
+
+@media screen and (max-width: 520px) {
+  .ant-image-preview-operations .ant-image-preview-operations-progress {
+    left: 0;
+    transform: translateX(10px);
+  }
+}

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

@@ -6,6 +6,7 @@ declare type PayloadAction<T> = {
 export declare const fetchPanelInfo: (params: QyFlowPanelInfoRequest, options: any) => (dispatch: any) => Promise<void>;
 export declare const fetchAllFlowOperateRecord: (params: QueryAllFlowOperateRecordRequest) => (dispatch: any) => Promise<void>;
 export declare const fetchCurrentTradeIdLinkWorkOrder: (params: any) => (dispatch: any) => Promise<void>;
+export declare const fetchCollectOrder: (params: any) => (dispatch: any) => Promise<void>;
 export declare const setNodeAssistantInfo: (state: FlowTemplateDetailState, { payload }: PayloadAction<{
     [nodeId: string]: Assistant[];
 }>) => void;
@@ -37,6 +38,7 @@ export declare const setLabelList: (state: FlowTemplateDetailState, { payload }:
 export declare const clearLabelList: (state: FlowTemplateDetailState) => void;
 export declare const setRejectLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 export declare const setWithDrawLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
+export declare const setFollow: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
     type: string;
     payload: any;
@@ -81,5 +83,6 @@ declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
     labelList: string[];
     rejectLoading: boolean;
     withdrawLoading: boolean;
+    follow: boolean;
 };
 export default reducers;