Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

# Conflicts:
#	sf_base/views/base_view.xml
#	sf_base/views/common_view.xml
#	sf_tool_management/models/base.py

sf_base/views/base_view.xml

@@ -11,9 +11,12 @@
                 <field name="name" string="模糊搜索"
                        filter_domain="['|',('name', 'ilike', self),('code', 'ilike', self)]"/>
                 <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
-                <!--                <searchpanel>-->
-                <!--                    <field name="tag_ids" icon="fa-filter"/>-->
-                <!--                </searchpanel>-->
+                <group string="分组">
+                    <filter name="tag_ids" string="标签" domain="[]" context="{'group_by': 'tag_ids'}"/>
+                </group>
+                <searchpanel>
+                    <field name="tag_ids" select="multi" icon="fa-building" enable_counters="1"/>
+                </searchpanel>
             </search>
         </field>
     </record>