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;