From cd0f455db3a4da518a630b1ea451866b34898dd5 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Wed, 16 Aug 2023 17:30:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/static/src/scss/test.scss          |  19 +-
 sf_maintenance/views/maintenance_views.xml | 270 +++++++++++----------
 2 files changed, 159 insertions(+), 130 deletions(-)

diff --git a/sf_base/static/src/scss/test.scss b/sf_base/static/src/scss/test.scss
index e351acc2..3206d847 100644
--- a/sf_base/static/src/scss/test.scss
+++ b/sf_base/static/src/scss/test.scss
@@ -12,4 +12,21 @@
   padding: 0 4px !important;
   vertical-align: top !important;
   font-size: 1.5rem !important;
-  }
\ No newline at end of file
+  }
+.my-image div {
+  width: 100px !important;
+  height: 130px !important;
+}
+.add_flex {
+  display: flex;
+  flex-direction: column;
+}
+.maintenance_name {
+  font-weight: bold;
+}
+.o_kanban_renderer .o_kanban_record .o_kanban_record_has_image_fill .o_kanban_image_fill_left {
+  flex:unset !important;
+}
+.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom {
+  margin-top: 5px;
+}
\ No newline at end of file
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index 23ebdb76..8ba7e9ef 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -20,8 +20,8 @@
 
             <data>
                 <xpath expr="//sheet" position="after">
-<!--                    <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"/>-->
-                     <field name="state_zc" widget="radio" options="{'horizontal': true}"/>
+                    <!--                    <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"/>-->
+                    <field name="state_zc" widget="radio" options="{'horizontal': true}"/>
                 </xpath>
                 <xpath expr="//field[@name='maintenance_team_id']" position="before">
                     <field name="machine_tool_picture" widget="image"/>
@@ -30,121 +30,122 @@
                     <field name="code" readonly="1"/>
                     <field name="state" widget="radio" options="{'horizontal': true}"/>
                     <field name="equipment_type" invisible="1"/>
-                     <field name="brand_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"
+                    <field name="brand_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"
                            force_save="1"/>
-                    <field name="type_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}" required="1"  domain="[('brand_id', '=', brand_id)]"/>
+                    <field name="type_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}" required="1"
+                           domain="[('brand_id', '=', brand_id)]"/>
                     <field name="machine_tool_category" readonly="1" attrs="{'invisible': [('type_id', '=', False)]}"
                            force_save="1"/>
                 </xpath>
                 <xpath expr="//page[@name='description']" position="before">
                     <page string="设备参数" name="sf_equipment" attrs="{'invisible': [('type_id', '=', False)]}">
                         <group>
-                        <group string="基本参数">
-                                    <field name="control_system_id" required="1" options="{'no_create': True}"/>
-                                    <label for="workbench_L" string="工作台尺寸(mm)"/>
-                                    <div class="test_model">
-                                        <label for="workbench_L" string="长"/>
-                                        <field name="workbench_L" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                        <span>&amp;nbsp;</span>
-                                        <label for="workbench_W" string="宽"/>
-                                        <field name="workbench_W" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                    </div>
-                                    <label for="machine_tool_L" string="机床尺寸(mm)"/>
-                                    <div class="test_model">
-                                        <label for="machine_tool_L" string="长"/>
-                                        <field name="machine_tool_L" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                        <span>&amp;nbsp;</span>
-                                        <label for="machine_tool_W" string="宽"/>
-                                        <field name="machine_tool_W" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                        <label for="machine_tool_H" string="高"/>
-                                        <field name="machine_tool_H" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                    </div>
-                                    <field name="feed_speed" required="1"/>
-                                    <label for="precision_min" string="X轴定位精度(mm)"/>
-                                    <div class="test_model">
-                                        <label for="precision_min" string="最小(min)"/>
-                                        <field name="precision_min" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                        <span>&amp;nbsp;</span>
-                                        <label for="precision_max" string="最大(max)"/>
-                                        <field name="precision_max" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                    </div>
-                                    <field name="workpiece_load" required="1"/>
-                                    <field name="number_of_knife_library" required="1" options="{'format': false}"/>
-                                    <field name="lead_screw" required="1"/>
-                                    <field name="number_of_axles" required="1" 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"
-                                               options="{'format': false}"/>
-                                        <span>&amp;nbsp;</span>
-                                        <label for="y_axis" string="y"/>
-                                        <field name="y_axis" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                        <span>&amp;nbsp;</span>
-                                        <label for="z_axis" string="z"/>
-                                        <field name="z_axis" class="o_address_zip" required="1"
-                                               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"
-                                               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"
-                                               attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
-                                               options="{'format': false}"/>
-                                    </div>
-                                </group>
-                                <group string="主轴">
-                                    <field name="taper" required="1"/>
-                                    <field name="rotate_speed" string="主轴转速(r/min)" required="1"
+                            <group string="基本参数">
+                                <field name="control_system_id" required="1" options="{'no_create': True}"/>
+                                <label for="workbench_L" string="工作台尺寸(mm)"/>
+                                <div class="test_model">
+                                    <label for="workbench_L" string="长"/>
+                                    <field name="workbench_L" class="o_address_zip" required="1"
                                            options="{'format': false}"/>
