From a9ba65ec17ea89027465c5b93f4ba738797661e7 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Tue, 24 Oct 2023 09:41:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E5=B1=85=E4=B8=AD=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_frontend/static/src/scss/custom_style.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index d4df8c40..3626cd08 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -317,10 +317,10 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
 .o_horizontal_separator {
   font-size: 1.5rem;
 }
-
-.o_field_widget input[class='o_input'] {
-text-align: center
-}
+//
+//.o_field_widget input[class='o_input'] {
+//text-align: center
+//}
 
 div:has(.o_required_modifier) > label::before {
   position: absolute;

From 4098dda5b8a6a33cb5f7e2e7eb00eaa975a01399 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Tue, 24 Oct 2023 17:31:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/maintenance_logs_views.xml          | 10 ++++----
 .../views/production_line_view.xml            |  2 +-
 .../views/sf_maintenance_equipment.xml        | 23 +------------------
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml
index f226349f..a4e8d605 100644
--- a/sf_maintenance/views/maintenance_logs_views.xml
+++ b/sf_maintenance/views/maintenance_logs_views.xml
@@ -9,16 +9,16 @@
                 <tree>
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="type"/>
+                    <field name="type" optional="hide"/>
                     <field name="brand"/>
                     <field name="maintenance_equipment_id"/>
-                    <field name="code_location"/>
+                    <field name="code_location" optional="hide"/>
                     <field name="fault_type"/>
-                    <field name="fault_code"/>
+                    <field name="fault_code" optional="hide"/>
                     <field name="fault_alarm_info"/>
-                    <field name="alarm_level"/>
+                    <field name="alarm_level" optional="hide"/>
                     <field name="alarm_time"/>
-                    <field name="alarm_way"/>
+                    <field name="alarm_way" optional="hide"/>
                     <field name="fault_process"/>
                     <field name="operator"/>
                     <field name="recovery_time"/>
diff --git a/sf_manufacturing/views/production_line_view.xml b/sf_manufacturing/views/production_line_view.xml
index 47e03488..237697c3 100644
--- a/sf_manufacturing/views/production_line_view.xml
+++ b/sf_manufacturing/views/production_line_view.xml
@@ -101,7 +101,7 @@
         <field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/>
          <field name="arch" type="xml">
              <xpath expr="//field[@name='code']" position="after">
-                 <field name="production_line_id"/>
+                 <field name="production_line_id" optional="hide"/>
              </xpath>
          </field>
      </record>
diff --git a/sf_manufacturing/views/sf_maintenance_equipment.xml b/sf_manufacturing/views/sf_maintenance_equipment.xml
index f072967b..a2d9437d 100644
--- a/sf_manufacturing/views/sf_maintenance_equipment.xml
+++ b/sf_manufacturing/views/sf_maintenance_equipment.xml
@@ -1,27 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-<!--    设备新增生产线-->
-     <record id="sf_hr_equipment_view_form_manufacturing" model="ir.ui.view">
-        <field name="name">sf_equipment.form</field>
-        <field name="model">maintenance.equipment</field>
-        <field name="inherit_id" ref="sf_maintenance.sf_hr_equipment_view_form"/>
-         <field name="arch" type="xml">
-             <xpath expr="//field[@name='brand_id']" position="after">
-                 <field name="production_line_id"/>
-             </xpath>
-         </field>
-     </record>
-<!--    故障日志增加产线对象-->
-         <record id="sf_view_maintenance_logs_tree" model="ir.ui.view">
-        <field name="name">sf.maintenance.logs.tree</field>
-        <field name="model">sf.maintenance.logs</field>
-        <field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/>
-         <field name="arch" type="xml">
-             <xpath expr="//field[@name='code']" position="after">
-                 <field name="production_line_id"/>
-             </xpath>
-         </field>
-     </record>
+
 <!--    设备增加刀具库位table-->
     <record id="sf_manufacturing_hr_equipment_view_form" model="ir.ui.view">
         <field name="name">sf_manufacturing_equipment.form</field>