From fb81f5966eedb985735eecffcfe22eb550c86654 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 15 五月 2026 11:38:36 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro
---
src/views/equipmentManagement/measurementEquipment/index.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/views/equipmentManagement/measurementEquipment/index.vue b/src/views/equipmentManagement/measurementEquipment/index.vue
index c1d5379..52c52a1 100644
--- a/src/views/equipmentManagement/measurementEquipment/index.vue
+++ b/src/views/equipmentManagement/measurementEquipment/index.vue
@@ -89,12 +89,6 @@
align: "center",
},
{
- label: "瀹夎浣嶇疆",
- prop: "instationLocation",
- width: 150,
- align:"center"
- },
- {
label: "妫�瀹氬崟浣�",
prop: "unit",
width: 200,
@@ -131,10 +125,20 @@
align:"center"
},
{
- label: "妫�瀹氬懆鏈�(澶�)",
- prop: "cycle",
+ label: "蹇埌鏈熸彁閱�",
+ prop: "valid",
width: 130,
- align:"center"
+ align: "center",
+ formatData: (cell) => {
+ if (!cell) return "";
+ const validDate = new Date(cell);
+ const now = new Date();
+ const diffDays = Math.ceil((validDate - now) / (1000 * 60 * 60 * 24));
+ if (diffDays <= 7 && diffDays >= 0) {
+ return "鈿狅笍 " + diffDays + "澶╁悗鍒版湡";
+ }
+ return "";
+ }
},
{
label: "鐘舵��",
--
Gitblit v1.9.3