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

Accept Merge Request #303: (feature/tree视图表格样式修改 -> develop)

Browse Source 
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:
许何哲
2023-08-07 16:58:41 +08:00
committed by Coding
parent a99fe44408 194bb28085
commit 7fb585dfdd
3 changed files with 108 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_manufacturing/static/src/scss/kanban_change.scss
View File

@@ -5,9 +5,15 @@
margin-top: 1vw !important; margin-top: 1vw !important;
} }
.choosekanban > button { .choosekanban > button {
width: 4vw !important; width: 4vw !important;
height: 2vw !important; height: 2vw !important;
border: none !important; border: none !important;
margin-left: 16px !important; margin-left: 16px !important;
} }
.o_content > .d-flex {
display: block !important;
}

2
sf_manufacturing/static/src/xml/kanban_change.xml
View File

@@ -4,7 +4,7 @@
<xpath expr="//t[@t-component='props.Renderer']" position="before"> <xpath expr="//t[@t-component='props.Renderer']" position="before">
<div class="choosekanban"> <div class="choosekanban">
<!-- <t t-foreach="env['mrp.workcenter'].get_dynamic_data()" t-as="i" t-key="i"> --> <!-- <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"> <button t-on-click="buttonClick" t-att-data-id="i.name">
<t t-esc="i.name"></t> <t t-esc="i.name"></t>
</button> </button>

161
sf_manufacturing/views/mrp_workcenter_views.xml
View File

