接单

api/order/detail.uts

@@ -2,7 +2,7 @@
  * 工作台详情接口
  */
 import { request } from '../../utils/request'
-import type { orderInfo } from '../../types/order'
+import type { acceptOrderInfo } from '../../types/order'
 
 /**
  * 根据 ID 获取维保工单详情
@@ -27,7 +27,7 @@ export const getRepairOrderInfoById = (id: string): Promise<any> => {
 }
 
 // 接单（支持一次性选择处理人员和检修人员）
-export const acceptOrder = (gxtWorkOrder: orderInfo | null): Promise<any> => {
+export const acceptOrder = (gxtWorkOrder: acceptOrderInfo | null): Promise<any> => {
 	const plainObject = gxtWorkOrder != null ? JSON.parse(JSON.stringify(gxtWorkOrder)) : null;
 	const data: UTSJSONObject | null = plainObject as UTSJSONObject;
 	return request({

pages/order/detail/acceptIndex.uvue

@@ -123,7 +123,7 @@
 
 <script setup lang="uts">
     import { ref } from 'vue'
-    import type { orderInfo } from '../../../types/order'
+    import type { acceptOrderInfo } from '../../../types/order'
     import type { WorkOrderFlow } from '../../../types/flow'
     import { getOrderInfoById, getRepairOrderInfoById, acceptOrder } from '../../../api/order/detail'
 	import type { SysDictData } from '../../../types/dict'
@@ -137,7 +137,7 @@
 	const dictLoaded = ref<boolean>(false)
 
 	// 详情数据
-	const detailData = ref<orderInfo>({
+	const detailData = ref<acceptOrderInfo>({
 		orderType: 0,
 		id: 0,
 		teamLeaderId: 0,
@@ -390,7 +390,7 @@
                 }
 
                 // 转换数据
-                const orderDtail: orderInfo = {
+                const orderDtail: acceptOrderInfo = {
                     orderType: data['orderType'] as Number,
                     id: data['id'] as Number,
   					teamLeaderId: data['teamLeaderId'] != null ? (data['teamLeaderId'] as Number) : 0,

pages/order/detail/index.uvue

@@ -66,7 +66,7 @@
 
 <script setup lang="uts">
     import { ref } from 'vue'
-    import type { orderInfo } from '../../../types/order'
+    import type { acceptOrderInfo } from '../../../types/order'
     import type { WorkOrderFlow } from '../../../types/flow'
     import { getOrderInfoById, getRepairOrderInfoById } from '../../../api/order/detail'
 	import type { SysDictData } from '../../../types/dict'
@@ -117,7 +117,7 @@
 	    }
 	}
     // 详情数据
-    const detailData = ref<orderInfo>({
+    const detailData = ref<acceptOrderInfo>({
 		orderType: 0,
 		id: 0,
 		teamLeaderId: 0,
@@ -217,7 +217,7 @@
                 }
 
                 // 转换数据
-                const orderDtail: orderInfo = {
+                const orderDtail: acceptOrderInfo = {
                     orderType: data['orderType'] as Number,
                     id: data['id'] as Number,
 					teamLeaderId: data['teamLeaderId'] != null ? (data['teamLeaderId'] as Number) : 0,

pages/order/index.uvue

@@ -107,13 +107,13 @@
 
 <script setup lang="uts">
 import { ref, onBeforeUnmount, onMounted } from 'vue'
-import type { orderInfo } from '../../types/order'
+import type { acceptOrderInfo } from '../../types/order'
 import type { SysDictData, DictDataResponse } from '../../types/dict'
 import { getOrderList } from '../../api/order/list'
 import { getDictDataByType } from '../../api/dict/index'
 
     // 列表数据
-    const dataList = ref<orderInfo[]>([])
+    const dataList = ref<acceptOrderInfo[]>([])
     let keyword = ref<string>("")
     const page = ref<number>(1)
     const pageSize: number = 10
@@ -198,11 +198,11 @@ import { getDictDataByType } from '../../api/dict/index'
             const responseTotal = resultObj['total'] as number
 
             if (code == 200) {
-                // 将 any[] 转换为 orderInfo[]
-                const newData: orderInfo[] = []
+                // 将 any[] 转换为 acceptOrderInfo[]
+                const newData: acceptOrderInfo[] = []
                 for (let i = 0; i < responseData.length; i++) {
                     const item = responseData[i] as UTSJSONObject
-                    const orderItem: orderInfo = {
+                    const orderItem: acceptOrderInfo = {
 						orderType: item['orderType'] as Number,
                         id: item['id'] as Number,
 						teamLeaderId: item['teamLeaderId'] != null ? (item['teamLeaderId'] as Number) : 0,
@@ -275,43 +275,43 @@ import { getDictDataByType } from '../../api/dict/index'
     // 辅助函数：从 any 类型提取属性
     const getOrderType = (item: any | null): string => {
         if (item == null) return ''
-        const orderInfoItem = item as orderInfo
+        const orderInfoItem = item as acceptOrderInfo
         return orderInfoItem.orderType == 1?"维修工单":"维保工单";
     }
 
     const getWorkOrderProjectNo = (item: any | null): string | null => {
         if (item == null) return ''
-        const orderInfoItem = item as orderInfo
+        const orderInfoItem = item as acceptOrderInfo
         return orderInfoItem.workOrderProjectNo
     }
 
     const getPcsStationName = (item: any | null): string | null=> {
         if (item == null) return ''
-        const orderInfoItem = item as orderInfo
+        const orderInfoItem = item as acceptOrderInfo
         return orderInfoItem.pcsStationName
     }
 
     const getPcsDeviceName = (item: any | null): string | null=> {
         if (item == null) return ''
-        const orderInfoItem = item as orderInfo
+        const orderInfoItem = item as acceptOrderInfo
         return orderInfoItem.pcsDeviceName
     }
 
     const getAssignTime = (item: any | null): string|null => {
         if (item == null) return null
-        const orderInfoItem = item as orderInfo
+        const orderInfoItem = item as acceptOrderInfo
         return orderInfoItem.assignTime
     }
 
 	const getAcceptTime = (item: any | null): string|null => {
 	    if (item == null) return null
-	    const orderInfoItem = item as orderInfo
+	    const orderInfoItem = item as acceptOrderInfo
 	    return orderInfoItem.acceptTime
 	}
 
 	const getCreateTime = (item: any | null): string|null => {
 	    if (item == null) return null
-	    const orderInfoItem = item as orderInfo
+	    const orderInfoItem = item as acceptOrderInfo
 	    return orderInfoItem.createTime
 	}
 
@@ -319,7 +319,7 @@ import { getDictDataByType } from '../../api/dict/index'
 	// 根据状态显示不同的时间
 	const getDisplayTime = (item: any | null): string|null => {
 		if (item == null) return null
-		const orderInfoItem = item as orderInfo
+		const orderInfoItem = item as acceptOrderInfo
 
 		// 如果是"待接单"状态，显示派单时间
 		if (currentStatus.value === 'assigned') {
@@ -336,7 +336,7 @@ import { getDictDataByType } from '../../api/dict/index'
 
 	const getWorkOrderStatus = (item: any | null): string | null => {
 	    if (item == null) return ''
-	    const orderInfoItem = item as orderInfo
+	    const orderInfoItem = item as acceptOrderInfo
 	    const rawStatus = orderInfoItem.workOrderStatus
 
 	    if (rawStatus==null) return ''
@@ -389,7 +389,7 @@ import { getDictDataByType } from '../../api/dict/index'
     // 点击列表项
     const handleItemClick = (item: any | null, index: number): void => {
         if (item == null) return
-        const orderItem = item as orderInfo
+        const orderItem = item as acceptOrderInfo
 		if(currentStatus.value === '' || currentStatus.value === 'to_finish' || currentStatus.value === 'completed') {
 			// 传递orderType参数以便详情页决定调用哪个API
 			uni.navigateTo({
@@ -407,7 +407,7 @@ import { getDictDataByType } from '../../api/dict/index'
     // 接单操作
     const acceptOrder = (item: any | null): void => {
         if (item == null) return
-        const orderItem = item as orderInfo
+        const orderItem = item as acceptOrderInfo
         console.log('接单操作:', orderItem.id)
         // 跳转到接单页面
         uni.navigateTo({
@@ -418,7 +418,7 @@ import { getDictDataByType } from '../../api/dict/index'
     // 审批操作
     const approveOrder = (item: any | null): void => {
         if (item == null) return
-        const orderItem = item as orderInfo
+        const orderItem = item as acceptOrderInfo
         console.log('审批操作:', orderItem.id)
         // 这里可以添加实际的审批逻辑
         uni.showToast({
@@ -430,7 +430,7 @@ import { getDictDataByType } from '../../api/dict/index'
     // 查看工单详情
     const showWorkOrderDetail = (item: any | null): void => {
         if (item == null) return
-        const orderItem = item as orderInfo
+        const orderItem = item as acceptOrderInfo
         uni.navigateTo({
             url: `/pages/workbench/detail/index?id=${orderItem.id}`
         })

types/order.uts

@@ -4,9 +4,9 @@ import type { WorkOrderFlowList } from './flow'
 export type orderInfo = {
 	orderType: Number
     id: Number
-	teamLeaderId: Number | 0
+	// teamLeaderId: Number | 0
     teamLeaderName: string | null
-	acceptUserId: Number | 0
+	// acceptUserId: Number | 0
     acceptUserName: string | null
     acceptTime: string | null
     assignTime: string | null
@@ -41,3 +41,29 @@ export type orderListResponse = {
     total: number
     rows: orderInfo[]
 }
+
+// 工单信息
+export type acceptOrderInfo = {
+	orderType: Number
+    id: Number
+	teamLeaderId: Number | 0
+    teamLeaderName: string | null
+	acceptUserId: Number | 0
+    acceptUserName: string | null
+    acceptTime: string | null
+    assignTime: string | null
+    assignUserName: string | null
+    status: Number
+    workOrderProjectNo: string | null
+    workOrderStatus: string | null
+    gxtCenterId: Number | 0
+    gxtCenter: string | null
+    pcsStationId: Number | 0
+    pcsStationName: string | null
+    pcsDeviceId: Number | 0
+    pcsDeviceName: string | null
+    brand: string | null
+    model: string | null
+    createTime: string | null
+    workOrderFlowList?: WorkOrderFlowList | null
+}