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

Merge Request: 修改设备菜单默认展示页面

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/497?initial=true
This commit is contained in:
龚启豪
2023-10-26 17:34:01 +08:00
committed by Coding

View File

@@ -636,7 +636,7 @@
</div> </div>
<field name='robot_axis_num' attrs="{'required': [('equipment_type', '=', '机器人')]}"/> <field name='robot_axis_num' attrs="{'required': [('equipment_type', '=', '机器人')]}"/>
<field name='axis_ids' widget="One2many"> <field name='axis_ids'>
<tree editable='bottom'> <tree editable='bottom'>
<field name="name"/> <field name="name"/>
<field name="angle_min"/> <field name="angle_min"/>
@@ -647,6 +647,7 @@
<field name="permissible_inertial_torque"/> <field name="permissible_inertial_torque"/>
</tree> </tree>
</field> </field>
<label for="robot_track_dimensions_L" string="轨道尺寸"/> <label for="robot_track_dimensions_L" string="轨道尺寸"/>
<div class="test_model"> <div class="test_model">
<div> <div>
@@ -1178,5 +1179,13 @@
groups="maintenance.group_equipment_manager,base.group_user" groups="maintenance.group_equipment_manager,base.group_user"
sequence="2"/> sequence="2"/>
<menuitem
id="maintenance.menu_m_dashboard"
name="设备清单"
parent="maintenance.menu_maintenance_title"
groups="maintenance.group_equipment_manager,base.group_user"
action="hr_equipment_action1"
sequence="0"/>
</odoo> </odoo>