-                                    <field name="heightened_way" required="1"/>
-                                    <field name="torque" required="1"/>
-                                    <field name="motor_power" required="1"/>
-                                    <label for="distance_min" string="主轴端面-工作台距离(mm)"/>
-                                    <div class="test_model">
-                                        <label for="distance_min" string="最小（min）"/>
-                                        <field name="distance_min" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                        <span>&amp;nbsp;</span>
-                                        <label for="distance_max" string="最大（max）"/>
-                                        <field name="distance_max" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                    </div>
-                                    <field name="guide_rail" required="1"/>
-                                </group>
-                                <group string="刀具">
-                                    <field name="knife_type" required="1"/>
-                                    <field name="tool_speed" required="1"/>
-                                    <field name="tool_long_max" required="1"/>
-                                    <label for="tool_diameter_min" string="刀具刀径(mm)"/>
-                                      <div class="test_model">
-                                        <label for="tool_diameter_min" string="最小(min)"/>
-                                        <field name="tool_diameter_min" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                        <span>&amp;nbsp;</span>
-                                        <label for="tool_diameter_max" string="最大(max)"/>
-                                        <field name="tool_diameter_max" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
-                                    </div>
-                                    <field name="tool_quality_max" required="1"/>
-                                </group>
-</group>
+                                    <span>&amp;nbsp;</span>
+                                    <label for="workbench_W" string="宽"/>
+                                    <field name="workbench_W" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
+                                </div>
+                                <label for="machine_tool_L" string="机床尺寸(mm)"/>
+                                <div class="test_model">
+                                    <label for="machine_tool_L" string="长"/>
+                                    <field name="machine_tool_L" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
+                                    <span>&amp;nbsp;</span>
+                                    <label for="machine_tool_W" string="宽"/>
+                                    <field name="machine_tool_W" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
+                                    <label for="machine_tool_H" string="高"/>
+                                    <field name="machine_tool_H" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
+                                </div>
+                                <field name="feed_speed" required="1"/>
+                                <label for="precision_min" string="X轴定位精度(mm)"/>
+                                <div class="test_model">
+                                    <label for="precision_min" string="最小(min)"/>
+                                    <field name="precision_min" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
+                                    <span>&amp;nbsp;</span>
+                                    <label for="precision_max" string="最大(max)"/>
+                                    <field name="precision_max" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
+                                </div>
+                                <field name="workpiece_load" required="1"/>
+                                <field name="number_of_knife_library" required="1" options="{'format': false}"/>
+                                <field name="lead_screw" required="1"/>
+                                <field name="number_of_axles" required="1" 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"
+                                           options="{'format': false}"/>
+                                    <span>&amp;nbsp;</span>
+                                    <label for="y_axis" string="y"/>
+                                    <field name="y_axis" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
+                                    <span>&amp;nbsp;</span>
+                                    <label for="z_axis" string="z"/>
+                                    <field name="z_axis" class="o_address_zip" required="1"
+                                           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"
+                                           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"
+                                           attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
+                                           options="{'format': false}"/>
+                                </div>
+                            </group>
+                            <group string="主轴">
+                                <field name="taper" required="1"/>
+                                <field name="rotate_speed" string="主轴转速(r/min)" required="1"
+                                       options="{'format': false}"/>
+                                <field name="heightened_way" required="1"/>
+                                <field name="torque" required="1"/>
+                                <field name="motor_power" required="1"/>
+                                <label for="distance_min" string="主轴端面-工作台距离(mm)"/>
+                                <div class="test_model">
+                                    <label for="distance_min" string="最小（min）"/>
+                                    <field name="distance_min" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
+                                    <span>&amp;nbsp;</span>
+                                    <label for="distance_max" string="最大（max）"/>
+                                    <field name="distance_max" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
+                                </div>
+                                <field name="guide_rail" required="1"/>
+                            </group>
+                            <group string="刀具">
+                                <field name="knife_type" required="1"/>
+                                <field name="tool_speed" required="1"/>
+                                <field name="tool_long_max" required="1"/>
+                                <label for="tool_diameter_min" string="刀具刀径(mm)"/>
+                                <div class="test_model">
+                                    <label for="tool_diameter_min" string="最小(min)"/>
+                                    <field name="tool_diameter_min" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
+                                    <span>&amp;nbsp;</span>
+                                    <label for="tool_diameter_max" string="最大(max)"/>
+                                    <field name="tool_diameter_max" class="o_address_zip" required="1"
+                                           options="{'format': false}"/>
+                                </div>
+                                <field name="tool_quality_max" required="1"/>
+                            </group>
+                        </group>
 
 
                     </page>
