From e32d17213665f032280db2f5fe85f3812670ec2d Mon Sep 17 00:00:00 2001
From: ai-coding <ai-coding@devgenie.local>
Date: 星期三, 29 七月 2026 14:50:07 +0800
Subject: [PATCH] Merge origin/feat/730-xywang into feat/deploy-uat
---
src/views/userContent/contentCenter/components/AgreementListForm.vue | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/views/userContent/contentCenter/components/AgreementListForm.vue b/src/views/userContent/contentCenter/components/AgreementListForm.vue
index cae9607..f20f028 100644
--- a/src/views/userContent/contentCenter/components/AgreementListForm.vue
+++ b/src/views/userContent/contentCenter/components/AgreementListForm.vue
@@ -13,6 +13,7 @@
getLoginAgreementPageList,
saveLoginAgreement,
} from "@/service/api/operations";
+import { getAgreementCategoryLabel } from "../constants/agreementCategory";
import dayjs from "dayjs";
const props = defineProps<{
@@ -28,6 +29,7 @@
updateTime: string;
sort: number;
version: string;
+ agreementCategory?: number | null;
}
const router = useRouter();
@@ -66,7 +68,14 @@
]);
},
},
- { title: titleLabel, resizable: true, key: "title" },
+ { title: titleLabel, resizable: true, key: "title", width: 260, ellipsis: { tooltip: true } },
+ {
+ title: "协议类型",
+ resizable: true,
+ key: "agreementCategory",
+ width: 140,
+ render: (row: AgreementItem) => getAgreementCategoryLabel(row.agreementCategory),
+ },
{ title: "启用中版本号", resizable: true, key: "version", width: 180 },
{ title: "创建人", resizable: true, key: "creator", width: 180 },
{
@@ -81,6 +90,7 @@
title: "操作",
key: "actions",
width: 120,
+ fixed: "right",
render: (row: AgreementItem) => {
return h(
NSpace,
@@ -124,6 +134,8 @@
updateTime: item.updateTime || item.createTime || "",
sort: Number(item.sort || 0),
version: item.latestVersion || "-",
+ // 协议列表展示的协议类型取"生效中版本"的协议类型，与启用中版本号同源
+ agreementCategory: item.latestAgreementCategory ?? null,
}));
}
@@ -381,6 +393,7 @@
:bottom-bordered="true"
:row-key="(row) => row.id ?? row.nameId"
:row-props="getRowProps"
+ :scroll-x="1200"
class="custom-table"
>
<template #empty>
--
Gitblit v1.7.1