From 998f20a1771cdd395d9a4f600cf8850fb4d370e8 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: Fri, 29 Aug 2025 11:00:17 +0800
Subject: [PATCH 1/2] =?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/templates/soong_workflow_templates.xml  | 10 +++++-----
 yuthon_property/views/yuthon_property_views.xml        |  2 +-
 .../views/property_approval_views.xml                  |  4 +---
 .../views/property_merge_approval_views.xml            |  4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml
index bbe65ebcf..e0dc4d759 100644
--- a/soong_workflow/templates/soong_workflow_templates.xml
+++ b/soong_workflow/templates/soong_workflow_templates.xml
@@ -6,10 +6,10 @@
                 <field name="log_ids" style="width:100%; margin-top: 10px;">
                     <tree editable="bottom">
                         <field name="sequence" string="" widget="handle" groups="soong_workflow.group_soong_workflow_manager"/>
-                        <field name="name" string="" readonly="0"/>
-                        <field name="done_by" string=""/>
+                        <field name="name" string="申请人" readonly="0"/>
+                        <field name="done_by" string="节点"/>
+                         <field name="comment" string=""/>
                         <field name="lase_click_date" string=""/>
-                        <field name="comment" string=""/>
                         <field name="approval_state" string=""/>
                         <field name="node_btn_name" string="" groups="soong_workflow.group_soong_workflow_manager"/>
                         <field name="document_ids" string="" widget="preview_many2many"/>
@@ -20,8 +20,8 @@
                 <field name="log_ids" style="width:100%; margin-top: 10px;" domain="[('node_btn_name', '!=', '1')]">
                     <tree editable="bottom">
                         <field name="sequence" string="" widget="handle" groups="soong_workflow.group_soong_workflow_manager"/>
-                        <field name="name" string="" readonly="0"/>
-                        <field name="done_by" string=""/>
+                        <field name="name" string="申请人" readonly="0"/>
+                        <field name="done_by" string="节点"/>
                         <field name="lase_click_date" string=""/>
                         <field name="comment" string=""/>
                         <field name="approval_state" string=""/>
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 2596c34ae..74061f4bf 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -232,7 +232,7 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="合并信息" invisible="not is_done_merge">
+                        <page string="被合并信息" invisible="not is_done_merge">
                             <field name="property_merge_approval_id"/>
                         </page>
                         <page string="水表列表" invisible="is_meter == False">
diff --git a/yuthon_property_approval/views/property_approval_views.xml b/yuthon_property_approval/views/property_approval_views.xml
index 7d8439792..c01ca7809 100644
--- a/yuthon_property_approval/views/property_approval_views.xml
+++ b/yuthon_property_approval/views/property_approval_views.xml
@@ -56,10 +56,8 @@
                         <field name="issues_result" invisible="is_issues == False"/>
                         <field name="users_id" invisible="1"/>
                         <field name="department_id" invisible="1"/>
-                        <field name="property_documents_ids" widget="preview_many2many"/>
-                    </group>
-                    <group>
                         <field name="tip_description" type="html"/>
+                        <field name="property_documents_ids" widget="preview_many2many"/>
                     </group>
                     <notebook>
                         <page string="审批信息">
diff --git a/yuthon_property_approval/views/property_merge_approval_views.xml b/yuthon_property_approval/views/property_merge_approval_views.xml
index e4bb3b821..3f826d264 100644
--- a/yuthon_property_approval/views/property_merge_approval_views.xml
+++ b/yuthon_property_approval/views/property_merge_approval_views.xml
@@ -57,7 +57,7 @@
                         <field name="documents_ids" widget="preview_many2many"/>
                     </group>
                     <notebook>
-                        <page string="合并信息">
+                        <page string="被合并信息">
                             <gourp/>
                             <group>
                                 <field name="property_merge_approval_line_ids" string=" ">
@@ -72,7 +72,7 @@
                                     </tree>
                                 </field>
                             </group>
-                            <group col="2" string="物业信息">
+                            <group col="2" string="合并信息">
                                 <group>
                                     <field name="property_name"/>
                                     <field name="merge_units"/>

From 218f4e1c80eca00b0d230bcdddcc7d8b82f62273 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: Fri, 29 Aug 2025 11:08:37 +0800
Subject: [PATCH 2/2] =?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_approval/models/property_merge_approval.py   | 5 ++++-
 .../views/property_merge_approval_views.xml                  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/yuthon_property_approval/models/property_merge_approval.py b/yuthon_property_approval/models/property_merge_approval.py
index b0fb173cc..f8657b420 100644
--- a/yuthon_property_approval/models/property_merge_approval.py
+++ b/yuthon_property_approval/models/property_merge_approval.py
@@ -55,11 +55,14 @@ class PropertyMergeApproval(models.Model):
 
     def put_merge_message(self):
         property_list = []
+        merge_asset_type_id = self.property_merge_approval_line_ids[0].property_id.asset_type_id
+        merge_property_floor_id = self.property_merge_approval_line_ids[0].property_id.property_floor_id
         property_id = self.env['yuthon.property'].create({
             'name': self.property_name,
             'building_area': self.merge_building_area,
+            'property_floor_id': merge_property_floor_id.id,
             'rent_area': self.merge_rent_area,
-            'asset_type_id': self.merge_asset_type_id.id,
+            'asset_type_id': merge_asset_type_id.id ,
             'is_done_split':True,
         })
         for record in self.property_merge_approval_line_ids:
diff --git a/yuthon_property_approval/views/property_merge_approval_views.xml b/yuthon_property_approval/views/property_merge_approval_views.xml
index 3f826d264..db0825cfe 100644
--- a/yuthon_property_approval/views/property_merge_approval_views.xml
+++ b/yuthon_property_approval/views/property_merge_approval_views.xml
@@ -76,8 +76,8 @@
                                 <group>
                                     <field name="property_name"/>
                                     <field name="merge_units"/>
-                                    <field name="merge_property_floor_id"/>
-                                    <field name="merge_asset_type_id"/>
+                                    <field name="merge_property_floor_id" invisible="1"/>
+                                    <field name="merge_asset_type_id" invisible="1"/>
                                 </group>
                                 <group>
                                     <field name="merge_building_area"/>