@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13-beta.30 → 2.2.13-beta.32

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

@@ -456,6 +456,7 @@ var FormRender = function FormRender(props, ref) {
             queryMemberLevels(_currentNodeTid, shopId);
             _context2.next = 27;
             return orderBack({
+              companyKey: companyKey,
               order_no: _currentNodeTid,
               form: form,
               shopId: shopId,
@@ -491,6 +492,7 @@ var FormRender = function FormRender(props, ref) {
             queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap5 = record.jsonMap) === null || _record$jsonMap5 === void 0 ? void 0 : _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
             _context2.next = 38;
             return orderBack({
+              companyKey: companyKey,
               order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap6 = record.jsonMap) === null || _record$jsonMap6 === void 0 ? void 0 : _record$jsonMap6["".concat(tradeIdUniqueKey, "_tradeId")],
               form: form,
               shopId: shopId,
@@ -568,6 +570,7 @@ var FormRender = function FormRender(props, ref) {
             queryMemberLevels(orderNo, shopId);
             _context2.next = 63;
             return orderBack({
+              companyKey: companyKey,
               order_no: orderNo,
               form: form,
               shopId: shopId,
@@ -830,6 +833,7 @@ var FormRender = function FormRender(props, ref) {
             sessionStorage.setItem('order_no_test', order_no);
             _context5.next = 5;
             return orderBack({
+              companyKey: companyKey,
               order_no: order_no,
               form: form,
               shopId: shopId,
@@ -984,7 +988,12 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur
             });
           case 8:
-            if (!['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT'].includes(companyKey)) {
+            if (!['SZF4ZGWZSNW6PYXMCIFEWBXT',
+            //test 测马奔腾
+            '6O47IBXFR26FJF4HUQ7WGO4H',
+            //prod 陈健企业工单
+            'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
+            ].includes(companyKey)) {
               _context6.next = 11;
               break;
             }
@@ -1190,6 +1199,7 @@ var FormRender = function FormRender(props, ref) {
       var paymentValue = (_allValue = allValue[paymentUniqueKey]) === null || _allValue === void 0 ? void 0 : _allValue.enterprisePaymentTid;
       if (_tradeValue || paymentValue) {
         orderBack({
+          companyKey: companyKey,
           order_no: _tradeValue || paymentValue,
           form: form,
           shopId: val,

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

@@ -39,7 +39,7 @@ export declare const calcWorkOrderList: (source: Partial<WorkOrderDetail>[], tem
     workOrderComponentType: string;
     uniqueKey: string;
 }[], type?: string) => any[];
-export declare const orderBack: ({ order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, }: any) => Promise<void>;
+export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, }: any) => Promise<void>;
 export declare const imgResize: (url: string, w?: number, h?: number) => string;
 export declare const COMPONENT_MAP: {
     [key: string]: string;

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

@@ -140,52 +140,72 @@ 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, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _jyOrder$value$data, _skxOrder$value, _skxReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _jyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, kmVideoOrder, orderSubFormOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
+    var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, trySetShopId, _res$data, res, _res$data2, _res$data3, JOIN_SHOP, hasFlagMap, _ref4, shopSourceStr, _ref4$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, _jyOrder$value, _jyOrder$value$data, _skxOrder$value, _skxReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _jyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, kmVideoOrder, orderSubFormOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jstInfo, skxInfo, skxReturnInfo, 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:
-          order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey;
-          console.log('orderBack-run--', callKey);
+          companyKey = _ref.companyKey, order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey;
+          console.log('orderBack-run--', callKey, templateDetail);
           shopId = propsShopid; //如果是pc平台且没有shopId的情况下 获取shopId
-          if (!(order_no && [PlatForm.PC, PlatForm.WEB].includes(plat.platform) && !!(plat !== null && plat !== void 0 && plat.bindERP) && type === 'add')) {
-            _context.next = 18;
+          trySetShopId = function trySetShopId(_ref3) {
+            var theShopId = _ref3.theShopId,
+              theShopUniqueKey = _ref3.theShopUniqueKey,
+              theShopName = _ref3.theShopName,
+              erpShopName = _ref3.erpShopName;
+            var shopInfo = shopList.find(function (item) {
+              return theShopId && item.shopId === theShopId || theShopUniqueKey && item.uniqueKey === theShopUniqueKey;
+            });
+            if (!shopInfo) {
+              message.error(erpShopName ? "\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u914D\u7F6E".concat(erpShopName, "\u6620\u5C04\uFF0C\u6216\u5BF9\u5E94\u5E97\u94FA\u662F\u5426\u6709\u6743\u9650") : "\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u6709".concat(theShopName, "\u5E97\u94FA\u6743\u9650"));
+            } else {
+              if (!shopInfo.auditStatus) {
+                message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5".concat(theShopName, "\u6388\u6743\u662F\u5426\u6B63\u5E38"));
+              } else {
+                shopId = shopInfo.shopId;
+                callbackShopId === null || callbackShopId === void 0 ? void 0 : callbackShopId(shopId);
+              }
+            }
+          };
+          console.log('*** ', companyKey, ['SZF4ZGWZSNW6PYXMCIFEWBXT',
+          //test 测马奔腾
+          '6O47IBXFR26FJF4HUQ7WGO4H',
+          //prod 陈健企业工单
+          'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
+          ].includes(companyKey));
+          if (!(order_no && [PlatForm.PC, PlatForm.WEB].includes(plat.platform) && (!!(plat !== null && plat !== void 0 && plat.bindERP) || ['SZF4ZGWZSNW6PYXMCIFEWBXT',
+          //test 测马奔腾
+          '6O47IBXFR26FJF4HUQ7WGO4H',
+          //prod 陈健企业工单
+          'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
+          ].includes(companyKey)) && type === 'add')) {
+            _context.next = 20;
             break;
           }
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(true);
-          _context.prev = 5;
-          _context.next = 8;
+          _context.prev = 7;
+          _context.next = 10;
           return queryShopByTid({
             tid: order_no
           });
-        case 8:
+        case 10:
           res = _context.sent;
           if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.shopId) {
-            shopInfo = shopList.find(function (item) {
-              var _res$data2;
-              return item.shopId === (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shopId);
+            trySetShopId({
+              theShopName: res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shopName,
+              theShopId: res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shopId
             });
-            if (!shopInfo) {
-              message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u6709".concat(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shopName, "\u5E97\u94FA\u6743\u9650"));
-            } else {
-              if (!shopInfo.auditStatus) {
-                message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5".concat(res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.shopName, "\u6388\u6743\u662F\u5426\u6B63\u5E38"));
-              } else {
-                shopId = res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.shopId;
-                callbackShopId === null || callbackShopId === void 0 ? void 0 : callbackShopId(shopId);
-              }
-            }
           }
-          _context.next = 15;
+          _context.next = 17;
           break;
-        case 12:
-          _context.prev = 12;
-          _context.t0 = _context["catch"](5);
+        case 14:
+          _context.prev = 14;
+          _context.t0 = _context["catch"](7);
           console.error(_context.t0);
-        case 15:
-          _context.prev = 15;
+        case 17:
+          _context.prev = 17;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(15);
-        case 18:
+          return _context.finish(17);
+        case 20:
           //是否是对接平台，只有对接平台才能返填订单号
           JOIN_SHOP = shopList.find(function (item) {
             return !item.notJoin && item.shopId == shopId;
@@ -201,7 +221,7 @@ export var orderBack = /*#__PURE__*/function () {
           }).every(function (item) {
             return item === false;
           }))) {
-            _context.next = 23;
+            _context.next = 25;
             break;
           }
           //处理店铺映射存在店铺信息却没有返填的问题
@@ -211,12 +231,12 @@ export var orderBack = /*#__PURE__*/function () {
             });
           }
           return _context.abrupt("return");
-        case 23:
-          _ref3 = shopList.find(function (item) {
+        case 25:
+          _ref4 = shopList.find(function (item) {
             return item.shopId == shopId;
-          }) || {}, shopSourceStr = _ref3.shopSourceStr, _ref3$thirdUserNick = _ref3.thirdUserNick, thirdUserNick = _ref3$thirdUserNick === void 0 ? '' : _ref3$thirdUserNick, thirdShopMainType = _ref3.thirdShopMainType;
+          }) || {}, shopSourceStr = _ref4.shopSourceStr, _ref4$thirdUserNick = _ref4.thirdUserNick, thirdUserNick = _ref4$thirdUserNick === void 0 ? '' : _ref4$thirdUserNick, thirdShopMainType = _ref4.thirdShopMainType;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(true);
-          _context.prev = 25;
+          _context.prev = 27;
           promise = [];
           if (!JOIN_SHOP || thirdShopMainType === '1' && shopSourceStr === 'JD') {
             promise.push(Promise.resolve([]));
@@ -273,9 +293,9 @@ export var orderBack = /*#__PURE__*/function () {
           }
 
           //需按照orderBackMap中的顺序结构
-          _context.next = 36;
+          _context.next = 38;
           return Promise.allSettled(promise);
-        case 36:
+        case 38:
           _yield$Promise$allSet = _context.sent;
           _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 14);
           data = _yield$Promise$allSet2[0];
@@ -553,7 +573,7 @@ export var orderBack = /*#__PURE__*/function () {
           pushGyLog('detail', detail);
           //抖音数据特殊处理
           if (!orderInfo) {
-            _context.next = 137;
+            _context.next = 139;
             break;
           }
           if (shopSourceStr === 'FXG') {
@@ -565,7 +585,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 121;
+            _context.next = 123;
             break;
           }
           list = detail['itemList'];
@@ -583,10 +603,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 111;
-          _context.next = 114;
+          _context.prev = 113;
+          _context.next = 116;
           return Promise.all(promises);
-        case 114:
+        case 116:
           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), {}, {
@@ -596,25 +616,25 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 121;
+          _context.next = 123;
           break;
-        case 118:
-          _context.prev = 118;
-          _context.t1 = _context["catch"](111);
+        case 120:
+          _context.prev = 120;
+          _context.t1 = _context["catch"](113);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 121:
+        case 123:
           // 判断是否存在签收时间组件
           hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
           if (!hasSigningDatetime) {
-            _context.next = 137;
+            _context.next = 139;
             break;
           }
           if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
-            _context.next = 136;
+            _context.next = 138;
             break;
           }
-          _context.prev = 124;
-          _context.next = 127;
+          _context.prev = 126;
+          _context.next = 129;
           return request({
             url: '/qy/logistics/logisticsSignTime',
             method: 'post',
@@ -624,21 +644,21 @@ export var orderBack = /*#__PURE__*/function () {
               mailNo: orderInfo.expressLogisticsCode
             }
           });
-        case 127:
+        case 129:
           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 = 134;
+          _context.next = 136;
           break;
-        case 131:
-          _context.prev = 131;
-          _context.t2 = _context["catch"](124);
+        case 133:
+          _context.prev = 133;
+          _context.t2 = _context["catch"](126);
           console.error('调用签收时间错误', _context.t2);
-        case 134:
-          _context.next = 137;
-          break;
         case 136:
+          _context.next = 139;
+          break;
+        case 138:
           detail['tradeSigningDateTime'] = '';
-        case 137:
+        case 139:
           values = orderBackFormValues({
             detail: detail,
             _get_order_fail_: !orderInfo,
@@ -674,6 +694,14 @@ export var orderBack = /*#__PURE__*/function () {
             }
           }
           // console.log('orderback', values);
+          if (values.shopUniqueKey) {
+            trySetShopId({
+              theShopUniqueKey: values.shopUniqueKey,
+              erpShopName: values.erpShopName
+            });
+            delete values.shopUniqueKey;
+            delete values.erpShopName;
+          }
           form.setFieldsValue(_objectSpread(_objectSpread(_objectSpread({}, formValue), values), {}, {
             fixed_field_buyerOpenUid: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid,
             shopId: shopId
@@ -683,21 +711,21 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 148;
+          _context.next = 151;
           break;
-        case 145:
-          _context.prev = 145;
-          _context.t3 = _context["catch"](25);
-          console.error(_context.t3);
         case 148:
           _context.prev = 148;
-          setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(148);
+          _context.t3 = _context["catch"](27);
+          console.error(_context.t3);
         case 151:
+          _context.prev = 151;
+          setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
+          return _context.finish(151);
+        case 154:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 12, 15, 18], [25, 145, 148, 151], [111, 118], [124, 131]]);
+    }, _callee, null, [[7, 14, 17, 20], [27, 148, 151, 154], [113, 120], [126, 133]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -833,14 +861,14 @@ export var HasTradeSigningDatetime = function HasTradeSigningDatetime() {
     return ['TRADE_SIGNING_DATETIME'].includes(item.workOrderComponentType);
   });
 };
-export var submitParams = function submitParams(_ref4) {
+export var submitParams = function submitParams(_ref5) {
   var _currentNodeDetail$no;
-  var update = _ref4.update,
-    formData = _ref4.formData,
-    currentNodeDetail = _ref4.currentNodeDetail,
-    plat = _ref4.plat,
-    operateParams = _ref4.operateParams,
-    shopUniqueKey = _ref4.shopUniqueKey;
+  var update = _ref5.update,
+    formData = _ref5.formData,
+    currentNodeDetail = _ref5.currentNodeDetail,
+    plat = _ref5.plat,
+    operateParams = _ref5.operateParams,
+    shopUniqueKey = _ref5.shopUniqueKey;
   var newTemplateDetail = cloneDeep(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) || {};
   var params = {
     isAdd: !update,
@@ -1086,14 +1114,14 @@ export var reversalFormValues = function reversalFormValues() {
 };
 
 //删除缓存数据
-export var deleteCacheOrder = function deleteCacheOrder(_ref5) {
-  var _ref5$templateList = _ref5.templateList,
-    templateList = _ref5$templateList === void 0 ? [] : _ref5$templateList,
-    values = _ref5.values,
-    nodeId = _ref5.nodeId,
-    flowTemplateId = _ref5.flowTemplateId,
-    plat = _ref5.plat,
-    unDeleteOrderInfo = _ref5.unDeleteOrderInfo;
+export var deleteCacheOrder = function deleteCacheOrder(_ref6) {
+  var _ref6$templateList = _ref6.templateList,
+    templateList = _ref6$templateList === void 0 ? [] : _ref6$templateList,
+    values = _ref6.values,
+    nodeId = _ref6.nodeId,
+    flowTemplateId = _ref6.flowTemplateId,
+    plat = _ref6.plat,
+    unDeleteOrderInfo = _ref6.unDeleteOrderInfo;
   if (plat !== null && plat !== void 0 && plat.subOrderNo) {
     var getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
     // !unDeleteOrderInfo && delete getCacheInfo[plat?.subOrderNo];
@@ -1114,11 +1142,11 @@ export var deleteCacheOrder = function deleteCacheOrder(_ref5) {
   }
 };
 //bs商品信息返填
-export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
+export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref7) {
   var _templateList$compone;
-  var templateList = _ref6.templateList,
-    value = _ref6.value,
-    form = _ref6.form;
+  var templateList = _ref7.templateList,
+    value = _ref7.value,
+    form = _ref7.form;
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var bsGoodsComponent = (_templateList$compone = templateList.componentDtoList) === null || _templateList$compone === void 0 ? void 0 : _templateList$compone.filter(function (item) {
@@ -1138,11 +1166,11 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
   form.setFieldsValue(values);
 };
 // bs e3商品信息返填
-export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref7) {
+export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref8) {
   var _templateList$compone2, _templateList$compone3;
-  var templateList = _ref7.templateList,
-    value = _ref7.value,
-    form = _ref7.form;
+  var templateList = _ref8.templateList,
+    value = _ref8.value,
+    form = _ref8.form;
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var bsE3GoodsComponent = (_templateList$compone2 = templateList.componentDtoList) === null || _templateList$compone2 === void 0 ? void 0 : _templateList$compone2.filter(function (item) {
@@ -1166,11 +1194,11 @@ export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref7)
 };
 
 //wln商品信息返填
-export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref8) {
+export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref9) {
   var _templateList$compone4;
-  var templateList = _ref8.templateList,
-    value = _ref8.value,
-    form = _ref8.form;
+  var templateList = _ref9.templateList,
+    value = _ref9.value,
+    form = _ref9.form;
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var bsGoodsComponent = (_templateList$compone4 = templateList.componentDtoList) === null || _templateList$compone4 === void 0 ? void 0 : _templateList$compone4.filter(function (item) {
@@ -1190,11 +1218,11 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref8) {
 };
 
 // km 商品信息返填
-export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref9) {
+export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref10) {
   var _templateList$compone5, _templateList$compone6;
-  var templateList = _ref9.templateList,
-    value = _ref9.value,
-    form = _ref9.form;
+  var templateList = _ref10.templateList,
+    value = _ref10.value,
+    form = _ref10.form;
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var kmGoodsComponent = (_templateList$compone5 = templateList.componentDtoList) === null || _templateList$compone5 === void 0 ? void 0 : _templateList$compone5.filter(function (item) {
@@ -1218,11 +1246,11 @@ export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref9) {
 };
 
 // wdt商品信息返填
-export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref10) {
+export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref11) {
   var _templateList$compone7, _templateList$compone8;
-  var templateList = _ref10.templateList,
-    value = _ref10.value,
-    form = _ref10.form;
+  var templateList = _ref11.templateList,
+    value = _ref11.value,
+    form = _ref11.form;
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var wdtGoodsComponent = (_templateList$compone7 = templateList.componentDtoList) === null || _templateList$compone7 === void 0 ? void 0 : _templateList$compone7.filter(function (item) {
@@ -1251,11 +1279,11 @@ export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref10)
 };
 
 //gy商品信息返填
-export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref11) {
+export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref12) {
   var _templateList$compone9, _templateList$compone10;
-  var templateList = _ref11.templateList,
-    value = _ref11.value,
-    form = _ref11.form;
+  var templateList = _ref12.templateList,
+    value = _ref12.value,
+    form = _ref12.form;
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var gyGoodsComponent = (_templateList$compone9 = templateList.componentDtoList) === null || _templateList$compone9 === void 0 ? void 0 : _templateList$compone9.filter(function (item) {
@@ -1279,11 +1307,11 @@ export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref11) {
 };
 
 //聚水潭商品信息返填
-export var jstSystemOrderBackValues = function jstSystemOrderBackValues(_ref12) {
+export var jstSystemOrderBackValues = function jstSystemOrderBackValues(_ref13) {
   var _templateList$compone11, _templateList$compone12;
-  var templateList = _ref12.templateList,
-    value = _ref12.value,
-    form = _ref12.form;
+  var templateList = _ref13.templateList,
+    value = _ref13.value,
+    form = _ref13.form;
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var jstGoodsComponent = (_templateList$compone11 = templateList.componentDtoList) === null || _templateList$compone11 === void 0 ? void 0 : _templateList$compone11.filter(function (item) {
@@ -1306,11 +1334,11 @@ export var jstSystemOrderBackValues = function jstSystemOrderBackValues(_ref12)
   form.setFieldsValue(values);
 };
 // 巨益商品信息反填
-export var jySystemOrderBackValues = function jySystemOrderBackValues(_ref13) {
+export var jySystemOrderBackValues = function jySystemOrderBackValues(_ref14) {
   var _templateList$compone13, _templateList$compone14;
-  var templateList = _ref13.templateList,
-    value = _ref13.value,
-    form = _ref13.form;
+  var templateList = _ref14.templateList,
+    value = _ref14.value,
+    form = _ref14.form;
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var jyGoodsComponent = (_templateList$compone13 = templateList.componentDtoList) === null || _templateList$compone13 === void 0 ? void 0 : _templateList$compone13.filter(function (item) {
@@ -1492,12 +1520,12 @@ export var transformWorkOrderDetail = function transformWorkOrderDetail(detail)
 };
 
 // 返填物流轨迹信息
-export var setLogisticsInfo = function setLogisticsInfo(_ref14) {
-  var logisticsMappingConfig = _ref14.logisticsMappingConfig,
-    uniqueKey = _ref14.uniqueKey,
-    workOrderComponentType = _ref14.workOrderComponentType,
-    value = _ref14.value,
-    form = _ref14.form;
+export var setLogisticsInfo = function setLogisticsInfo(_ref15) {
+  var logisticsMappingConfig = _ref15.logisticsMappingConfig,
+    uniqueKey = _ref15.uniqueKey,
+    workOrderComponentType = _ref15.workOrderComponentType,
+    value = _ref15.value,
+    form = _ref15.form;
   var values = logisticsMappingConfig.reduce(function (prv, next) {
     var logisticsValues = form.getFieldValue(next.uniqueKey);
     var componentConfig = next.componentConfig;

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

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

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

@@ -6,7 +6,6 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
     paymentWorkOrder: import("./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").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectCurrentPaymentRecord: ((state: {
     paymentWorkOrder: import("./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").PaymentWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
     paymentWorkOrder: import("./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").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -48,7 +45,6 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
     paymentWorkOrder: import("./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").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -62,7 +58,6 @@ export declare const selectFlagPayModalVisible: ((state: {
     paymentWorkOrder: import("./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").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -76,7 +71,6 @@ export declare const selectLogModalVisible: ((state: {
     paymentWorkOrder: import("./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").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -90,7 +84,6 @@ export declare const selectPaymentFormModalVisible: ((state: {
     paymentWorkOrder: import("./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").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -104,7 +97,6 @@ export declare const selectRepeatVisible: ((state: {
     paymentWorkOrder: import("./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").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -118,7 +110,6 @@ export declare const selectRepeatWorkOrderList: ((state: {
     paymentWorkOrder: import("./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").PaymentWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {

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

@@ -6,7 +6,6 @@ export declare const selectorSingleTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -48,7 +45,6 @@ export declare const selectorTemplateId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -62,7 +58,6 @@ export declare const selectorFormModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.13-beta.30",
+  "version": "2.2.13-beta.32",
   "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": "2.2.13-beta.30",
-    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.29",
-    "@kmkf-fe-packages/services-components": "2.2.13-beta.30",
+    "@kmkf-fe-packages/basic-components": "2.2.13-beta.32",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.32",
+    "@kmkf-fe-packages/services-components": "2.2.13-beta.32",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -74,7 +74,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4a5bd269f5e91fcf0b353ba506102e67a9ed37be",
+  "gitHead": "d0ec0985f307bffc3735962998d286b3dfec3054",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }