diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index 9131ea93..2db3681b 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -159,6 +159,20 @@ td.o_required_modifier { } //----------------------------------------------------------- + +//图文展示换行及对齐 +.many2many_flex { + flex-wrap: wrap; +} + +.many2many_flex > div { + width: 110px; + margin-right: 15px; + display: flex; + flex-direction: column; + align-items: flex-start; +} + div[class="o_content o_component_with_search_panel"] .oe_kanban_color_0 { position: relative; padding: 0 !important; @@ -166,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 { @@ -217,3 +232,10 @@ div[class="o_content o_component_with_search_panel"] .show_state span { margin-top: 10px; 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_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index e2903d54..85be0a1c 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -177,7 +177,7 @@ - + diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml index a1ea65ec..20275f8a 100644 --- a/sf_manufacturing/views/mrp_workcenter_views.xml +++ b/sf_manufacturing/views/mrp_workcenter_views.xml @@ -24,6 +24,26 @@ + + mrp.workcenter.view.kanban.inherit.mrp.workorder + mrp.workcenter + + + + + + + + + + + + +
绿色:正常,红色:故障,黄色:下线/暂停
+
+
+
+ mrp.workcenter.view.kanban.inherit.mrp.workorder mrp.workcenter @@ -65,6 +85,28 @@
+ + + mrp.workcenter.kanban.inherit + mrp.workcenter + + + +

+

+
+
+ + + +

+
+
+
+ diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml index 7878fa5f..f7c22624 100644 --- a/sf_plan/views/view.xml +++ b/sf_plan/views/view.xml @@ -35,7 +35,7 @@