From f4e303ca010bf97dd533f316229e09585fa737d0 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Mon, 27 May 2024 13:57:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E4=BF=AE=E6=94=B9=E3=80=81=E5=A4=87=E4=BB=B6=E6=9C=80?=
 =?UTF-8?q?=E4=BD=8E=E6=9C=80=E9=AB=98=E5=BA=93=E5=AD=98=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E3=80=81=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/basic/item/index.vue           |  3 ++-
 src/views/eam/item/countadjustPlan/index.vue |  2 +-
 src/views/eam/report/itemWarning/index.vue   | 22 +++++++++-----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/views/eam/basic/item/index.vue b/src/views/eam/basic/item/index.vue
index bb6adcf..c09acaf 100644
--- a/src/views/eam/basic/item/index.vue
+++ b/src/views/eam/basic/item/index.vue
@@ -226,8 +226,9 @@ const formsSuccess = async (formType, data) => {
     return item.field === 'maxInventory' || item.field === 'minInventory'
   })
   if (isHave) {
-    if (data.minInventory && data.maxInventory && data.minInventory >= data.maxInventory) {
+    if (data.minInventory && data.maxInventory && data.minInventory > data.maxInventory) {
       message.error('最高库存要大于最低库存')
+      basicFormRef.value.formLoading = false
       return false
     }
   }
diff --git a/src/views/eam/item/countadjustPlan/index.vue b/src/views/eam/item/countadjustPlan/index.vue
index 9d1237d..4fd8135 100644
--- a/src/views/eam/item/countadjustPlan/index.vue
+++ b/src/views/eam/item/countadjustPlan/index.vue
@@ -134,7 +134,7 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = [
   // defaultButtons.mainListEditBtn({hasPermi:'eam:countadjustPlan:update'}), // 编辑
-  // defaultButtons.mainListDeleteBtn({hasPermi:'eam:countadjustPlan:delete'}), // 删除
+  defaultButtons.mainListDeleteBtn({hasPermi:'item:countadjustPlan:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/eam/report/itemWarning/index.vue b/src/views/eam/report/itemWarning/index.vue
index c445592..2f13949 100644
--- a/src/views/eam/report/itemWarning/index.vue
+++ b/src/views/eam/report/itemWarning/index.vue
@@ -10,7 +10,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns"  :stripe="false" :row-style="tableRowClassName" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table :columns="tableColumns"  :stripe="false" :row-class-name="tableRowClassName" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort">
@@ -257,14 +257,16 @@
     function  tableRowClassName({row, rowIndex}) {
       console.log(row.classification);
         if (row.classification =='A') {
-          return {
-            background: 'red !important'
-          };
+          // return {
+          //   background: '#ff4800 !important'
+          // };
+          return 'red-row';
         } 
         if (row.classification =='B') {
-          return {
-            background: 'yellow !important'
-          };
+          // return {
+          //   background: 'yellow !important'
+          // };
+          return 'yellow-row';
         }
         return '';
       }
@@ -296,17 +298,13 @@
 //     color: white !important;
 // }
   ::v-deep .el-table .red-row {
-    background: red !important;
+    background: #ff4800 !important;
   }
 
   ::v-deep .el-table .yellow-row {
     background: yellow !important;
   }
 
-  ::v-deep .el-table tr > red-row{
-    background: red !important;
-  }
-
 //   ::v-deep .el-table .red-row {
 //   --el-table-tr-bg-color: var(--el-color-warning-light-9) !important;
 // }