Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

# Conflicts: # sf_maintenance/views/maintenance_views.xml
2023-10-30 10:48:13 +08:00
parent 46807003e1 911f464aca
commit 5ffe2ce0e2
4 changed files with 59 additions and 4 deletions
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -269,6 +269,7 @@
                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                    <searchpanel class="account_root">
                        <field name="materials_id" icon="fa-filter"/>
+                        <field name="standards_id" icon="fa-filter"/>
                    </searchpanel>
                </search>
            </field>