From 3ce715a4e66955eac86dcd2f5c8afcfdf8becb6d Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 29 十月 2026 16:46:47 +0800
Subject: [PATCH] Merge origin/dev_项目管理 into dev_项目管理
---
src/components/PIMTable/PIMTable.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index f99b1eb..7940f1a 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -11,6 +11,7 @@
:row-key="rowKey"
:style="tableStyle"
tooltip-effect="dark"
+ :tooltip-options="{ popperOptions: { strategy: 'absolute' } }"
:expand-row-keys="expandRowKeys"
:show-summary="isShowSummary"
:summary-method="summaryMethod"
@@ -18,6 +19,7 @@
@current-change="currentChange"
@selection-change="handleSelectionChange"
@expand-change="expandChange"
+ @sort-change="handleSortChange"
class="lims-table">
<el-table-column align="center"
type="selection"
@@ -40,7 +42,7 @@
:prop="item.prop"
:show-overflow-tooltip="item.dataType !== 'action' && item.dataType !== 'slot'"
:align="item.align"
- :sortable="!!item.sortable"
+ :sortable="item.sortable || false"
:type="item.type"
:width="item.width"
:minWidth="item.minWidth">
@@ -177,15 +179,19 @@
class="cell link"
style="width: 100%"
@click="goLink(scope.row, item.linkMethod)">
- <span v-if="!item.formatData">{{ scope.row[item.prop] }}</span>
+ <span v-if="!item.formatData">{{
+ toDateOnly(scope.row[item.prop])
+ }}</span>
</div>
<!-- 榛樿绾睍绀烘暟鎹� -->
<div v-else
class="cell"
style="width: 100%">
- <span v-if="!item.formatData">{{ scope.row[item.prop] }}</span>
+ <span v-if="!item.formatData">{{
+ toDateOnly(scope.row[item.prop])
+ }}</span>
<span v-else>{{
- formatters(scope.row[item.prop], item.formatData)
+ toDateOnly(formatters(scope.row[item.prop], item.formatData))
}}</span>
</div>
</template>
@@ -203,6 +209,7 @@
import pagination from "./Pagination.vue";
import { computed, ref, inject, getCurrentInstance } from "vue";
import { ElMessage } from "element-plus";
+ import { toDateOnly } from "@/utils/dateDisplay";
// 鑾峰彇鍏ㄥ眬鐨� uploadHeader
const { proxy } = getCurrentInstance();
@@ -214,6 +221,7 @@
"expand-change",
"selection-change",
"row-click",
+ "sort-change",
]);
// Filters
@@ -499,6 +507,10 @@
const handleSelectionChange = newSelection => {
emit("selection-change", newSelection);
};
+
+ const handleSortChange = ({ column, prop, order }) => {
+ emit("sort-change", { column, prop, order });
+ };
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3