diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index 0312fde28..c437043e1 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -16,15 +16,52 @@ class YuthonProperty(models.Model):
property_use_id = fields.Integer(string="物业用途ID")
property_asset_type = fields.Selection([('plant', '厂房'), ('goods', '商品'),
('office', '写字楼'), ('dormitory', '宿舍'),
- ('rig', '设备等管理用房')], string='资产类型')
+ ('rig', '设备等管理用房')], string='管理类型')
property_asset_use = fields.Selection([('hire', '出租'), ('personal', '自用')], string='资产用途')
- property_use_type = fields.Selection([('work', '办公'), ('dorm', '宿舍'), ('cater', '餐饮')], string='使用类型')
+ property_use_type = fields.Selection([('work', '办公'), ('dorm', '宿舍'), ('cater', '餐饮'),('shops', '商铺'),
+ ('plant', '厂房')], string='出租用途')
property_use_time = fields.Datetime(string="使用年限")
property_rent_type = fields.Selection([('could', '可租'), ('no', '不可租'),
- ('done', '已租'), ('none', '空置')], string="出租状态")
+ ('done', '已租'), ('none', '空置'),('assessment','评估'),
+ ('none_assessment', '待评估'),('filing', '备案'),('hang', '挂网'),
+ ('agency', '签约中')], string="出租状态")
state_id = fields.Many2one('property.type', string='状态')
property_source = fields.Selection([('cut', '划入'), ('self', '自建'),
('replace', '置换'), ('buy', '购入'),
('entrust', '委托'), ('Rent', '租入')], string='来源')
image_1920 = fields.Image(string="图片")
description = fields.Html(string="描述")
+ ame = fields.Char(string='标题')
+ 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="物业地址")
+ is_confirm_authorization = fields.Boolean(string="是否确权")
+ is_handle_land = fields.Boolean(string="是否办理土地有偿使用手续")
+ owner = fields.Char(string="权属人")
+ title_number = fields.Char(string="产权编号")
+ property_area = fields.Float(string="产权面积")
+ suite_area = fields.Float(string="套内面积")
+ pooled_area = fields.Float(string="公摊面积")
+ start_time = fields.Date(string="开始时间")
+ end_time = fields.Date(string="结束时间")
+ management_area = fields.Float(string="管理面积")
+ rentable_area = fields.Float(string="可租面积")
+ is_meter = fields.Boolean(string="是否支持多个水表")
+ is_electricity_meter = fields.Boolean(string="是否支持多个电表")
+ is_hvac = fields.Boolean(string="是否中央空调")
+ manage_standard = fields.Char(string="物业管理费标准")
+ remarks = fields.Char(string="备注")
+ company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="所属公司")
+ property = fields.Selection([('escrow','代管'), ('self','私有')], string="属性")
+ street = fields.Char(string="街道")
+ admin = fields.Many2one('res.users', string="管理员")
+ title_address = fields.Char(string="产权地址")
+ rental_address = fields.Char(string="出租地址")
+
+ def put_change_title(self):
+ pass
+
+
+ def put_change_manage(self):
+ pass
\ No newline at end of file
diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml
index 378f63845..96e5bd897 100644
--- a/yuthon_property/views/menuitem.xml
+++ b/yuthon_property/views/menuitem.xml
@@ -257,7 +257,12 @@
parent="yuthon_property_menu_root"
name="资源管理"
sequence="2"/>
-
+
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 4adfec663..61b3b9953 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -5,19 +5,41 @@
yuthon.property
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -27,7 +49,7 @@