diff --git a/src/store/modules/workOrder.ts b/src/store/modules/workOrder.ts index 5470f90..a729454 100644 --- a/src/store/modules/workOrder.ts +++ b/src/store/modules/workOrder.ts @@ -11,7 +11,9 @@ export const useWorkOrderStore = defineStore({ activeId: '', packageList: [], immersion: false, - name: '' + name: '', + dataId: '', + approvalList: [], }), getters: { getActiveId: (state: OrderState) => state.activeId, @@ -22,10 +24,11 @@ export const useWorkOrderStore = defineStore({ setOrderList(list: PackageListItem[]) { this.packageList = list }, - setActive(index: number, orderId?: string) { + setActive(index: number, orderId?: string, dataId?: string) { this.currentIndex = index const order = this.packageList[index] this.activeId = orderId || order?.checkDuplicateId + this.dataId = dataId || order.id; }, forward() { const len = this.packageList.length @@ -46,7 +49,7 @@ export const useWorkOrderStore = defineStore({ }, async fetchOrderList(pagination, keyword) { const res = await getPackageList(pagination, keyword) - if (res.data&&res.data.length > 0) { + if (res.data && res.data.length > 0) { this.packageList.push(...res.data) if (!this.activeId) this.setActive(0) diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue index 8c2aba9..d8fa596 100644 --- a/src/views/final/aside/Aside.vue +++ b/src/views/final/aside/Aside.vue @@ -1,162 +1,178 @@