Accept Merge Request #255: (feature/修改设备基础参数 -> develop)
Merge Request: 修改设备参数布局 Created By: @龚启豪 Accepted By: @龚启豪 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/255?initial=true
This commit is contained in:
@@ -26,43 +26,51 @@
|
|||||||
<field name="equipment_type"/>
|
<field name="equipment_type"/>
|
||||||
<field name="brand_id"/>
|
<field name="brand_id"/>
|
||||||
<field name="type_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"/>
|
<field name="type_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"/>
|
||||||
<field name="machine_tool_category" readonly="1" attrs="{'invisible': [('type_id', '=', False)]}" force_save="1"/>
|
<field name="machine_tool_category" readonly="1" attrs="{'invisible': [('type_id', '=', False)]}"
|
||||||
|
force_save="1"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//page[@name='maintenance']" position="after">
|
<xpath expr="//page[@name='maintenance']" position="after">
|
||||||
<page string="设备参数" name="sf_equipment" attrs="{'invisible': [('type_id', '=', False)]}">
|
<page string="设备参数" name="sf_equipment" attrs="{'invisible': [('type_id', '=', False)]}">
|
||||||
<group string="参数">
|
<group string="参数">
|
||||||
<group>
|
<group>
|
||||||
|
<field name="control_system_id" required="1" options="{'no_create': True}"/>
|
||||||
|
<field name="workbench_L" required="1"/>
|
||||||
|
<field name="workbench_W" required="1"/>
|
||||||
|
<field name="machine_tool_L" required="1"/>
|
||||||
|
<field name="machine_tool_W" required="1"/>
|
||||||
|
<field name="machine_tool_H" required="1"/>
|
||||||
|
<field name="knife_type" required="1"/>
|
||||||
|
<field name="workpiece_load" required="1"/>
|
||||||
|
<field name="lead_screw" required="1"/>
|
||||||
|
<field name="taper" required="1"/>
|
||||||
|
<field name="torque" required="1"/>
|
||||||
|
<field name="motor_power" required="1"/>
|
||||||
|
|
||||||
<field name="knife_type" />
|
|
||||||
<field name="workpiece_load"/>
|
|
||||||
<field name="lead_screw"/>
|
|
||||||
<field name="workbench_L"/>
|
|
||||||
<field name="workbench_W"/>
|
|
||||||
<field name="taper"/>
|
|
||||||
<field name="torque"/>
|
|
||||||
<field name="motor_power"/>
|
|
||||||
<field name="tool_quality_max"/>
|
|
||||||
<field name="tool_long_max"/>
|
|
||||||
<field name="number_of_knife_library" required="1" options="{'format': false}"/>
|
<field name="number_of_knife_library" required="1" options="{'format': false}"/>
|
||||||
<field name="number_of_axles" widget="radio" options="{'horizontal': true}"/>
|
<field name="number_of_axles" required="1" widget="radio"
|
||||||
|
options="{'horizontal': true}"/>
|
||||||
<label for="x_axis" string="加工行程(mm)"
|
<label for="x_axis" string="加工行程(mm)"
|
||||||
attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
|
attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
|
||||||
<div class="o_address_format"
|
<div class="test_model"
|
||||||
attrs="{'invisible': [('number_of_axles', '=', False)]}">
|
attrs="{'invisible': [('number_of_axles', '=', False)]}">
|
||||||
<label for="x_axis" string="x"/>
|
<label for="x_axis" string="x"/>
|
||||||
<field name="x_axis" class="o_address_city" required="1"
|
<field name="x_axis" class="o_address_zip" required="1"
|
||||||
options="{'format': false}"/>
|
options="{'format': false}"/>
|
||||||
|
<span>&nbsp;</span>
|
||||||
<label for="y_axis" string="y"/>
|
<label for="y_axis" string="y"/>
|
||||||
<field name="y_axis" class="o_address_zip" required="1"
|
<field name="y_axis" class="o_address_zip" required="1"
|
||||||
options="{'format': false}"/>
|
options="{'format': false}"/>
|
||||||
|
<span>&nbsp;</span>
|
||||||
<label for="z_axis" string="z"/>
|
<label for="z_axis" string="z"/>
|
||||||
<field name="z_axis" class="o_address_zip" required="1"
|
<field name="z_axis" class="o_address_zip" required="1"
|
||||||
options="{'format': false}"/>
|
options="{'format': false}"/>
|
||||||
|
<br></br>
|
||||||
<label for="b_axis" string="b"
|
<label for="b_axis" string="b"
|
||||||
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
|
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
|
||||||
<field name="b_axis" class="o_address_city" required="1"
|
<field name="b_axis" class="o_address_zip" required="1"
|
||||||
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
|
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
|
||||||
options="{'format': false}"/>
|
options="{'format': false}"/>
|
||||||
|
<span>&nbsp;</span>
|
||||||
<label for="c_axis" string="c"
|
<label for="c_axis" string="c"
|
||||||
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
|
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
|
||||||
<field name="c_axis" class="o_address_zip" required="1"
|
<field name="c_axis" class="o_address_zip" required="1"
|
||||||
@@ -71,22 +79,24 @@
|
|||||||
</div>
|
</div>
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
|
<field name="heightened_way" required="1"/>
|
||||||
|
<field name="tool_quality_max" required="1"/>
|
||||||
|
<field name="tool_long_max" required="1"/>
|
||||||
|
<field name="tool_diameter_max" required="1"/>
|
||||||
|
<field name="guide_rail" required="1"/>
|
||||||
|
|
||||||
|
<field name="feed_speed" required="1"/>
|
||||||
|
<field name="tool_speed" required="1"/>
|
||||||
|
<field name="distance" required="1"/>
|
||||||
|
<field name="rotate_speed" string="主轴转速(min)" required="1"
|
||||||
|
options="{'format': false}"/>
|
||||||
|
<field name="precision" required="1" string="X轴定位精度(mm)(mm)"/>
|
||||||
|
|
||||||
<field name="guide_rail"/>
|
|
||||||
<field name="machine_tool_L"/>
|
|
||||||
<field name="machine_tool_W"/>
|
|
||||||
<field name="machine_tool_H"/>
|
|
||||||
|
|
||||||
<field name="feed_speed"/>
|
|
||||||
<field name="tool_speed"/>
|
|
||||||
<field name="distance"/>
|
|
||||||
<field name="rotate_speed" required="1" string="转速(min)" options="{'format': false}"/>
|
|
||||||
<field name="precision" required="1" string="加工精度(mm)"/>
|
|
||||||
<field name="control_system_id" required="1" options="{'no_create': True}"/>
|
|
||||||
<field name="state" widget="selection"/>
|
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
|
<group string="其它">
|
||||||
|
<field name="remark"/>
|
||||||
|
</group>
|
||||||
</page>
|
</page>
|
||||||
<page string="其他">
|
<page string="其他">
|
||||||
<group string="其他">
|
<group string="其他">
|
||||||
@@ -177,7 +187,4 @@
|
|||||||
<!-- sequence="1"/>-->
|
<!-- sequence="1"/>-->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</odoo>
|
</odoo>
|
||||||
Reference in New Issue
Block a user