From 69506af2ab0f6825a19644a8edaf20dbea4c1696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?=
Date: Thu, 14 Sep 2023 17:23:50 +0800
Subject: [PATCH] =?UTF-8?q?sf=E7=9C=8B=E6=9D=BF=E6=A0=B7=E5=BC=8F=E7=BB=9F?=
=?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../static/src/scss/custom_style.scss | 82 ++-
.../views/mrp_workcenter_views.xml | 475 +++++++++---------
2 files changed, 319 insertions(+), 238 deletions(-)
diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index a9f2cee8..9131ea93 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -49,24 +49,29 @@ td.o_required_modifier {
display: flex;
flex-direction: column;
position: absolute;
- top: 0;
+ top: 28px;
bottom: 0;
- right: 8px;
+ right: 18px;
margin: auto;
- height: 34px;
+ //height: 34px;
+ height: unset !important;
+ align-items: center;
}
.show_state > div {
- width: 12px;
+ width: 20px;
height: 12px;
border: 1px solid #000
}
-.show_state > div:nth-child(2) {
- border-top: none;
+.show_state > div:nth-child(1) {
border-bottom: none;
}
+.show_state > div:nth-child(2) {
+ border-top: 1px solid black !important;
+}
+
.oe_kanban_card.kanban_color_2 {
background-color: #FF4343 !important;
color: #fff;
@@ -83,6 +88,11 @@ td.o_required_modifier {
color: #fff;
}
+.my-image div {
+ width: 122px !important;
+ height: 122px !important;
+}
+
.my-image img {
width: 100%;
height: 100%;
@@ -148,4 +158,62 @@ td.o_required_modifier {
justify-content: flex-start;
}
-//-----------------------------------------------------------
\ No newline at end of file
+//-----------------------------------------------------------
+div[class="o_content o_component_with_search_panel"] .oe_kanban_color_0 {
+ position: relative;
+ padding: 0 !important;
+}
+
+div[class="o_content o_component_with_search_panel"] img[name="equipment_image"] {
+ width: 150px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_card_content button {
+ position: absolute;
+ top: -52px;
+ left: -55px;
+ width: 80px;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_primary > span:nth-of-type(1) {
+ position: absolute;
+ top: 10px;
+ left: 168px;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_primary > span:nth-of-type(2) {
+ margin-left: 18px;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_dashboard:not(.o_legacy_kanban_view) .o_kanban_record > div .o_kanban_manage_toggle_button {
+ top: 10px !important;
+ right: 17px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_record_headings .ml8 {
+ margin-left: 0px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_dashboard:not(.o_legacy_kanban_view) .o_kanban_record > div .o_kanban_card_content {
+ min-height: 0 !important;
+ height: 0 !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_dashboard:not(.o_legacy_kanban_view) .o_kanban_record > div .o_kanban_card_header + .container.o_kanban_card_content {
+ margin-top: -5px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .o_kanban_primary_left {
+ right: 10px;
+ padding: 0 !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .show_state {
+ right: 10px !important;
+ top: 45px !important;
+}
+
+div[class="o_content o_component_with_search_panel"] .show_state span {
+ margin-top: 10px;
+ font-size: 12px;
+}
diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml
index 48487bfd..a1ea65ec 100644
--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -24,34 +24,46 @@
-
- mrp.workcenter.view.kanban.inherit.mrp.workorder
- mrp.workcenter
-
-
-
-
+
+ mrp.workcenter.view.kanban.inherit.mrp.workorder
+ mrp.workcenter
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 绿色:正常,红色:故障,黄色:下线/暂停
-
-
-
-
-
+
+
+
+
+
+
+
+
+ mrp.workcenter.kanban.inherit
+ mrp.workcenter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -118,202 +130,203 @@
-
- mrp.workcenter.view.kanban.inherit.maintenance
- mrp.workcenter
-
-
-
-
-
-
-
+
+ mrp.workcenter.view.kanban.inherit.maintenance
+ mrp.workcenter
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -->
- -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -->
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -342,18 +355,18 @@
-
-
- mrp.workcenter.inherit
- mrp.workcenter
-
-
-
-
-
-
-
-
-
+
+
+ mrp.workcenter.inherit
+ mrp.workcenter
+
+
+
+
+
+
+
+
+