Accept Merge Request #341: (feature/必填字段label添加星号 -> develop)
Merge Request: 修改看板样式 Created By: @许何哲 Accepted By: @许何哲 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/341?initial=true
This commit is contained in:
@@ -15,20 +15,27 @@ div:has(.o_required_modifier)>label::before {
|
|||||||
vertical-align: top !important;
|
vertical-align: top !important;
|
||||||
font-size: 1.5rem !important;
|
font-size: 1.5rem !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.my-image div {
|
.my-image div {
|
||||||
width: 100px !important;
|
width: 110px !important;
|
||||||
height: 130px !important;
|
height: 110px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.add_flex {
|
.add_flex {
|
||||||
|
padding: 5px 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|
||||||
.maintenance_name {
|
.maintenance_name {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
.o_kanban_renderer .o_kanban_record .o_kanban_record_has_image_fill .o_kanban_image_fill_left {
|
.o_kanban_renderer .o_kanban_record .o_kanban_record_has_image_fill .o_kanban_image_fill_left {
|
||||||
flex: unset !important;
|
flex: unset !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom {
|
.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom {
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
display: inline !important;
|
display: inline !important;
|
||||||
@@ -37,3 +44,79 @@ div:has(.o_required_modifier)>label::before {
|
|||||||
td.o_required_modifier {
|
td.o_required_modifier {
|
||||||
display: table-cell !important;
|
display: table-cell !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.show_state {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
bottom: 0;
|
||||||
|
right: 8px;
|
||||||
|
margin: auto;
|
||||||
|
height: 34px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.show_state > div {
|
||||||
|
width: 12px;
|
||||||
|
height: 12px;
|
||||||
|
border: 1px solid #000
|
||||||
|
}
|
||||||
|
|
||||||
|
.show_state > div:nth-child(2) {
|
||||||
|
border-top: none;
|
||||||
|
border-bottom: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oe_kanban_card.kanban_color_2 {
|
||||||
|
background-color: #FF4343 !important;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oe_kanban_card.kanban_color_1 {
|
||||||
|
background-color: #27FEA9 !important;
|
||||||
|
opacity: 0.7;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oe_kanban_card.kanban_color_3 {
|
||||||
|
background-color: rgb(255, 150, 0) !important;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.my-image img {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.color_1 {
|
||||||
|
background-color: #27FEA9;
|
||||||
|
}
|
||||||
|
|
||||||
|
.color_2 {
|
||||||
|
background-color: #FF4343;
|
||||||
|
}
|
||||||
|
|
||||||
|
.color_3 {
|
||||||
|
background-color: rgb(255, 150, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.font_color_1 {
|
||||||
|
color: rgb(0, 183, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.font_color_2 {
|
||||||
|
color: #FF4343;
|
||||||
|
}
|
||||||
|
|
||||||
|
.font_color_3 {
|
||||||
|
color: rgb(255, 150, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.o_kanban_card_header_title {
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.o_kanban_record_bottom {
|
||||||
|
font-family: '华文中宋';
|
||||||
|
//font-weight: bold;
|
||||||
|
}
|
||||||
@@ -286,10 +286,7 @@
|
|||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//templates" position="inside">
|
<xpath expr="//templates" position="inside">
|
||||||
<t t-name="kanban-box">
|
<t t-name="kanban-box">
|
||||||
<div t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click
|
<div t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click">
|
||||||
#{record.state.raw_value == '正常' ? 'kanban_color_1' : ''}
|
|
||||||
#{record.state.raw_value == '故障' ? 'kanban_color_2' : ''}
|
|
||||||
#{record.state.raw_value == '不可用' ? 'kanban_color_3' : ''}">
|
|
||||||
|
|
||||||
<field name="machine_tool_picture" class="o_kanban_image_fill_left d-block my-image"
|
<field name="machine_tool_picture" class="o_kanban_image_fill_left d-block my-image"
|
||||||
preview_image="image_128" widget="image"/>
|
preview_image="image_128" widget="image"/>
|
||||||
@@ -304,7 +301,10 @@
|
|||||||
<div class="o_kanban_record_bottom state_zc">
|
<div class="o_kanban_record_bottom state_zc">
|
||||||
<field name="state_zc"/>
|
<field name="state_zc"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="o_kanban_record_bottom state_zc">
|
<div class="o_kanban_record_bottom state_zc"
|
||||||
|
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"/>
|
<field name="state"/>
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="o_kanban_record_bottom">-->
|
<!-- <div class="o_kanban_record_bottom">-->
|
||||||
@@ -313,7 +313,12 @@
|
|||||||
<!-- <field name="supplier_id"/>-->
|
<!-- <field name="supplier_id"/>-->
|
||||||
<!-- </div>-->
|
<!-- </div>-->
|
||||||
</div>
|
</div>
|
||||||
|
<div class="show_state" t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click
|
||||||
|
">
|
||||||
|
<div t-attf-class="#{record.state.raw_value == '正常' ? 'color_1' : ''}"></div>
|
||||||
|
<div t-attf-class="#{record.state.raw_value == '故障' ? 'color_2' : ''}"></div>
|
||||||
|
<div t-attf-class="#{record.state.raw_value == '不可用' ? 'color_3' : ''}"></div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</t>
|
</t>
|
||||||
</xpath>
|
</xpath>
|
||||||
|
|||||||
Reference in New Issue
Block a user