From 2aa29e5cbfd2f1a828a975b281e820fac36f47f7 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 28 Mar 2024 10:35:08 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A1=A8=E9=9D=A2=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B2=E3=80=81=E5=A4=B9=E5=85=B7?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=9A=84=E7=B1=BB=E5=9E=8B=E3=80=81=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E6=B7=BB=E5=8A=A0=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/common_view.xml                                | 5 ++++-
 sf_dlm_management/views/product_template_management_view.xml | 5 +++--
 sf_tool_management/models/base.py                            | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index bf9201b8..0826b51c 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -27,7 +27,7 @@
                             <group>
                                 <field name="code" readonly="1"/>
                                 <field name="process_id" readonly="1"/>
-                                <field name="gain_way" />
+                                <field name="gain_way"/>
                             </group>
 
                         </group>
@@ -231,6 +231,9 @@
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
                     <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
+                    <searchpanel>
+                        <field name="category_id" icon="fa-building" enable_counters="1"/>
+                    </searchpanel>
                 </search>
             </field>
         </record>
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index 264a1c95..453de6a3 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -41,14 +41,15 @@
                            context="{'default_cutting_tool_type': cutting_tool_type,'default_standard_library_id':cutting_tool_model_id}"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"
                            domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
-                    <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
+                    <field name="fixture_material_id"
+                           attrs="{'invisible': [('categ_type', '!=', '夹具')],'required': [('categ_type', '=', '夹具')]}"
                            placeholder="请选择" options="{'no_create': True}"/>
                     <field name="fixture_model_id" string="型号" placeholder="请选择" options="{'no_create': True}"
                            attrs="{'invisible': [('categ_type', '!=', '夹具')],'required': [('categ_type', '=', '夹具')]}"
                            domain="[('fixture_material_id','=',fixture_material_id)]"/>
                     <field name="specification_fixture_id" string="规格" placeholder="请选择"
                            options="{'no_create': True}"
-                           attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
+                           attrs="{'invisible': [('categ_type', '!=', '夹具')],'required': [('categ_type', '=', '夹具')]}"
                            domain="[('fixture_model_id','=',fixture_model_id)]"/>
                 </field>
                 <xpath expr="//label[@for='volume']" position="before">
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 968f6841..8e25ae1f 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -830,7 +830,7 @@ class FunctionalToolAssembly(models.Model):
     code = fields.Char('功能刀具编码', readonly=True)
     rfid = fields.Char('Rfid', readonly=True)
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True)
-    name = fields.Char(string='名称', readonly=True, compute='_compute_name')
+    name = fields.Char(string='名称', readonly=True, compute='_compute_name', store=True)
     assembly_order_code = fields.Char(string='组装单编码', readonly=True)
 
     functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True)