diff --git a/app/admin/form/Goods.php b/app/admin/form/Goods.php index cf756fa7d..836953598 100644 --- a/app/admin/form/Goods.php +++ b/app/admin/form/Goods.php @@ -108,13 +108,13 @@ class Goods 'view_key' => 'brand_name', 'is_sort' => 1, 'search_config' => [ - 'form_type' => 'module', - 'template' => 'lib/module/category_brand', + 'form_type' => 'select', 'form_name' => 'brand_id', + 'where_type' => 'in', 'data' => BrandService::CategoryBrand(), 'data_key' => 'id', 'data_name' => 'name', - 'where_type' => 'in', + 'is_multiple' => 1, ], ], [ diff --git a/app/admin/view/default/lib/module/category_brand.html b/app/admin/view/default/lib/module/category_brand.html deleted file mode 100644 index d438dc6e8..000000000 --- a/app/admin/view/default/lib/module/category_brand.html +++ /dev/null @@ -1,8 +0,0 @@ - -{{if !empty($module_data['data']) && !empty($module_data['form_name_key'])}} - -{{/if}} \ No newline at end of file diff --git a/app/admin/view/default/public/module/form_table.html b/app/admin/view/default/public/module/form_table.html index 8b98938b6..598c19e74 100644 --- a/app/admin/view/default/public/module/form_table.html +++ b/app/admin/view/default/public/module/form_table.html @@ -279,7 +279,16 @@ {{case radio}} {{if isset($data_list[$i][$form_table['base']['key_field']])}} - {{if empty($t['not_show_data']) or empty($t['not_show_key']) or !isset($data_list[$i][$t['not_show_key']]) or !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])}} + {{if + !isset($t['not_show_data']) or + empty($t['not_show_key']) or + (is_array($t['not_show_data']) and isset($data_list[$i][$t['not_show_key']]) and !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])) or + (isset($t['not_show_type']) and isset($data_list[$i][$t['not_show_key']]) and ( + ($t['not_show_type'] eq 0 and $data_list[$i][$t['not_show_key']] eq $t['not_show_data']) or + ($t['not_show_type'] eq 1 and $data_list[$i][$t['not_show_key']] gt $t['not_show_data']) or + ($t['not_show_type'] eq 2 and $data_list[$i][$t['not_show_key']] lt $t['not_show_data']) + )) + }}