!1870 添加功能

Merge pull request !1870 from dev_zhou

yuthon_official/views/yuthon_official_incoming_normal_views.xml

@@ -50,6 +50,7 @@
                     </group>
                     <group string="行政信息">
                         <group col="2">
+                            <field name="official_partner_id"/>
                             <field name="reference_cold"/>
                             <field name="secret_level"/>
                             <field name="time_date"/>

yuthon_property/models/yuthon_property.py

@@ -65,6 +65,8 @@ class YuthonProperty(models.Model):
     equity_area = fields.Float(string="产权面积", group_operator=None, digits=(16, 4))
     decoration_type = fields.Selection([('blank', '毛坯'), ('hardcover', '精装'), ('brands', '简装'), ('rsz', '豪装')],
                                        string="装修类型")
+    feature_ids = fields.Many2many('feature.setting', string="特色")
+    major_ids = fields.One2many('yuthon.major.event.line', 'yuthon_property_id', string="重大事项明细行")
     water_meter_ids = fields.One2many('yuthon.property.water', 'yuthon_property_id', string='水表列表')
     energy_meter_ids = fields.One2many('yuthon.property.energy', 'yuthon_property_id', string='电表列表')
     title_information_ids = fields.One2many('title.information.line', 'yuthon_property_id', string='关联产权信息明细行')
@@ -408,4 +410,14 @@ class YuthonReferenceConditions(models.Model):
     rent_id = fields.Many2one('rent.free.setting', string="办法")
     start_lease_period = fields.Selection(selection=[(str(i), str(i)) for i in range(1, 7)], string='租期开始', default='1')
     end_lease_period = fields.Selection(selection=[(str(i), str(i)) for i in range(1, 7)], string='租期结束', default='6')
-    annual_increase_percentage = fields.Float(string='每年递增(%)', igits=(6, 2))
+    annual_increase_percentage = fields.Float(string='每年递增(%)', igits=(6, 2))
+
+class YuthonMajorEventLine(models.Model):
+    _name = 'yuthon.major.event.line'
+    _description = '重大事件'
+
+    yuthon_property_id = fields.Many2one('yuthon.property', string="关联物业信息")
+    major_id = fields.Many2one('major.event.setting', string="重大事件")
+    inspector_html = fields.Html(related='major_id.inspector_html', string="内容")
+    documents_ids = fields.Many2many(related='major_id.documents_ids', string="附件")
+    start_date = fields.Date(related='major_id.start_date')

yuthon_property/models/yuthon_resource_mgmt_config.py

@@ -195,3 +195,18 @@ class RentFreeLine(models.Model):
     minimum_area = fields.Float(string="最小面积")
     maximum_area = fields.Float(string="最大面积")
     rent_fee_date = fields.Integer(string="免租期不超过")
+
+class FeatureSetting(models.Model):
+    _name = 'feature.setting'
+    _description = '特色配置'
+
+    name = fields.Char(string="名称")
+
+class MajorEventSetting(models.Model):
+    _name = 'major.event.setting'
+    _description = '重大事项配置'
+
+    name = fields.Char(string="名称")
+    inspector_html = fields.Html(string="内容")
+    documents_ids = fields.Many2many('ir.attachment', string="附件")
+    start_date = fields.Date(string="生效日期", default=fields.Date.today())

yuthon_property/security/ir.model.access.csv

@@ -79,4 +79,7 @@ access_property_subject_form,property_subject_form,model_property_subject_form,b
 access_yuthon_premises_setting,yuthon_premises_setting,model_yuthon_premises_setting,base.group_user,1,1,1,1
 access_rent_free_setting,rent_free_setting,model_rent_free_setting,base.group_user,1,1,1,1
 access_yuthon_reference_conditions,yuthon_reference_conditions,model_yuthon_reference_conditions,base.group_user,1,1,1,1
-access_rent_free_line,rent_free_line,model_rent_free_line,base.group_user,1,1,1,1
+access_rent_free_line,rent_free_line,model_rent_free_line,base.group_user,1,1,1,1
+access_feature_setting,feature_setting,model_feature_setting,base.group_user,1,1,1,1
+access_major_event_setting,major_event_setting,model_major_event_setting,base.group_user,1,1,1,1
+access_yuthon_major_event_line,yuthon_major_event_line,model_yuthon_major_event_line,base.group_user,1,1,1,1

yuthon_property/views/menuitem.xml

@@ -340,6 +340,10 @@
                   action="view_yuthon_property_produce_action" sequence="80"/>
     <menuitem id="yuthon_premises_setting_menu" parent="resource_mgmt_config_menu" name="楼盘配置"
                   action="view_yuthon_premises_setting_action" sequence="85"/>
+    <menuitem id="view_feature_setting_menu" parent="resource_mgmt_config_menu" name="特色配置"
+                  action="action_feature_setting" sequence="90"/>
+    <menuitem id="view_action_major_event_ment" parent="resource_mgmt_config_menu" name="重大事项配置"
+                  action="action_major_event_setting" sequence="95"/>
 
      <menuitem
             id="property_approval_my_management_menu"

yuthon_property/views/yuthon_property_views.xml

@@ -85,6 +85,7 @@
                             <field name="property_source"/>
                             <field name="district"/>
                             <field name="live_room"/>
+                            <field name="feature_ids" widget="many2many_tags"/>
                             <field name="is_done_split" invisible="1"/>
                             <field name="is_done_merge" invisible="1"/>
                             <field name="state" invisible="1"/>
@@ -200,6 +201,17 @@
                                 </tree>
                             </field>
                         </page>
+                        <page string="重大事项及其他披露内容">
+                            <field name="major_ids">
+                                <tree editable="bottom">
+                                    <field name="yuthon_property_id" column_invisible="1"/>
+                                    <field name="major_id"/>
+                                    <field name="inspector_html"/>
+                                    <field name="start_date"/>
+                                    <field name="documents_ids" widget="preview_many2many"/>
+                                </tree>
+                            </field>
+                        </page>
                         <page string="拆分信息" invisible="not is_done_split">
                             <field name="disassembly_information_ids">
                                 <tree editable="bottom">

yuthon_property/views/yuthon_resource_mgmt_config_views.xml

@@ -337,4 +337,35 @@
         <field name="res_model">rent.free.setting</field>
         <field name="view_mode">tree,form</field>
     </record>
+    <record id="view_feature_setting_tree" model="ir.ui.view">
+        <field name="name">feature.setting.tree</field>
+        <field name="model">feature.setting</field>
+        <field name="arch" type="xml">
+            <tree string="特色配置" editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+    <record id="action_feature_setting" model="ir.actions.act_window">
+        <field name="name">特色配置</field>
+        <field name="res_model">feature.setting</field>
+        <field name="view_mode">tree</field>
+    </record>
+    <record id="view_major_event_setting_tree" model="ir.ui.view">
+        <field name="name">major.event.setting.tree</field>
+        <field name="model">major.event.setting</field>
+        <field name="arch" type="xml">
+            <tree string="重大事项配置" editable="bottom">
+                <field name="name"/>
+                <field name="inspector_html"/>
+                <field name="start_date"/>
+                <field name="documents_ids" widget="preview_many2many"/>
+            </tree>
+        </field>
+    </record>
+    <record id="action_major_event_setting" model="ir.actions.act_window">
+        <field name="name">重大事项配置</field>
+        <field name="res_model">major.event.setting</field>
+        <field name="view_mode">tree</field>
+    </record>
 </odoo>