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:
#	jikimo_frontend/static/src/scss/custom_style.scss
#	sf_manufacturing/views/mrp_workcenter_views.xml
This commit is contained in:
mgw
2023-09-15 10:40:30 +08:00
parent 2cc03c21ed 480d628125
commit db5d9863b1
20 changed files with 449 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sf_maintenance/views/maintenance_views.xml
View File

@@ -381,8 +381,9 @@
<field name="name">maintenance.equipment.image.tree</field>
<field name="model">maintenance.equipment.image</field>
<field name="arch" type="xml">
<tree string="设备图文">
<tree string="能力特征库">
<field name="name"/>
<field name="type"/>
<field name="image" widget="image"/>
<field name="equipment_id" invisible="1"/>
<field name="active" invisible="1"/>
@@ -394,11 +395,12 @@
<field name="name">maintenance.equipment.image.form</field>
<field name="model">maintenance.equipment.image</field>
<field name="arch" type="xml">
<form string="设备图文">
<form string="能力特征库">
<sheet>
<group>
<field name="name"/>
<field name="image" widget="image"/>
<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>
@@ -408,14 +410,14 @@
</record>
<record id="action_maintenance_equipment_image" model="ir.actions.act_window">
<field name="name">设备图文图文</field>
<field name="name">能力特征库</field>
<field name="res_model">maintenance.equipment.image</field>
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
</record>
<menuitem
<menuitem
id="maintenance_equipment_image_form"
name="设备图文展示"
name="能力特征库"
parent="maintenance.menu_m_request"
action="action_maintenance_equipment_image"
groups="maintenance.group_equipment_manager,base.group_user"