@@ -94,7 +94,7 @@
<xpath expr="//field[@name='alternative_workcenter_ids']" position="after"> <xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
<field name="production_line_id"/> <field name="production_line_id"/>
<field name="equipment_id"/> <field name="equipment_id"/>
<field name="production_line_show"/> <field name="production_line_show" invisible="1"/>
</xpath> </xpath>
<xpath expr="//field[@name='resource_calendar_id']" position="after"> <xpath expr="//field[@name='resource_calendar_id']" position="after">
<field name="is_process_outsourcing"/> <field name="is_process_outsourcing"/>
@@ -102,26 +102,27 @@
</field> </field>
</record> </record>
<!-- <record id="mrp_workcenter_view_kanban_inherit_maintenance" model="ir.ui.view"> --> <!-- <record id="mrp_workcenter_view_kanban_inherit_maintenance" model="ir.ui.view"> -->
<!-- <field name="name">mrp.workcenter.view.kanban.inherit.maintenance</field> --> <!-- <field name="name">mrp.workcenter.view.kanban.inherit.maintenance</field> -->
<!-- <field name="model">mrp.workcenter</field> --> <!-- <field name="model">mrp.workcenter</field> -->
<!-- <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/> --> <!-- <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/> -->
<!-- <field name="arch" type="xml"> --> <!-- <field name="arch" type="xml"> -->
<!-- <xpath expr="//div[@name='plan_order']" position="after"> --> <!-- <xpath expr="//div[@name='plan_order']" position="after"> -->
<!-- <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> -->
<!-- </xpath> --> <!-- </xpath> -->
<!-- </field> --> <!-- </field> -->
<!-- </record> --> <!-- </record> -->
<!-- 继承原有的看板视图 --> <!-- 继承原有的看板视图 -->
<record id="mrp_workcenter_kanban_inherit1" model="ir.ui.view"> <record id="mrp_workcenter_kanban_inherit1" model="ir.ui.view">
<field name="name">mrp.workcenter.kanban.inherit</field> <field name="name">mrp.workcenter.kanban.inherit</field>
<field name="model">mrp.workcenter</field> <field name="model">mrp.workcenter</field>
<field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/> <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//kanban" position="replace"> <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="name"/>
<field name="color"/> <field name="color"/>
<field name="workorder_count"/> <field name="workorder_count"/>
@@ -130,39 +131,46 @@
<field name="production_line_show"/> <field name="production_line_show"/>
<field name="production_line_id"/> <field name="production_line_id"/>
<templates> <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="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}">
<div t-attf-class="o_kanban_card_header o_kanban_record_top"> <div t-attf-class="o_kanban_card_header o_kanban_record_top">
<div class="o_kanban_record_headings o_kanban_card_header_title"> <div class="o_kanban_record_headings o_kanban_card_header_title">
<span class="o_primary ml8" style="display: inline-block"> <span class="o_primary ml8" style="display: inline-block">
<field name="name"/> <field name="name"/>
<field name="production_line_show"/>
</span> </span>
</div> </div>
<div class="o_kanban_manage_button_section"> <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> </div>
<div class="container o_kanban_card_content"> <div class="container o_kanban_card_content">
<div class="row mb16"> <div class="row mb16">
<div class="col-6 o_kanban_primary_left"> <div class="col-6 o_kanban_primary_left">
<div class="btn-group" name="o_wo"> <div class="btn-group" name="o_wo">
<t t-if="record.workorder_count.raw_value &gt; 0"> <t t-if="record.workorder_count.raw_value &gt; 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"
<span>WORK ORDERS</span> type="object"
</button> context="{'search_default_ready': 1, 'search_default_progress': 1}">
</t> <span>WORK ORDERS</span>
<t t-if="record.workorder_count.raw_value &lt;= 0"> </button>
<button class="btn btn-warning" name="%(mrp.act_product_mrp_production_workcenter)d" type="action"> </t>
<span>PLAN ORDERS</span> <t t-if="record.workorder_count.raw_value &lt;= 0">
</button> <button class="btn btn-warning"
</t> name="%(mrp.act_product_mrp_production_workcenter)d"
type="action">
<span>PLAN ORDERS</span>
</button>
</t>
</div> </div>
</div> </div>
<div class="col-6 o_kanban_primary_right"> <div class="col-6 o_kanban_primary_right">
<div class="row" t-if="record.workorder_ready_count.raw_value &gt; 0"> <div class="row" t-if="record.workorder_ready_count.raw_value &gt; 0">
<div class="col-8"> <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 To Launch
</a> </a>
</div> </div>
@@ -172,7 +180,8 @@
</div> </div>
<div class="row" t-if="record.workorder_progress_count.raw_value &gt; 0"> <div class="row" t-if="record.workorder_progress_count.raw_value &gt; 0">
<div class="col-8"> <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 In Progress
</a> </a>
</div> </div>
@@ -182,7 +191,8 @@
</div> </div>
<div class="row" t-if="record.workorder_late_count.raw_value &gt; 0"> <div class="row" t-if="record.workorder_late_count.raw_value &gt; 0">
<div class="col-8"> <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 Late
</a> </a>
</div> </div>
@@ -192,7 +202,8 @@
</div> </div>
<div class="row" t-if="record.oee.raw_value &gt; 0"> <div class="row" t-if="record.oee.raw_value &gt; 0">
<div class="col-6"> <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 OEE
</a> </a>
</div> </div>
@@ -207,22 +218,26 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-12 o_kanban_primary_left" style="position:absolute; bottom:10px;" name="wc_stages"> <div class="col-12 o_kanban_primary_left"
<a name="%(mrp.act_mrp_block_workcenter)d" type="action" class="o_status float-end" style="position:absolute; bottom:10px;" name="wc_stages">
title="No workorder currently in progress. Click to mark work center as blocked." <a name="%(mrp.act_mrp_block_workcenter)d" type="action"
aria-label="No workorder currently in progress. Click to mark work center as blocked." class="o_status float-end"
attrs="{'invisible': [('working_state','in',('blocked','done'))]}"/> 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'))]}"/>
<a name="unblock" type="object" class=" o_status o_status_red float-end" <a name="unblock" type="object" class=" o_status o_status_red float-end"
title="Workcenter blocked, click to unblock." title="Workcenter blocked, click to unblock."
aria-label="Workcenter blocked, click to unblock." aria-label="Workcenter blocked, click to unblock."
attrs="{'invisible': [('working_state','in',('normal','done'))]}"/> 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"
title="Work orders in progress. Click to block work center." class="o_status o_status_green float-end"
aria-label="Work orders in progress. Click to block work center." title="Work orders in progress. Click to block work center."
attrs="{'invisible': [('working_state','in',('normal','blocked'))]}"/> aria-label="Work orders in progress. Click to block work center."
attrs="{'invisible': [('working_state','in',('normal','blocked'))]}"/>
</div> </div>
</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="row">
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_view"> <div class="col-6 o_kanban_card_manage_section o_kanban_manage_view">
<div role="menuitem" class="o_kanban_card_manage_title"> <div role="menuitem" class="o_kanban_card_manage_title">
@@ -231,24 +246,31 @@
<div role="menuitem" name="plan_order"> <div role="menuitem" name="plan_order">
<a name="action_work_order" type="object">Plan Orders</a> <a name="action_work_order" type="object">Plan Orders</a>
</div> </div>
<div> <div>
<a name="%(maintenance.hr_equipment_request_action)d" type="action">Maintenance</a> <a name="%(maintenance.hr_equipment_request_action)d" type="action">
</div> Maintenance
</a>
</div>
</div> </div>
<div class="col-6 o_kanban_card_manage_section o_kanban_manage_new"> <div class="col-6 o_kanban_card_manage_section o_kanban_manage_new">
<div role="menuitem" class="o_kanban_card_manage_title"> <div role="menuitem" class="o_kanban_card_manage_title">
<span>Reporting</span> <span>Reporting</span>
</div> </div>
<div role="menuitem"> <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>
<div role="menuitem"> <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 Performance
</a> </a>
</div> </div>
<div role="menuitem"> <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> </div>
</div> </div>
@@ -266,9 +288,9 @@
</t> </t>
</templates> </templates>
</kanban> </kanban>
</xpath> </xpath>
</field> </field>
</record> </record>
<!-- MRP.PRODUCTION --> <!-- MRP.PRODUCTION -->
<record id="mrp_production_view_form_inherit_maintenance" model="ir.ui.view"> <record id="mrp_production_view_form_inherit_maintenance" model="ir.ui.view">
@@ -296,4 +318,23 @@
</field> </field>
</field> </field>
</record> </record>
<!--&lt;!&ndash; 测试searchpanel &ndash;&gt;-->
<!-- <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">-->
<!--&lt;!&ndash; <field name="location_type" icon="fa-filter"/> &ndash;&gt;-->
<!-- <field name="production_line_id" select="multi"/>-->
<!-- </searchpanel>-->
<!-- </xpath>-->
<!-- </field>-->
<!-- </record>-->
=======
>>>>>>> develop
</odoo> </odoo>