From 13c11ebb652e8d6427c4dd7e40ca5021df4b1aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Sun, 28 Sep 2025 16:28:52 +0800
Subject: [PATCH] =?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

---
 soong_workflow/views/soong_workflow_record.xml     | 14 +++++++-------
 .../report/lease_contract_templates.xml            |  8 ++++++++
 .../views/property_lease_contract.xml              | 10 +++++-----
 .../wizard/choose_property_wizard.py               |  9 ---------
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index 84090a828..fb83f3c5e 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -67,21 +67,21 @@
                        <button name="admin_end" type="object" string="管理员强制结束" class="oe_highlight" groups="soong_workflow.group_soong_workflow_manager"/>
                        <button name="delete_record" type="object" string="删除" class="oe_highlight" groups="soong_workflow.group_soong_workflow_manager"/>
                     </header>
+                    <field name="workflow_id" string="审批类型"/>
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="workflow_id" string="审批类型"/>
+                    <field name="approve_state" string="审批状态" widget="badge" decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
+                    <field name="create_uid"/>
+                    <field name="node_id" string="当前节点"/>
+                    <field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width"/>
+                     <field name="soong_state"/>
+                     <field name="documents_ids" widget="preview_many2many"/>
                     <field name="approvals_group_id" optional="hide"/>
                     <field name="department_id" optional="hide"/>
-                    <field name="node_id" string="当前节点"/>
-                    <field name="approve_state" string="审批状态" widget="badge" decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
                     <field name="users_ids" string="用户" widget="many2many_tags" optional="hide"/>
-                    <field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width"/>
-                    <field name="create_uid"/>
                     <field name="write_date2"/>
                     <field name="company_id" optional="hide"/>
                     <field name="text" optional="hide"/>
-                    <field name="soong_state"/>
-                    <field name="documents_ids" widget="preview_many2many"/>
                     <field name="reclaim_state" column_invisible="1"/>
                     <field name="member_of_department" optional="hide"/>
                     <field name="is_manager" column_invisible="1"/>
diff --git a/yuthon_property_approval/report/lease_contract_templates.xml b/yuthon_property_approval/report/lease_contract_templates.xml
index 36372dab6..92b6ca6b0 100644
--- a/yuthon_property_approval/report/lease_contract_templates.xml
+++ b/yuthon_property_approval/report/lease_contract_templates.xml
@@ -83,6 +83,14 @@
                             </td>
                         </tr>
                     </table>
+                    <table width="100%" style="table-layout:fixed;">
+                        <tr>
+                            <td width="15%"><strong>合约开始时间：</strong></td>
+                            <td width="35%"><span t-field="o.term_start_time"/></td>
+                            <td width="15%"><strong>合约结束时间：</strong></td>
+                            <td width="35%"><span t-field="o.term_end_time"/></td>
+                        </tr>
+                    </table>
 
                     <!-- 审批明细 -->
                     <t t-if="o.log_ids">
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 3122e7796..480e33f1c 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -92,7 +92,7 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="物业列表" invisible="state not in ['分管领导', '总经理']">
+                        <page string="物业列表" invisible="(state in ['分管领导', '总经理']) and (not work_end)">
                             <button name="choose_property_button" string="添加物业" type="object"
                                     class="btn-primary"/>
                             <field name="lease_ids" string=" ">
@@ -249,7 +249,7 @@
                         <field name="ele_price"/>
                     </group>
                     <notebook>
-                        <page string="租金明细" invisible="state not in ['分管领导', '总经理']">
+                        <page string="租金明细" invisible="(state in ['分管领导', '总经理']) and (not work_end)">
                             <field name="breakdown_ids" string=" ">
                                 <tree editable="bottom">
                                     <field name="breakdown_id" column_invisible="1"/>
@@ -262,7 +262,7 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="其他费用" invisible="state not in ['分管领导', '总经理']">
+                        <page string="其他费用" invisible="(state in ['分管领导', '总经理']) and (not work_end)">
                             <field name="other_ids" string=" ">
                                 <tree editable="bottom">
                                     <field name="other_id" column_invisible="1"/>
@@ -298,7 +298,7 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="银行流水" invisible="state not in ['分管领导', '总经理']">
+                        <page string="银行流水" invisible="(state in ['分管领导', '总经理']) and (not work_end)">
                             <field name="bank_statements_ids" string=" ">
                                 <tree editable="bottom">
                                     <field name="start_time"/>
@@ -330,7 +330,7 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="附件" invisible="state not in ['分管领导', '总经理']">
+                        <page string="附件">
                             <group col="2">
                                 <group>
                                     <field name="asset_valuation_ids"  widget="preview_many2many"/>
diff --git a/yuthon_property_approval/wizard/choose_property_wizard.py b/yuthon_property_approval/wizard/choose_property_wizard.py
index bd01efa76..d876b6673 100644
--- a/yuthon_property_approval/wizard/choose_property_wizard.py
+++ b/yuthon_property_approval/wizard/choose_property_wizard.py
@@ -37,15 +37,6 @@ class ChoosePropertyWizard(models.Model):
                 "address_id": record.id,
             }))
 
-            if record.is_message_fee:
-                rec.is_mange = True
-                standard_id = record.message_standard_id
-                fee_list.append([0, 0, {
-                    'fees_id': standard_id.id,
-                    'proportional': standard_id.amount}])
-            else:
-                rec.is_mange = False
-
             manage_id = record.manage_information_ids[-1] if record.manage_information_ids else False
             admin_id = False
             company_id = False