feat(appointment): integrate work calendar and original business actions

src/modules/overseas-master-data/pages/TripDetailView.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
+import { appointmentReturnTarget } from '@/modules/appointment-calendar'
 import { inquiryReturnTarget } from '../inquiryNavigation'
 import TripDispatchSelector from '../components/TripDispatchSelector.vue'
 import { computed, onBeforeUnmount, ref, watch } from 'vue'
@@ -186,7 +187,7 @@ onBeforeUnmount(() => { generation++; inspectionSequence++; historySequence++ })
 </script>
 <template>
   <AdminPage class="admin-density"><DetailPageLayout class="density-detail-layout surface-panel" aria-label="车次详情">
-    <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push(inquiryReturnTarget(route.query) || { name: 'overseas-master-data-trips' })">{{ inquiryReturnTarget(route.query) ? '返回原拼车登记' : '返回车次列表' }}</el-button><h1 class="density-detail-title">{{ detail?.trip.tripNo || '车次详情' }}</h1><span v-if="detail">{{ tripStatusLabels[detail.trip.status] }}</span></div><div class="density-actions"><el-button :disabled="!!busy" @click="load">刷新车次</el-button><el-button v-if="access.can('platform:fleet:capacity-offer:manage')" @click="offerSettingsOpen = true">发布拼车余位</el-button><el-button v-if="editable" :disabled="!!busy" @click="editorOpen = true">编辑计划</el-button><el-button v-if="planned && access.can(permission.tripCancel)" type="danger" plain :disabled="!!busy || !!detail?.dispatches.length" @click="cancel">取消车次</el-button></div></div></template>
+    <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="router.push(appointmentReturnTarget(route.query) || inquiryReturnTarget(route.query) || { name: 'overseas-master-data-trips' })">{{ appointmentReturnTarget(route.query) ? '返回预约工作' : inquiryReturnTarget(route.query) ? '返回原拼车登记' : '返回车次列表' }}</el-button><h1 class="density-detail-title">{{ detail?.trip.tripNo || '车次详情' }}</h1><span v-if="detail">{{ tripStatusLabels[detail.trip.status] }}</span></div><div class="density-actions"><el-button :disabled="!!busy" @click="load">刷新车次</el-button><el-button v-if="access.can('platform:fleet:capacity-offer:manage')" @click="offerSettingsOpen = true">发布拼车余位</el-button><el-button v-if="editable" :disabled="!!busy" @click="editorOpen = true">编辑计划</el-button><el-button v-if="planned && access.can(permission.tripCancel)" type="danger" plain :disabled="!!busy || !!detail?.dispatches.length" @click="cancel">取消车次</el-button></div></div></template>
     <LoadErrorState v-if="error" title="车次详情加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <LoadErrorState v-if="operationError" title="操作未完成" :message="operationError.message" @retry="load"><template #details><ApiErrorMeta :details="operationError" /></template></LoadErrorState>
     <div v-loading="loading"><template v-if="detail">

src/modules/overseas-master-data/pages/TripsBehavior.test.ts

@@ -1,4 +1,4 @@
-const tripQuery = vi.hoisted(() => ({ tab: '' }))
+const tripQuery = vi.hoisted(() => ({ tab: '', appointmentReturn: '' }))
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { shallowMount, flushPromises, type VueWrapper } from '@vue/test-utils'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -40,12 +40,19 @@ function mount(component: object, props: Record<string, unknown> = {}): VueWrapp
 }
 function button(wrapper: VueWrapper, text: string) { return wrapper.findAll('button').find(node => node.text() === text)! }
 beforeEach(() => {
-  vi.clearAllMocks(); state.writable = true; tripQuery.tab = ''
+  vi.clearAllMocks(); state.writable = true; tripQuery.tab = ''; tripQuery.appointmentReturn = ''
   vi.mocked(api.listTrips).mockResolvedValue({ records: [structuredClone(trip)], page: 1, size: 20, total: 1, pages: 1 })
   vi.mocked(api.getTrip).mockResolvedValue(structuredClone(detail))
   vi.mocked(api.listTripHistory).mockResolvedValue({ records: [], page: 1, size: 20, total: 0, pages: 0 })
 })
 afterEach(() => wrappers.splice(0).forEach(wrapper => wrapper.unmount()))
