添加功能

2024-11-01 16:36:44 +08:00
parent 910e97930b
commit 424405f740
31 changed files with 376 additions and 67 deletions
@@ -12,6 +12,6 @@ class TianHeFeeExpend(models.Model):
    joint_name = fields.Char(string="合同名称")
    project_name = fields.Char(string="项目名称")
    property_listings = fields.Char(string="物业列表")
-    property_address = fields.Char(string="物业地址")
+    property_address = fields.Text(string="物业地址")
    payment_type = fields.Char(string="支付类型")
    expend_fee = fields.Integer(string="支出金额")
@@ -7,7 +7,7 @@ class WuguanIntertubularProtocol(models.Model):
    _inherit = "approval.request"
    _description = '管子间协议'

-    wuguan_payout_address = fields.Char(string="物业地址")
+    wuguan_payout_address = fields.Text(string="物业地址")
    management_fee = fields.Char(string="管理费")
    collection_agencies = fields.Char(string="收款公司")
    total_management_fee = fields.Char(string="管理费总额")
@@ -10,7 +10,7 @@ class WuGuanLeaseContractApprovalForm(models.Model):
    first_years_rent = fields.Char(string="首年租金")
    industry = fields.Char(string="行业")
    wuguan_payout_address = fields.Char(string="物业地址")
-    uses = fields.Char(string="出租用途")
+    uses = fields.Many2one('yuthon.rental.purpose',string="出租用途")
    payment_method = fields.Char(string="缴费方式")
    partner_name = fields.Char(string="联系人")
    contact_number = fields.Char(string="联系电话")
@@ -17,7 +17,7 @@ class YuthonReconcil(models.Model):
    payout_name = fields.Char(string="户名")
    payout_note = fields.Char(string="备注")
    payout_contract = fields.Char(string="合同编号")
-    payout_address = fields.Char(string="物业地址")
+    payout_address = fields.Text(string="物业地址")
    payout_contract_money = fields.Float(string="合同累计应收")
    payout_contract_no_money = fields.Float(string="合同累计违约金")
    voucher_type = fields.Char(string="凭证种类")
@@ -19,7 +19,6 @@
        'views/property_patrol_standard.xml',
        'views/yuthon_draw_result_views.xml',
        'views/yuthon_expert_database_views.xml',
-        'views/property_rental_form_views.xml',
        'views/property_transaction_confirmed.xml',
        'views/yuthon_resource_mgmt_config_views.xml',
        'views/property_meter_archives_views.xml',
@@ -8,7 +8,6 @@ from . import yuthon_resource_mgmt_config
 from . import yuthon_draw_result
 from . import yuthon_expert_database
 from . import yuthon_property_evaluation
-from . import property_rental_form
 from . import property_transaction_confirmed
 from . import property_meter_archives
 from . import property_meter_water
@@ -58,7 +58,7 @@ class YuthonProperty(models.Model):
    code = fields.Char(string="编号",
                       default=lambda self: self.env['ir.sequence'].next_by_code('property_message_code'))
    rental_unit_price = fields.Float(string="评估单价")
-    address = fields.Char(string="物业地址")
+    address = fields.Text(string="物业地址")
    title_number = fields.Char(string="产权编号")
    suite_area = fields.Float(string="套内面积")
    start_time = fields.Date(string="生效时间")
@@ -14,6 +14,12 @@ class YuthonPropertyEvaluated(models.Model):
    notice_documents_ids = fields.Many2many('ir.attachment', string='议题附件')
    evaluate_application_ids = fields.One2many('evaluated.application.line', 'yuthon_property_evaluated_id', string='关联物业信息明细行')

+    def put_declare_approval(self):
+        pass
+    def put_offline_approval(self):
+        pass
+    def put_adjustment_approval(self):
+        pass

 class EvaluatedApplicationLine(models.Model):
    _name = 'evaluated.application.line'
@@ -18,7 +18,7 @@ class YuthonResourceHouseType(models.Model):

 class YuthonResourcePurpose(models.Model):
    _name = 'yuthon.resource.purpose'
-    _description = '用途'
+    _description = '资产用途'

    name = fields.Char(string="用途")

@@ -47,4 +47,11 @@ class YuthonOwnerMessage(models.Model):
    _name = 'yuthon.owner.message'
    _description = '权属人'

