From 9c556c5f4096195d6d4bb5a4983782a68725e7f0 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Wed, 19 Jul 2023 17:10:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_maintenance/models/sf_maintenance.py       |  1 +
 .../equipment_maintenance_standards_views.xml | 13 +++-
 .../views/maintenance_logs_views.xml          |  2 +-
 sf_maintenance/views/maintenance_views.xml    | 64 ++++++++++---------
 4 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py
index bc7c841b..911c043b 100644
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -155,6 +155,7 @@ class SfMaintenanceEquipment(models.Model):
             result.append((parameter.id, name))
         return result
 
+
     @api.constrains('rotate_speed')
     def _check_rotate_speed(self):
         if self.rotate_speed <= 0:
diff --git a/sf_maintenance/views/equipment_maintenance_standards_views.xml b/sf_maintenance/views/equipment_maintenance_standards_views.xml
index 7263a135..9681efac 100644
--- a/sf_maintenance/views/equipment_maintenance_standards_views.xml
+++ b/sf_maintenance/views/equipment_maintenance_standards_views.xml
@@ -8,19 +8,26 @@
         <field name="arch" type="xml">
             <form string="设备维保标准">
                 <sheet>
+                    <group>
                     <group>
                         <field name="code" readonly="1" force_save="1"/>
-                        <field name="maintenance_type" required="1"/>
                         <field name="name" required="1"/>
+                        <field name="maintenance_equipment_category_id" required="1"/>
                         <field name="eq_maintenance_ids" invisible='1'/>
                         <field name="overhaul_ids" invisible='1'/>
 
 
                     </group>
                     <group>
+                        <field name="maintenance_type" required="1"/>
                         <field name="created_user_id"/>
-                        <field name="maintenance_equipment_category_id" required="1"/>
-                        <field name="maintenance_equipment_ids" widget="many2many_tags"/>
+
+
+                    </group>
+
+                    </group>
+                    <group>
+                         <field name="maintenance_equipment_ids" widget="many2many_tags" attrs="{'invisible': [('maintenance_equipment_category_id', '=', False)]}"/>
                     </group>
                     <notebook>
                         <page string="维保项目">
diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml
index 3a985d3f..d5cffdae 100644
--- a/sf_maintenance/views/maintenance_logs_views.xml
+++ b/sf_maintenance/views/maintenance_logs_views.xml
@@ -88,7 +88,7 @@
         <!-- Action -->
 
     <record id="action_maintenance_logs" model="ir.actions.act_window">
-        <field name="name">设备维保标准</field>
+        <field name="name">设备故障日志</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sf.maintenance.logs</field>
         <field name="view_mode">tree,form</field>
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index ba890bd1..7f1f41ba 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -24,8 +24,10 @@
                 <xpath expr="//field[@name='category_id']" position="after">
                     <field name="code" readonly="1"/>
                     <field name="equipment_type"/>
-                    <field name="brand_id"/>
-                    <field name="type_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"/>
+
+                    <field name="type_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}" required="1"/>
+                        <field name="brand_id" attrs="{'invisible': [('type_id', '=', False)]}"
+                           force_save="1"/>
                     <field name="machine_tool_category" readonly="1" attrs="{'invisible': [('type_id', '=', False)]}"
                            force_save="1"/>
                 </xpath>
@@ -33,64 +35,64 @@
                     <page string="设备参数" name="sf_equipment" attrs="{'invisible': [('type_id', '=', False)]}">
                         <group string="参数">
                             <group>
-                                <field name="control_system_id" required="1" options="{'no_create': True}"/>
-                                <field name="workbench_L" required="1"/>
-                                <field name="workbench_W" required="1"/>
-                                <field name="machine_tool_L" required="1"/>
-                                <field name="machine_tool_W" required="1"/>
-                                <field name="machine_tool_H" required="1"/>
-                                <field name="knife_type" required="1"/>
-                                <field name="workpiece_load" required="1"/>
-                                <field name="lead_screw" required="1"/>
-                                <field name="taper" required="1"/>
-                                <field name="torque" required="1"/>
-                                <field name="motor_power" required="1"/>
+                                <field name="control_system_id" options="{'no_create': True}"/>
+                                <field name="workbench_L"/>
+                                <field name="workbench_W"/>
+                                <field name="machine_tool_L"/>
+                                <field name="machine_tool_W"/>
+                                <field name="machine_tool_H"/>
+                                <field name="knife_type"/>
+                                <field name="workpiece_load"/>
+                                <field name="lead_screw"/>
+                                <field name="taper"/>
+                                <field name="torque"/>
+                                <field name="motor_power"/>
 
-                                <field name="number_of_knife_library" required="1" options="{'format': false}"/>
-                                <field name="number_of_axles" required="1" widget="radio"
+                                <field name="number_of_knife_library" options="{'format': false}"/>
+                                <field name="number_of_axles" widget="radio"
                                        options="{'horizontal': true}"/>
                                 <label for="x_axis" string="加工行程(mm)"
                                        attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
                                 <div class="test_model"
                                      attrs="{'invisible': [('number_of_axles', '=', False)]}">
                                     <label for="x_axis" string="x"/>
-                                    <field name="x_axis" class="o_address_zip" required="1"
+                                    <field name="x_axis" class="o_address_zip"
                                            options="{'format': false}"/>
                                     <span>&amp;nbsp;</span>
                                     <label for="y_axis" string="y"/>
-                                    <field name="y_axis" class="o_address_zip" required="1"
+                                    <field name="y_axis" class="o_address_zip"
                                            options="{'format': false}"/>
                                     <span>&amp;nbsp;</span>
                                     <label for="z_axis" string="z"/>
-                                    <field name="z_axis" class="o_address_zip" required="1"
+                                    <field name="z_axis" class="o_address_zip"
                                            options="{'format': false}"/>
                                     <br></br>
                                     <label for="b_axis" string="b"
                                            attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
-                                    <field name="b_axis" class="o_address_zip" required="1"
+                                    <field name="b_axis" class="o_address_zip"
                                            attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
                                            options="{'format': false}"/>
                                     <span>&amp;nbsp;</span>
                                     <label for="c_axis" string="c"
                                            attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
-                                    <field name="c_axis" class="o_address_zip" required="1"
+                                    <field name="c_axis" class="o_address_zip"
                                            attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
                                            options="{'format': false}"/>
                                 </div>
                             </group>
                             <group>
-                                <field name="heightened_way" required="1"/>
-                                <field name="tool_quality_max" required="1"/>
-                                <field name="tool_long_max" required="1"/>
-                                <field name="tool_diameter_max" required="1"/>
-                                <field name="guide_rail" required="1"/>
+                                <field name="heightened_way"/>
+                                <field name="tool_quality_max"/>
+                                <field name="tool_long_max"/>
+                                <field name="tool_diameter_max"/>
+                                <field name="guide_rail"/>
 
-                                <field name="feed_speed" required="1"/>
-                                <field name="tool_speed" required="1"/>
-                                <field name="distance" required="1"/>
-                                <field name="rotate_speed" string="主轴转速(min)" required="1"
+                                <field name="feed_speed"/>
+                                <field name="tool_speed"/>
+                                <field name="distance"/>
+                                <field name="rotate_speed" string="主轴转速(min)"
                                        options="{'format': false}"/>
-                                <field name="precision" required="1" string="X轴定位精度(mm)(mm)"/>
+                                <field name="precision" string="X轴定位精度(mm)(mm)"/>
 
                             </group>
                         </group>