From de59d59309e4649c56746542334fbae4aa58d418 Mon Sep 17 00:00:00 2001
From: "yunpeng.zhang" <zhangyp1015@163.com>
Date: Wed, 10 Jan 2024 11:22:19 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E5=8D=B3=E5=B0=86=E5=88=B0=E6=9C=9F?=
 =?UTF-8?q?=E8=80=97=E6=9D=90=E5=9C=A8=E8=A1=A8=E6=A0=BC=E4=B8=AD=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=90=8C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipments/consumables.vue | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/views/equipments/consumables.vue b/src/views/equipments/consumables.vue
index 7e35f03..7f7fdbe 100644
--- a/src/views/equipments/consumables.vue
+++ b/src/views/equipments/consumables.vue
@@ -130,6 +130,7 @@
 
     <el-table
       v-loading="loading"
+      :cell-style="cellStyle"
       :data="consumablesList"
       @selection-change="handleSelectionChange"
     >
@@ -145,14 +146,14 @@
           <span>{{equipmentOptions.find(option=>option.equipmentId===scope.row.equipmentId)?.equipmentName}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="耗材名称" align="center" prop="consumableName" width="150"/>
+      <el-table-column label="耗材名称" align="center" prop="consumableName" width="220"/>
       <el-table-column label="耗材编号" align="center" prop="consumableNo"  width="200"/>
       <el-table-column label="开始使用时间" align="center" prop="activationTime" width="110">
         <template #default="scope">
           <span>{{ parseTime(scope.row.activationTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="使用期效" align="center" prop="validity" width="100">
+      <el-table-column label="使用期效" align="center" prop="validity">
         <template #default="scope">
           <span>{{ scope.row.validity + sys_time_unit.find(item=>item.value===scope.row.validityUint)?.label}}</span>
         </template>
@@ -162,12 +163,12 @@
           <span>{{ parseTime(scope.row.dueTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="负责人" align="center" prop="chargeUser" width="100">
+      <el-table-column label="负责人" align="center" prop="chargeUser">
         <template #default="scope">
           <span>{{ userOptions.find(option=>option.userId===scope.row.chargeUser)?.nickName}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" width="100">
+      <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :options="consumable_status" :value="scope.row.status" />
         </template>
@@ -414,6 +415,25 @@ function getList() {
   });
 }
 
+// 根据返回的每一行的数据判断,修改这一行的样式
+const cellStyle = (data) => {
+  const dueTime = new Date(data.row.dueTime);
+  const currentDate = new Date();
+  const sevenDaysAfter = new Date(currentDate);
+  sevenDaysAfter.setDate(currentDate.getDate() + 7);
+  if (dueTime < currentDate) {
+    return {
+      color: "#000",
+      background: "#fabcc3",
+    };
+  }else if (dueTime < sevenDaysAfter) {
+    return {
+      color: "#000",
+      background: "#e6a23c",
+    };
+  }
+};
+
 // 取消按钮
 function cancel() {
   open.value = false;