Accept Merge Request #226: (feature/为看板设置颜色 -> develop)
Merge Request: 在看板xml中增加判断逻辑选择不同的class属性值,以匹配对应的css颜色 Created By: @马广威 Accepted By: @马广威 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/226?initial=true
This commit is contained in:
@@ -23,7 +23,7 @@
|
|||||||
'web.assets_qweb': [
|
'web.assets_qweb': [
|
||||||
],
|
],
|
||||||
'web.assets_backend':[
|
'web.assets_backend':[
|
||||||
# 'sf_tool_management/static/src/change.scss'
|
'sf_warehouse/static/src/kanban_color_change.scss'
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
.modal-content .o_cp_buttons {
|
|
||||||
display:none
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-content .o_control_panel {
|
|
||||||
display:none
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-content .o_list_button {
|
|
||||||
|
|
||||||
}
|
|
||||||
11
sf_warehouse/static/src/kanban_color_change.scss
Normal file
11
sf_warehouse/static/src/kanban_color_change.scss
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
.oe_kanban_card.kanban_color_1 {
|
||||||
|
background-color: red !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oe_kanban_card.kanban_color_2 {
|
||||||
|
background-color: blue !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oe_kanban_card.kanban_color_3 {
|
||||||
|
background-color: green !important;
|
||||||
|
}
|
||||||
@@ -76,25 +76,53 @@
|
|||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<kanban class="o_kanban_mobile">
|
<kanban class="o_kanban_mobile">
|
||||||
<templates>
|
<templates>
|
||||||
<t t-name="kanban-box">
|
<t t-name="kanban-box">
|
||||||
<div t-attf-class="oe_kanban_card">
|
<div t-attf-class="oe_kanban_card oe_kanban_global_click
|
||||||
<!-- 标题 -->
|
#{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''}
|
||||||
<div class="o_kanban_card_header">
|
#{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''}
|
||||||
<div class="o_kanban_card_header_title">
|
#{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}">
|
||||||
<field name="name"/>
|
<!-- 标题 -->
|
||||||
</div>
|
<div class="o_kanban_card_header">
|
||||||
</div>
|
<div class="o_kanban_card_header_title">
|
||||||
<!-- 内容 -->
|
<field name="name"/>
|
||||||
<div class="o_kanban_record_bottom">
|
|
||||||
<field name="location_status"/>
|
|
||||||
</div>
|
|
||||||
<div class="o_kanban_record_bottom">
|
|
||||||
<field name="product_sn_id"/>
|
|
||||||
<span> | </span>
|
|
||||||
<field name="product_id"/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</t>
|
<!-- 内容 -->
|
||||||
|
<div class="o_kanban_record_bottom">
|
||||||
|
<field name="location_status"/>
|
||||||
|
</div>
|
||||||
|
<div class="o_kanban_record_bottom">
|
||||||
|
<field name="product_sn_id"/>
|
||||||
|
<span> | </span>
|
||||||
|
<field name="product_id"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</t>
|
||||||
|
<!-- <t t-name="kanban-box"> -->
|
||||||
|
<!-- <div t-attf-class="oe_kanban_card oe_kanban_global_click -->
|
||||||
|
<!-- #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''} -->
|
||||||
|
<!-- #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''} -->
|
||||||
|
<!-- #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}"> -->
|
||||||
|
<!-- --><!-- 看板内容 -->
|
||||||
|
<!-- </div> -->
|
||||||
|
<!-- <div t-attf-class="oe_kanban_card"> -->
|
||||||
|
<!-- --><!-- 标题 -->
|
||||||
|
<!-- <div class="o_kanban_card_header"> -->
|
||||||
|
<!-- <div class="o_kanban_card_header_title"> -->
|
||||||
|
<!-- <field name="name"/> -->
|
||||||
|
<!-- </div> -->
|
||||||
|
<!-- </div> -->
|
||||||
|
<!-- --><!-- 内容 -->
|
||||||
|
<!-- <div class="o_kanban_record_bottom"> -->
|
||||||
|
<!-- <field name="location_status"/> -->
|
||||||
|
<!-- </div> -->
|
||||||
|
<!-- <div class="o_kanban_record_bottom"> -->
|
||||||
|
<!-- <field name="product_sn_id"/> -->
|
||||||
|
<!-- <span> | </span> -->
|
||||||
|
<!-- <field name="product_id"/> -->
|
||||||
|
<!-- </div> -->
|
||||||
|
<!-- </div> -->
|
||||||
|
<!-- </t> -->
|
||||||
</templates>
|
</templates>
|
||||||
</kanban>
|
</kanban>
|
||||||
</field>
|
</field>
|
||||||
|
|||||||
Reference in New Issue
Block a user