From 988f70bf6925599ef492c2c9df230617dcd7167b Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 18 Jul 2023 16:20:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A4=B9=E5=85=B7=E5=9E=8B=E5=8F=B7=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=90=9C=E7=B4=A2=E9=9D=A2=E6=9D=BF=202.=E5=A4=B9?=
 =?UTF-8?q?=E5=85=B7=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=92=8C=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/fixture_view.xml            | 15 +++++++++++----
 sf_base/views/functional_fixture_view.xml |  5 ++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index e064e102..a21aaa8f 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -25,6 +25,8 @@
                 <field name="code"/>
                 <field name="name"/>
                 <field name="remark"/>
+                <field name="create_uid" string="创建人"/>
+                <field name="create_date" string="创建时间"/>
             </tree>
         </field>
     </record>
@@ -87,6 +89,8 @@
                 <field name="code"/>
                 <field name="name"/>
                 <field name="remark"/>
+                <field name="create_uid" string="创建人"/>
+                <field name="create_date" string="创建时间"/>
             </tree>
         </field>
     </record>
@@ -138,12 +142,15 @@
                 <field name="multi_mounting_type_id" string="联装类型"
                        filter_domain="[('multi_mounting_type_id.name', 'ilike', self)]"/>
                 <group expand="0" string="Group By...">
-                    <filter string='品牌' name="default_unit_of_measure" domain="[]"
+                    <filter string='品牌' name="brand_id" domain="[]"
                             context="{'group_by' : 'brand_id'}"/>
-                    <filter string="夹具物料" name="product" domain="[]" context="{'group_by': 'fixture_material_id'}"/>
-                    <filter string='联装类型' name="group_by_type" domain="[]"
+                    <filter string="夹具物料" name="fixture_material_id" domain="[]" context="{'group_by': 'fixture_material_id'}"/>
+                    <filter string='联装类型' name="multi_mounting_type_id" domain="[]"
                             context="{'group_by' : 'multi_mounting_type_id'}"/>
                 </group>
+                <searchpanel class="account_root">
+                    <field name="fixture_material_id" icon="fa-filter"/>
+                </searchpanel>
             </search>
         </field>
     </record>
@@ -180,7 +187,7 @@
                             <field name="multi_mounting_type_id"/>
                         </group>
                         <group>
-<!--                            <field name="upload_model_file" widget="many2many_binary"/>-->
+                            <!--                            <field name="upload_model_file" widget="many2many_binary"/>-->
                             <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                                    attrs="{'invisible': [('model_file', '=', False)]}"/>
                         </group>
diff --git a/sf_base/views/functional_fixture_view.xml b/sf_base/views/functional_fixture_view.xml
index 2cf4d50a..6b49bb87 100644
--- a/sf_base/views/functional_fixture_view.xml
+++ b/sf_base/views/functional_fixture_view.xml
@@ -26,6 +26,8 @@
                 <field name="code"/>
                 <field name="name"/>
                 <field name="remark"/>
+                <field name="create_uid" string="创建人"/>
+                <field name="create_date" string="创建时间"/>
             </tree>
         </field>
     </record>
@@ -83,7 +85,8 @@
                 <field name="code"/>
                 <field name="name"/>
                 <field name="type_id"/>
-                <field name="zero_chuck_model_ids" widget="many2many_tags"/>
+                <field name="create_uid" string="创建人"/>
+                <field name="create_date" string="创建时间"/>
             </tree>
         </field>
     </record>