diff --git a/src/store/order.ts b/src/store/order.ts index a327756..c540e3e 100644 --- a/src/store/order.ts +++ b/src/store/order.ts @@ -11,7 +11,7 @@ interface OrderState { pageSize: number total: number keyword: string - + // 已审批列表相关 completedList: CompletedApprovalItem[] completedLoading: boolean @@ -20,7 +20,7 @@ interface OrderState { completedPageSize: number completedTotal: number completedKeyword: string - + // 详情相关 currentOrder: any | null // 临时改为any来避免类型问题 detailLoading: boolean @@ -36,7 +36,7 @@ export const useOrderStore = defineStore('order', { pageSize: 20, total: 0, keyword: '', - + // 已审批列表状态 completedList: [], completedLoading: false, @@ -45,7 +45,7 @@ export const useOrderStore = defineStore('order', { completedPageSize: 20, completedTotal: 0, completedKeyword: '', - + currentOrder: null, detailLoading: false }), @@ -53,16 +53,16 @@ export const useOrderStore = defineStore('order', { getters: { // 获取当前订单基本信息 currentOrderInfo: (state) => state.currentOrder?.projectOrderInfo, - + // 获取审批历史 approvalHistory: (state) => state.currentOrder?.approveLog || [], - + // 获取当前用户信息 currentUser: (state) => state.currentOrder?.user, - + // 检查待审批是否还有更多数据 hasMore: (state) => state.orderList.length < state.total, - + // 检查已审批是否还有更多数据 completedHasMore: (state) => state.completedList.length < state.completedTotal }, @@ -72,7 +72,7 @@ export const useOrderStore = defineStore('order', { * 加载订单列表 */ async loadOrderList(refresh = false) { - if (this.loading) return + // if (this.loading) return if (refresh) { this.currentPage = 1 @@ -84,7 +84,7 @@ export const useOrderStore = defineStore('order', { try { const params: ListParams = { - approve:'approve', + approve: 'approve', page: this.currentPage, pageSize: this.pageSize, keyword: this.keyword || undefined @@ -100,7 +100,7 @@ export const useOrderStore = defineStore('order', { } this.total = total - + // 判断是否已加载完所有数据 if (this.orderList.length >= total || rows.length === 0) { this.finished = true @@ -135,16 +135,16 @@ export const useOrderStore = defineStore('order', { try { const response = await getOrderDetail(id) - + // 直接获取数据对象 const orderData = response.data.data - + // 确保数据存在再赋值 if (orderData) { this.currentOrder = orderData } - + return response } catch (error) { @@ -183,7 +183,7 @@ export const useOrderStore = defineStore('order', { const params: CompletedListParams = { page: this.completedCurrentPage, pageSize: this.completedPageSize, - processKeyList:['order_approve_online','order_approve_offline'], + processKeyList: ['order_approve_online', 'order_approve_offline'], businessName: this.completedKeyword || undefined } @@ -200,7 +200,7 @@ export const useOrderStore = defineStore('order', { } this.completedTotal = total - + // 判断是否已加载完所有数据 if (this.completedList.length >= total || rows.length === 0) { this.completedFinished = true diff --git a/src/views/List/index.vue b/src/views/List/index.vue index fa4863f..fc8efaf 100644 --- a/src/views/List/index.vue +++ b/src/views/List/index.vue @@ -2,17 +2,12 @@
- + @@ -23,12 +18,8 @@ - + +
{{ order.orderCode }}
@@ -68,13 +59,10 @@ - -
+ +
{{ item.businessKey }}
@@ -118,77 +106,45 @@ - +
审批意见 - +
常用意见
- + {{ tag }}
- +