+it('returns from a trip to the exact appointment work context and preserves it while choosing a trip', async () => {
+  tripQuery.appointmentReturn = '/appointment-calendar?workItem=work-1&workPage=3'
+  const list = mount(TripsView); await flushPromises(); await button(list, '详情').trigger('click')
+  expect(state.push).toHaveBeenCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: 'TR-TEST' }, query: { appointmentReturn: tripQuery.appointmentReturn } })
+  const page = mount(TripDetailView); await flushPromises(); await button(page, '返回预约工作').trigger('click')
+  expect(state.push).toHaveBeenLastCalledWith(tripQuery.appointmentReturn)
+})
 
 it('shows mixed signature and return quantities from one lazy completion read', async () => {
   vi.mocked(api.getTrip).mockResolvedValue({ ...structuredClone(detail), trip: { ...trip, status: 'IN_TRANSIT' } })
@@ -79,7 +86,7 @@ it('loads one trip page and opens a real detail route without fetching each row'
   const wrapper = mount(TripsView); await flushPromises()
   expect(api.listTrips).toHaveBeenCalledTimes(1); expect(api.getTrip).not.toHaveBeenCalled()
   await button(wrapper, '详情').trigger('click')
-  expect(state.push).toHaveBeenCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: 'TR-TEST' } })
+  expect(state.push).toHaveBeenCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: 'TR-TEST' }, query: {} })
   wrapper.findComponent({ name: 'DataTable' }).vm.$emit('update:page', 2); await flushPromises()
   expect(api.listTrips).toHaveBeenLastCalledWith(expect.objectContaining({ page: 2 }))
 })

src/modules/overseas-master-data/pages/TripsView.vue

@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
+import { appointmentReturnTarget, appointmentReturnQuery } from '@/modules/appointment-calendar'
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ListPageLayout from '@/shared/components/ListPageLayout.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
@@ -15,7 +16,7 @@ import { listTrips, type TripQuery } from '../api/trips'
 import { overseasMasterDataPermissions as permission } from '../permissions'
 import { tripStatusLabels, type FleetTrip, type TripDetail } from '../tripTypes'
 
-const router = useRouter(), access = useAccessPreviewStore()
+const route = useRoute(), router = useRouter(), access = useAccessPreviewStore()
 const rows = ref<FleetTrip[]>([]), total = ref(0), page = ref(1), size = ref(20), loading = ref(false), editorOpen = ref(false)
 const error = ref<ApiErrorDetails | null>(null), filters = ref<QueryModel>({ keyword: '', status: '' })
 let applied: Omit<TripQuery, 'page' | 'size'> = {}, sequence = 0
@@ -39,14 +40,14 @@ function search() {
   applied = { keyword: String(filters.value.keyword || '').trim() || undefined, status: (filters.value.status || undefined) as TripQuery['status'] }
   if (page.value !== 1) page.value = 1; else void load()
 }
-function view(tripNo: string) { void router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo } }) }
+function view(tripNo: string) { void router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo }, query: appointmentReturnQuery(route.query) }) }
 function created(detail: TripDetail) { view(detail.trip.tripNo) }
 watch([page, size], load); onMounted(load); onBeforeUnmount(() => { sequence++ })
 </script>
 <template>
   <AdminPage class="admin-density"><ListPageLayout aria-label="车次管理">
     <DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="true" preference-key="fleet-trips-table" v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :total="total" :loading="loading" row-key="tripNo" empty-text="暂无车次，先建立计划再关联排车单">
-      <template #toolbar-start><h1>车次管理</h1></template>
+      <template #toolbar-start><el-button v-if="appointmentReturnTarget(route.query)" link @click="router.push(appointmentReturnTarget(route.query)!)">返回预约工作</el-button><h1>车次管理</h1></template>
       <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="车次查询" preference-key="fleet-trips-query" :loading="loading" @search="search" @reset="search" /></template>
       <template #notices><LoadErrorState v-if="error" title="车次加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
       <template #toolbar-actions><el-button v-if="access.can(permission.tripCreate)" type="primary" @click="editorOpen = true">新建车次</el-button></template>