@kmkf-fe-packages/kmkf-work-order-service-component 2.2.39-beta.3 → 2.2.39-beta.31

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { isNumber } from 'lodash';
 import { Divider, Button } from 'antd';
-import { LB } from '@kmkf-fe-packages/kmkf-work-order-service-component';
+import { LBOrder } from "../../../LBOrderDetail";
 export var AutoTaskDetail = function AutoTaskDetail(_ref) {
   var flowEventData = _ref.flowEventData,
     shopList = _ref.shopList;
@@ -60,7 +60,7 @@ export var AutoTaskDetail = function AutoTaskDetail(_ref) {
     var repairOrderStatus = repairData.repairOrderStatus,
       id = repairData.id;
     var isSuccess = repairOrderStatus === '成功';
-    return /*#__PURE__*/React.createElement("div", null, id && /*#__PURE__*/React.createElement(LB.LBOrder, {
+    return /*#__PURE__*/React.createElement("div", null, id && /*#__PURE__*/React.createElement(LBOrder, {
       id: id,
       activeKey: "orderInfo",
       shopList: shopList,

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

@@ -29,7 +29,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
-INNER_REPLACE_COMPONENT, reversalFormValues, wdtReturnBillNoBackValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, wdtReturnBillNoBackValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, jkySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
@@ -417,7 +417,7 @@ var FormRender = function FormRender(props, ref) {
               return prv;
             }, {});
             if (!workOrderId) {
-              _context2.next = 44;
+              _context2.next = 45;
               break;
             }
             // 先初始化端上内容
@@ -450,7 +450,7 @@ var FormRender = function FormRender(props, ref) {
             // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
             tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
             if (!newRecord.notAutoFillWithFirstSubmit) {
-              _context2.next = 34;
+              _context2.next = 35;
               break;
             }
             currentNodeTradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
@@ -488,16 +488,18 @@ var FormRender = function FormRender(props, ref) {
               jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
             });
           case 32:
-            _context2.next = 42;
+            // 仅在依赖值有值且映射值为空时触发一次映射
+            batchFillByMappingWhenTargetEmpty(initialValues);
+            _context2.next = 43;
             break;
-          case 34:
+          case 35:
             if (!(tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap3 = record.jsonMap) !== null && _record$jsonMap3 !== void 0 && _record$jsonMap3["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill)) {
-              _context2.next = 41;
+              _context2.next = 42;
               break;
             }
             queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap4 = record.jsonMap) === null || _record$jsonMap4 === void 0 ? void 0 : _record$jsonMap4["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
             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 = 39;
+            _context2.next = 40;
             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")],
@@ -511,16 +513,16 @@ var FormRender = function FormRender(props, ref) {
               callKey: 1,
               setLoading: setLoading
             });
-          case 39:
-            _context2.next = 42;
+          case 40:
+            _context2.next = 43;
             break;
-          case 41:
+          case 42:
             // 如果没有订单反填，则单独更新remark
             fetchRemark(shopId, currentNodeTid);
-          case 42:
-            _context2.next = 67;
+          case 43:
+            _context2.next = 68;
             break;
-          case 44:
+          case 45:
             fillByShopId(shopId);
             initFormValues = null;
             if (plat !== null && plat !== void 0 && plat.subOrderNo) {
@@ -539,7 +541,7 @@ var FormRender = function FormRender(props, ref) {
 
             // console.log(orderNo, initFormValues);
             if (!initFormValues) {
-              _context2.next = 55;
+              _context2.next = 56;
               break;
             }
             form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
@@ -556,9 +558,9 @@ var FormRender = function FormRender(props, ref) {
               _orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
             }
             fetchRemark(_shopId, _orderNo);
-            _context2.next = 67;
+            _context2.next = 68;
             break;
-          case 55:
+          case 56:
             _transData = calcWorkOrderList([{
               jsonMap: jsonMap
             }], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
@@ -570,12 +572,12 @@ var FormRender = function FormRender(props, ref) {
             batchFillByMapping(_initialValues);
             //如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
             if (!(orderNo && shopId)) {
-              _context2.next = 66;
+              _context2.next = 67;
               break;
             }
             queryLabels(orderNo, shopId);
             queryMemberLevels(orderNo, shopId);
-            _context2.next = 64;
+            _context2.next = 65;
             return orderBack({
               companyKey: companyKey,
               order_no: orderNo,
@@ -590,13 +592,13 @@ var FormRender = function FormRender(props, ref) {
               callKey: 2,
               setLoading: setLoading
             });
-          case 64:
-            _context2.next = 67;
+          case 65:
+            _context2.next = 68;
             break;
-          case 66:
+          case 67:
             // 如果没有订单反填，则单独更新remark
             fetchRemark(shopId, currentNodeTid);
-          case 67:
+          case 68:
             antFormEl = document.getElementsByClassName('ant-form');
             (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
             resetMappingHideComponents();
@@ -605,7 +607,7 @@ var FormRender = function FormRender(props, ref) {
               type: 'setaAutoSubmitFlag',
               payload: true
             });
-          case 71:
+          case 72:
           case "end":
             return _context2.stop();
         }
@@ -655,6 +657,14 @@ var FormRender = function FormRender(props, ref) {
       shopUniqueKey && fillByMapping('SHOP_SELECT_MAPPING', shopUniqueKey);
     }, 0);
   };
+  var isEmptyMappingValue = function isEmptyMappingValue(value) {
+    if (isArray(value)) return value.length === 0;
+    if (value && _typeof(value) === 'object') {
+      if ('value' in value) return !value.value;
+      return isEmpty(value);
+    }
+    return value === undefined || value === null || value === '';
+  };
 
   // 批量映射
   var batchFillByMapping = function batchFillByMapping(values) {
@@ -662,23 +672,52 @@ var FormRender = function FormRender(props, ref) {
       fillByMapping(_key, values[_key]);
     }
   };
+
+  // 依赖值有值且目标映射值为空时才触发映射
+  var batchFillByMappingWhenTargetEmpty = function batchFillByMappingWhenTargetEmpty(values) {
+    var componentList = [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []));
+    var _loop = function _loop(key) {
+      var _componentList$find, _mappingConfig$config;
+      var workOrderComponentType = (_componentList$find = componentList.find(function (t) {
+        return t.uniqueKey === key;
+      })) === null || _componentList$find === void 0 ? void 0 : _componentList$find.workOrderComponentType;
+      var triggerValue = getMappingTargetValue(values[key], workOrderComponentType);
+      if (isEmptyMappingValue(triggerValue)) return "continue";
+      var mapping = (_mappingConfig$config = mappingConfig.config) === null || _mappingConfig$config === void 0 ? void 0 : _mappingConfig$config[key];
+      var targetValues = mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue];
+      if (!targetValues) return "continue";
+      var patch = {};
+      for (var targetKey in targetValues) {
+        if (isEmptyMappingValue(form.getFieldValue(targetKey))) {
+          patch[targetKey] = targetValues[targetKey];
+        }
+      }
+      if (!isEmpty(patch)) {
+        form.setFieldsValue(patch);
+      }
+    };
+    for (var _key2 in values) {
+      var _ret = _loop(_key2);
+      if (_ret === "continue") continue;
+    }
+  };
   // 组件映射
   var fillByMapping = function fillByMapping(triggerUniqueKey, value) {
-    var _componentList$find, _mappingConfig$config;
+    var _componentList$find2, _mappingConfig$config2;
     var componentList = [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []));
-    var workOrderComponentType = (_componentList$find = componentList.find(function (t) {
+    var workOrderComponentType = (_componentList$find2 = componentList.find(function (t) {
       return t.uniqueKey === triggerUniqueKey;
-    })) === null || _componentList$find === void 0 ? void 0 : _componentList$find.workOrderComponentType;
+    })) === null || _componentList$find2 === void 0 ? void 0 : _componentList$find2.workOrderComponentType;
     var triggerValue = getMappingTargetValue(value, workOrderComponentType);
 
     // 如果有映射关系，则修改对应组件的值
-    var mapping = (_mappingConfig$config = mappingConfig.config) === null || _mappingConfig$config === void 0 ? void 0 : _mappingConfig$config[triggerUniqueKey];
+    var mapping = (_mappingConfig$config2 = mappingConfig.config) === null || _mappingConfig$config2 === void 0 ? void 0 : _mappingConfig$config2[triggerUniqueKey];
     if (mapping !== null && mapping !== void 0 && mapping[triggerValue]) {
       form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
     } else {
       var resetSet = new Set();
-      for (var _key2 in mapping) {
-        for (var uniqueKey in mapping[_key2]) {
+      for (var _key3 in mapping) {
+        for (var uniqueKey in mapping[_key3]) {
           resetSet.add(uniqueKey);
         }
       }
@@ -942,6 +981,13 @@ var FormRender = function FormRender(props, ref) {
         form: form
       });
     }
+    if (workOrderComponentType === 'JKY_SYSTEM_ORDER') {
+      jkySystemOrderBackValues({
+        templateList: templateDetail,
+        value: value,
+        form: form
+      });
+    }
     if (workOrderComponentType === 'WDT_RETURN_BILL_NO') {
       wdtReturnBillNoBackValues({
         templateList: templateDetail,
@@ -1180,7 +1226,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', 'GY_LOGISTICS', 'JY_SEND_GOOD', 'JY_LOGISTICS', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].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', 'JY_SEND_GOOD', 'JY_LOGISTICS', 'JKY_LOGISTICS', 'JKY_SEND_GOOD', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].includes(item.workOrderComponentType);
     });
     if (hasBs) {
       var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
@@ -1192,6 +1238,7 @@ var FormRender = function FormRender(props, ref) {
           case 'BS_E3_LOGISTICS':
           case 'GY_LOGISTICS':
           case 'JY_LOGISTICS':
+          case 'JKY_LOGISTICS':
           case 'SKX_LOGISTICS':
             prv[next.uniqueKey] = [{
               logisticsCompany: null,
@@ -1211,6 +1258,7 @@ var FormRender = function FormRender(props, ref) {
           case 'KM_SEND_GOOD':
           case 'GY_SEND_GOOD':
           case 'JY_SEND_GOOD':
+          case 'JKY_SEND_GOOD':
             prv[next.uniqueKey] = [{
               sendName: '',
               sendId: ''

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

@@ -274,7 +274,7 @@ var NodeItem = function NodeItem(props) {
       isAllStaff: data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$nodeInfo = _data$data11.nodeInfo) === null || _data$data11$nodeInfo === void 0 ? void 0 : (_data$data11$nodeInfo2 = _data$data11$nodeInfo.assistants) === null || _data$data11$nodeInfo2 === void 0 ? void 0 : _data$data11$nodeInfo2.isAllStaff
     });
   }, [data, plat.userKey, assistantMap]);
-  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'WDT_STORE_STATUS', 'BS_E3_RETAIL_RETURN_IN_STOCK_SYNC', 'RETAIL_RETURN_IN_STOCK_SYNC', 'LBDJ_ONE_PRICE_ORDER'].includes(eventNodeType);
+  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'WDT_STORE_STATUS', 'BS_E3_RETAIL_RETURN_IN_STOCK_SYNC', 'RETAIL_RETURN_IN_STOCK_SYNC', 'LBDJ_ONE_PRICE_ORDER', 'PLATFORM_LOGISTICS_INTERCEPT'].includes(eventNodeType);
   // 人工节点+打开状态+当前工单提交人是当前完成人+状态是待处理
   var showEdit = isArtificialNode && open && isCurrentNodeHandler && !readonly && [FlowStatus.PROCESSING, FlowStatus.COMPLETED].includes(flowStatus);
 

package/dist/esm/FlowTemplateDetailV2/constant.js

@@ -7,4 +7,4 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 // 切换当前店铺时，以下组件字段需要清空
-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', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_RETURN_BILL_NO', 'SKX_REFUND_BILL_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS', 'SKX_GOODS', 'SKX_RETURN_GOODS', 'SKX_ORDER_TYPE', 'SKX_RETURN_ORDER_STATUS', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME'];
+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', 'JY_SYSTEM_ORDER', 'JY_SEND_GOOD', 'JY_GOODS', 'JY_REISSUE_GOODS', 'JY_RETURN_GOODS', 'JY_LOGISTICS', 'JKY_SYSTEM_ORDER', 'JKY_SEND_GOOD', 'JKY_GOODS', 'JKY_REISSUE_GOODS', 'JKY_RETURN_GOODS', 'JKY_LOGISTICS', 'SKX_OUTBOUND_NOTICE_NO', 'SKX_RETURN_BILL_NO', 'SKX_REFUND_BILL_NO', 'SKX_SHOP_NAME', 'SKX_WAREHOUSE', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS', 'SKX_GOODS', 'SKX_RETURN_GOODS', 'SKX_ORDER_TYPE', 'SKX_RETURN_ORDER_STATUS', 'SKX_ORDER_STATUS', 'SKX_CREATE_TIME'];

package/dist/esm/LBOrderDetail/detail/OrderInfo.js

@@ -300,10 +300,7 @@ export var DETAIL_ITEM_LIST = [{
   render: renderTime
 }, {
   title: '师傅打卡方式',
-  dataIndex: 'clockInType',
-  render: function render(value) {
-    return value === 0 ? '位置' : value === 1 ? '打卡码' : value;
-  }
+  dataIndex: 'clockInType'
 }, {
   title: '师傅完工时间',
   dataIndex: 'workerFinishTime',

package/dist/esm/LBOrderDetail/detail/ServiceProgress.js

@@ -74,10 +74,7 @@ var serviceProgressDetailConfig = {
     render: renderTime
   }], {
     title: '师傅打卡方式',
-    dataIndex: 'clockInType',
-    render: function render(value) {
-      return value === 0 ? '位置' : value === 1 ? '打卡码' : value;
-    }
+    dataIndex: 'clockInType'
   }],
   6: [[{
     title: '师傅姓名',

package/dist/esm/LBOrderDetail/detail/types.d.ts

@@ -62,7 +62,7 @@ export declare type DetailType = {
         appointEndTime: string;
         clockInWorkerName: string;
         clockInTime: string;
-        clockInType: 0 | 1;
+        clockInType: string;
         exceptionAppointTime: string;
         exceptionType: string;
         exceptionRemark: string;
@@ -202,7 +202,7 @@ declare type ServiceProgressDataType = {
     data: {
         workerName: string;
         time: string;
-        clockInType: 0 | 1;
+        clockInType: string;
     };
 } | {
     serviceProgress: 6;

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

@@ -86,6 +86,11 @@ export var systemOrderMap = {
     ids: 'jySystemSelectIds',
     order: 'jySystemShowOrder'
   },
+  JKY_SYSTEM_ORDER: {
+    no: 'jkySystemOrderNo',
+    ids: 'jkySystemSelectIds',
+    order: 'jkySystemShowOrder'
+  },
   WDT_RETURN_BILL_NO: {
     no: 'wdtReturnBillNo',
     ids: 'wdtReturnBillSelectIds',
@@ -251,6 +256,11 @@ export var SUBMIT_COMPONENT_ERP_LOGISTICS_MAP = {
     company: 'jyLogisticsCompany',
     code: 'jyLogisticsCode'
   },
+  JKY_LOGISTICS: {
+    list: 'jkyLogisticsList',
+    company: 'jkyLogisticsCompany',
+    code: 'jkyLogisticsCode'
+  },
   SKX_LOGISTICS: {
     list: 'skxLogisticsList',
     company: 'skxLogisticsCompany',
@@ -312,6 +322,10 @@ export var SUBMIT_COMPONENT_GOODS_MAP = {
     type: 'jyGoods',
     shopCode: 'shopCode'
   },
+  JKY_GOODS: {
+    type: 'jkyGoods',
+    shopCode: 'shopCode'
+  },
   JST_AFTERSALE_GOODS: {
     type: 'jstAftersaleGoods',
     shopCode: 'shopCode'
@@ -361,6 +375,12 @@ export var SUBMIT_COMPONENT_REISSUE_MAP = {
     goods: 'jyReissueGoods',
     shopCode: 'shopCode',
     systemOrderNo: 'jySystemOrderNo'
+  },
+  JKY_REISSUE_GOODS: {
+    type: 'jkyReissueType',
+    goods: 'jkyReissueGoods',
+    shopCode: 'shopCode',
+    systemOrderNo: 'jkySystemOrderNo'
   }
 };
 export var SUBMIT_COMPONENT_RETURN_GOODS_MAP = {
@@ -435,6 +455,12 @@ export var SUBMIT_COMPONENT_SYSTEM_ORDER_MAP = {
     ids: 'jySystemSelectIds',
     order: 'jySystemShowOrder',
     select: 'tradeNo'
+  },
+  JKY_SYSTEM_ORDER: {
+    no: 'jkySystemOrderNo',
+    ids: 'jkySystemSelectIds',
+    order: 'jkySystemShowOrder',
+    select: 'tradeNo'
   }
 };
 export var platformMap = {