From 7c8e470199a571cca9b0b18bd6efba67b0c302f2 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 1 Aug 2023 15:08:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=96=B0=E5=A2=9E=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/fixture.py              |  2 +-
 sf_base/views/fixture_view.xml         |  8 ++------
 sf_dlm/views/product_template_view.xml | 10 +++++++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py
index 06418847..d5ad7fe6 100644
--- a/sf_base/models/fixture.py
+++ b/sf_base/models/fixture.py
@@ -29,7 +29,7 @@ class FixtureModel(models.Model):
     code = fields.Char(string='编码')
     name = fields.Char(string="名称", size=15)
     fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料", )
-    fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
+    fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name', store=True)
     multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
     brand_id = fields.Many2one('sf.machine.brand', string="品牌")
     manufacturer_model_number = fields.Char(string="厂家型号")
diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index a267aeea..cef36ff2 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -197,15 +197,13 @@
                            attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","转接板(锁板)托盘","磁吸托盘","虎钳托盘","零点卡盘"))]}'>
                         <group>
                             <label for="length" string="尺寸[mm]"/>
-                            <div class="o_address_format">
+                            <div class="test_model">
                                 <label for="length" string="长"/>
                                 <field name="length" class="o_address_zip"
                                        options="{'format': false}"/>
-                                <span>&amp;nbsp;</span>
                                 <label for="width" string="宽"/>
                                 <field name="width" class="o_address_zip"
                                        options="{'format': false}"/>
-                                <span>&amp;nbsp;</span>
                                 <label for="height" string="高"/>
                                 <field name="height" class="o_address_zip"
                                        options="{'format': false}"/>
@@ -213,18 +211,16 @@
                             <field name="weight"></field>
                             <label for="length" string="夹持工件最大尺寸[mm]"
                                    attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'/>
-                            <div class="o_address_format"
+                            <div class="test_model"
                                  attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'>
                                 <label for="clamp_workpiece_length_max" string="长"/>
                                 <field name="clamp_workpiece_length_max" class="o_address_zip"
                                        options="{'format': false}"
                                        attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
-                                <span>&amp;nbsp;</span>
                                 <label for="clamp_workpiece_width_max" string="宽"/>
                                 <field name="clamp_workpiece_width_max" class="o_address_zip"
                                        options="{'format': false}"
                                        attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
-                                <span>&amp;nbsp;</span>
                                 <label for="clamp_workpiece_height_max" string="高"/>
                                 <field name="clamp_workpiece_height_max" class="o_address_zip"
                                        options="{'format': false}"
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index a4a9d998..e7bd62a9 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -355,8 +355,16 @@
                     <filter name="finish_product" string="成品" domain="[('categ_id.type','=','成品')]"/>
                     <filter name="embryo" string="坯料" domain="[('categ_id.type','=','坯料')]"/>
                     <filter name="raw_bom" string="原材料" domain="[('categ_id.type','=','原材料')]"/>
+                    <!--                    <searchpanel>-->
+                    <!--                        <field name="categ_id" icon="fa-building" enable_counters="1"/>-->
+                    <!--                    </searchpanel>-->
+                </xpath>
+                <xpath expr="//search" position="inside">
+                    <searchpanel>
+                        <field name="categ_id" icon="fa-building" enable_counters="1"/>
+                    </searchpanel>
                 </xpath>
             </field>
-        </record>
+        </record>                                                                                                                                                                
     </data>
 </odoo>
\ No newline at end of file