From ed27274d6d6f6ef8aa4f39e078ddef4efb49a359 Mon Sep 17 00:00:00 2001 From: zhouzhou <123@qq.com> Date: Fri, 1 Nov 2024 11:51:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/yuthon_job_lv_views.xml | 66 +------------------ yuthon_property/models/property_assess.py | 3 + yuthon_property/models/yuthon_property.py | 56 +++++++++++----- .../models/yuthon_property_evaluated.py | 29 +++++++- .../models/yuthon_resource_mgmt_config.py | 5 ++ yuthon_property/security/ir.model.access.csv | 4 +- yuthon_property/views/menuitem.xml | 3 + .../views/yuthon_property_evaluated_views.xml | 48 +++++++------- .../yuthon_resource_mgmt_config_views.xml | 15 ++++- .../models/property_evaluate_application.py | 59 ++++++++++++++--- .../models/property_record.py | 12 ++-- .../security/ir.model.access.csv | 4 +- .../property_evaluate_application_views.xml | 16 ++--- .../views/property_record_views.xml | 8 ++- 14 files changed, 194 insertions(+), 134 deletions(-) diff --git a/yuthon_hr_employee/views/yuthon_job_lv_views.xml b/yuthon_hr_employee/views/yuthon_job_lv_views.xml index 3c86d403f..f9eaa9398 100644 --- a/yuthon_hr_employee/views/yuthon_job_lv_views.xml +++ b/yuthon_hr_employee/views/yuthon_job_lv_views.xml @@ -42,37 +42,6 @@ tree {'search_default_group_company': True, 'search_default_group_lv': True} - - - yuthon.job.lv.tree - yuthon.job.lv - - - - - - - - - - - - - - - - - - - - 职级管理 - yuthon.job.lv - tree - [('yuthon_company', '=', 'tz')] - - {'search_default_group_company': True, 'search_default_group_lv': True} - yuthon.job.lv.tree @@ -102,37 +71,6 @@ {'search_default_group_company': True, 'search_default_group_lv': True} - - - - yuthon.job.lv.tree - yuthon.job.lv - - - - - - - - - - - - - - - - - - - - 职级管理 - yuthon.job.lv - tree - [('yuthon_company', '=', 'thlc')] - - {'search_default_group_company': True, 'search_default_group_lv': True} \ No newline at end of file diff --git a/yuthon_property/models/property_assess.py b/yuthon_property/models/property_assess.py index c170e0e0e..d64805cf3 100644 --- a/yuthon_property/models/property_assess.py +++ b/yuthon_property/models/property_assess.py @@ -10,3 +10,6 @@ class PropertyAssess(models.Model): class PropertyAssessLine(models.Model): _name = 'property.assess.line' +class PropertyType(models.Model): + _name = 'property.type' + diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py index a8e397f46..a3df3cb3b 100644 --- a/yuthon_property/models/yuthon_property.py +++ b/yuthon_property/models/yuthon_property.py @@ -1,6 +1,7 @@ from odoo import models, fields, api from odoo.exceptions import UserError, ValidationError + class YuthonProperty(models.Model): _name = 'yuthon.property' _description = '物业管理' @@ -32,17 +33,18 @@ class YuthonProperty(models.Model): pooled_area = fields.Float(string="公摊面积") rentable_area = fields.Float(string="可租面积") state = fields.Selection([('to', '待评估'), ('done', '已评估'), ('ing', '评估中'), - ('ing_handover', '移交中') ,('done_handover', '已移交'), - ('filing', '评估备案'), ('net', '挂网'), ('signing', '签约中'), - ('leased', '已出租'),('idle', '闲置')],string='状态', default='to') + ('ing_handover', '移交中'), ('done_handover', '已移交'), + ('filing', '备案中'), ('net', '挂网'), ('signing', '签约中'), + ('signed', '已备案'), ('leased', '已出租'), ('idle', '闲置')], string='状态', default='to') is_meter = fields.Boolean(string="是否有水表") is_electricity_meter = fields.Boolean(string="是否有电表") - company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储'), ('tj','天河投建')], string="所属公司") + company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储'), ('tj', '天河投建')], + string="所属公司") admin_id = fields.Many2one('res.users', string="管理员") purpose_id = fields.Many2one('yuthon.resource.purpose', string="资产用途") mgmt_type_id = fields.Many2one('yuthon.resource.management.type', string="管理类型") is_confirm_authorization = fields.Boolean(string="是否确权") - owner_id = fields.Many2one('res.users', string="权属人") + owner_id = fields.Many2one('yuthon.owner.message', string="权属人") property_card = fields.Html(string="产权证") life_timer = fields.Datetime(string="使用时间") property_use_time = fields.Selection([('a', '70年'), ('b', '40年')], string="使用年限") @@ -71,15 +73,18 @@ class YuthonProperty(models.Model): 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='关联产权信息明细行') - manage_information_ids = fields.One2many('manage.information.line', 'yuthon_property_id', string='关联管理信息明细行') - disassembly_information_ids = fields.One2many('disassembly.information.line', 'yuthon_property_id', string='关联拆合信息明细行') + manage_information_ids = fields.One2many('manage.information.line', 'yuthon_property_id', + string='关联管理信息明细行') + disassembly_information_ids = fields.One2many('disassembly.information.line', 'yuthon_property_id', + string='关联拆合信息明细行') + @api.onchange('building_area') def _onchange_building_area(self): for rec in self: rec.management_area = rec.building_area rec.rentable_area = rec.building_area - #待评估物业相关信息 + # 待评估物业相关信息 unit_price = fields.Float(string='单价') current_status = fields.Date(string='现状（合同到期日）') registered_use = fields.Char(string='证载用途') @@ -96,9 +101,7 @@ class YuthonProperty(models.Model): evaluation_whole_rent_price = fields.Float(string='评估整租单价（元/m² •月）') evaluation_whole_rent_total = fields.Float(string='评估总价（元•月，整租）') - assessment_category = fields.Char(string='评估类别') - property_message_id = fields.Many2one('property.evaluate.application', string='关联物业评估申请') - # yuthon_property_evaluated_id = fields.Many2one('yuthon.property.evaluated', string='关联评估备案表') + def put_change_title(self): pass @@ -107,7 +110,8 @@ class YuthonProperty(models.Model): pass def put_property_handover(self): - property_ids = self.env["yuthon.property"].browse(self._context.get('active_ids', self._context.get('active_id'))) + property_ids = self.env["yuthon.property"].browse( + self._context.get('active_ids', self._context.get('active_id'))) form_id = self.env.ref('yuthon_property_approval.view_property_handover_form').id property_list = [] for record in property_ids: @@ -121,9 +125,10 @@ class YuthonProperty(models.Model): 'type': 'ir.actions.act_window', 'views': [(form_id, 'form')], "context": { - 'default_property_handover_ids':property_list + 'default_property_handover_ids': property_list } } + def put_assessment_approval(self): property_ids = self.env["yuthon.property"].browse( self._context.get('active_ids', self._context.get('active_id'))) @@ -135,10 +140,23 @@ class YuthonProperty(models.Model): if i.state != 'to': raise UserError("当前状态不允许提交") form_id = self.env.ref('yuthon_property_approval.property_evaluate_application_form').id + property_list = [] if not property_ids: property_ids = self for i in property_ids: i.write({'state': 'ing'}) + for record in property_ids: + property_list.append([0, 0, {'name': record.name, + 'evaluation_area': record.evaluation_area, + 'registered_use':record.registered_use, + 'owner_id': record.owner_id.id, + 'purpose_id': record.purpose_id.id, + 'current_status': record.current_status, + 'last_hand_rent_price': record.unit_price, + 'rental_conditions': record.rental_conditions, + 'state':record.state, + 'remarks': record.remarks}]) + return { 'name': '提交物业评估', 'view_mode': 'form', @@ -146,7 +164,7 @@ class YuthonProperty(models.Model): 'type': 'ir.actions.act_window', 'views': [(form_id, 'form')], "context": { - 'default_yuthon_property_ids': [(6, 0, property_ids.ids)] + 'default_evaluate_application_ids': property_list } } @@ -170,6 +188,7 @@ class YuthonPropertyWater(models.Model): for rec in self: rec.property_meter_water_id.write({'yuthon_property_id': rec.property_meter_water_id.id}) + class YuthonPropertyEnergy(models.Model): _name = 'yuthon.property.energy' _description = '电表' @@ -190,7 +209,6 @@ class YuthonPropertyEnergy(models.Model): rec.property_meter_archives_id.write({'yuthon_property_id': rec.property_meter_archives_id.id}) - class TitleInformationLine(models.Model): _name = 'title.information.line' _description = '产权信息明细行' @@ -201,11 +219,12 @@ class TitleInformationLine(models.Model): management_area = fields.Float(string="管理面积") building_area = fields.Float(string="建筑面积") rent_area = fields.Float(string="可租面积") - owner = fields.Char(string="权属人") + owner = fields.Many2one('yuthon.owner.message',string="权属人") title_certificate = fields.Char(string="产权证号") start_time = fields.Date(string="生效日期") end_date = fields.Date(string="失效日期") + class ManageInformationLine(models.Model): _name = 'manage.information.line' _description = '管理信息明细行' @@ -219,12 +238,13 @@ class ManageInformationLine(models.Model): start_time = fields.Date(string="生效日期") end_date = fields.Date(string="失效日期") + class DisassemblyInformationLine(models.Model): _name = 'disassembly.information.line' _description = '拆合信息明细行' yuthon_property_id = fields.Many2one('yuthon.property', string="关联物业信息") - property_name = fields.Char(string="物业名称") #逻辑没搞清,暂时先放这里 + property_name = fields.Char(string="物业名称") # 逻辑没搞清,暂时先放这里 rent_area = fields.Float(string="可租面积") start_time = fields.Date(string="生效日期") - end_date = fields.Date(string="失效日期") \ No newline at end of file + end_date = fields.Date(string="失效日期") diff --git a/yuthon_property/models/yuthon_property_evaluated.py b/yuthon_property/models/yuthon_property_evaluated.py index 1f304a91e..9b82cc944 100644 --- a/yuthon_property/models/yuthon_property_evaluated.py +++ b/yuthon_property/models/yuthon_property_evaluated.py @@ -12,4 +12,31 @@ class YuthonPropertyEvaluated(models.Model): base_date = fields.Date(string="基准日") expert_review_time = fields.Date(string="专家评审时间") notice_documents_ids = fields.Many2many('ir.attachment', string='议题附件') - # yuthon_property_evaluation_ids = fields.One2many('yuthon.', 'yuthon_property_evaluated_id', string='物业信息明细行') \ No newline at end of file + evaluate_application_ids = fields.One2many('evaluated.application.line', 'yuthon_property_evaluated_id', string='关联物业信息明细行') + + +class EvaluatedApplicationLine(models.Model): + _name = 'evaluated.application.line' + _description = '物业信息明细行(已评估)' + + yuthon_property_evaluated_id = fields.Many2one('yuthon.property.evaluated', string='关联评估备案表(已评估)') + name = fields.Char(string='评估资产') + owner_id = fields.Many2one('yuthon.owner.message', string="权属人") + assessment_category = fields.Selection([('rent_money', '租金'), ('value', '价值')], string="评估类别") + registered_use = fields.Char(string='证载用途') + purpose_id = fields.Many2one('yuthon.resource.purpose', string="资产用途") + rental_conditions = fields.Text(string='出租条件') + current_status = fields.Date(string='现状（合同到期日）') + evaluation_area = fields.Float(string='评估面积（m²）') + remarks = fields.Text(string='备注') + last_hand_rent_price = fields.Float(string='上一手历史租金单价（元/m²•月）') + gov_rent_price = fields.Float(string='政府租金参考价') + evaluation_rent_price = fields.Float(string='评估散租单价（元/m²•月）') + evaluation_rent_total = fields.Float(string='评估总价（元•月，散租）') + evaluation_whole_rent_price = fields.Float(string='评估整租单价（元/m² •月）') + evaluation_whole_rent_total = fields.Float(string='评估总价（元•月，整租）') + state = fields.Selection([('to', '待评估'), ('done', '已评估'), ('ing', '评估中'), + ('ing_handover', '移交中'), ('done_handover', '已移交'), + ('filing', '备案中'), ('net', '挂网'), ('signing', '签约中'), + ('signed', '已备案'), ('leased', '已出租'), ('idle', '闲置')], string='状态', + default='to') \ No newline at end of file diff --git a/yuthon_property/models/yuthon_resource_mgmt_config.py b/yuthon_property/models/yuthon_resource_mgmt_config.py index 87cea83d1..14cd739dc 100644 --- a/yuthon_property/models/yuthon_resource_mgmt_config.py +++ b/yuthon_property/models/yuthon_resource_mgmt_config.py @@ -43,3 +43,8 @@ class YuthonPropertySource(models.Model): name = fields.Char(string="资产来源") +class YuthonOwnerMessage(models.Model): + _name = 'yuthon.owner.message' + _description = '权属人' + + name = fields.Char(string="名称") \ No newline at end of file diff --git a/yuthon_property/security/ir.model.access.csv b/yuthon_property/security/ir.model.access.csv index 70f19eff9..8eddf53d4 100644 --- a/yuthon_property/security/ir.model.access.csv +++ b/yuthon_property/security/ir.model.access.csv @@ -24,4 +24,6 @@ access_property_prospective_customers,property_prospective_customers,model_prope access_title_information_line,title_information_line,model_title_information_line,base.group_user,1,1,1,1 access_manage_information_line,manage_information_line,model_manage_information_line,base.group_user,1,1,1,1 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml index 8a53c399e..8f60634a6 100644 --- a/yuthon_property/views/menuitem.xml +++ b/yuthon_property/views/menuitem.xml @@ -280,6 +280,8 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml index 9343d2cb6..78826ebae 100644 --- a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml +++ b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml @@ -90,5 +90,18 @@ yuthon.property.source tree - + + yuthon.owner.message.tree + yuthon.owner.message + + + + + + + + 物业来源 + yuthon.owner.message + tree + diff --git a/yuthon_property_approval/models/property_evaluate_application.py b/yuthon_property_approval/models/property_evaluate_application.py index 31bf9691d..5e7195af4 100644 --- a/yuthon_property_approval/models/property_evaluate_application.py +++ b/yuthon_property_approval/models/property_evaluate_application.py @@ -15,15 +15,54 @@ class PropertyEvaluateApplication(models.Model): is_experts = fields.Boolean(string="是否需要专家评审") notice_documents_ids = fields.Many2many('ir.attachment', string='议题附件') issue_library_id = fields.Many2one('issue.library', string='关联议题') - yuthon_property_ids = fields.One2many('yuthon.property', 'property_message_id', string='物业信息明细行') + evaluate_application_ids = fields.One2many('evaluate.application.line', 'property_message_id', string='物业信息明细行') - # def put(self): - # done_ids = self.env["property.evaluate.application"].browse(self._context.get('active_ids', self._context.get('active_id'))) - # form_id = self.env.ref('yuthon_property_approval.view_property_handover_form').id - # return { - # 'name': '已评估', - # 'type': 'ir.actions.act_window', - # 'res_model': 'property.evaluate.application', - # 'view_mode': 'form', - # 'views': [(form_id, 'form')], + def put_property_record(self): + property_ids = self.env["property.evaluate.application"].browse( + self._context.get('active_ids', self._context.get('active_id'))) + form_id = self.env.ref('yuthon_property_approval.view_property_record_form').id + property_list = [] + for i in property_ids: + for record in i.evaluate_application_ids: + property_list.append([0, 0, {'product': record.name, + 'state': record.state, + 'property_type':record.assessment_category, + 'property_m2': record.evaluation_area,} + ]) + return { + 'name': '提交物业备案审批', + 'view_mode': 'form', + 'res_model': 'property.record', + 'type': 'ir.actions.act_window', + 'views': [(form_id, 'form')], + "context": { + 'default_property_record_line_ids':property_list + } + } +class EvaluateApplicationLine(models.Model): + _name = 'evaluate.application.line' + _description = '物业信息明细行' + + property_message_id = fields.Many2one('property.evaluate.application', string='关联评估申请') + yuthon_property_evaluated_id = fields.Many2one('yuthon.property.evaluated', string='关联评估备案表(已评估)') + name = fields.Char(string='评估资产') + owner_id = fields.Many2one('yuthon.owner.message', string="权属人") + assessment_category = fields.Selection([('rent_money', '租金'), ('value', '价值')], string="评估类别") + registered_use = fields.Char(string='证载用途') + purpose_id = fields.Many2one('yuthon.resource.purpose', string="资产用途") + rental_conditions = fields.Text(string='出租条件') + current_status = fields.Date(string='现状（合同到期日）') + evaluation_area = fields.Float(string='评估面积（m²）') + remarks = fields.Text(string='备注') + last_hand_rent_price = fields.Float(string='上一手历史租金单价（元/m²•月）') + gov_rent_price = fields.Float(string='政府租金参考价') + evaluation_rent_price = fields.Float(string='评估散租单价（元/m²•月）') + evaluation_rent_total = fields.Float(string='评估总价（元•月，散租）') + evaluation_whole_rent_price = fields.Float(string='评估整租单价（元/m² •月）') + evaluation_whole_rent_total = fields.Float(string='评估总价（元•月，整租）') + state = fields.Selection([('to', '待评估'), ('done', '已评估'), ('ing', '评估中'), + ('ing_handover', '移交中'), ('done_handover', '已移交'), + ('filing', '备案中'), ('net', '挂网'), ('signing', '签约中'), + ('signed', '已备案'), ('leased', '已出租'), ('idle', '闲置')], string='状态', + default='to') \ No newline at end of file diff --git a/yuthon_property_approval/models/property_record.py b/yuthon_property_approval/models/property_record.py index 51ab4f751..7ffc8aa5d 100644 --- a/yuthon_property_approval/models/property_record.py +++ b/yuthon_property_approval/models/property_record.py @@ -14,19 +14,23 @@ class PropertyRecord(models.Model): code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_record_code')) property_documents_ids = fields.Many2many('documents.document', string="物业备案文件") property_record_line_ids = fields.One2many('property.record.line', 'property_record_id', string="评估文件") - + is_issues = fields.Boolean(string='是否上会') + related_issues_id = fields.Many2one('issue.library', string="关联议题") class PropertyRecordLine(models.Model): _name = 'property.record.line' property_record_id = fields.Many2one('property.record', string='关联审批') - product_id = fields.Many2one('product.product', string="物业") + product = fields.Char(string="物业") product_code = fields.Char(string="评估编号") partner_id = fields.Many2one('res.partner', string="评估公司") - property_statu = fields.Char(string="评估状态") property_type = fields.Selection([('rent_money', '租金'), ('value', '价值')], string="评估类别") property_m2 = fields.Float(string="评估面积") - + state = fields.Selection([('to', '待评估'), ('done', '已评估'), ('ing', '评估中'), + ('ing_handover', '移交中'), ('done_handover', '已移交'), + ('filing', '备案中'), ('net', '挂网'), ('signing', '签约中'), + ('signed', '已备案'), ('leased', '已出租'), ('idle', '闲置')], string='状态', + default='to') diff --git a/yuthon_property_approval/security/ir.model.access.csv b/yuthon_property_approval/security/ir.model.access.csv index 0321f4e0a..750f56bd2 100644 --- a/yuthon_property_approval/security/ir.model.access.csv +++ b/yuthon_property_approval/security/ir.model.access.csv @@ -42,4 +42,6 @@ access_property_approval,property_approval,model_property_approval,base.group_us access_property_approval_line,property_approval_line,model_property_approval_line,base.group_user,1,1,1,1 access_property_handover,property_handover,model_property_handover,base.group_user,1,1,1,1 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/yuthon_property_approval/views/property_evaluate_application_views.xml b/yuthon_property_approval/views/property_evaluate_application_views.xml index 6f7366b43..b91350341 100644 --- a/yuthon_property_approval/views/property_evaluate_application_views.xml +++ b/yuthon_property_approval/views/property_evaluate_application_views.xml @@ -5,6 +5,9 @@ property.evaluate.application +
+
@@ -17,11 +20,6 @@
-
-

