From 32b773c48607034a96486611a45c68801efbf4b2 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Fri, 1 Sep 2023 16:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=96=B0=E5=A2=9E=E5=9B=BE?=
 =?UTF-8?q?=E6=96=87=E5=B1=95=E7=A4=BAtable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_maintenance/models/sf_maintenance.py       |  9 ++
 sf_maintenance/security/ir.model.access.csv   |  1 +
 .../views/maintenance_logs_views.xml          | 96 +++++++++++--------
 sf_maintenance/views/maintenance_views.xml    | 10 +-
 4 files changed, 74 insertions(+), 42 deletions(-)

diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py
index 98a508eb..9273cc12 100644
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -474,3 +474,12 @@ class SfMaintenanceEquipment(models.Model):
                                                                     ('sf_maintenance_type', '=', '检修')])
             if not next_requests:
                 equipment._create_new_request1(equipment.overhaul_date)
+
+    image_id = fields.Many2many('maintenance.equipment.image', 'equipment_id', string='设备图文')
+
+class MaintenanceStandardImage(models.Model):
+    _name = 'maintenance.equipment.image'
+    _description = '设备图文展示'
+
+    image = fields.Binary(string='设备图文')
+    equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备')
\ No newline at end of file
diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv
index 039583ce..f5517576 100644
--- a/sf_maintenance/security/ir.model.access.csv
+++ b/sf_maintenance/security/ir.model.access.csv
@@ -4,6 +4,7 @@ access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,base.gr
 access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,base.group_user,1,1,1,1
 access_maintenance_standards,maintenance_standards,model_maintenance_standards,base.group_user,1,1,1,1
 access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,base.group_user,1,1,1,1
+access_maintenance_equipment_image,maintenance_equipment_image,model_maintenance_equipment_image,base.group_user,1,1,1,1
 
 
 
diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml
index 33e22bf2..f226349f 100644
--- a/sf_maintenance/views/maintenance_logs_views.xml
+++ b/sf_maintenance/views/maintenance_logs_views.xml
@@ -34,25 +34,39 @@
             <field name="model">sf.maintenance.logs</field>
             <field name="arch" type="xml">
                 <form string="设备故障日志">
-                    <group>
-                        <field name="code"/>
-                        <field name="name"/>
-                        <field name="type"/>
-                        <field name="brand"/>
-                        <field name="maintenance_equipment_id"/>
-                        <field name="code_location"/>
-                        <field name="fault_type"/>
-                        <field name="fault_code"/>
-                        <field name="fault_alarm_info"/>
-                        <field name="alarm_level"/>
-                        <field name="alarm_time"/>
-                        <field name="alarm_way"/>
-                        <field name="fault_process"/>
-                        <field name="operator"/>
-                        <field name="recovery_time"/>
-                        <field name="fault_duration"/>
-                        <field name="note"/>
-                    </group>
+                    <header>
+                        <field name="alarm_level" widget="statusbar"/>
+                    </header>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="code" readonly="1"/>
+                            </h1>
+                        </div>
+                        <group>
+                            <group>
+
+                                <field name="name"/>
+                                <field name="type" required="1" widget="radio" options="{'horizontal': true}"/>
+                                <field name="brand"/>
+                                <field name="maintenance_equipment_id"/>
+                                <field name="code_location"/>
+                                <field name="fault_type" required="1" widget="radio" options="{'horizontal': true}"/>
+                                <field name="fault_code"/>
+                                <field name="fault_process"/>
+                            </group>
+                            <group>
+                                <field name="fault_alarm_info"/>
+                                <field name="alarm_time"/>
+                                <field name="alarm_way" required="1" widget="radio" options="{'horizontal': true}"/>
+                                <field name="operator"/>
+                                <field name="recovery_time"/>
+                                <field name="fault_duration"/>
+                                <field name="note"/>
+
+                            </group>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -64,8 +78,8 @@
             <field name="arch" type="xml">
                 <search>
                     <searchpanel>
-                    <field name="maintenance_equipment_id" icon="fa-building" enable_counters="1"/>
-                </searchpanel>
+                        <field name="maintenance_equipment_id" icon="fa-building" enable_counters="1"/>
+                    </searchpanel>
                     <field name="code"/>
                     <field name="name"/>
                     <field name="type"/>
@@ -90,28 +104,28 @@
 
         <!-- Action -->
 
-    <record id="action_maintenance_logs" model="ir.actions.act_window">
-        <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>
-        <field name="view_id" ref="view_maintenance_logs_tree"/>
-        <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
-                设备故障日志
-            </p>
-        </field>
-    </record>
+        <record id="action_maintenance_logs" model="ir.actions.act_window">
+            <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>
+            <field name="view_id" ref="view_maintenance_logs_tree"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    设备故障日志
+                </p>
+            </field>
+        </record>
 
-<!--        <record id="action_maintenance_logs" model="ir.actions.act_window">-->
-<!--            <field name="name">设备故障日志</field>-->
-<!--            <field name="res_model">sf.maintenance.logs</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" ref="view_maintenance_logs_tree"/>-->
-<!--        </record>-->
+        <!--        <record id="action_maintenance_logs" model="ir.actions.act_window">-->
+        <!--            <field name="name">设备故障日志</field>-->
+        <!--            <field name="res_model">sf.maintenance.logs</field>-->
+        <!--            <field name="view_type">form</field>-->
+        <!--            <field name="view_mode">tree,form</field>-->
+        <!--            <field name="view_id" ref="view_maintenance_logs_tree"/>-->
+        <!--        </record>-->
 
-          <!-- Menu -->
+        <!-- Menu -->
         <menuitem name="设备故障日志" id="menu_maintenance_logs" parent="maintenance.menu_m_request"
                   sequence="10" action="action_maintenance_logs"/>
     </data>
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index b3d0a207..2aa0b980 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -172,6 +172,14 @@
 
                     </page>
 
+                    <page string="图文展示">
+                            <field name='image_id' widget="one2many">
+                                <tree editable="bottom">
+                                    <field name="image" widget="image"
+                                           options="{'size': [100, 100], 'click enlarge': True}"/>
+                                </tree>
+                            </field>
+                    </page>
 
 
                 </xpath>
@@ -210,7 +218,7 @@
                 </xpath>
 
                 <xpath expr="//page[@name='maintenance']" position="after">
-                     <page string="其他" attrs="{'invisible': [('type_id', '=', False)]}">
+                    <page string="其他" attrs="{'invisible': [('type_id', '=', False)]}">
                         <group string="其他">
                             <field name="remark"/>
                         </group>