-    name = fields.Char(string="名称")
+    name = fields.Char(string="名称")
+
+
+class YuthonRentalPurposes(models.Model):
+    _name = 'yuthon.rental.purpose'
+    _description = '出租用途'
+
+    name = fields.Char(string="出租用途")
@@ -14,7 +14,6 @@ access_yuthon_resource_house_type,yuthon_resource_house_type,model_yuthon_resour
 access_yuthon_resource_purpose,yuthon_resource_purpose,model_yuthon_resource_purpose,base.group_user,1,1,1,1
 access_yuthon_resource_management_type,yuthon_resource_management_type,model_yuthon_resource_management_type,base.group_user,1,1,1,1
 access_yuthon_resource_billing_type,yuthon_resource_billing_type,model_yuthon_resource_billing_type,base.group_user,1,1,1,1
-access_property_rental_form,property_rental_form,model_property_rental_form,base.group_user,1,1,1,1
 access_property_transaction_confirmed,property_transaction_confirmed,model_property_transaction_confirmed,base.group_user,1,1,1,1
 access_property_meter_archives,property_meter_archives,model_property_meter_archives,base.group_user,1,1,1,1
 access_property_meter_water,property_meter_water,model_property_meter_water,base.group_user,1,1,1,1
@@ -26,4 +25,5 @@ access_manage_information_line,manage_information_line,model_manage_information_
 access_disassembly_information_line,disassembly_information_line,model_disassembly_information_line,base.group_user,1,1,1,1
 access_yuthon_property_source,yuthon_property_source,model_yuthon_property_source,base.group_user,1,1,1,1
 access_yuthon_owner_message,yuthon_owner_message,model_yuthon_owner_message,base.group_user,1,1,1,1
-access_evaluated_application_line,evaluated_application_line,model_evaluated_application_line,base.group_user,1,1,1,1
+access_evaluated_application_line,evaluated_application_line,model_evaluated_application_line,base.group_user,1,1,1,1
+access_yuthon_rental_purpose,yuthon_rental_purpose,model_yuthon_rental_purpose,base.group_user,1,1,1,1
@@ -52,17 +52,6 @@
              name="招租"
              parent="yuthon_property_menu_root"/>

-    <menuitem id="yuthon_property_rental_form"
-              sequence="1"
-              name="出租申报表"
-              parent="yuthon_property_menu_data"
-              action="action_property_rental_form"/>
-
-<!--    <menuitem id="yuthon_property_eligibility_form"-->
-<!--              sequence="3"-->
-<!--              name="承租资格申报表"-->
-<!--              parent="yuthon_property_menu_data"-->
-<!--              action="yuthon_property_approval.property_eligibility_action"/>-->

    <menuitem id="yuthon_property_confirmation_of_transaction_menu"
              sequence="5"
@@ -284,8 +273,10 @@
              action="yuthon_owner_message_action" sequence="12"/>
    <menuitem id="yuthon_resource_house_type_menu" parent="resource_mgmt_config_menu" name="户型"
              action="yuthon_resource_house_type_action" sequence="20"/>
-    <menuitem id="yuthon_resource_purpose_menu" parent="resource_mgmt_config_menu" name="用途"
+    <menuitem id="yuthon_resource_purpose_menu" parent="resource_mgmt_config_menu" name="资源用途配置"
              action="yuthon_resource_purpose_action" sequence="30"/>
+    <menuitem id="yuthon_rental_purpose_menu" parent="resource_mgmt_config_menu" name="出租用途配置"
+              action="yuthon_rental_purpose_action" sequence="32"/>
    <menuitem id="yuthon_resource_management_type_menu" parent="resource_mgmt_config_menu" name="管理类型"
              action="yuthon_resource_management_type_action" sequence="10"/>
    <menuitem id="yuthon_resource_mgmt_config_menu" parent="resource_mgmt_config_menu" name="开票类型"
@@ -5,6 +5,11 @@
        <field name="model">yuthon.property.evaluated</field>
        <field name="arch" type="xml">
            <tree string="评估备案表">
+                <header>
+                    <button name="put_declare_approval" type="object" string="提交出租申报"/>
+                    <button name="put_offline_approval" type="object" string="提交线下审批"/>
+                    <button name="put_adjustment_approval" type="object" string="提交调整审批"/>
+                </header>
                <field name="name"/>
                <field name="other_company_id"/>
                <field name="base_date"/>