- -

-
@@ -38,19 +36,21 @@ - + + - + - + + diff --git a/yuthon_property_approval/views/property_record_views.xml b/yuthon_property_approval/views/property_record_views.xml index 8af6e11cf..d2075838b 100644 --- a/yuthon_property_approval/views/property_record_views.xml +++ b/yuthon_property_approval/views/property_record_views.xml @@ -31,21 +31,25 @@ + - + - + + + + From 424405f7402c9b6da3d29249283ce12b4b881314 Mon Sep 17 00:00:00 2001 From: zhouzhou <123@qq.com> Date: Fri, 1 Nov 2024 16:36:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/tianhe_fee_expend_approval.py | 2 +- .../models/wuguan_intertubular_protocol.py | 2 +- .../wuguan_lease_contract_approval_form.py | 2 +- yuthon_account/models/yuthon_reconcil.py | 2 +- yuthon_property/__manifest__.py | 1 - yuthon_property/models/__init__.py | 1 - yuthon_property/models/yuthon_property.py | 2 +- .../models/yuthon_property_evaluated.py | 6 ++ .../models/yuthon_resource_mgmt_config.py | 11 ++- yuthon_property/security/ir.model.access.csv | 4 +- yuthon_property/views/menuitem.xml | 15 +--- .../views/yuthon_property_evaluated_views.xml | 5 ++ .../yuthon_resource_mgmt_config_views.xml | 18 +++- yuthon_property_approval/__manifest__.py | 3 + .../data/sale_renting_code_data.xml | 17 +++- yuthon_property_approval/models/__init__.py | 5 +- .../models/property_approval.py | 2 +- .../models/property_be_evaluated.py | 2 +- .../models/property_fitment.py | 2 +- .../models/property_handover.py | 3 +- .../models/property_information.py | 2 +- .../models/property_lease_contract.py | 4 +- .../models/property_offline_registration.py | 37 ++++++++ .../models/property_rental_conditions.py | 46 ++++++++++ .../models/property_rental_form.py | 12 ++- .../security/ir.model.access.csv | 8 +- .../views/property_handover_views.xml | 36 ++++---- .../views/property_menu_all.xml | 17 ++++ .../views/property_offline_registration.xml | 71 +++++++++++++++ .../views/property_rental_conditions.xml | 89 +++++++++++++++++++ .../views/property_rental_form_views.xml | 16 ++-- 31 files changed, 376 insertions(+), 67 deletions(-) create mode 100644 yuthon_property_approval/models/property_offline_registration.py create mode 100644 yuthon_property_approval/models/property_rental_conditions.py rename {yuthon_property => yuthon_property_approval}/models/property_rental_form.py (59%) create mode 100644 yuthon_property_approval/views/property_offline_registration.xml create mode 100644 yuthon_property_approval/views/property_rental_conditions.xml rename {yuthon_property => yuthon_property_approval}/views/property_rental_form_views.xml (86%) diff --git a/tianhe_approvals/models/tianhe_fee_expend_approval.py b/tianhe_approvals/models/tianhe_fee_expend_approval.py index 93169828b..574e4e63e 100644 --- a/tianhe_approvals/models/tianhe_fee_expend_approval.py +++ b/tianhe_approvals/models/tianhe_fee_expend_approval.py @@ -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="支出金额") diff --git a/tianhe_approvals/models/wuguan_intertubular_protocol.py b/tianhe_approvals/models/wuguan_intertubular_protocol.py index cc795841d..0d6cc162d 100644 --- a/tianhe_approvals/models/wuguan_intertubular_protocol.py +++ b/tianhe_approvals/models/wuguan_intertubular_protocol.py @@ -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="管理费总额") diff --git a/tianhe_approvals/models/wuguan_lease_contract_approval_form.py b/tianhe_approvals/models/wuguan_lease_contract_approval_form.py index 2d97d6733..2030e9621 100644 --- a/tianhe_approvals/models/wuguan_lease_contract_approval_form.py +++ b/tianhe_approvals/models/wuguan_lease_contract_approval_form.py @@ -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="联系电话") diff --git a/yuthon_account/models/yuthon_reconcil.py b/yuthon_account/models/yuthon_reconcil.py index 9494e9e14..68ab39cdd 100644 --- a/yuthon_account/models/yuthon_reconcil.py +++ b/yuthon_account/models/yuthon_reconcil.py @@ -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="凭证种类") diff --git a/yuthon_property/__manifest__.py b/yuthon_property/__manifest__.py index 96134119e..169af9067 100644 --- a/yuthon_property/__manifest__.py +++ b/yuthon_property/__manifest__.py @@ -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', diff --git a/yuthon_property/models/__init__.py b/yuthon_property/models/__init__.py index 5ea97e7de..e1a13c129 100644 --- a/yuthon_property/models/__init__.py +++ b/yuthon_property/models/__init__.py @@ -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 diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py index a3df3cb3b..97dab0f5e 100644 --- a/yuthon_property/models/yuthon_property.py +++ b/yuthon_property/models/yuthon_property.py @@ -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="生效时间") diff --git a/yuthon_property/models/yuthon_property_evaluated.py b/yuthon_property/models/yuthon_property_evaluated.py index 9b82cc944..7689f2adc 100644 --- a/yuthon_property/models/yuthon_property_evaluated.py +++ b/yuthon_property/models/yuthon_property_evaluated.py @@ -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' diff --git a/yuthon_property/models/yuthon_resource_mgmt_config.py b/yuthon_property/models/yuthon_resource_mgmt_config.py index 14cd739dc..8bc408625 100644 --- a/yuthon_property/models/yuthon_resource_mgmt_config.py +++ b/yuthon_property/models/yuthon_resource_mgmt_config.py @@ -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="名称") \ No newline at end of file + name = fields.Char(string="名称") + + +class YuthonRentalPurposes(models.Model): + _name = 'yuthon.rental.purpose' + _description = '出租用途' + + name = fields.Char(string="出租用途") diff --git a/yuthon_property/security/ir.model.access.csv b/yuthon_property/security/ir.model.access.csv index 8eddf53d4..04351f8db 100644 --- a/yuthon_property/security/ir.model.access.csv +++ b/yuthon_property/security/ir.model.access.csv @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml index 8f60634a6..bdb77a701 100644 --- a/yuthon_property/views/menuitem.xml +++ b/yuthon_property/views/menuitem.xml @@ -52,17 +52,6 @@ name="招租" parent="yuthon_property_menu_root"/> - - - - - - - - + yuthon.property.evaluated +
+
diff --git a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml index 78826ebae..87e0c101c 100644 --- a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml +++ b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml @@ -41,7 +41,7 @@ - 用途 + 资产用途 yuthon.resource.purpose tree @@ -100,8 +100,22 @@ - 物业来源 + 权属人配置 yuthon.owner.message tree + + yuthon.rental.purpose.tree + yuthon.rental.purpose + + + + + + + + 出租用途配置 + yuthon.rental.purpose + tree + diff --git a/yuthon_property_approval/__manifest__.py b/yuthon_property_approval/__manifest__.py index 803b184df..ba737b579 100644 --- a/yuthon_property_approval/__manifest__.py +++ b/yuthon_property_approval/__manifest__.py @@ -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', diff --git a/yuthon_property_approval/data/sale_renting_code_data.xml b/yuthon_property_approval/data/sale_renting_code_data.xml index 7d36a54b5..9201d44b4 100644 --- a/yuthon_property_approval/data/sale_renting_code_data.xml +++ b/yuthon_property_approval/data/sale_renting_code_data.xml @@ -213,7 +213,22 @@ 更名编号 property_renamed_code - %(y)s%(month)s%(day)s + GM%(y)s%(month)s%(day)s + + 线下承租方编号 + property_offline_registration_code + CZ%(y)s%(month)s%(day)s + + + 出租申报编号 + property_rental_form_code + CC%(y)s%(month)s%(day)s + + + 出租调整编号 + property_rental_conditions_code + CT%(y)s%(month)s%(day)s + \ No newline at end of file diff --git a/yuthon_property_approval/models/__init__.py b/yuthon_property_approval/models/__init__.py index 1ab8a69d7..ab20c7953 100644 --- a/yuthon_property_approval/models/__init__.py +++ b/yuthon_property_approval/models/__init__.py @@ -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 \ No newline at end of file +from . import property_handover +from . import property_offline_registration +from . import property_rental_form +from . import property_rental_conditions \ No newline at end of file diff --git a/yuthon_property_approval/models/property_approval.py b/yuthon_property_approval/models/property_approval.py index a01b88488..bcc434702 100644 --- a/yuthon_property_approval/models/property_approval.py +++ b/yuthon_property_approval/models/property_approval.py @@ -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="产权编号") diff --git a/yuthon_property_approval/models/property_be_evaluated.py b/yuthon_property_approval/models/property_be_evaluated.py index 63a201b47..10c4b2539 100644 --- a/yuthon_property_approval/models/property_be_evaluated.py +++ b/yuthon_property_approval/models/property_be_evaluated.py @@ -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="物业地址") diff --git a/yuthon_property_approval/models/property_fitment.py b/yuthon_property_approval/models/property_fitment.py index 114b30571..17d53d98d 100644 --- a/yuthon_property_approval/models/property_fitment.py +++ b/yuthon_property_approval/models/property_fitment.py @@ -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="联系电话") diff --git a/yuthon_property_approval/models/property_handover.py b/yuthon_property_approval/models/property_handover.py index 07cb9f36b..de82fd06d 100644 --- a/yuthon_property_approval/models/property_handover.py +++ b/yuthon_property_approval/models/property_handover.py @@ -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") \ No newline at end of file + state = fields.Selection(related='property_id.state', string="状态",) \ No newline at end of file diff --git a/yuthon_property_approval/models/property_information.py b/yuthon_property_approval/models/property_information.py index 6c868ae2a..f061f1b57 100644 --- a/yuthon_property_approval/models/property_information.py +++ b/yuthon_property_approval/models/property_information.py @@ -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") diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index d3bf1200f..58b624fda 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -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="评估单价") diff --git a/yuthon_property_approval/models/property_offline_registration.py b/yuthon_property_approval/models/property_offline_registration.py new file mode 100644 index 000000000..a6a845bfe --- /dev/null +++ b/yuthon_property_approval/models/property_offline_registration.py @@ -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='是否行使优先权') \ No newline at end of file diff --git a/yuthon_property_approval/models/property_rental_conditions.py b/yuthon_property_approval/models/property_rental_conditions.py new file mode 100644 index 000000000..180fa7396 --- /dev/null +++ b/yuthon_property_approval/models/property_rental_conditions.py @@ -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='其他') \ No newline at end of file diff --git a/yuthon_property/models/property_rental_form.py b/yuthon_property_approval/models/property_rental_form.py similarity index 59% rename from yuthon_property/models/property_rental_form.py rename to yuthon_property_approval/models/property_rental_form.py index a2067c865..f9a070231 100644 --- a/yuthon_property/models/property_rental_form.py +++ b/yuthon_property_approval/models/property_rental_form.py @@ -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='备注') \ No newline at end of file + remarks = fields.Text(string='备注') + is_issues = fields.Boolean(string='是否上会') + related_issues_id = fields.Many2one('issue.library', string="关联议题") \ No newline at end of file diff --git a/yuthon_property_approval/security/ir.model.access.csv b/yuthon_property_approval/security/ir.model.access.csv index 750f56bd2..a0142ce9f 100644 --- a/yuthon_property_approval/security/ir.model.access.csv +++ b/yuthon_property_approval/security/ir.model.access.csv @@ -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 \ No newline at end of file +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 diff --git a/yuthon_property_approval/views/property_handover_views.xml b/yuthon_property_approval/views/property_handover_views.xml index 685552884..4cc2ffcc3 100644 --- a/yuthon_property_approval/views/property_handover_views.xml +++ b/yuthon_property_approval/views/property_handover_views.xml @@ -33,26 +33,28 @@ - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/yuthon_property_approval/views/property_menu_all.xml b/yuthon_property_approval/views/property_menu_all.xml index 6f2b1b520..98586667f 100644 --- a/yuthon_property_approval/views/property_menu_all.xml +++ b/yuthon_property_approval/views/property_menu_all.xml @@ -208,4 +208,21 @@ name="专项审批" action="property_record_action" sequence="11"/> + + + + + \ No newline at end of file diff --git a/yuthon_property_approval/views/property_offline_registration.xml b/yuthon_property_approval/views/property_offline_registration.xml new file mode 100644 index 000000000..a89881a7b --- /dev/null +++ b/yuthon_property_approval/views/property_offline_registration.xml @@ -0,0 +1,71 @@ + + + + property.offline.registration.tree + property.offline.registration + + + + + + + + + + + + property.offline.registration.form + property.offline.registration + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + 线下意向承租方报名表 + property.offline.registration + tree,form + + \ No newline at end of file diff --git a/yuthon_property_approval/views/property_rental_conditions.xml b/yuthon_property_approval/views/property_rental_conditions.xml new file mode 100644 index 000000000..5b4b410f9 --- /dev/null +++ b/yuthon_property_approval/views/property_rental_conditions.xml @@ -0,0 +1,89 @@ + + + + property.rental.conditions.tree + property.rental.conditions + + + + + + + + + + + + + + property.rental.conditions.form + property.rental.conditions + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + 出租条件调整表 + property.rental.conditions + tree,form + + \ No newline at end of file diff --git a/yuthon_property/views/property_rental_form_views.xml b/yuthon_property_approval/views/property_rental_form_views.xml similarity index 86% rename from yuthon_property/views/property_rental_form_views.xml rename to yuthon_property_approval/views/property_rental_form_views.xml index 276a539dc..b1e35c57d 100644 --- a/yuthon_property/views/property_rental_form_views.xml +++ b/yuthon_property_approval/views/property_rental_form_views.xml @@ -7,16 +7,8 @@ - - - - - - - - @@ -27,7 +19,8 @@
-
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3e9f108e7be7bcdc2c9fe6c705da9b9f5e7f5260 Mon Sep 17 00:00:00 2001 From: zhouzhou <123@qq.com> Date: Fri, 1 Nov 2024 20:20:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_property/views/yuthon_property_views.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml index c968899e7..9923d81e4 100644 --- a/yuthon_property/views/yuthon_property_views.xml +++ b/yuthon_property/views/yuthon_property_views.xml @@ -11,6 +11,7 @@ + @@ -45,6 +46,7 @@ +