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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改

Browse Source 
# Conflicts:
#	sf_maintenance/views/equipment_maintenance_standards_views.xml

增加owl监听必填标识功能
This commit is contained in:
黄焱
2024-03-14 16:47:20 +08:00
parent a705d805c9 8117715a02
commit cdf8e7227c
18 changed files with 494 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_maintenance/views/equipment_maintenance_standards_views.xml
View File

@@ -12,14 +12,14 @@
<group>
<field name="code" readonly="1" force_save="1"/>
<field name="name" readonly="1" force_save="1"/>
<field name="maintenance_equipment_category_id" required="1" class="custom_required"/>
<field name="maintenance_equipment_category_id" required="1" />
<field name="eq_maintenance_ids" invisible='1'/>
<field name="overhaul_ids" invisible='1'/>
</group>
<group>
<field name="maintenance_type" required="1" class="custom_required"/>
<field name="maintenance_type" required="1"/>
<field name="created_user_id"/>
<field name="remark"/>
</group>
@@ -31,7 +31,7 @@
<notebook>
<page string="维保项目">
<field name="maintenance_standards_ids" >
<field name="maintenance_standards_ids" delete="1">
<tree editable="bottom" >
<field name="name" />
<field name="fault_type" />

15
sf_maintenance/views/maintenance_views.xml
View File

@@ -60,9 +60,9 @@
<field name="function_type"/>
<field name="code" readonly="1"/>
<field name="equipment_type" invisible="1"/>
<field name="brand_id" force_save="1" class="custom_required"/>
<field name="brand_id" force_save="1" />
<field name="type_id" attrs="{'required': [('equipment_type', '=', '机床')]}"
domain="[('brand_id', '=', brand_id)]" class="custom_required"/>
domain="[('brand_id', '=', brand_id)]" />
<field name="machine_tool_category" readonly="1" attrs="{'invisible': [('type_id', '=', False)]}"
force_save="1"/>
<field name="run_time" force_save="1"/>
@@ -73,9 +73,9 @@
<group>
<group string="基础参数">
<field name="control_system_id" attrs="{'required': [('equipment_type', '=', '机床')]}"
options="{'no_create': True}" class="custom_required"/>
options="{'no_create': True}" />
<label for="workbench_L" string="工作台尺寸(mm)"/>
<div class="test_model custom_required">
<div class="test_model">
<label for="workbench_L" string="长"/>
<field name="workbench_L" class="o_address_zip"
attrs="{'required': [('equipment_type', '=', '机床')]}"
@@ -134,7 +134,7 @@
<!-- <field name="guide_rail" required="1"/>-->
<field name="number_of_axles" attrs="{'required': [('equipment_type', '=', '机床')]}"
widget="radio"
options="{'horizontal': true}" class="custom_required"/>
options="{'horizontal': true}" />
<label for="x_axis" string="加工行程(mm)"
attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
<div class="test_model"
@@ -177,8 +177,7 @@
<group string="刀具">
<!-- <field name="knife_type" required="1"/>-->
<field name="number_of_knife_library"
attrs="{'required': [('equipment_type', '=', '机床')]}"
class="custom_required"/>
attrs="{'required': [('equipment_type', '=', '机床')]}"/>
<!-- <field name="tool_speed" required="1"/>-->
<field name="tool_full_diameter_max"/>
<field name="tool_perimeter_diameter_max"/>
@@ -198,7 +197,7 @@
<field name="C_tool_time"/>
</group>
<group string="主轴">
<field name="taper_type_id" attrs="{'required': [('equipment_type', '=', '机床')]}" class="custom_required"/>
<field name="taper_type_id" attrs="{'required': [('equipment_type', '=', '机床')]}" />
<label for="distance_min" string="主轴端面-工作台距离(mm)"/>
<div class="test_model">
<label for="distance_min" string="最小(min)"/>