@@ -41,7 +41,7 @@
        </field>
    </record>
    <record id="yuthon_resource_purpose_action" model="ir.actions.act_window">
-        <field name="name">用途</field>
+        <field name="name">资产用途</field>
        <field name="res_model">yuthon.resource.purpose</field>
        <field name="view_mode">tree</field>
    </record>
@@ -100,8 +100,22 @@
        </field>
    </record>
    <record id="yuthon_owner_message_action" model="ir.actions.act_window">
-        <field name="name">物业来源</field>
+        <field name="name">权属人配置</field>
        <field name="res_model">yuthon.owner.message</field>
        <field name="view_mode">tree</field>
    </record>
+    <record id="view_yuthon_rental_purpose_tree" model="ir.ui.view">
+        <field name="name">yuthon.rental.purpose.tree</field>
+        <field name="model">yuthon.rental.purpose</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+    <record id="yuthon_rental_purpose_action" model="ir.actions.act_window">
+        <field name="name">出租用途配置</field>
+        <field name="res_model">yuthon.rental.purpose</field>
+        <field name="view_mode">tree</field>
+    </record>
 </odoo>
@@ -28,6 +28,9 @@
        'views/property_management_fee.xml',
        'views/property_material_procurement.xml',
        'views/property_penalty_proportion.xml',
+        'views/property_offline_registration.xml',
+        'views/property_rental_form_views.xml',
+        'views/property_rental_conditions.xml',
        'views/property_rent_relief.xml',
        'views/property_penalty_relief.xml',
        'views/property_report_repair.xml',
@@ -213,7 +213,22 @@
    <record id="property_renamed_sequence" model="ir.sequence">
        <field name="name">更名编号</field>
        <field name="code">property_renamed_code</field>
-        <field name="prefix">%(y)s%(month)s%(day)s</field>
+        <field name="prefix">GM%(y)s%(month)s%(day)s</field>
    </record>

+    <record id="property_offline_registration_sequence" model="ir.sequence">
+        <field name="name">线下承租方编号</field>
+        <field name="code">property_offline_registration_code</field>
+        <field name="prefix">CZ%(y)s%(month)s%(day)s</field>
+    </record>
+    <record id="property_rental_form_sequence" model="ir.sequence">
+        <field name="name">出租申报编号</field>
+        <field name="code">property_rental_form_code</field>
+        <field name="prefix">CC%(y)s%(month)s%(day)s</field>
+    </record>
+    <record id="property_rental_conditions_sequence" model="ir.sequence">
+        <field name="name">出租调整编号</field>
+        <field name="code">property_rental_conditions_code</field>
+        <field name="prefix">CT%(y)s%(month)s%(day)s</field>
+    </record>
 </odoo>
@@ -30,4 +30,7 @@ from . import property_contract_changes
 from . import property_construction_work
 from . import property_evaluate_application
 from . import property_approval
-from . import property_handover
+from . import property_handover
+from . import property_offline_registration
+from . import property_rental_form
+from . import property_rental_conditions
@@ -31,7 +31,7 @@ class PropertyApprovalLine(models.Model):
    _description = '新增物业审批明细行'

    property_approval_id = fields.Many2one('property.approval', string="审批信息")
-    property_address = fields.Char(string="物业地址")
+    property_address = fields.Text(string="物业地址")
    is_affirmation = fields.Boolean(string="是否确权")
    owner = fields.Char(string="权属人")
    title_number = fields.Char(string="产权编号")
@@ -11,5 +11,5 @@ class PropertyBeEvaluated(models.Model):

    name = fields.Char(string='名称')
    owner = fields.Char(string="权属人")
-    property_address = fields.Char(string="物业地址")
+    property_address = fields.Text(string="物业地址")
    
@@ -13,7 +13,7 @@ class PropertyFitment(models.Model):
    name = fields.Char(string='标题')
    code = fields.Char(string="编号",
                       default=lambda self: self.env['ir.sequence'].next_by_code('property_fitment_code'))
-    address = fields.Char(string="物业地址")
+    address = fields.Text(string="物业地址")
    lessee = fields.Char(string="承租方")
    contact = fields.Char(string="联系人")
    phone = fields.Char(string="联系电话")
