From 5148ad3952215ea00a0a53c7832f9597f26ff8af Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 15 Sep 2023 10:58:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_frontend/static/src/scss/custom_style.scss | 9 ++++++++-
 sf_manufacturing/views/mrp_workcenter_views.xml   | 9 +++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index 5a8c2d84..2db3681b 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -161,7 +161,7 @@ td.o_required_modifier {
 //-----------------------------------------------------------
 
 //图文展示换行及对齐
-.many2many_flex  {
+.many2many_flex {
   flex-wrap: wrap;
 }
 
@@ -180,6 +180,7 @@ div[class="o_content o_component_with_search_panel"] .oe_kanban_color_0 {
 
 div[class="o_content o_component_with_search_panel"] img[name="equipment_image"] {
   width: 150px !important;
+  height: 150px !important;
 }
 
 div[class="o_content o_component_with_search_panel"] .o_kanban_card_content button {
@@ -232,3 +233,9 @@ div[class="o_content o_component_with_search_panel"] .show_state span {
   font-size: 12px;
 }
 
+div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .row {
+  position: absolute;
+  top: 55px;
+  right: 263px;
+}
+
diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml
index 3fecb69a..20275f8a 100644
--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -92,12 +92,17 @@
         <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
         <field name="arch" type="xml">
             <xpath expr="//kanban//templates//t" position="inside">
-                <div class="show_state" t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click
+                <p class="show_state" t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click
                 ">
                     <div t-attf-class="#{record.equipment_status.raw_value == '正常' ? 'color_1' : ''}"></div>
                     <div t-attf-class="#{record.equipment_status.raw_value == '故障' ? 'color_2' : ''}"></div>
                     <div t-attf-class="#{record.equipment_status.raw_value == '不可用' ? 'color_3' : ''}"></div>
-                </div>
+                    <span t-attf-class="#{record.equipment_status.raw_value == '正常' ? 'font_color_1' : ''}
+                        #{record.equipment_status.raw_value == '故障' ? 'font_color_2' : ''}
+                        #{record.equipment_status.raw_value == '不可用' ? 'font_color_3' : ''}">
+                        <field name="equipment_status"/>
+                    </span>
+                </p>
             </xpath>
         </field>
     </record>