@kmkf-fe-packages/kmkf-work-order-service-component 2.2.31-beta.74 → 2.2.31-beta.76

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

@@ -9,6 +9,7 @@ import { Table, message, Image } from 'antd';
 import moment from 'moment';
 import styles from "./index.module.less";
 import { queryInstallationRepairDetail } from "./services";
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 export var renderTime = function renderTime(value) {
   return value && value !== '--' ? moment(value).format('YYYY-MM-DD HH:mm:ss') : value !== null && value !== void 0 ? value : '';
 };
@@ -53,7 +54,20 @@ export var DETAIL_ITEM_LIST = [{
   title: '下单状态',
   dataIndex: 'orderStatus',
   render: function render(value) {
-    return value ? '成功' : '失败';
+    var item = [{
+      value: 0,
+      label: '失败',
+      color: '#ff4d4f'
+    }, {
+      value: 1,
+      label: '成功',
+      color: '#52c41a'
+    }][value];
+    return item ? /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: item.color
+      }
+    }, item.label) : value;
   }
 }, {
   title: '安装/维修订单编号',
@@ -69,10 +83,24 @@ export var DETAIL_ITEM_LIST = [{
   dataIndex: 'serviceTypeDesc'
 }, {
   title: '服务状态',
-  dataIndex: 'serviceStatusDesc'
+  dataIndex: 'serviceStatusDesc',
+  render: function render(value) {
+    return /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: '#1b5bf3'
+      }
+    }, value);
+  }
 }, {
   title: '最新服务进度',
-  dataIndex: 'latestServiceProgressDesc'
+  dataIndex: 'latestServiceProgressDesc',
+  render: function render(value) {
+    return /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: '#1b5bf3'
+      }
+    }, value);
+  }
 }, {
   title: '最新服务进度时间',
   dataIndex: 'latestProgressTime',
@@ -152,13 +180,13 @@ export var DETAIL_ITEM_LIST = [{
   title: '师傅促好评返现',
   dataIndex: 'isGoodReviewRebate',
   render: function render(value) {
-    return value ? '有' : '无';
+    return ['无', '有'][value] || value;
   }
 }, {
   title: '是否加急',
   dataIndex: 'isUrgent',
   render: function render(value) {
-    return value ? '是' : '否';
+    return ['否', '是'][value] || value;
   }
 }, {
   title: '客户旺旺号',
@@ -167,7 +195,7 @@ export var DETAIL_ITEM_LIST = [{
   title: '是否到货',
   dataIndex: 'isArrived',
   render: function render(value) {
-    return value ? '是' : '否';
+    return ['否', '是'][value] || value;
   }
 },
 // {
@@ -185,7 +213,7 @@ export var DETAIL_ITEM_LIST = [{
 // {
 //   title: '有无电梯',
 //   dataIndex: 'hasElevator',
-//   render: (value) => (value ? '有' : '无'),
+//   render: (value) => (['无', '有'][value] || value),
 // },
 // {
 //   title: '楼层',
@@ -215,7 +243,7 @@ export var DETAIL_ITEM_LIST = [{
     var shop = (_effects$shopList = effects.shopList) === null || _effects$shopList === void 0 ? void 0 : _effects$shopList.find(function (shop) {
       return shop.uniqueKey === value;
     });
-    return shop ? shop.shopName : '';
+    return shop ? shop.shopName : value;
   }
 }, {
   title: '流程工单编号',
@@ -271,7 +299,10 @@ export var DETAIL_ITEM_LIST = [{
   render: renderTime
 }, {
   title: '师傅打卡方式',
-  dataIndex: 'clockInMethod'
+  dataIndex: 'clockInType',
+  render: function render(value) {
+    return value === 0 ? '位置' : value === 1 ? '打卡码' : value;
+  }
 }, {
   title: '师傅完工时间',
   dataIndex: 'workerFinishTime',
@@ -477,7 +508,7 @@ export var DETAIL_ITEM_LIST = [{
     title: '是否赔偿',
     dataIndex: 'isCompensation',
     render: function render(value) {
-      return value ? '是' : '否';
+      return ['否', '是'][value] || value;
     }
   }, {
     title: '赔偿金额',
@@ -518,6 +549,7 @@ export var DETAIL_ITEM_LIST = [{
 var renderDetailItem = function renderDetailItem(record, item, effects) {
   var isTable = 'children' in item && item.children;
   var value = isTable ? record[item.dataIndex] : record.main[item.dataIndex];
+  if (isNull(value)) return;
   return /*#__PURE__*/React.createElement("div", {
     className: isTable ? styles.detailItemTable : styles.detailItem,
     key: item.dataIndex

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

@@ -29,6 +29,7 @@ var renderDetailItem = function renderDetailItem(record, item, effects) {
 
 // 不同 serviceProgress 对应的配置，利用 satisfies 做强类型约束
 var serviceProgressDetailConfig = {
+  '-1': [],
   2: [[{
     title: '师傅姓名',
     dataIndex: 'workerName'
@@ -383,6 +384,7 @@ var ProgressContent = function ProgressContent(_ref) {
     shopList = _ref.shopList,
     singleColumn = _ref.singleColumn;
   var list = getServiceProgressList(detail.serviceProgress, singleColumn);
+  if (list.length === 0) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: styles.progressContent
   }, /*#__PURE__*/React.createElement("div", null, list.map(function (listItem) {

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

@@ -62,7 +62,7 @@ export declare type DetailType = {
         appointEndTime: string;
         clockInWorkerName: string;
         clockInTime: string;
-        clockInMethod: string;
+        clockInType: 0 | 1;
         exceptionAppointTime: string;
         exceptionType: string;
         exceptionRemark: string;
@@ -125,7 +125,7 @@ export declare type DetailType = {
         isCompensation: 0 | 1;
         indemnityAmount: string;
         indemnityType: string;
-        payType: 0 | 1;
+        payWay: 0 | 1;
         processRemark: string;
         accountType: 0 | 1 | 2 | 3;
         accountName: string;
@@ -172,6 +172,11 @@ export declare type DetailItemSchemaType = {
 }[TableKeyType];
 export declare type ServiceProgressType = ServiceProgressDataType['serviceProgress'];
 declare type ServiceProgressDataType = {
+    serviceProgress: -1;
+    data: {
+        time: string;
+    };
+} | {
     serviceProgress: 2;
     data: {
         workerName: string;

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.74",
+  "version": "2.2.31-beta.76",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d2c34713c1dd60cb460e4f479955bf03cd7e2613",
+  "gitHead": "fdcbf9149a7cf2f149203867db967e32ca76e10f",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }