From d8363f263789a72a43f0e9dd01c6497ef2157300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?=
 <xuhezhe@jikimo.com>
Date: Fri, 22 Sep 2023 17:33:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=B9=B6=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/scss/custom_style.scss         | 48 +++++++++++++++----
 sf_maintenance/views/maintenance_views.xml    | 12 ++++-
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index 60a4968d..3237fc2b 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -159,20 +159,22 @@ td.o_required_modifier {
 }
 
 .o_list_view .o_list_table thead {
-    position: sticky;
-    top: 0;
-    //z-index: 100000;
+  position: sticky;
+  top: 0;
+  z-index: 100000;
 }
+
 //.o_list_view .o_list_table {
 //    height: 1799px !important;
 //}
 .table-responsive {
-    overflow: unset;
+  overflow: unset;
 }
+
 .o_form_view.o_xxl_form_view .o_form_sheet_bg > .o_form_statusbar {
-    position: sticky !important;
-    top: 0;
-    //z-index: 100000;
+  position: sticky !important;
+  top: 0;
+  z-index: 100000;
 }
 
 //-----------------------------------------------------------
@@ -253,6 +255,36 @@ div[class="o_content o_component_with_search_panel"] .show_state span {
 div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .row {
   position: absolute;
   top: 55px;
-  right: 263px;
+  right: 43.5%;
 }
 
+@media screen and (min-width: 1200px) {
+  div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .row {
+    right: 52%;
+  }
+
+  div[class="o_content o_component_with_search_panel"] .o_kanban_card_content button {
+    left: -95px;
+  }
+
+}
+
+//.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom {
+//  display: flex !important;
+//  flex-direction: column;
+//}
+
+.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom>div:nth-child(1)>span:nth-child(1) {
+  display: inline-block;
+  margin-right: 10px;
+
+}
+
+.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom>div:nth-child(1) {
+  margin-top: -5px;
+  margin-bottom: 5px;
+}
+
+.text-bg-warning {
+  background-color: #FED300 !important;
+}
\ No newline at end of file
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index e929b444..500d6282 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -332,7 +332,15 @@
                             </div>
                             <!-- 内容 -->
                             <div class="o_kanban_record_bottom state_zc">
-                                <field name="state_zc"/>
+                                <div>
+                                    <field name="brand_id"/>
+                                    <field name="type_id"/>
+                                </div>
+                                <div>
+                                    <field name="state_zc"
+                                           widget="label_selection"
+                                           options="{'classes': {'未注册': 'warning', '已注册': 'success'}}"/>
+                                </div>
                             </div>
                             <div class="o_kanban_record_bottom state_zc">
                                 <field name="technician_user_id"/>
@@ -349,7 +357,7 @@
                             <div t-attf-class="#{record.state.raw_value == '故障' ? 'color_2' : ''}"></div>
                             <div t-attf-class="#{record.state.raw_value == '不可用' ? 'color_3' : ''}"></div>
                             <p class="o_kanban_record_bottom state_zc"
-                                 t-attf-class="#{record.state.raw_value == '正常' ? 'font_color_1' : ''}
+                               t-attf-class="#{record.state.raw_value == '正常' ? 'font_color_1' : ''}
                         #{record.state.raw_value == '故障' ? 'font_color_2' : ''}
                         #{record.state.raw_value == '不可用' ? 'font_color_3' : ''}">
                                 <field name="state"/>