From 9a89bbb84275d1c7f64761f86a7bbd1a932507e6 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Fri, 17 Jan 2025 11:58:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_property/models/yuthon_property.py | 7 ------ .../models/yuthon_resource_mgmt_config.py | 19 ++++++++++++++- yuthon_property/views/menuitem.xml | 3 ++- .../views/yuthon_property_views.xml | 13 ++++++++-- .../yuthon_resource_mgmt_config_views.xml | 24 +++++++++++++++++++ 5 files changed, 55 insertions(+), 11 deletions(-) diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py index b7bedf3a1..23aa3e9e1 100644 --- a/yuthon_property/models/yuthon_property.py +++ b/yuthon_property/models/yuthon_property.py @@ -376,10 +376,3 @@ class YuthonPropertyRepair(models.Model): yuthon_property_id = fields.Many2one('yuthon.property', string="关联物业信息") name = fields.Char(string="维修名称") - -class YuthonPropertyProduce(models.Model): - _name = 'yuthon.property.produce' - _description = '安全生产' - - yuthon_property_id = fields.Many2one('yuthon.property', string="关联物业信息") - name = fields.Char(string="名称") \ No newline at end of file diff --git a/yuthon_property/models/yuthon_resource_mgmt_config.py b/yuthon_property/models/yuthon_resource_mgmt_config.py index 37d26fe16..c1fe32778 100644 --- a/yuthon_property/models/yuthon_resource_mgmt_config.py +++ b/yuthon_property/models/yuthon_resource_mgmt_config.py @@ -132,4 +132,21 @@ class YuthonBankSetting(models.Model): _name = 'yuthon.bank.setting' _description = '银行' - name = fields.Char(string="银行") \ No newline at end of file + name = fields.Char(string="银行") + + +class YuthonPropertyProduce(models.Model): + _name = 'yuthon.property.produce' + _description = '安全生产' + + yuthon_property_id = fields.Many2one('yuthon.property', string="关联物业信息") + name = fields.Char(string="检查项目") + check_context = fields.Text(string='检查内容') + check_results = fields.Text(string="检查结果") + check_criteria = fields.Text(string="检查标准") + there_problem = fields.Text(string="存在问题") + problem_suggestion = fields.Text(string="整改措施") + problem_date = fields.Date(string="整改期限") + review_situation = fields.Text(string="复查情况") + check_people = fields.Many2one('hr.employee', string="检查人") + check_date = fields.Date(string="检查日期") \ No newline at end of file diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml index 73529dd03..cdd6c1153 100644 --- a/yuthon_property/views/menuitem.xml +++ b/yuthon_property/views/menuitem.xml @@ -320,7 +320,8 @@ action="view_yuthon_management_type_action" sequence="70"/> - + - + - + + + + + + + + + + diff --git a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml index 2b6bad568..2e6ab465e 100644 --- a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml +++ b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml @@ -251,4 +251,28 @@ yuthon.bank.setting tree + + yuthon.property.produce.tree + yuthon.property.produce + + + + + + + + + + + + + + + + + + 安全生产 + yuthon.property.produce + tree +