jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化

Browse Source 
# Conflicts:
#	jikimo_frontend/static/src/scss/custom_style.scss
#	sf_manufacturing/views/mrp_workcenter_views.xml
This commit is contained in:
mgw
2023-09-15 10:40:30 +08:00
parent 2cc03c21ed 480d628125
commit db5d9863b1
20 changed files with 449 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
jikimo_frontend/static/src/scss/custom_style.scss
View File

@@ -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%;
@@ -149,6 +159,7 @@ td.o_required_modifier {
}
//-----------------------------------------------------------
//图文展示换行及对齐
.many2many_flex {
flex-wrap: wrap;
@@ -160,4 +171,64 @@ td.o_required_modifier {
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;
}
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;
}