@kmkf-fe-packages/kmkf-work-order-service-component 2.2.31-beta.68 → 2.2.31-beta.71

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

@@ -20,8 +20,9 @@ export var renderImages = function renderImages(value) {
       display: 'flex',
       flexWrap: 'wrap'
     }
-  }, list.map(function (url) {
+  }, list.map(function (url, index) {
     return /*#__PURE__*/React.createElement(Image, {
+      key: "".concat(url, "-").concat(index),
       src: url,
       width: 24,
       height: 24
@@ -137,16 +138,17 @@ export var DETAIL_ITEM_LIST = [{
   title: '期望上门时间',
   dataIndex: 'expectedVisitTime',
   render: renderTime
-}, {
-  title: '是否核销单',
-  dataIndex: 'isWriteOff',
-  render: function render(value) {
-    return ['否', '喵师傅核销', '汪师傅核销'][value] || value;
-  }
-}, {
-  title: '核销单号',
-  dataIndex: 'writeOffNo'
-}, {
+},
+// {
+//   title: '是否核销单',
+//   dataIndex: 'writeOffType',
+//   render: (value) => ['否', '喵师傅核销', '汪师傅核销'][value] || value,
+// },
+// {
+//   title: '核销单号',
+//   dataIndex: 'writeOffNo',
+// },
+{
   title: '师傅促好评返现',
   dataIndex: 'isGoodReviewRebate',
   render: function render(value) {
@@ -167,37 +169,45 @@ export var DETAIL_ITEM_LIST = [{
   render: function render(value) {
     return value ? '是' : '否';
   }
-}, {
-  title: '物流公司名称',
-  dataIndex: 'logisticsCompany'
-}, {
-  title: '物流单号',
-  dataIndex: 'logisticsNo'
-}, {
-  title: '货物数量',
-  dataIndex: 'goodsQuantity'
-}, {
-  title: '有无电梯',
-  dataIndex: 'hasElevator',
-  render: function render(value) {
-    return value ? '有' : '无';
-  }
-}, {
-  title: '楼层',
-  dataIndex: 'floor'
-}, {
-  title: '提货地址',
-  dataIndex: 'pickupAddress'
-}, {
-  title: '提货电话',
-  dataIndex: 'pickupPhone'
-}, {
-  title: '货物规格',
-  dataIndex: 'goodsSpec'
-}, {
-  title: '配送备注',
-  dataIndex: 'deliveryRemark'
-}, {
+},
+// {
+//   title: '物流公司名称',
+//   dataIndex: 'logisticsCompany',
+// },
+// {
+//   title: '物流单号',
+//   dataIndex: 'logisticsNo',
+// },
+// {
+//   title: '货物数量',
+//   dataIndex: 'goodsQuantity',
+// },
+// {
+//   title: '有无电梯',
+//   dataIndex: 'hasElevator',
+//   render: (value) => (value ? '有' : '无'),
+// },
+// {
+//   title: '楼层',
+//   dataIndex: 'floor',
+// },
+// {
+//   title: '提货地址',
+//   dataIndex: 'pickupAddress',
+// },
+// {
+//   title: '提货电话',
+//   dataIndex: 'pickupPhone',
+// },
+// {
+//   title: '货物规格',
+//   dataIndex: 'goodsSpec',
+// },
+// {
+//   title: '配送备注',
+//   dataIndex: 'deliveryRemark',
+// },
+{
   title: '店铺',
   dataIndex: 'shopUk',
   render: function render(value, record, item, effects) {

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

@@ -73,7 +73,10 @@ var serviceProgressDetailConfig = {
     render: renderTime
   }], {
     title: '师傅打卡方式',
-    dataIndex: 'clockInType'
+    dataIndex: 'clockInType',
+    render: function render(value) {
+      return value === 0 ? '位置' : value === 1 ? '打卡码' : value;
+    }
   }],
   6: [[{
     title: '师傅姓名',
@@ -407,7 +410,6 @@ var ServiceProgress = function ServiceProgress(props) {
   React.useEffect(function () {
     if (props.id) {
       queryInstallationRepairServiceProgress(props.id).then(function (res) {
-        console.log("\uD83D\uDE80 ~ ServiceProgress.tsx:51 ~ ServiceProgress ~ res:", res);
         if (res.data) {
           setServiceProgressList(res.data);
         } else {

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

@@ -22,7 +22,7 @@ export declare type DetailType = {
         orderTime: string;
         customerName: string;
         customerPhone: string;
-        isWriteOff: 0 | 1 | 2;
+        writeOffType: 0 | 1 | 2;
         writeOffNo: string;
         isGoodReviewRebate: 0 | 1;
         isUrgent: 0 | 1;
@@ -197,7 +197,7 @@ declare type ServiceProgressDataType = {
     data: {
         workerName: string;
         time: string;
-        clockInType: string;
+        clockInType: 0 | 1;
     };
 } | {
     serviceProgress: 6;

package/dist/esm/LBOrderDetail/index.js

@@ -53,7 +53,7 @@ export function LBOrder(props) {
     onClose: onClose,
     visible: open,
     open: open
-  }, /*#__PURE__*/React.createElement(LBOrderDetail, {
+  }, open && /*#__PURE__*/React.createElement(LBOrderDetail, {
     contentWidth: width,
     id: props.id,
     shopList: props.shopList,

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.31-beta.68",
+  "version": "2.2.31-beta.71",
   "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.31-beta.67",
-    "@kmkf-fe-packages/kmkf-utils": "2.2.31-beta.66",
-    "@kmkf-fe-packages/services-components": "2.2.31-beta.67",
+    "@kmkf-fe-packages/basic-components": "2.2.31-beta.70",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.31-beta.70",
+    "@kmkf-fe-packages/services-components": "2.2.31-beta.70",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c4dfb46d0795ed9241f599cbd683b2bf9a944a9c",
+  "gitHead": "a8cec95d7311087071c94347b3f814af48a179d7",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }