!1377 结束

Merge pull request !1377 from 李鹏宇/dev_zhou

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="名称")

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="银行")
+    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="检查日期")

yuthon_property/views/menuitem.xml

@@ -320,7 +320,8 @@
                   action="view_yuthon_management_type_action" sequence="70"/>
     <menuitem id="yuthon_bank_setting_menu" parent="resource_mgmt_config_menu" name="银行"
                   action="view_yuthon_bank_setting_action" sequence="75"/>
-
+    <menuitem id="yuthon_property_produce_menu" parent="resource_mgmt_config_menu" name="安全生产"
+                  action="view_yuthon_property_produce_action"/>
 
      <menuitem
             id="property_approval_my_management_menu"

yuthon_property/views/yuthon_property_views.xml

@@ -185,11 +185,20 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="生产">
+                        <page string="安全生产">
                             <field name="produce_ids">
                                 <tree editable="bottom">
-                                    <field name="yuthon_property_id" column_invisible="1"/>
                                     <field name="name"/>
+                                    <field name="yuthon_property_id" column_invisible="1"/>
+                                    <field name="check_context"/>
+                                    <field name="check_results"/>
+                                    <field name="check_criteria"/>
+                                    <field name="there_problem" optional="hide"/>
+                                    <field name="problem_suggestion"/>
+                                    <field name="problem_date"/>
+                                    <field name="review_situation" optional="hide"/>
+                                    <field name="check_people" optional="hide"/>
+                                    <field name="check_date" optional="hide"/>
                                 </tree>
                             </field>
                         </page>

yuthon_property/views/yuthon_resource_mgmt_config_views.xml

@@ -251,4 +251,28 @@
         <field name="res_model">yuthon.bank.setting</field>
         <field name="view_mode">tree</field>
     </record>
+    <record id="view_yuthon_property_produce_tree" model="ir.ui.view">
+        <field name="name">yuthon.property.produce.tree</field>
+        <field name="model">yuthon.property.produce</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom">
+                <field name="name"/>
+                <field name="yuthon_property_id" column_invisible="1"/>
+                <field name="check_context"/>
+                <field name="check_results"/>
+                <field name="check_criteria"/>
+                <field name="there_problem" optional="hide"/>
+                <field name="problem_suggestion"/>
+                <field name="problem_date"/>
+                <field name="review_situation" optional="hide"/>
+                <field name="check_people" optional="hide"/>
+                <field name="check_date" optional="hide"/>
+            </tree>
+        </field>
+    </record>
+    <record id="view_yuthon_property_produce_action" model="ir.actions.act_window">
+        <field name="name">安全生产</field>
+        <field name="res_model">yuthon.property.produce</field>
+        <field name="view_mode">tree</field>
+    </record>
 </odoo>