From acd87349ea011aa176caa844e498d4c8fd05fffd Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Thu, 3 Apr 2025 10:19:30 +0800
Subject: [PATCH] =?UTF-8?q?web=E5=B1=8F=E8=94=BD=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/Web/ItemController.php    |  2 +-
 Laravel/public/tool/register.html             | 23 ++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Web/ItemController.php b/Laravel/app/Http/Controllers/API/Web/ItemController.php
index bf11f32..dd237f5 100644
--- a/Laravel/app/Http/Controllers/API/Web/ItemController.php
+++ b/Laravel/app/Http/Controllers/API/Web/ItemController.php
@@ -25,7 +25,7 @@ class ItemController extends Controller
     $group_arr = [];
     $group_list = [];
     $keshi_list = [];
-    $keshi_list=DB::table('items')->select('keshi_id','keshi_name')->where(['is_choose'=>1,'status'=>1])->groupBy('keshi_id','keshi_name')->get();
+    $keshi_list=DB::table('items')->select('keshi_id','keshi_name')->where(['is_choose'=>1,'status'=>1])->where('keshi_name','<>','材料费')->groupBy('keshi_id','keshi_name')->get();
     foreach ($items as $item) {
       if($item->sex <> $sex and $item->sex<>0){
         continue;
diff --git a/Laravel/public/tool/register.html b/Laravel/public/tool/register.html
index 932abfc..f4ffdb1 100644
--- a/Laravel/public/tool/register.html
+++ b/Laravel/public/tool/register.html
@@ -122,6 +122,9 @@
       color: #909399;
       font-weight: bold;
     }
+    .disnone{
+      display: none;
+    }
   </style>
   <script></script>
 </head>
@@ -288,7 +291,7 @@
           <div class="mt-3">
             <div class="table_title_wrapper">已选项目</div>
             <el-table border :data="select_table_computed" style="width: 100%" height="calc(50vh - 45px - 79px)"
-              show-overflow-tooltip ref="select_table_ref" row-class-name="cursor-pointer" highlight-current-row
+              show-overflow-tooltip ref="select_table_ref" :row-class-name="yixuanClassName" highlight-current-row
               @row-click="itemRowClick">
               <el-table-column type="selection" width="38"></el-table-column>
               <el-table-column property="name" label="项目名称" width="120"></el-table-column>
@@ -1083,12 +1086,25 @@
         for (let i in select_rows) {
           select_ids.push(select_rows[i].id)
         }
+        let classnames=''
+
         if (select_ids.includes(e.row.id)) {
           console.log('select_ids', select_ids, e.row.id)
-          return 'item_active cursor-pointer'
+          classnames=  'item_active cursor-pointer'
         } else {
-          return 'cursor-pointer'
+          classnames= 'cursor-pointer'
+        }
+        if(e.row.group==='材料费'){
+          classnames=classnames+' disnone'
+        }
+        return classnames
+      }
+      const yixuanClassName=(e)=>{
+       let classname= 'cursor-pointer'
+        if(e.row.group==='材料费'){
+          classname=classname+' disnone';
         }
+        return classname
       }
       function isEnglishOnly(str) {
         // 使用正则表达式检查字符串是否只包含英文字符
@@ -1113,6 +1129,7 @@
         PlanDateChange,
         isEnglishOnly,
         itemTableRowClassName,
+        yixuanClassName,
         createOrderClick,
         selectPlanClick,
         getPlanList,