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

Accept Merge Request #496: (feature/修改机床参数bug -> develop)

Browse Source 
Merge Request: 修改设备日志列表展示

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/496
This commit is contained in:
龚启豪
2023-10-24 17:32:39 +08:00
committed by Coding
parent 2c67f7a286 e7de773f28
commit 802bd4285c
4 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,10 +317,10 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
.o_horizontal_separator { .o_horizontal_separator {
font-size: 1.5rem; font-size: 1.5rem;
} }
//
.o_field_widget input[class='o_input'] { //.o_field_widget input[class='o_input'] {
text-align: center //text-align: center
} //}
div:has(.o_required_modifier) > label::before { div:has(.o_required_modifier) > label::before {
position: absolute; position: absolute;

10
sf_maintenance/views/maintenance_logs_views.xml
View File

@@ -9,16 +9,16 @@
<tree> <tree>
<field name="code"/> <field name="code"/>
<field name="name"/> <field name="name"/>
<field name="type"/> <field name="type" optional="hide"/>
<field name="brand"/> <field name="brand"/>
<field name="maintenance_equipment_id"/> <field name="maintenance_equipment_id"/>
<field name="code_location"/> <field name="code_location" optional="hide"/>
<field name="fault_type"/> <field name="fault_type"/>
<field name="fault_code"/> <field name="fault_code" optional="hide"/>
<field name="fault_alarm_info"/> <field name="fault_alarm_info"/>
<field name="alarm_level"/> <field name="alarm_level" optional="hide"/>
<field name="alarm_time"/> <field name="alarm_time"/>
<field name="alarm_way"/> <field name="alarm_way" optional="hide"/>
<field name="fault_process"/> <field name="fault_process"/>
<field name="operator"/> <field name="operator"/>
<field name="recovery_time"/> <field name="recovery_time"/>

2
sf_manufacturing/views/production_line_view.xml
View File

@@ -101,7 +101,7 @@
<field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/> <field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='code']" position="after"> <xpath expr="//field[@name='code']" position="after">
<field name="production_line_id"/> <field name="production_line_id" optional="hide"/>
</xpath> </xpath>
</field> </field>
</record> </record>

23
sf_manufacturing/views/sf_maintenance_equipment.xml
View File

@@ -1,27 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<!-- 设备新增生产线-->
<record id="sf_hr_equipment_view_form_manufacturing" model="ir.ui.view">
<field name="name">sf_equipment.form</field>
<field name="model">maintenance.equipment</field>
<field name="inherit_id" ref="sf_maintenance.sf_hr_equipment_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='brand_id']" position="after">
<field name="production_line_id"/>
</xpath>
</field>
</record>
<!-- 故障日志增加产线对象-->
<record id="sf_view_maintenance_logs_tree" model="ir.ui.view">
<field name="name">sf.maintenance.logs.tree</field>
<field name="model">sf.maintenance.logs</field>
<field name="inherit_id" ref="sf_maintenance.view_maintenance_logs_tree"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='code']" position="after">
<field name="production_line_id"/>
</xpath>
</field>
</record>
<!-- 设备增加刀具库位table--> <!-- 设备增加刀具库位table-->
<record id="sf_manufacturing_hr_equipment_view_form" model="ir.ui.view"> <record id="sf_manufacturing_hr_equipment_view_form" model="ir.ui.view">
<field name="name">sf_manufacturing_equipment.form</field> <field name="name">sf_manufacturing_equipment.form</field>