From e87846bfc7e467836d958632b15a22a901eb51d2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 09 一月 2025 15:33:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/components/noticeTable.vue | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/src/views/components/noticeTable.vue b/src/views/components/noticeTable.vue
index 319ebda..4789ab9 100644
--- a/src/views/components/noticeTable.vue
+++ b/src/views/components/noticeTable.vue
@@ -1,6 +1,6 @@
<template>
- <div>
- <div class="flex justify-between mb-[15px]">
+ <div style="position: relative">
+ <div class="flex justify-between mb-[15px]" style="align-items: center;margin-bottom: 5px">
<div class="block mb-3 font-semibold fonts">寰呭姙浜嬮」</div>
<div class="flex text-[12px]">
<div
@@ -26,7 +26,7 @@
color: '#454B5E',
fontSize: '12px'
}"
- height="280"
+ min-height="280"
max-height="280"
>
<el-table-column
@@ -37,6 +37,7 @@
:min-width="column.minWidth"
:prop="column.prop"
:show-overflow-tooltip="true"
+ :formatter="column.formatter"
>
</el-table-column>
@@ -44,35 +45,39 @@
align="center"
fixed="right"
label="鎿嶄綔"
- min-width="150"
+ min-width="90"
>
- <template #default="scope">
+ <template slot-scope="scope">
<el-button
- plain
size="small"
- type="primary"
+ type="text"
@click="handleDetail(scope.row)"
>
鏌ョ湅</el-button
>
<el-button
- plain
size="small"
- type="primary"
+ type="text"
@click="handleUpdate(scope.row)"
>
- 澶勭疆</el-button
+ 澶勭悊</el-button
>
</template>
</el-table-column>
</el-table>
- <pagination
+ <div style="position: absolute; bottom: 0px;width: 100%;">
+ <div style="width: 100%;display: flex;flex-direction: row-reverse;align-items: center">
+ <pagination
+ style="width: 100%"
v-show="total >= 0"
+ :page-sizes="[4]"
:limit="queryParams.pageSize"
:page="queryParams.pageNum"
:total="total"
@pagination="getList"
- />
+ />
+ </div>
+ </div>
</div>
</template>
<script>
@@ -85,7 +90,7 @@
total: 0,
queryParams: {
pageNum: 1,
- pageSize: 5,
+ pageSize: 4,
},
tableData: [],
currentTableHeaders: [],
@@ -93,11 +98,25 @@
{ label: "娴佺▼鐜妭", prop: "taskName", minWidth: 150, align: "left" },
{
label: "鐢宠椤圭洰",
- prop: "processName",
+ prop: "projectName",
minWidth: 150,
align: "left",
},
- { label: "瀹℃壒浜�", prop: "handlerName", minWidth: 100, align: "left" },
+ {
+ label: "澶勭悊浜�",
+ prop: "handlerName",
+ minWidth: 100,
+ align: "left",
+ formatter: (row) => {
+ if (row.handlerType === 'USER') {
+ return row.handlerName.join('銆�')
+ } else if (row.handlerType === 'DEPT') {
+ return row.handlerUnitName.join('銆�')
+ } else if (row.handlerType === 'ROLE') {
+ return row.handlerUnitName.join('銆�')
+ }
+ }
+ },
{ label: "瀹屾垚鎯呭喌", prop: "taskStatus", minWidth: 143, align: "left" },
{
label: "鍓╀綑鏃堕棿",
@@ -221,10 +240,13 @@
<style lang="scss" scoped>
.tab {
- padding: 8px;
+ padding: 6px;
border: 1px solid #dbdeea;
cursor: pointer;
width: 72px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
.active {
--
Gitblit v1.8.0