From 20436ff6ac18e80f5dc24ea0ba75036317022011 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Thu, 14 Mar 2024 14:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BF=85=E5=A1=AB=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5string?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/maintenance_equipment_category_views.xml        | 4 ++--
 sf_maintenance/views/maintenance_request_views.xml        | 8 ++++++++
 sf_maintenance/views/maintenance_views.xml                | 8 ++++----
 sf_tool_management/security/ir.model.access.csv           | 3 ---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/sf_maintenance/views/maintenance_equipment_category_views.xml b/sf_maintenance/views/maintenance_equipment_category_views.xml
index 2cdb47a3..a9bb90fd 100644
--- a/sf_maintenance/views/maintenance_equipment_category_views.xml
+++ b/sf_maintenance/views/maintenance_equipment_category_views.xml
@@ -18,8 +18,8 @@
         <field name="inherit_id" ref="maintenance.hr_equipment_category_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='technician_user_id']" position="before">
-                <field name="equipment_type"/>
-                <field name="equipment_type_code" required='1'/>
+                <field name="equipment_type" class="custom_required"/>
+                <field name="equipment_type_code" required='1' class="custom_required"/>
             </xpath>
         </field>
     </record>
diff --git a/sf_maintenance/views/maintenance_request_views.xml b/sf_maintenance/views/maintenance_request_views.xml
index c435c720..ad09c096 100644
--- a/sf_maintenance/views/maintenance_request_views.xml
+++ b/sf_maintenance/views/maintenance_request_views.xml
@@ -76,6 +76,13 @@
                 <field name="equipment_maintenance_id"/>
 
             </xpath>
+             <xpath expr="//field[@name='user_id']" position="replace">
+                      <field name="user_id" string="维保人"/>
+                 </xpath>
+                <xpath expr="//field[@name='close_date']" position="replace">
+                      <field name="close_date" attrs="{'invisible': [('done', '!=', True)]}" readonly="True" string="维保日期"/>
+                 </xpath>
+
             <sheet>
 
                 <notebook>
@@ -92,6 +99,7 @@
                     </page>
                 </notebook>
 
+
             </sheet>
 
 
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index 140456df..c1e13d34 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -982,16 +982,16 @@
 
                 <xpath expr="//field[@name='next_action_date']" position="before">
 
-                    <field name='eq_maintenance_id' force_save="1" widget="many2one"/>
+                    <field name='eq_maintenance_id' force_save="1" widget="many2one" class="custom_required"/>
 
                 </xpath>
 
                 <xpath expr="//div[hasclass('o_row')][field[@name='maintenance_duration']]" position="after">
 
 
-                    <field name='overhaul_id'/>
+                    <field name='overhaul_id' class="custom_required"/>
                     <field name="overhaul_date" string="下次预防检修"/>
-                    <label for="overhaul_period" string="预防检修频次"/>
+                    <label for="overhaul_period" string="预防检修频次" class="custom_required"/>
                     <div class="o_row">
                         <field name="overhaul_period"/>
                         days
@@ -1188,7 +1188,7 @@
                 <field name="name" readonly="1"/>
                 <field name="type" readonly="1"/>
                 <field name="image" widget="image" readonly="1"/>
-                <field name="equipment_id"/>
+<!--                <field name="equipment_id"/>-->
                 <field name="active" invisible="1"/>
             </tree>
         </field>
diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv
index 91eebb6f..6df54c0b 100644
--- a/sf_tool_management/security/ir.model.access.csv
+++ b/sf_tool_management/security/ir.model.access.csv
@@ -29,6 +29,3 @@ access_sf_tool_transfer_request_information_group_plan_dispatch,sf.tool.transfer
 access_sf_functional_tool_assembly_group_plan_dispatch,sf.functional.tool.assembly,model_sf_functional_tool_assembly,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_functional_tool_assembly_order_group_plan_dispatch,sf.functional.tool.assembly.order,model_sf_functional_tool_assembly_order,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_tool_material_search_group_plan_dispatch,sf.tool.material.search,model_sf_tool_material_search,sf_base.group_plan_dispatch,1,0,0,0
-
-
-