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

This commit is contained in:
黄焱
2024-03-14 16:50:03 +08:00
30 changed files with 584 additions and 212 deletions

View File

@@ -981,16 +981,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
@@ -1187,7 +1187,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>