From 932f82ac6c5c2267527eef431c2ad623d4cc38e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E7=84=B1?= <huangyan@jikimo.com>
Date: Wed, 20 Dec 2023 17:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82-=E5=AE=A2=E6=88=B7=E3=80=81?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=A7=86=E5=9B=BE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=BA=93=E5=AD=98-=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=A6=82=E8=A7=88=E7=95=8C=E9=9D=A2=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=9C=80=E4=BC=98=E5=8C=96=20=E5=B7=A5=E5=8E=82=E7=AB=AF?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E6=96=B0=E5=BB=BA=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E4=BF=9D=E5=AD=98=E5=92=8C=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E5=8F=8A=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E8=A6=81=E4=BC=98=E5=8C=96=20=E3=80=90=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E7=BB=84=E8=A3=85=E3=80=91=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E7=BB=84=E8=A3=85=E5=8D=95=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=9C=89=E4=B8=AA=E5=AD=97=E6=AE=B5=E6=A0=87=E9=A2=98=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8=20=E5=88=B6=E9=80=A0-=E5=88=80?=
 =?UTF-8?q?=E5=85=B7=E7=AE=A1=E7=90=86-=E6=9C=BA=E5=BA=8A=E6=8D=A2?=
 =?UTF-8?q?=E5=88=80=E7=94=B3=E8=AF=B7=E7=95=8C=E9=9D=A2=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=87=8D=E5=8F=A0=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/js/custom_form_status_indicator.js    | 14 +++++-
 .../static/src/scss/custom_style.scss         | 44 +++++++++++++------
 sf_base/static/src/scss/test.scss             |  8 +++-
 3 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
index c1ba8248..a5ca68f1 100644
--- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js
+++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
@@ -47,4 +47,16 @@ patch(FormStatusIndicator.prototype, 'jikimo_frontend.FormStatusIndicator', {
 }
 );
 
-
+$(function (){
+    document.addEventListener('click', function () {
+        const dom = $('.o_form_status_indicator_buttons ')
+        if(dom) {
+            const dom1 = dom.children().eq(0)
+            const dom2 = dom.children().eq(1)
+            if(!dom1.text()) {
+                dom1.append('保存')
+                dom2.append('取消')
+            }
+        }
+    })
+})
diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index 5c632e96..766cca31 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -328,19 +328,19 @@ div:has(.o_required_modifier) > label::before {
   left: -3px;
 }
 
-.o_form_view .o_form_label {
-  position: relative;
-  width: 9rem;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  padding-left: 1rem;
-}
-
-.o_form_view .o_form_label:hover {
-  white-space: normal;
-  overflow: visible;
-}
+//.o_form_view .o_form_label {
+//  position: relative;
+//  width: 9rem;
+//  overflow: hidden;
+//  text-overflow: ellipsis;
+//  white-space: nowrap;
+//  padding-left: 1rem;
+//}
+//
+//.o_form_view .o_form_label:hover {
+//  white-space: normal;
+//  overflow: visible;
+//}
 
 .o_form_view {
     .o_form_sheet_bg .o_form_sheet {
@@ -382,4 +382,22 @@ div:has(.o_required_modifier) > label::before {
       margin-right: 10px;
     }
   }
+}
+
+.o_stock_kanban .o_kanban_card_content {
+  .row {
+    align-items: center;
+
+    .o_kanban_primary_left, .o_kanban_primary_right {
+      display: block;
+    }
+
+    .o_kanban_primary_right {
+      position: unset;
+    }
+  }
+}
+// 机床换刀申请表格宽度设置
+.o_list_table_ungrouped  {
+  min-width: 1089px;
 }
\ No newline at end of file
diff --git a/sf_base/static/src/scss/test.scss b/sf_base/static/src/scss/test.scss
index a2992e1a..fdc5821e 100644
--- a/sf_base/static/src/scss/test.scss
+++ b/sf_base/static/src/scss/test.scss
@@ -34,8 +34,14 @@ div:has(.o_required_modifier) > label::before {
 
 .o_kanban_renderer .o_kanban_record .o_kanban_record_has_image_fill .o_kanban_image_fill_left {
   flex: unset !important;
+  min-width: 100px;
+}
+.o_kanban_renderer .o_kanban_record .o_kanban_record_title {
+  font-weight: bold;
+}
+.o_kanban_renderer .o_kanban_record .oe_kanban_details ul {
+  margin-top: calc(var(--KanbanRecord-gap-v) * 0.5);
 }
-
 .o_kanban_renderer .o_kanban_record .o_kanban_record_bottom {
   margin-top: 5px;
   display: inline !important;