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/修改机床参数bug

Browse Source 
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
#	sf_mrs_connect/models/sync_common.py
This commit is contained in:
qihao.gong@jikimo.com
2023-10-11 14:56:18 +08:00
parent b1d2cd1ceb 0752ba9d2d
commit ecb1f4140e
14 changed files with 950 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
sf_maintenance/views/maintenance_views.xml
View File

@@ -953,40 +953,37 @@
<field name="name">maintenance.equipment.image.tree</field>
<field name="model">maintenance.equipment.image</field>
<field name="arch" type="xml">
<tree string="能力特征库">
<field name="name"/>
<field name="type"/>
<field name="image" widget="image"/>
<field name="equipment_id" invisible="1"/>
<tree string="能力特征库" editable="bottom" delete="0" create="0" >
<field name="name" readonly="1"/>
<field name="type" readonly="1"/>
<field name="image" widget="image" readonly="1"/>
<field name="equipment_id" />
<field name="active" invisible="1"/>
</tree>
</field>
</record>
<record id="view_maintenance_equipment_image_form" model="ir.ui.view">
<field name="name">maintenance.equipment.image.form</field>
<record model="ir.ui.view" id="view_maintenance_equipment_image_search">
<field name="name">maintenance.equipment.image.search</field>
<field name="model">maintenance.equipment.image</field>
<field name="arch" type="xml">
<form string="能力特征库">
<sheet>
<group>
<field name="name" required="1"/>
<field name="type" required="1"/>
<field name="image" widget="image" required="1"/>
<field name="equipment_id" invisible="1"/>
<field name="active" invisible="1"/>
</group>
</sheet>
</form>
<search>
<field name="name"/>
<searchpanel class="account_root">
<field name="type" icon="fa-filter" enable_counters="1"/>
</searchpanel>
</search>
</field>
</record>
<record id="action_maintenance_equipment_image" model="ir.actions.act_window">
<field name="name">能力特征库</field>
<field name="res_model">maintenance.equipment.image</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree</field>
<field name="domain">[]</field>
</record>
<menuitem
id="maintenance_equipment_image_form"
name="能力特征库"