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

Merge branch refs/heads/develop into refs/heads/feature/前端样式修改

Browse Source
This commit is contained in:
黄焱
2024-03-14 16:13:01 +08:00
parent a705d805c9 cfc044b7bc
commit 827b8337bd
44 changed files with 1003 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_maintenance/views/equipment_maintenance_standards_views.xml
View File

@@ -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" />

4
sf_maintenance/views/maintenance_equipment_category_views.xml
View File

@@ -18,8 +18,8 @@
<field name="inherit_id" ref="maintenance.hr_equipment_category_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='technician_user_id']" position="before">
<field name="equipment_type"/>
<field name="equipment_type_code" required='1'/>
<field name="equipment_type" class="custom_required"/>
<field name="equipment_type_code" required='1' class="custom_required"/>
</xpath>
</field>
</record>

8
sf_maintenance/views/maintenance_request_views.xml
View File

@@ -76,6 +76,13 @@
<field name="equipment_maintenance_id"/>
</xpath>
<xpath expr="//field[@name='user_id']" position="replace">
<field name="user_id" string="维保人"/>
</xpath>
<xpath expr="//field[@name='close_date']" position="replace">
<field name="close_date" attrs="{'invisible': [('done', '!=', True)]}" readonly="True" string="维保日期"/>
</xpath>
<sheet>
<notebook>
@@ -92,6 +99,7 @@
</page>
</notebook>
</sheet>

8
sf_maintenance/views/maintenance_views.xml
View File

@@ -982,16 +982,16 @@
<xpath expr="//field[@name='next_action_date']" position="before">
<field name='eq_maintenance_id' force_save="1" widget="many2one"/>
<field name='eq_maintenance_id' force_save="1" widget="many2one" class="custom_required"/>
</xpath>
<xpath expr="//div[hasclass('o_row')][field[@name='maintenance_duration']]" position="after">
<field name='overhaul_id'/>
<field name='overhaul_id' class="custom_required"/>
<field name="overhaul_date" string="下次预防检修"/>
<label for="overhaul_period" string="预防检修频次"/>
<label for="overhaul_period" string="预防检修频次" class="custom_required"/>
<div class="o_row">
<field name="overhaul_period"/>
days
@@ -1188,7 +1188,7 @@
<field name="name" readonly="1"/>
<field name="type" readonly="1"/>
<field name="image" widget="image" readonly="1"/>
<field name="equipment_id"/>
<!-- <field name="equipment_id"/>-->
<field name="active" invisible="1"/>
</tree>
</field>