Accept Merge Request #303: (feature/tree视图表格样式修改 -> develop)
Merge Request: 标签页筛选完后看板视图的样式修改 Created By: @许何哲 Accepted By: @许何哲 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/303?initial=true
This commit is contained in:
许何哲
@@ -5,9 +5,15 @@
|
||||
margin-top: 1vw !important;
|
||||
}
|
||||
|
||||
|
||||
.choosekanban > button {
|
||||
width: 4vw !important;
|
||||
height: 2vw !important;
|
||||
border: none !important;
|
||||
margin-left: 16px !important;
|
||||
}
|
||||
|
||||
.o_content > .d-flex {
|
||||
display: block !important;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<xpath expr="//t[@t-component='props.Renderer']" position="before">
|
||||
<div class="choosekanban">
|
||||
<!-- <t t-foreach="env['mrp.workcenter'].get_dynamic_data()" t-as="i" t-key="i"> -->
|
||||
<t t-foreach="workOrders" t-as="i" t-key="i">
|
||||
<t t-foreach="workOrders" t-as="i" t-key="i.id">
|
||||
<button t-on-click="buttonClick" t-att-data-id="i.name">
|
||||
<t t-esc="i.name"></t>
|
||||
</button>
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
<xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
|
||||
<field name="production_line_id"/>
|
||||
<field name="equipment_id"/>
|
||||
<field name="production_line_show"/>
|
||||
<field name="production_line_show" invisible="1"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='resource_calendar_id']" position="after">
|
||||
<field name="is_process_outsourcing"/>
|
||||
@@ -121,7 +121,8 @@
|
||||
<field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//kanban" position="replace">
|
||||
<kanban class="oe_background_grey o_kanban_dashboard o_workcenter_kanban" create="0" sample="1" js_class="custom_kanban1">
|
||||
<kanban class="oe_background_grey o_kanban_dashboard o_workcenter_kanban" create="0" sample="1"
|
||||
js_class="custom_kanban1">
|
||||
<field name="name"/>
|
||||
<field name="color"/>
|
||||
<field name="workorder_count"/>
|
||||
@@ -130,17 +131,19 @@
|
||||
<field name="production_line_show"/>
|
||||
<field name="production_line_id"/>
|
||||
<templates>
|
||||
<t t-name="kanban-box" t-if="record.production_line_id.value == record.production_line_show.raw_value">
|
||||
<t t-name="kanban-box"
|
||||
t-if="record.production_line_id.value == record.production_line_show.raw_value">
|
||||
<div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}">
|
||||
<div t-attf-class="o_kanban_card_header o_kanban_record_top">
|
||||
<div class="o_kanban_record_headings o_kanban_card_header_title">
|
||||
<span class="o_primary ml8" style="display: inline-block">
|
||||
<field name="name"/>
|
||||
<field name="production_line_show"/>
|
||||
</span>
|
||||
</div>
|
||||
<div class="o_kanban_manage_button_section">
|
||||
<a class="o_kanban_manage_toggle_button" href="#"><i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/></a>
|
||||
<a class="o_kanban_manage_toggle_button" href="#">
|
||||
<i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container o_kanban_card_content">
|
||||
@@ -148,12 +151,16 @@
|
||||
<div class="col-6 o_kanban_primary_left">
|
||||
<div class="btn-group" name="o_wo">
|
||||
<t t-if="record.workorder_count.raw_value > 0">
|
||||
<button class="btn btn-primary" name="action_work_order" type="object" context="{'search_default_ready': 1, 'search_default_progress': 1}">
|
||||
<button class="btn btn-primary" name="action_work_order"
|
||||
type="object"
|
||||
context="{'search_default_ready': 1, 'search_default_progress': 1}">
|
||||
<span>WORK ORDERS</span>
|
||||
</button>
|
||||
</t>
|
||||
<t t-if="record.workorder_count.raw_value <= 0">
|
||||
<button class="btn btn-warning" name="%(mrp.act_product_mrp_production_workcenter)d" type="action">
|
||||
<button class="btn btn-warning"
|
||||
name="%(mrp.act_product_mrp_production_workcenter)d"
|
||||
type="action">
|
||||
<span>PLAN ORDERS</span>
|
||||
</button>
|
||||
</t>
|
||||
@@ -162,7 +169,8 @@
|
||||
<div class="col-6 o_kanban_primary_right">
|
||||
<div class="row" t-if="record.workorder_ready_count.raw_value > 0">
|
||||
<div class="col-8">
|
||||
<a name="action_work_order" type="object" context="{'search_default_ready': 1}">
|
||||
<a name="action_work_order" type="object"
|
||||
context="{'search_default_ready': 1}">
|
||||
To Launch
|
||||
</a>
|
||||
</div>
|
||||
@@ -172,7 +180,8 @@
|
||||
</div>
|
||||
<div class="row" t-if="record.workorder_progress_count.raw_value > 0">
|
||||
<div class="col-8">
|
||||
<a name="action_work_order" type="object" context="{'search_default_progress': 1}">
|
||||
<a name="action_work_order" type="object"
|
||||
context="{'search_default_progress': 1}">
|
||||
In Progress
|
||||
</a>
|
||||
</div>
|
||||
@@ -182,7 +191,8 @@
|
||||
</div>
|
||||
<div class="row" t-if="record.workorder_late_count.raw_value > 0">
|
||||
<div class="col-8">
|
||||
<a name="action_work_order" type="object" context="{'search_default_late': 1}">
|
||||
<a name="action_work_order" type="object"
|
||||
context="{'search_default_late': 1}">
|
||||
Late
|
||||
</a>
|
||||
</div>
|
||||
@@ -192,7 +202,8 @@
|
||||
</div>
|
||||
<div class="row" t-if="record.oee.raw_value > 0">
|
||||
<div class="col-6">
|
||||
<a name="%(mrp.mrp_workcenter_productivity_report_oee)d" type="action">
|
||||
<a name="%(mrp.mrp_workcenter_productivity_report_oee)d"
|
||||
type="action">
|
||||
OEE
|
||||
</a>
|
||||
</div>
|
||||
@@ -207,8 +218,10 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12 o_kanban_primary_left" style="position:absolute; bottom:10px;" name="wc_stages">
|
||||
<a name="%(mrp.act_mrp_block_workcenter)d" type="action" class="o_status float-end"
|
||||
<div class="col-12 o_kanban_primary_left"
|
||||
style="position:absolute; bottom:10px;" name="wc_stages">
|
||||
<a name="%(mrp.act_mrp_block_workcenter)d" type="action"
|
||||
class="o_status float-end"
|
||||
title="No workorder currently in progress. Click to mark work center as blocked."
|
||||
aria-label="No workorder currently in progress. Click to mark work center as blocked."
|
||||
attrs="{'invisible': [('working_state','in',('blocked','done'))]}"/>
|
||||
@@ -216,13 +229,15 @@
|
||||
title="Workcenter blocked, click to unblock."
|
||||
aria-label="Workcenter blocked, click to unblock."
|
||||
attrs="{'invisible': [('working_state','in',('normal','done'))]}"/>
|
||||
<a name="%(mrp.act_mrp_block_workcenter)d" type="action" class="o_status o_status_green float-end"
|
||||
<a name="%(mrp.act_mrp_block_workcenter)d" type="action"
|
||||
class="o_status o_status_green float-end"
|
||||
title="Work orders in progress. Click to block work center."
|
||||
aria-label="Work orders in progress. Click to block work center."
|
||||
attrs="{'invisible': [('working_state','in',('normal','blocked'))]}"/>
|
||||
</div>
|
||||
</div>
|
||||
</div><div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
|
||||
</div>
|
||||
<div class="container o_kanban_card_manage_pane dropdown-menu" role="menu">
|
||||
<div class="row">
|
||||
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_view">
|
||||
<div role="menuitem" class="o_kanban_card_manage_title">
|
||||
@@ -232,7 +247,9 @@
|
||||
<a name="action_work_order" type="object">Plan Orders</a>
|
||||
</div>
|
||||
<div>
|
||||
<a name="%(maintenance.hr_equipment_request_action)d" type="action">Maintenance</a>
|
||||
<a name="%(maintenance.hr_equipment_request_action)d" type="action">
|
||||
Maintenance
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_new">
|
||||
@@ -240,15 +257,20 @@
|
||||
<span>Reporting</span>
|
||||
</div>
|
||||
<div role="menuitem">
|
||||
<a name="%(mrp.mrp_workcenter_productivity_report_oee)d" type="action">OEE</a>
|
||||
<a name="%(mrp.mrp_workcenter_productivity_report_oee)d" type="action">
|
||||
OEE
|
||||
</a>
|
||||
</div>
|
||||
<div role="menuitem">
|
||||
<a name="%(mrp.mrp_workorder_workcenter_report)d" type="action" context="{'search_default_thisyear':True}">
|
||||
<a name="%(mrp.mrp_workorder_workcenter_report)d" type="action"
|
||||
context="{'search_default_thisyear':True}">
|
||||
Performance
|
||||
</a>
|
||||
</div>
|
||||
<div role="menuitem">
|
||||
<a name="action_work_order" type="object" context="{'search_default_waiting': 1}">Waiting Availability</a>
|
||||
<a name="action_work_order" type="object"
|
||||
context="{'search_default_waiting': 1}">Waiting Availability
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -296,4 +318,23 @@
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!--<!– 测试searchpanel –>-->
|
||||
<!-- <record id="view_location_search_sf11111_inherit" model="ir.ui.view">-->
|
||||
<!-- <field name="name">mrp.workcenter.inherit</field>-->
|
||||
<!-- <field name="model">mrp.workcenter</field>-->
|
||||
<!-- <field name="inherit_id" ref="mrp.view_mrp_workcenter_search"/>-->
|
||||
<!-- <field name="arch" type="xml">-->
|
||||
<!-- <xpath expr="//search[1]" position="inside">-->
|
||||
<!-- <searchpanel class="account_root">-->
|
||||
<!--<!– <field name="location_type" icon="fa-filter"/> –>-->
|
||||
<!-- <field name="production_line_id" select="multi"/>-->
|
||||
<!-- </searchpanel>-->
|
||||
<!-- </xpath>-->
|
||||
<!-- </field>-->
|
||||
<!-- </record>-->
|
||||
|
||||
|
||||
=======
|
||||
>>>>>>> develop
|
||||
</odoo>
|
||||
|
||||
Reference in New Issue
Block a user