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
This commit is contained in:
yuxianghui
2023-07-17 10:43:47 +08:00
parent 9752b2e49f 00795ca3e9
commit b48c231dcc
4 changed files with 1713 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1672
password_security/static/lib/zxcvbn/zxcvbn.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

8
sf_maintenance/models/sf_equipment_maintenance_standards.py
View File

@@ -23,7 +23,13 @@ class SfEquipmentSaintenanceStandards(models.Model):
name = fields.Char(string='名称')
created_user_id = fields.Many2one('res.users', string='创建人', default=lambda self: self.env.user)
maintenance_equipment_category_id = fields.Many2one('maintenance.equipment.category', string='设备类别')
maintenance_equipment_ids = fields.Many2many('maintenance.equipment', 'sf_maintenance_equipment_ids', string='设备')
maintenance_equipment_ids = fields.Many2many(
'maintenance.equipment',
'sf_maintenance_equipment_ids',
string='设备',
domain="[('category_id', '=', maintenance_equipment_category_id)]"
)
maintenance_standards_ids = fields.One2many('maintenance.standards', 'equipment_maintenance_standards_id', string='维保项目')
eq_maintenance_ids = fields.One2many('maintenance.equipment', 'eq_maintenance_id', string='保养设备')
overhaul_ids = fields.One2many('maintenance.equipment', 'overhaul_id', string='检修设备')

14
sf_maintenance/views/maintenance_request_views.xml
View File

@@ -39,7 +39,7 @@
</record>
<record id="hr_equipment_request_action" model="ir.actions.act_window">
<record id="hr_equipment_request_action1" model="ir.actions.act_window">
<field name="name">维保计划</field>
<field name="res_model">maintenance.request</field>
<field name="view_mode">kanban,tree,form,pivot,graph,calendar</field>
@@ -47,22 +47,26 @@
<field name="context">{'default_user_id': uid}</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
Add a new maintenance request
添加维保计划
</p>
<p>
Follow the process of the request and communicate with the collaborator.
跟进请求的处理，并且和合作者沟通。
</p>
</field>
</record>
<menuitem
id="menu_m_request_form"
id="menu_m_request_form1"
name="维保计划"
parent="maintenance.menu_m_request"
action="hr_equipment_request_action"
action="hr_equipment_request_action1"
groups="maintenance.group_equipment_manager,base.group_user"
sequence="1"/>
<record id="maintenance.menu_m_request_form" model="ir.ui.menu">
<field name="active" eval="False"/>
</record>
</odoo>

27
sf_maintenance/views/maintenance_views.xml
View File

@@ -37,6 +37,7 @@
<field name="workpiece_load"/>
<field name="lead_screw"/>
<field name="workbench_L"/>
<field name="workbench_W"/>
<field name="taper"/>
<field name="torque"/>
<field name="motor_power"/>
@@ -71,11 +72,12 @@
</group>
<group>
<field name="workbench_W"/>
<field name="guide_rail"/>
<field name="machine_tool_L"/>
<field name="machine_tool_W"/>
<field name="machine_tool_H"/>
<field name="feed_speed"/>
<field name="tool_speed"/>
<field name="distance"/>
@@ -118,7 +120,7 @@
<field name="overhaul_duration"/>
hours
</div>
<field name='equipment_maintenance_standards_ids' widget="many2many_tags"/>
<field name='equipment_maintenance_standards_ids' widget="many2many_tags" invisible="1"/>
</xpath>
</data>
@@ -153,6 +155,27 @@
</field>
</record>
<!-- <menuitem-->
<!-- id="menu_maintenance_title_sf"-->
<!-- name="设备管理"-->
<!-- web_icon="maintenance,static/description/icon.svg"-->
<!-- sequence="160"/>-->
<record id="maintenance.menu_maintenance_title" model="ir.ui.menu">
<field name="name">设备管理</field>
</record>
<record id="maintenance.menu_m_request" model="ir.ui.menu">
<field name="name">设备管理</field>
</record>
<!-- <menuitem-->
<!-- id="menu_m_request"-->
<!-- name="设备管理"-->
<!-- parent="menu_maintenance_title_sf"-->
<!-- groups="maintenance.group_equipment_manager,base.group_user"-->
<!-- sequence="1"/>-->