vue3-element-plus-app-chu 0.0.23 → 0.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-plus-app-chu",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "private": false,
   "type": "module",
   "files": [

package/src/router/index.ts

@@ -29,36 +29,6 @@ const routes: RouteRecordRaw[] = [
         component: DigitalRmbForecast,
         meta: { menu: 'forecast', title: '数字人民币头寸预报' },
       },
-      {
-        path: 'forecast/create',
-        name: 'forecast-create',
-        component: DigitalRmbForecast,
-        meta: { menu: 'forecast', title: '新增数字人民币头寸预报' },
-        props: (route) => ({
-          mode: 'create',
-          tranDate: typeof route.query.tranDate === 'string' ? route.query.tranDate : undefined,
-        }),
-      },
-      {
-        path: 'forecast/:predRefNo/edit',
-        name: 'forecast-edit',
-        component: DigitalRmbForecast,
-        meta: { menu: 'forecast', title: '修改数字人民币头寸预报' },
-        props: (route) => ({
-          mode: 'edit',
-          predRefNo: String(route.params.predRefNo ?? ''),
-        }),
-      },
-      {
-        path: 'forecast/:predRefNo',
-        name: 'forecast-detail',
-        component: DigitalRmbForecast,
-        meta: { menu: 'forecast', title: '数字人民币头寸预报详情' },
-        props: (route) => ({
-          mode: 'detail',
-          predRefNo: String(route.params.predRefNo ?? ''),
-        }),
-      },
       {
         path: 'estimation',
         name: 'estimation',

package/src/view/dcps/forecast/index.vue

@@ -21,7 +21,6 @@ const recallForecastRow = (predRefNo?: string): ForecastRowType | null => {
 
 <script setup lang="ts">
 import { computed, onActivated, onBeforeUnmount, reactive, ref, watch } from 'vue'
-import { useRouter } from 'vue-router'
 import { ElConfigProvider, ElMessage, ElMessageBox } from 'element-plus'
 import API from './api'
 import { dcpsRuntime } from '../runtime'
@@ -41,17 +40,8 @@ defineOptions({ name: 'DcpsForecastPage' })
 
 /**
  * 预报页面：列表、新增/修改、详情共用一个入口文件。
- * 路由通过 mode 区分页面形态：create/edit 为表单页，detail 为详情页，缺省为列表。
+ * 新增/修改/详情直接在当前页面以对话框打开，不跳转新页面。
  */
-const props = defineProps<{
-  mode?: 'create' | 'edit' | 'detail' // 页面形态；缺省为列表页。
-  predRefNo?: string // 修改、详情模式的预报流水号，来自路由参数。
-  tranDate?: string // 新增模式的默认交易日期，格式为 YYYYMMDD。
-}>()
-
-const router = useRouter()
-const isEditor = computed(() => props.mode === 'create' || props.mode === 'edit')
-const isDetail = computed(() => props.mode === 'detail')
 
 // ---------- 页面内工具函数 ----------
 
@@ -243,6 +233,13 @@ const listBusy = computed(() => listMutation.value !== null)
 const listTableRef = ref<InstanceType<typeof ArtDataTable> | null>(null)
 let listRequestId = 0
 
+// ---------- 对话框状态 ----------
+const editorDialogVisible = ref(false) // 新增/修改对话框是否显示。
+const editorDialogMode = ref<'create' | 'edit'>('create') // 当前对话框形态。
+const editorDialogPredRefNo = ref('') // 修改模式的预报流水号。
+const detailDialogVisible = ref(false) // 详情对话框是否显示。
+const detailDialogPredRefNo = ref('') // 详情模式的预报流水号。
+
 const listHasReference = (row: ForecastRow) => Boolean(row.predRefNo?.trim())
 const listTextColumn = (prop: keyof ForecastRow, label: string, width: number, visible = true): ColumnOption<ForecastRow> => ({
   prop, label, width, visible, showOverflowTooltip: true,
@@ -342,25 +339,29 @@ const changeListPage = (current: number, size = listPagination.size) => {
   void loadList()
 }
 
-// 行内操作交给路由页面处理，这里只校验记录是否可用；整行记录用于补齐详情接口没有返回的字段。
+// 行内操作交给对话框处理，整行记录用于补齐详情接口没有返回的字段。
 const openEdit = (row: ForecastRow) => {
   if (listBusy.value || !listHasReference(row)) return
   const predRefNo = row.predRefNo?.trim()
   if (!predRefNo) return
   rememberForecastRow(row)
-  void router.push({ name: 'forecast-edit', params: { predRefNo } })
+  editorDialogPredRefNo.value = predRefNo
+  editorDialogMode.value = 'edit'
+  editorDialogVisible.value = true
 }
 const openDetail = (row: ForecastRow) => {
   if (listBusy.value || !listHasReference(row)) return
-  const predRefNo = row.predRefNo?.trim()
+  const predRefNo = row.prefRefNo ?? row.predRefNo?.trim()
   if (!predRefNo) return
   rememberForecastRow(row)
-  void router.push({ name: 'forecast-detail', params: { predRefNo } })
+  detailDialogPredRefNo.value = predRefNo
+  detailDialogVisible.value = true
 }
 const openCreate = () => {
   if (listBusy.value) return
-  const tranDate = listAppliedQuery.tranDate
-  void router.push({ name: 'forecast-create', query: tranDate ? { tranDate } : {} })
+  editorDialogPredRefNo.value = ''
+  editorDialogMode.value = 'create'
+  editorDialogVisible.value = true
 }
 
 async function deleteRecords(records: ForecastRow[]) {
@@ -387,7 +388,7 @@ async function deleteRecords(records: ForecastRow[]) {
 
 // 列表页由 KeepAlive 缓存；每次回到列表时重新查询，保留筛选条件和分页。
 onActivated(() => {
-  if (!isEditor.value && !isDetail.value) void loadList()
+  void loadList()
 })
 
 // ---------- 新增 / 修改页 ----------
@@ -401,7 +402,8 @@ type EditorField = {
   createOnly?: boolean
 }
 
-const editorMode = computed<'create' | 'edit'>(() => props.mode === 'edit' ? 'edit' : 'create')
+const editorMode = computed<'create' | 'edit'>(() => editorDialogMode.value)
+const editorPredRefNo = computed(() => editorDialogPredRefNo.value?.trim() || '')
 
 /** 修改时允许提交的字段；与新增接口保持同一组业务字段。 */
 const editableFields = [
@@ -457,7 +459,6 @@ const loadError = ref('')
 const initialValues = ref<Partial<ForecastFormValues>>({})
 const requiredFields = new Set<FieldKey>(['clientName', 'payDirec', 'busiType', 'payChannel', 'groundBranch', 'tranDate', 'predDate', 'predAmt'])
 const editorDisabled = computed(() => editorLoading.value || submitting.value)
-const editorPredRefNo = computed(() => props.predRefNo?.trim() || '')
 const editorTitle = computed(() => editorMode.value === 'create' ? '新增数字人民币头寸预报' : '修改数字人民币头寸预报')
 const visibleGroups = computed(() => fieldGroups.map(group => ({
   ...group,
@@ -482,7 +483,7 @@ const fieldPlaceholder = (field: EditorField) => {
 const initializeForm = () => {
   const nextValues = createFormValues()
   if (editorMode.value === 'create') {
-    nextValues.tranDate = props.tranDate || dcpsRuntime.date
+    nextValues.tranDate = dcpsRuntime.date
     nextValues.predDate = dcpsRuntime.date
   } else {
     for (const key of Object.keys(nextValues) as FieldKey[]) {
@@ -532,12 +533,7 @@ const loadEditorDetail = async () => {
   }
 }
 
-// 新增或修改页每次进入都重新初始化（页面实例由 KeepAlive 缓存）。
-onActivated(() => {
-  if (!isEditor.value) return
-  if (editorMode.value === 'create') initializeForm()
-  else void loadEditorDetail()
-})
+// 新增或修改每次打开对话框时重新初始化。
 
 watch(form, () => { formError.value = '' }, { deep: true })
 
@@ -636,7 +632,7 @@ const detailGroups: { title: string; fields: DetailField[] }[] = [
 const detail = ref<ForecastDetail | null>(null)
 const detailLoading = ref(false)
 const detailError = ref('')
-const detailPredRefNo = computed(() => props.predRefNo?.trim() || '')
+const detailPredRefNo = computed(() => detailDialogPredRefNo.value?.trim() || '')
 const detailTitle = computed(() => detailPredRefNo.value ? `预报详情 · ${detailPredRefNo.value}` : '数字人民币头寸预报详情')
 const detailRow = computed<ForecastRow>(() => ({ ...recallForecastRow(detailPredRefNo.value), predRefNo: detailPredRefNo.value }))