@@ -26,5 +26,4 @@ class PropertyHandoverLine(models.Model):
    title_number = fields.Char(string="产权编号")
    area = fields.Float(related='property_id.actual_area',string="面积")
    purposes = fields.Many2one(related='property_id.asset_type_id',string="用途")
-    state = fields.Selection(related='property_id.state', string="状态",
-                             default="rented")
+    state = fields.Selection(related='property_id.state', string="状态",)
@@ -21,7 +21,7 @@ class PropertyInformation(models.Model):
    company_id = fields.Many2one('res.company', string="所属公司")
    admin_id =  fields.Many2one('res.users', string="管理员")
    precinct = fields.Char(string="片区")
-    address = fields.Char(string="物业地址")
+    address = fields.Text(string="物业地址")
    management_type = fields.Char(string="管理类型")
    property_id = fields.Char(string="物业ID")

@@ -20,7 +20,7 @@ class PropertyLeaseContract(models.Model):
    phone = fields.Char(string="联系电话")
    email = fields.Char(string="电子邮箱")
    invoicing_type = fields.Selection([('spot', '专票'), ('cape', '普票')], string="开票类型")
-    rental_purposes = fields.Char(string="出租用途")
+    rental_purposes = fields.Many2one('yuthon.rental.purpose',string="出租用途")
    invoicing_begins = fields.Char(string="开票开头")
    tax_number = fields.Char(string="税号")
    industry = fields.Char(string="行业")
@@ -69,7 +69,7 @@ class PropertyLeaseContractLine(models.Model):
    _description = '物业列表明细行'

    lease_id = fields.Many2one('property.lease.contract', string="关联凭租合同审批")
-    property_address = fields.Char(string="物业地址")
+    property_address = fields.Text(string="物业地址")
    property_area = fields.Float(string="面积")
    evaluate_unit_price = fields.Float(string="评估单价")

@@ -0,0 +1,37 @@
+from odoo import models, fields, api
+
+
+class PropertyOfflineRegistration(models.Model):
+    _name = 'property.offline.registration'
+    _description = '线下意向承租方报名表'
+
+    code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].
+                       next_by_code('property_offline_registration_code'))
+    name = fields.Char(string='物业名称', required=True)
+    address = fields.Text(string='物业地址')
+    area = fields.Char(string='面积(m²)')
+    rental_price = fields.Float(string='租金底价(元/m²)')
+    monthly_rent = fields.Float(string='月租金(元)')
+    increment_rate = fields.Char(string='递增率')
+    rent_free = fields.Char(string='免租期')
+    contract_years = fields.Char(string='签约年限')
+    start_data = fields.Date(string="报价开始日期")
+    end_data = fields.Date(string="报价结束日期")
+    quote_message_line_ids = fields.One2many('quote.message.line', 'property_offline_registration_id', string='关联报价信息明细行')
+    is_issues = fields.Boolean(string='是否上会')
+    related_issues_id = fields.Many2one('issue.library', string="关联议题")
+
+class QuoteMessageLine(models.Model):
+    _name = 'quote.message.line'
+    _description = '报价信息明细行'
+
+    property_offline_registration_id = fields.Many2one('property.offline.registration', string='关联线下报表表')
+    name = fields.Char(string='客户名称', required=True)
+    start_data = fields.Date(string="报价日期")
+    lease = fields.Char(string='租期')
+    quote = fields.Float(string='报价(元/m²)')
+    attn = fields.Char(string='经办人')
+    phone = fields.Char(string='联系方式')
+    data_review = fields.Text(string='资料审核(资料清单)')
+    is_conform = fields.Boolean(string='是否符合要求')
+    is_priority = fields.Boolean(string='是否行使优先权')
@@ -0,0 +1,46 @@
+from odoo import models, fields, api
+
+
+class PropertyRentalConditions(models.Model):
+    _name = 'property.rental.conditions'
+    _description = '出租调整表'
+
+    name = fields.Char(string='物业名称')
+    address = fields.Text(string='物业地址')
+    code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].
+                       next_by_code('property_rental_conditions_code'))
+    registered_use = fields.Char(string='证载用途')
+    evaluation_area = fields.Float(string='出租面积（m²）')
+    lease_expiration_date = fields.Date(string='租赁到期日')
+    original_tenant = fields.Char(string='原租户')
+    now_rent_price = fields.Float(string='现租价（元/m² •月）')
+    appraisal_price = fields.Float(string='评估价（元/m² •月）')
+    now_rental_conditions_line_ids = fields.One2many('now.rental.conditions.line', 'property_rental_conditions_id', string='关联目前出租条件')
+    rental_adjustment_line_ids = fields.One2many('rental.adjustment.line', 'property_rental_conditions_id', string='关联出租调整')
+    is_issues = fields.Boolean(string='是否上会')
+    related_issues_id = fields.Many2one('issue.library', string="关联议题")
+
+class NowRentalConditionsLine(models.Model):
+    _name = 'now.rental.conditions.line'
+    _description = '目前出租条件'
+
+    property_rental_conditions_id = fields.Many2one('property.rental.conditions', string='关联出租调整表')
+    rental_price = fields.Float(string='租金底价(元/m²)')
+    rental_price_month = fields.Float(string='租金底价(/m²)')
+    rental_year = fields.Char(string='租聘期限（年）')
+    increment_rate = fields.Char(string='每年递增率（%）')
+    rental_use = fields.Many2one('yuthon.rental.purpose',string='出租用途')
+    other = fields.Char(string='其他')
+
+
+class RentalConditionsLine(models.Model):
+    _name = 'rental.adjustment.line'
+    _description = '出租条件调整'
+
+    property_rental_conditions_id = fields.Many2one('property.rental.conditions', string='关联出租调整表')
+    new_rental_price = fields.Float(string='租金底价(元/m²)')
+    new_rental_price_month = fields.Float(string='租金底价(/m²)')
+    new_rental_year = fields.Char(string='租聘期限（年）')
+    new_increment_rate = fields.Char(string='每年递增率（%）')
+    new_rental_use = fields.Many2one('yuthon.rental.purpose', string='出租用途')
+    new_other = fields.Char(string='其他')
@@ -1,12 +1,14 @@
 from odoo import models, fields, api
