pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!12918 添加功能

Browse Source 
Merge pull request !12918 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2026-09-24 11:39:54 +00:00
committed by Gitee
parent 45d3c1cbd0 f689a0f586
commit 0b3d1dfa70
30 changed files with 1219 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/views/property_confirm_views.xml
+12 -2
View File
@@ -5,8 +5,18 @@
<field name="model">property.confirm</field>
<field name="arch" type="xml">
<tree string="成交确认">
<field name="name"/>
<field name="code"/>
<field name="name" string="标题"/>
<field name="property_name"/>
<field name="lessee"/>
<field name="property_area"/>
<field name="lease_term_years"/>
<field name="rent_free_days"/>
<field name="employee_ids" widget="many2many_tags"/>
<field name="business_state" string="业务状态"/>
<field name="approve_state" string="审批状态" widget="badge"
decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
<button name="action_create_contract" type="object" string="创建合同" class="btn btn-primary"
invisible="approve_state != 'end'"/>
</tree>
</field>
</record>
yuthon_property_approval/views/property_evaluate_application_views.xml
+16 -7
View File
@@ -50,21 +50,30 @@
<group>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="quote"/>
<field name="evaluation_company_id"/>
<field name="date_assessment"/>
<field name="service_money"/>
<field name="pay_time"/>
<field name="pay_way"/>
<!-- 左右两栏：左 3 个 / 右 3 个 -->
<group>
<field name="evaluation_company_id"/>
<field name="date_assessment"/>
<field name="service_money"/>
</group>
<group>
<field name="pay_time"/>
<field name="pay_way"/>
</group>
<field name="is_experts"/>
</group>
<notebook>
<page string="待评估物业出租方案明细表">
<div class="mb-2">
<button name="action_export_assessment_result" type="object"
string="导出" class="btn-primary"
invisible="not property_ids"/>
</div>
<field name="property_ids">
<tree editable="bottom">
<field name="property_message_id" column_invisible="1"/>
<field name="property_evaluation_id" class="list_width" string="物业"/>
<field name="property_ids" widget="many2many_tags" optional="hide"/>
<field name="property_id" optional="hide"/>
<field name="evaluation_area"/>
<field name="assessment_category"/>
<field name="owner_id"/>
yuthon_property_approval/views/property_menu_all.xml
+2 -8
View File
@@ -151,13 +151,6 @@
action="property_confirm_action"
sequence="5"/>
<menuitem
id="property_assess_approval_menu"
parent="yuthon_property.yuthon_property_menu"
name="评估申请"
action="property_evaluate_application_action"
sequence="7"/>
<menuitem
id="property_record_approval_menu"
parent="yuthon_property.yuthon_property_menu"
@@ -200,11 +193,12 @@
parent="yuthon_property.yuthon_property_menu_data"
action="property_offline_registration_action"/>
<!-- 成交确认书菜单指向「成交确认审批」(property.confirm)；原 property.transaction.confirmed 已作废 -->
<menuitem id="yuthon_property_confirmation_of_transaction_menu"
sequence="5"
name="成交确认书"
parent="yuthon_property.yuthon_property_menu_data"
action="action_property_transaction_confirmed"/>
action="property_confirm_action"/>
<menuitem id="property_rental_conditions_menu"
sequence="10"
yuthon_property_approval/views/property_merge_approval_views.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<field name="name">property.merge.approval.tree</field>
<field name="model">property.merge.approval</field>
<field name="arch" type="xml">
<tree string="合并管理">
<tree string="合并管理" default_order="start_date desc">
<field name="property_name"/>
<field name="code"/>
<field name="merge_asset_type_id"/>
yuthon_property_approval/views/property_rental_form_views.xml
+13 -2
View File
@@ -5,8 +5,14 @@
<field name="model">property.rental.form</field>
<field name="arch" type="xml">
<tree string="挂牌申报表">
<field name="name"/>
<field name="code"/>
<field name="name"/>
<field name="listing_method"/>
<field name="business_state" string="业务状态"/>
<field name="employee_ids" widget="many2many_tags"/>
<field name="approve_state" string="审批状态" widget="badge"
decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
<button name="action_transaction_confirmed" type="object" string="成交确认书" class="btn btn-primary"/>
</tree>
</field>
</record>
@@ -51,7 +57,8 @@
<field name="property_rental_form_line_ids">
<tree editable="bottom">
<field name="property_rental_form_id" column_invisible="1"/>
<field name="property_id" options="{'no_create': True}"/>
<field name="property_id" options="{'no_create': True}"
domain="[('business_state', 'not in', ['to_sign', 'signing', 'signed'])]"/>
<field name="registered_id" optional="hide"/>
<field name="evaluation_area" optional="hide"/>
<field name="current_status"/>
@@ -77,5 +84,9 @@
<field name="name">挂牌申报表</field>
<field name="res_model">property.rental.form</field>
<field name="view_mode">tree,form</field>
<!-- 已进入签约阶段（待签约 / 签约中 / 已签约）的不在挂牌申报表列表显示；
尚未填明细行的空单仍然显示，避免刚保存的表单从列表消失 -->
<field name="domain">['|', ('property_rental_form_line_ids', '=', False),
('business_state', 'not in', ['to_sign', 'signing', 'signed'])]</field>
</record>
</odoo>
yuthon_property_approval/views/property_split_approval_views.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<field name="name">property.split.approval.tree</field>
<field name="model">property.split.approval</field>
<field name="arch" type="xml">
<tree string="物业拆分审批">
<tree string="物业拆分审批" default_order="effective_date desc">
<field name="property_id"/>
<field name="code"/>
<field name="units"/>
yuthon_property_approval/views/property_transaction_confirmed.xml
+3
View File
@@ -8,6 +8,9 @@
<field name="name"/>
<field name="lessee_id"/>
<field name="entity_type"/>
<field name="employee_ids" widget="many2many_tags"/>
<field name="approve_state" string="审批状态" widget="badge"
decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
</tree>
</field>
</record>