@@ -251,38 +252,49 @@
         </field>
     </record>
 
-       <record id="sf_maintenance_equipment_view_kanban_inherit_hr" model="ir.ui.view">
+    <record id="sf_maintenance_equipment_view_kanban_inherit_hr" model="ir.ui.view">
         <field name="name">sf.maintenance.equipment.view.kanban.inherit.hr</field>
         <field name="model">maintenance.equipment</field>
         <field name="inherit_id" ref="maintenance.hr_equipment_view_kanban"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='activity_state']" position="before">
-                <field name="state" />
+                <field name="state"/>
+                <field name="machine_tool_picture"/>
 
             </xpath>
-             <xpath expr="//templates" position="inside">
-      <t t-name="kanban-box">
-      <div t-attf-class="oe_kanban_card oe_kanban_global_click
+            <xpath expr="//templates" position="inside">
+                <t t-name="kanban-box">
+                    <div t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click
                         #{record.state.raw_value == '正常' ? 'kanban_color_1' : ''}
                         #{record.state.raw_value == '故障' ? 'kanban_color_2' : ''}
                         #{record.state.raw_value == '不可用' ? 'kanban_color_3' : ''}">
-            <div class="o_kanban_card_header">
-                            <div class="o_kanban_card_header_title">
-                                <field name="name"/>
+
+                        <field name="machine_tool_picture" class="o_kanban_image_fill_left d-block my-image"
+                               preview_image="image_128" widget="background_image"/>
+                        <!--            <field name="machine_tool_picture"  widget="image" options="{'previewImage': false}"/>-->
+                        <div class="add_flex">
+                            <div class="o_kanban_card_header">
+                                <div class="o_kanban_card_header_title maintenance_name">
+                                    <field name="name"/>
+                                </div>
                             </div>
+                            <!-- 内容 -->
+                            <div class="o_kanban_record_bottom state_zc">
+                                <field name="state_zc"/>
+                            </div>
+                             <div class="o_kanban_record_bottom state_zc">
+                                <field name="state"/>
+                            </div>
+                            <!--                        <div class="o_kanban_record_bottom">-->
+                            <!--                            <field name="factory_id"/>-->
+                            <!--                            <span> | </span>-->
+                            <!--                            <field name="supplier_id"/>-->
+                            <!--                        </div>-->
                         </div>
-                        <!-- 内容 -->
-                        <div class="o_kanban_record_bottom">
-                            <field name="state_zc"/>
-                        </div>
-                        <div class="o_kanban_record_bottom">
-                            <field name="factory_id"/>
-                            <span> | </span>
-                            <field name="supplier_id"/>
-                        </div>
-        </div>
-      </t>
-    </xpath>
+
+                    </div>
+                </t>
+            </xpath>
         </field>
     </record>