+from odoo.odoo.http import request


 class PropertyRentalForm(models.Model):
    _name = 'property.rental.form'
    _description = '出租申报表'

-    name = fields.Char(string='名称')
-    property_address = fields.Char(string='物业地址')
+    name = fields.Char(string='物业名称',required=True)
+    code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_rental_form_code'))
+    property_address = fields.Text(string='物业地址')
    registered_use = fields.Char(string='证载用途')
    evaluation_area = fields.Float(string='出租面积（m²）')
    current_status = fields.Date(string='租聘到期日')
@@ -17,6 +19,8 @@ class PropertyRentalForm(models.Model):
    upset = fields.Float(string='底价（元/月）')
    lease_period = fields.Char(string='租凭年限')
    increment_rate = fields.Float(string='递增率')
-    rental_use = fields.Char(string='出租用途')
+    rental_use = fields.Many2one('yuthon.rental.purpose',string='出租用途')
    other = fields.Char(string='其他')
-    remarks = fields.Text(string='备注')
+    remarks = fields.Text(string='备注')
+    is_issues = fields.Boolean(string='是否上会')
+    related_issues_id = fields.Many2one('issue.library', string="关联议题")
@@ -44,4 +44,10 @@ access_property_handover,property_handover,model_property_handover,base.group_us
 access_property_handover_line,property_handover_line,model_property_handover_line,base.group_user,1,1,1,1
 access_property_inducts_wizard,property_inducts_wizard,model_property_inducts_wizard,base.group_user,1,1,1,1
 access_evaluate_application_line,evaluate_application_line,model_evaluate_application_line,base.group_user,1,1,1,1
-access_property_record_line,property_record_line,model_property_record_line,base.group_user,1,1,1,1
+access_property_record_line,property_record_line,model_property_record_line,base.group_user,1,1,1,1
+access_property_rental_form,property_rental_form,model_property_rental_form,base.group_user,1,1,1,1
+access_property_offline_registration,property_offline_registration,model_property_offline_registration,base.group_user,1,1,1,1
+access_quote_message_line,quote_message_line,model_quote_message_line,base.group_user,1,1,1,1
+access_now_rental_conditions_line,now_rental_conditions_line,model_now_rental_conditions_line,base.group_user,1,1,1,1
+access_property_rental_conditions,property_rental_conditions,model_property_rental_conditions,base.group_user,1,1,1,1
+access_rental_adjustment_line,rental_adjustment_line,model_rental_adjustment_line,base.group_user,1,1,1,1
@@ -33,26 +33,28 @@
                        </group>
                    </group>
                    <group>
