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; + } @@ -288,7 +291,7 @@
已选项目
@@ -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,