Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
# Conflicts: # sf_maintenance/views/equipment_maintenance_standards_views.xml 增加owl监听必填标识功能
This commit is contained in:
@@ -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" />
|
||||
|
||||
Reference in New Issue
Block a user