-                            <field name="property_documents_ids" widget="many2many_tags"/>
-                        </group>
+                        <field name="property_documents_ids" widget="many2many_tags"/>
+                    </group>
                    <group>
                        <field name="tip_description" type="html"/>
                    </group>
-                    <group>
-                        <field name="property_handover_ids">
-                            <tree editable="bottom">
-                                <field name="property_handover_id" column_invisible="1"/>
-                                <field name="property_id" string="物业信息"/>
-                                <field name="property_address"/>
-                                <field name="is_affirmation"/>
-                                <field name="owner"/>
-                                <field name="title_number"/>
-                                <field name="area"/>
-                                <field name="purposes"/>
-                                <field name="state"/>
-                            </tree>
-                        </field>
-                    </group>
+                    <notebook>
+                        <page string="移交信息">
+                            <field name="property_handover_ids">
+                                <tree editable="bottom">
+                                    <field name="property_handover_id" column_invisible="1"/>
+                                    <field name="property_id" string="物业信息"/>
+                                    <field name="property_address"/>
+                                    <field name="is_affirmation"/>
+                                    <field name="owner"/>
+                                    <field name="title_number"/>
+                                    <field name="area"/>
+                                    <field name="purposes"/>
+                                    <field name="state"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
                </sheet>
            </form>
        </field>
@@ -208,4 +208,21 @@
            name="专项审批"
            action="property_record_action"
            sequence="11"/>
+
+    <menuitem id="yuthon_property_rental_form"
+              sequence="1"
+              name="出租申报表"
+              parent="yuthon_property.yuthon_property_menu_data"
+              action="action_property_rental_form"/>
+    <menuitem id="property_offline_registration_approval_menu"
+              sequence="2"
+              name="线下申报表"
+              parent="yuthon_property.yuthon_property_menu_data"
+              action="property_offline_registration_action"/>
+
+    <menuitem id="property_rental_conditions_menu"
+              sequence="3"
+              name="出租条件调整表"
+              parent="yuthon_property.yuthon_property_menu_data"
+              action="property_rental_conditions_action"/>
 </odoo>
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_property_offline_registration_tree" model="ir.ui.view">
+        <field name="name">property.offline.registration.tree</field>
+        <field name="model">property.offline.registration</field>
+        <field name="arch" type="xml">
+            <tree string="线下承租方报名表">
+                <field name="name"/>
+                <field name="area"/>
+                <field name="contract_years"/>
+                <field name="start_data"/>
+                <field name="end_data"/>
+            </tree>
+        </field>
+    </record>
+    <record id="view_property_offline_registration_form" model="ir.ui.view">
+        <field name="name">property.offline.registration.form</field>
+        <field name="model">property.offline.registration</field>
+        <field name="arch" type="xml">
+            <form string="线下承租方报名表">
+                <sheet>
+                    <group string="招租信息" col="3">
+                        <group>
+                            <field name="name"/>
+                            <field name="monthly_rent"/>
+                            <field name="contract_years"/>
+                            <field name="area"/>
+                            <field name="is_issues" invisible="1"/>
+                        </group>
+                        <group>
+                            <field name="code"/>
+                            <field name="increment_rate"/>
+                            <field name="start_data"/>
+                        </group>
+                        <group>
+                            <field name="rental_price"/>
+                            <field name="rent_free"/>
+                            <field name="end_data"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="报名信息">
+                            <field name="quote_message_line_ids">
+                                <tree editable="bottom">
+                                    <field name="property_offline_registration_id" column_invisible="1"/>
+                                    <field name="name"/>
+                                    <field name="start_data"/>
+                                    <field name="lease"/>
+                                    <field name="quote"/>
+                                    <field name="attn"/>
+                                    <field name="phone"/>
+                                    <field name="data_review"/>
+                                    <field name="is_conform"/>
+                                    <field name="is_priority"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="关联议题" invisible="not is_issues">
+                            <field name="related_issues_id"/>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="property_offline_registration_action" model="ir.actions.act_window">
+        <field name="name">线下意向承租方报名表</field>
+        <field name="res_model">property.offline.registration</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+</odoo>
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_property_rental_conditions_tree" model="ir.ui.view">
+        <field name="name">property.rental.conditions.tree</field>
+        <field name="model">property.rental.conditions</field>
+        <field name="arch" type="xml">
+            <tree string="出租条件调整">
+                <field name="name"/>
+                <field name="code"/>
+                <field name="registered_use"/>
+                <field name="original_tenant"/>
+                <field name="lease_expiration_date"/>
+                <field name="now_rent_price"/>
+                <field name="appraisal_price"/>
+            </tree>
+        </field>
+    </record>
+    <record id="view_property_rental_conditions_form" model="ir.ui.view">
+        <field name="name">property.rental.conditions.form</field>
+        <field name="model">property.rental.conditions</field>
+        <field name="arch" type="xml">
+            <form string="出租条件调整">
+                <sheet>
+                    <div class="oe_title">
+                        <label for="name"/>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                    </div>
+                    <group string="物业信息" col="3">
+                        <group>
+                            <field name="address"/>
+                            <field name="code"/>
+                            <field name="lease_expiration_date"/>
+                        </group>
+                        <group>
+                            <field name="registered_use"/>
+                            <field name="evaluation_area"/>
+                            <field name="is_issues" invisible="1"/>
+                        </group>
+                        <group>
+                            <field name="now_rent_price"/>
+                            <field name="appraisal_price"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="出租条件">
+                            <group/>
+                            <group string="目前出租条件">
+                                <field name="now_rental_conditions_line_ids" string=" ">
+                                    <tree editable="bottom">
+                                        <field name="property_rental_conditions_id" column_invisible="1"/>
+                                        <field name="rental_price"/>
+                                        <field name="rental_price_month"/>
+                                        <field name="rental_year"/>
+                                        <field name="increment_rate"/>
+                                        <field name="rental_use"/>
+                                        <field name="other"/>
+                                    </tree>
+                                </field>
+                            </group>
+                            <group string="拟调整出租条件">
+                                <field name="rental_adjustment_line_ids" string=" ">
+                                    <tree editable="bottom">
+                                        <field name="property_rental_conditions_id" column_invisible="1"/>
+                                        <field name="new_rental_price"/>
+                                        <field name="new_rental_price_month"/>
+                                        <field name="new_rental_year"/>
+                                        <field name="new_increment_rate"/>
+                                        <field name="new_rental_use"/>
+                                        <field name="new_other"/>
+                                    </tree>
+                                </field>
+                            </group>
+                        </page>
+                        <page string="关联议题" invisible="not is_issues">
+                            <field name="related_issues_id"/>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="property_rental_conditions_action" model="ir.actions.act_window">
+        <field name="name">出租条件调整表</field>
+        <field name="res_model">property.rental.conditions</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+</odoo>
@@ -7,16 +7,8 @@
            <tree string="出租申报表">
                <field name="name"/>
                <field name="property_address"/>
-                <field name="registered_use"/>
-                <field name="evaluation_area"/>
-                <field name="current_status"/>
                <field name="owner"/>
                <field name="now_rent_price"/>
-                <field name="evaluate_rent_price"/>
-                <field name="upset_square"/>
-                <field name="upset"/>
-                <field name="lease_period"/>
-                <field name="increment_rate"/>
                <field name="rental_use"/>
            </tree>
        </field>
@@ -27,7 +19,8 @@
        <field name="arch" type="xml">
            <form string="出租申报表">
                <sheet>
-                    <div class="col-12 text-center">
+                    <div class="oe_title">
+                        <label for="name"/>
                        <h1>
                            <field name="name"/>
                        </h1>
@@ -35,12 +28,14 @@
                    <group string="物业信息" col="3">
                        <group>
                            <field name="property_address"/>
+                            <field name="code"/>
                            <field name="current_status"/>
-                            <field name="evaluate_rent_price"/>
+                            <field name="is_issues" invisible="1"/>
                        </group>
                        <group>
                            <field name="registered_use"/>
                            <field name="owner"/>
+                            <field name="evaluate_rent_price"/>
                        </group>
                        <group>
                            <field name="evaluation_area"/>
@@ -62,6 +57,7 @@
                    </group>
                    <group string="备注">
                        <field name="remarks" string=" "/>
+                        <field name="related_issues_id" invisible="not is_issues"/>
                    </group>
                </sheet>
            </form>