!930 zhou

Merge pull request !930 from 李鹏宇/dev_zhou
2024-12-26 07:19:29 +00:00
parent b307a27971 53363b7a8d
commit aa4b09764e
8 changed files with 45 additions and 7 deletions
@@ -24,6 +24,8 @@ class PropertyRentRelief(models.Model):
    warehouse_management = fields.Char(string="库管")
    property_repair_relief_ids = fields.One2many('property.repair.relief.line', 'property_repair_relief_id', string="物料清单")
    total = fields.Float(string="总价")
+
+
 class PropertyRepairReliefLine(models.Model):
    _name = 'property.repair.relief.line'
    _description = '物料清单明细'
@@ -7,4 +7,11 @@
        <field name="padding">3</field>
        <field name="company_id" eval="False"/>
    </record>
+    <record id="yuthon_property_code_sequence1" model="ir.sequence">
+        <field name="name">物业编号</field>
+        <field name="code">yuthon_property_message_code</field>
+        <field name="prefix">WY</field>
+        <field name="padding">4</field>
+        <field name="company_id" eval="False"/>
+    </record>
 </odoo>
@@ -9,7 +9,8 @@ class YuthonProperty(models.Model):
    _rec_name = 'name'

    name = fields.Char(string="资产名称")
-    referred = fields.Char(string="简称")
+    code = fields.Char(string="物业编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_property_message_code'))
+    referred_id = fields.Many2one('yuthon.lot.setting', string="地段")
    premises = fields.Char(string="楼盘小区")
    units = fields.Char(string="单元")
    house_type_id = fields.Many2one('yuthon.resource.house.type', string="户型")
@@ -18,6 +19,7 @@ class YuthonProperty(models.Model):
    property_room = fields.Text(string="区")  # 删除要去掉关联

    building_area = fields.Float(string="建筑面积")
+    title_deed = fields.Char(string="房产证编号")
    actual_area = fields.Float(string="实际面积")
    management_area = fields.Float(string="管理面积")
    effective_date = fields.Date(string="生效日期")
@@ -26,7 +28,7 @@ class YuthonProperty(models.Model):
                                        ('entrust', '委托'), ('Rent', '租入')], string='资产来源')
    remark = fields.Char(string="备注")
    vr_link = fields.Char(string="VR链接")
-    notice_documents_ids = fields.Many2many('ir.attachment', string='附件')
+    notice_documents_ids = fields.Many2many('ir.attachment', string='产权证附件')
    current_rent = fields.Float(string="现租金")
    is_done_split = fields.Boolean(string="已拆分")
    is_done_merge = fields.Boolean(string="已合并")
@@ -78,4 +78,10 @@ class YuthonPropertySetting(models.Model):
    _name = 'yuthon.property.setting'
    _description = '物业费标准配置'

-    name = fields.Char(string="物业费标准")
+    name = fields.Char(string="物业费标准")
+
+class YuthonLotSetting(models.Model):
+    _name = 'yuthon.lot.setting'
+    _description = '地段配置'
+
+    name = fields.Char(string="地段")
@@ -51,4 +51,5 @@ access_yuthon_property_lessee, yuthon_property_lessee,model_yuthon_property_less
 access_yuthon_property_lessee,yuthon_property_lessee,model_yuthon_property_lessee,base.group_user,1,1,1,1
 access_yuthon_electricity_setting,yuthon_electricity_setting,model_yuthon_electricity_setting,base.group_user,1,1,1,1
 access_yuthon_water_setting,yuthon_water_setting,model_yuthon_water_setting,base.group_user,1,1,1,1
-access_manage_information_fee_line,manage.information.fee.line,model_manage_information_fee_line,base.group_user,1,1,1,1
+access_manage_information_fee_line,manage.information.fee.line,model_manage_information_fee_line,base.group_user,1,1,1,1
+access_yuthon_lot_setting,yuthon_lot_setting,model_yuthon_lot_setting,base.group_user,1,1,1,1
@@ -334,6 +334,8 @@
                  action="view_yuthon_electricity_setting_action" sequence="45"/>
    <menuitem id="yuthon_water_setting_menu" parent="resource_mgmt_config_menu" name="水费标准配置"
                  action="view_yuthon_water_setting_action" sequence="50"/>
+    <menuitem id="yuthon_lot_setting_action_menu" parent="resource_mgmt_config_menu" name="地段配置"
+                  action="view_yuthon_lot_setting_action" sequence="55"/>



@@ -11,8 +11,9 @@
                </header>
                <field name="name" required="1"/>
                <field name="owner_id"/>
-                <field name="address"/>
                <field name="state"/>
+                <field name="management_area"/>
+                <field name="title_deed"/>
                <field name="start_time"/>
                <field name="end_date"/>
                <button name="put_offline_approval" type="object" string="提交线下审批" class="btn btn-primary"/>
@@ -26,13 +27,14 @@
        <field name="arch" type="xml">
            <form string="资产信息">
                <sheet>
+                    <field name="code" readonly="1"/>
                    <div class="row justify-content-between position-relative w-100 m-0 mb-2">
                        <div class="oe_title mw-75 ps-0 pe-2">
                            <h1 class="d-flex flex-row align-items-center">
                                <field name="name" placeholder="资产名称"/>
                            </h1>
                            <h2>
-                                <field name="referred" placeholder="简称"/>
+                                <field name="referred_id" placeholder="地段"/>
                            </h2>
                        </div>
                        <div class="o_employee_avatar m-0 p-0">
@@ -58,6 +60,7 @@
                            <field name="pooled_area"/>
                            <field name="actual_area"/>
                            <field name="current_rent"/>
+                            <field name="title_deed"/>
                            <field name="state" readonly="1"/>
                            <field name="is_done_split" invisible="1"/>
                            <field name="is_done_merge" invisible="1"/>
@@ -86,7 +89,7 @@
                        <field name="building_area"/>
                    </group>
                    <group string="管理信息">
-                        <field name="property_precinct"/>
+                        <field name="precinct_id"/>
                        <field name="admin_id"/>
                    </group>
                    <notebook>
@@ -215,6 +218,7 @@
                    <filter name="group_purpose" string="资产用途" context="{'group_by': 'purpose_id'}"/>
                </group>
                <searchpanel>
+                    <field name="referred_id" enable_counters="1"/>
                    <field name="precinct_id" string="所属片区" enable_counters="1"/>
                    <field name="title_address" string="产权地址" enable_counters="1"/>
                </searchpanel>
@@ -160,4 +160,18 @@
        <field name="res_model">yuthon.water.setting</field>
        <field name="view_mode">tree</field>
    </record>
+    <record id="view_yuthon_lot_setting_tree" model="ir.ui.view">
+        <field name="name">yuthon.lot.setting.tree</field>
+        <field name="model">yuthon.lot.setting</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+    <record id="view_yuthon_lot_setting_action" model="ir.actions.act_window">
+        <field name="name">地段配置</field>
+        <field name="res_model">yuthon.lot.setting</field>
+        <field name="view_mode">tree</field>
+    </record>
 </odoo>