diff --git a/yuthon_maintain/models/inherit_maintenance_equipment.py b/yuthon_maintain/models/inherit_maintenance_equipment.py index 283642701..e56b3493d 100644 --- a/yuthon_maintain/models/inherit_maintenance_equipment.py +++ b/yuthon_maintain/models/inherit_maintenance_equipment.py @@ -7,4 +7,17 @@ class InheritMaintenanceEquipment(models.Model): _inherit = 'maintenance.equipment' image_1920 = fields.Image(string="图片") - documents_ids = fields.Many2many('ir.attachment', string="附件") \ No newline at end of file + documents_ids = fields.Many2many('ir.attachment', string="附件") + equipment_approval_line_ids = fields.One2many('maintenance.equipment.line', 'maintenance_equipment_id', + string='关联流程') + + +class MaintenanceEquipmentLine(models.Model): + _name = 'maintenance.equipment.line' + _description = '关联流程' + + maintenance_equipment_id = fields.Many2one('maintenance.equipment', string="关联产品") + workflow_record_id = fields.Many2one('soong.workflow.record', string="标题") + code = fields.Char(string="流程编号") + approval_type = fields.Many2one(related="workflow_record_id.workflow_id", string="类型") + approval_date = fields.Datetime(string="创建日期") \ No newline at end of file diff --git a/yuthon_maintain/security/ir.model.access.csv b/yuthon_maintain/security/ir.model.access.csv index 17e2c1f82..de3e8b4cd 100644 --- a/yuthon_maintain/security/ir.model.access.csv +++ b/yuthon_maintain/security/ir.model.access.csv @@ -8,4 +8,5 @@ access_maintain_service_setting,maintain_service_setting,model_maintain_service_ access_maintain_desktop_setting,maintain_desktop_setting,model_maintain_desktop_setting,base.group_user,1,1,1,1 access_yuthon_maintain_service,yuthon_maintain_service,model_yuthon_maintain_service,base.group_user,1,1,1,1 access_yuthon_maintain_desktop,yuthon_maintain_desktop,model_yuthon_maintain_desktop,base.group_user,1,1,1,1 -access_property_device_line,property_device_line,model_property_device_line,base.group_user,1,1,1,1 \ No newline at end of file +access_property_device_line,property_device_line,model_property_device_line,base.group_user,1,1,1,1 +access_maintenance_equipment_line,maintenance_equipment_line,model_maintenance_equipment_line,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/yuthon_maintain/views/maintenance_equipment_views.xml b/yuthon_maintain/views/maintenance_equipment_views.xml index 5648dce85..d98815902 100644 --- a/yuthon_maintain/views/maintenance_equipment_views.xml +++ b/yuthon_maintain/views/maintenance_equipment_views.xml @@ -10,6 +10,19 @@ 管理员 + + + + + + + + + + + + +
diff --git a/yuthon_property/models/yuthon_resource_mgmt_config.py b/yuthon_property/models/yuthon_resource_mgmt_config.py index 6b4f41612..58d713f10 100644 --- a/yuthon_property/models/yuthon_resource_mgmt_config.py +++ b/yuthon_property/models/yuthon_resource_mgmt_config.py @@ -218,6 +218,7 @@ class PropertyFloorSetting(models.Model): _rec_name = 'show_name' name = fields.Char('名称') + sequence = fields.Integer(string="顺序") show_name = fields.Char('名称', required=True) parent_id = fields.Many2one('property.floor.setting', string='父级') child_ids = fields.One2many('property.floor.setting', 'parent_id', string='子级') diff --git a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml index 4b4dc5b27..3f509b142 100644 --- a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml +++ b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml @@ -346,6 +346,7 @@ property.floor.setting + diff --git a/yuthon_work_brand/__manifest__.py b/yuthon_work_brand/__manifest__.py index ccafad9ed..f95c94714 100644 --- a/yuthon_work_brand/__manifest__.py +++ b/yuthon_work_brand/__manifest__.py @@ -6,13 +6,14 @@ 'hr', 'yuthon_holiday', 'hr_attendance', 'hr_holidays', 'hr_payroll', 'yuthon_hr_attendance', 'website', 'yuthon_hr_employee', - 'yuthon_salary', 'yuthon_sps_approval', 'yuthon_property', 'yuthon_property_approval', 'yuthon_performance', - 'resource', 'yuthon_hr_employee_approval', 'planning', 'yuthon_maintain', 'maintenance', 'yuthon_trade', 'attendance_iot' + 'yuthon_salary', 'yuthon_sps_approval', 'yuthon_property', 'yuthon_property_approval', 'yuthon_performance', 'purchase', 'yuthon_purchase', + 'resource', 'yuthon_hr_employee_approval', 'planning', 'yuthon_maintain', 'maintenance', 'yuthon_trade', 'attendance_iot', 'account', 'uom', 'product' ], 'data': [ 'security/ir.model.access.csv', 'views/yuthon_none_views.xml', 'views/hr_menus.xml', + 'views/purchase_menus.xml', 'views/executive_manage.xml', ], 'application': True, diff --git a/yuthon_work_brand/static/description/purchase.png b/yuthon_work_brand/static/description/purchase.png new file mode 100644 index 000000000..949de53f7 Binary files /dev/null and b/yuthon_work_brand/static/description/purchase.png differ diff --git a/yuthon_work_brand/views/purchase_menus.xml b/yuthon_work_brand/views/purchase_menus.xml new file mode 100644 index 000000000..d5e97de91 --- /dev/null +++ b/yuthon_work_brand/views/purchase_menus.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file