@kmkf-fe-packages/kmkf-work-order-service-component 2.2.31-beta.75 → 2.2.31-beta.77

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

@@ -10,6 +10,7 @@ export declare const DETAIL_ITEM_LIST: DetailItemSchemaType[];
 declare const OrderInfo: {
     (props: {
         id: string;
+        setIsShowServiceProgress: (isShow: boolean) => void;
         shopList: Shop[];
     }): React.JSX.Element;
     displayName: string;

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

@@ -40,9 +40,6 @@ export var renderTable = function renderTable(value, record, item, effects, key)
     columns: item.children,
     dataSource: value,
     pagination: false,
-    rowKey: function rowKey(record, index) {
-      return "".concat(key, "-table-").concat(index);
-    },
     size: "small"
   });
 };
@@ -54,7 +51,20 @@ export var DETAIL_ITEM_LIST = [{
   title: '下单状态',
   dataIndex: 'orderStatus',
   render: function render(value) {
-    return ['失败', '成功'][value] || 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: '安装/维修订单编号',
@@ -70,10 +80,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',
@@ -272,7 +296,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',
@@ -537,6 +564,10 @@ var OrderInfo = function OrderInfo(props) {
       queryInstallationRepairDetail(props.id).then(function (res) {
         if (res.data) {
           setOrderInfo(res.data);
+          if (res.data.main.orderStatus) {
+            //显示服务进度tab
+            props.setIsShowServiceProgress(true);
+          }
         } else {
           message.error('安装/维修单详情为空');
           setOrderInfo(void 0);

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/index.js

@@ -15,6 +15,10 @@ function LBOrderDetail(props) {
     _useState2 = _slicedToArray(_useState, 2),
     activeKey = _useState2[0],
     setActiveKey = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isShowServiceProgress = _useState4[0],
+    setIsShowServiceProgress = _useState4[1];
   return /*#__PURE__*/React.createElement("div", {
     className: styles.containerBox
   }, /*#__PURE__*/React.createElement(Tabs, {
@@ -27,17 +31,18 @@ function LBOrderDetail(props) {
   }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u8BA2\u5355\u4FE1\u606F",
     key: "orderInfo"
-  }), /*#__PURE__*/React.createElement(Tabs.TabPane, {
+  }), isShowServiceProgress && /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u670D\u52A1\u8FDB\u5EA6",
     key: "serviceProgress"
   })), /*#__PURE__*/React.createElement("div", {
     className: styles.content
-  }, activeKey === 'serviceProgress' && /*#__PURE__*/React.createElement(ServiceProgress, {
+  }, activeKey === 'serviceProgress' && isShowServiceProgress && /*#__PURE__*/React.createElement(ServiceProgress, {
     contentWidth: props.contentWidth,
     id: props.id,
     shopList: props.shopList
   }), activeKey === 'orderInfo' && /*#__PURE__*/React.createElement(OrderInfo, {
     id: props.id,
+    setIsShowServiceProgress: setIsShowServiceProgress,
     shopList: props.shopList
   })));
 }

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;
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.31-beta.75",
+  "version": "2.2.31-beta.77",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c0cad8d5b7cebe20ae861c226b953e7820c8de3b",
+  "gitHead": "d7c5aae8383190143985343943f30c6e2c015f06",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }