From 3ec28b18a388e0b1608cb212f3fe923427fe502f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Thu, 5 Feb 2026 14:34:32 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wizard/soong_workflow_comment_wizard_view.xml           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
index c4ca86517..9b3f269c2 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
@@ -34,9 +34,10 @@
                     </div>
                     <group>
                         <!-- 归档弹窗新增“本公司”勾选，控制抄送人员是否限定当前公司 -->
+                        <field name="document_ids" string="附件" widget="preview_many2many" force_save="1"/>
                         <field name="is_this_company"/>
                         <field name="circulated_employee_ids" widget="many2many_tags" options="{'no_create': True}" domain="[('company_id', '=', company_id), ('id', 'not in' , filter_personnel_ids)] if is_this_company else [('id', 'not in' , filter_personnel_ids)]"/>
-                        <field name="document_ids" string="附件" widget="preview_many2many" force_save="1"/>
+<!--                        <field name="document_ids" string="附件" widget="preview_many2many" force_save="1"/>-->
                     </group>
                 </group>
                 <group invisible="node_btn_name != '结束'">
@@ -82,10 +83,11 @@
                 </group>
                 <group col="2" invisible="node_btn_name in ['分发', '结束', '收回', '确认', '归档']">
                     <group>
+                        <field name="document_ids"  string="附件" widget="preview_many2many"  force_save="1"/>
                         <!--  本公司、附件  -->
                         <label for="is_this_company" string="本公司"/>
                         <field name="is_this_company" nolabel="1"/>
-                        <field name="document_ids"  string="附件" widget="preview_many2many"  force_save="1"/>
+<!--                        <field name="document_ids"  string="附件" widget="preview_many2many"  force_save="1"/>-->
                         <!--  转交人员  -->
                         <field name="trans_link_id" string="转交节点" invisible="node_btn_name == '退回'" domain="[('id', 'not in', invalid_link_ids)]"  options="{'no_open': True}" widget="radio" force_save="1"/>
                         <field name="employee_trans_domain_ids" invisible="1"/>

From fb2aa70fea245a5965c7d2dccaa86a7259b91e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Thu, 5 Feb 2026 15:13:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=B3=E8=81=94=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=B7=A6=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/soong_workflow_templates.xml           |  6 ++++--
 .../views/yuthon_medical_manage_views.xml            |  2 +-
 yuthon_issue/views/issue_library_views.xml           | 12 ++++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml
index 556684af9..ae14f50cb 100644
--- a/soong_workflow/templates/soong_workflow_templates.xml
+++ b/soong_workflow/templates/soong_workflow_templates.xml
@@ -33,6 +33,7 @@
             <page string="关联流程">
                 <field name="soong_record_ids" style="width:100%; margin-top: 10px;">
                     <tree create="1" edit="1" delete="1" editable="bottom" type="object">
+                        <button name="open_record" type="object" string="详情" class="btn-primary"/>
                         <field name="workflow_record_id" domain="[('users_ids', 'in', uid)]"
                                options="{'no_open': True}" context="{'tree_view_ref': 'soong_workflow.soong_workflow_record_no_action_tree'}"/>
                         <field name="code" column_invisible="1"/>
@@ -42,7 +43,7 @@
                         <field name="department_id"/>
                         <field name="approvals_group_id" column_invisible="1"/>
                         <field name="write_date2"/>
-                        <button name="open_record" type="object" string="详情" class="btn-primary"/>
+<!--                        <button name="open_record" type="object" string="详情" class="btn-primary"/>-->
                         <button name="unlink" type="object" string="删除" class="btn-primary"/>
                     </tree>
                 </field>
@@ -90,6 +91,7 @@
             <page string="关联流程">
                 <field name="soong_record_ids" style="width:100%%; margin-top: 10px;">
                     <tree editable="bottom" delete="False">
+                        <button name="open_record" type="object" string="详情" class="btn-primary"/>
                       <field name="workflow_record_id" domain="[('users_ids', 'in', uid)]"
                                options="{'no_open': True}" context="{'tree_view_ref': 'soong_workflow.soong_workflow_record_no_action_tree'}"/>
                         <field name="code" column_invisible="1"/>
@@ -99,7 +101,7 @@
                         <field name="department_id"/>
                         <field name="approvals_group_id" column_invisible="1"/>
                         <field name="write_date2"/>
-                        <button name="open_record" type="object" string="详情" class="btn-primary"/>
+<!--                        <button name="open_record" type="object" string="详情" class="btn-primary"/>-->
                         <button name="unlink" type="object" string="删除" class="btn-primary"/>
                     </tree>
                 </field>
diff --git a/yuthon_hr_employee/views/yuthon_medical_manage_views.xml b/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
index 162727c62..124fba646 100644
--- a/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
+++ b/yuthon_hr_employee/views/yuthon_medical_manage_views.xml
@@ -10,7 +10,7 @@
                 </header>
                 <field name="employee_id" options="{'no_create': True}"/>
                 <field name="year" column_invisible="1"/>
-                <field name="company_id" required="1" optional="show"/>
+<!--                <field name="company_id" required="1" optional="show"/>-->
                 <field name="current_year_remaining" options='{ "fg_color": "blue"}'/>
                 <field name="this_year_quota"/>
                 <field name="last_year_balance"/>
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index 7304c3ffc..33c482e5d 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -238,6 +238,7 @@
                             <button name="add_workflow" string="添加流程" type="object" class="btn-primary"/>
                             <field name="issue_library_approval_line_ids" readonly="1">
                                 <tree editable="bottom">
+                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
                                     <field name="issue_library_id" column_invisible="1"/>
                                     <field name="res_model" column_invisible="1"/>
                                     <field name="res_id" column_invisible="1"/>
@@ -246,7 +247,7 @@
                                     <field name="approval_type"/>
                                     <field name="department_id"/>
                                     <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
+<!--                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>-->
                                 </tree>
                             </field>
                         </page>
@@ -457,6 +458,7 @@
                             <button name="add_workflow" string="添加流程" type="object" class="btn-primary"/>
                             <field name="issue_library_approval_line_ids" readonly="1">
                                 <tree editable="bottom">
+                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
                                     <field name="issue_library_id" column_invisible="1"/>
                                     <field name="res_model" column_invisible="1"/>
                                     <field name="res_id" column_invisible="1"/>
@@ -465,7 +467,7 @@
                                     <field name="approval_type"/>
                                     <field name="department_id"/>
                                     <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
+<!--                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>-->
                                 </tree>
                             </field>
                         </page>
@@ -627,6 +629,7 @@
                             <button name="add_workflow" string="添加流程" type="object" class="btn-primary"/>
                             <field name="issue_library_approval_line_ids" readonly="1">
                                 <tree editable="bottom">
+                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
                                     <field name="issue_library_id" column_invisible="1"/>
                                     <field name="res_model" column_invisible="1"/>
                                     <field name="res_id" column_invisible="1"/>
@@ -635,7 +638,7 @@
                                     <field name="approval_type"/>
                                     <field name="department_id"/>
                                     <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
+<!--                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>-->
                                 </tree>
                             </field>
                         </page>
@@ -786,6 +789,7 @@
                             <button name="add_workflow" string="添加流程" type="object" class="btn-primary"/>
                             <field name="issue_library_approval_line_ids" readonly="1">
                                 <tree editable="bottom">
+                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
                                     <field name="issue_library_id" column_invisible="1"/>
                                     <field name="res_model" column_invisible="1"/>
                                     <field name="res_id" column_invisible="1"/>
@@ -794,7 +798,7 @@
                                     <field name="approval_type"/>
                                     <field name="department_id"/>
                                     <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
+<!--                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>-->
                                 </tree>
                             </field>
                         </page>

From c63fdc1aa01ae833f5dac9f959973a0135f9ca98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Thu, 5 Feb 2026 15:24:37 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8A=9E=E7=BB=93=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/views/soong_workflow_record.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index db6d33978..a464daa07 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -86,7 +86,7 @@
             <field name="arch" type="xml">
                 <tree string="流程查询" action="open_record" type="object"
                       delete="false" copy="false"
-                      create="false" default_order="display_end_time desc, write_date2 desc, id desc" expand="1" limit="10">
+                      create="false" default_order="display_end_time" expand="1" limit="10">
                     <header>
                         <button name="admin_end" type="object" string="管理员强制结束" class="oe_highlight"
                                 groups="soong_workflow.group_soong_workflow_manager"/>
@@ -139,7 +139,7 @@
             <field name="arch" type="xml">
                 <tree string="流程查询" type="object"
                       delete="false"
-                      create="false" default_order="display_end_time desc, write_date2 desc, id desc" expand="1" limit="10">
+                      create="false" default_order="display_end_time" expand="1" limit="10">
                     <header>
                         <button name="admin_end" type="object" string="管理员强制结束" class="oe_highlight"
                                 groups="soong_workflow.group_soong_workflow_manager"/>
@@ -412,7 +412,7 @@
             <field name="arch" type="xml">
                 <tree string="工作流回收站" action="open_record" type="object"
                       decoration-muted="approve_state == 'end'" decoration-warning="approve_state != 'end'"
-                      create="false" default_order="write_date2 desc" limit="10">
+                      create="false" default_order="display_end_time" limit="10">
                     <field name="name"/>
                     <field name="workflow_id" string="审批类型"/>
                     <field name="node_id" string="当前节点"/>

From 228895dd90b5bf11b877543b7fb9d71be6b68b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Thu, 5 Feb 2026 15:39:09 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8A=9E=E7=BB=93=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=87=E9=A2=98=E6=8B=89=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/yuthon_official_incoming_normal.py | 25 +++++++++++++++++++
 .../yuthon_official_incoming_normal_views.xml |  5 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/yuthon_official/models/yuthon_official_incoming_normal.py b/yuthon_official/models/yuthon_official_incoming_normal.py
index 75f2fd54e..4b9abbfc1 100644
--- a/yuthon_official/models/yuthon_official_incoming_normal.py
+++ b/yuthon_official/models/yuthon_official_incoming_normal.py
@@ -44,6 +44,31 @@ class YuthonOfficialIncomingNormal(models.Model):
     room_booking_ids = fields.One2many('room.booking', 'incoming_normal_id', string="会议关联")
     issue_library_ids = fields.One2many('issue.library', 'incoming_normal_id', string="议题关联")
     related_issues_id = fields.Many2one('issue.library', string="关联议题")
+    
+    # 显示用的办结时间（如果有审批日志，取最后一条日志的时间；否则使用write_date）
+    display_end_time = fields.Datetime(
+        string="办结时间",
+        compute='_compute_display_end_time',
+        store=True
+    )
+    
+    @api.depends('log_ids', 'write_date')
+    def _compute_display_end_time(self):
+        """
+        计算显示用的办结时间
+        逻辑：如果有审批日志，取最后一条日志的时间；否则使用write_date
+        """
+        for record in self:
+            if record.log_ids:
+                # 按ID排序，取最后一条日志的时间
+                sorted_logs = record.log_ids.sorted(lambda l: l.id)
+                if sorted_logs and hasattr(sorted_logs[-1], 'lase_click_date') and sorted_logs[-1].lase_click_date:
+                    record.display_end_time = sorted_logs[-1].lase_click_date
+                else:
+                    record.display_end_time = record.write_date
+            else:
+                record.display_end_time = record.write_date
+    
     def _get_default_name_title(self):
         return self._description if self._description else self._name
 
diff --git a/yuthon_official/views/yuthon_official_incoming_normal_views.xml b/yuthon_official/views/yuthon_official_incoming_normal_views.xml
index 7dcfd7933..2bf37eb7d 100644
--- a/yuthon_official/views/yuthon_official_incoming_normal_views.xml
+++ b/yuthon_official/views/yuthon_official_incoming_normal_views.xml
@@ -4,10 +4,11 @@
         <field name="name">yuthon.official.incoming.normal.tree</field>
         <field name="model">yuthon.official.incoming.normal</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree default_order="display_end_time">
                 <field name="name"/>
                 <field name="department_id"/>
                 <field name="time_date"/>
+                <field name="display_end_time" string="办结时间" optional="show"/>
             </tree>
         </field>
     </record>
@@ -57,13 +58,13 @@
                         <group col="2">
                             <field name="is_company" invisible="1"/>
                             <field name="users_id"/>
-                            <field name="name" required="1"/>
                         </group>
                         <group>
                             <field name="issues_result" invisible="is_issues == False"/>
                         </group>
                     </group>
                     <group>
+                        <field name="name" required="1"/>
                         <field name="main_text"/>
                         <field name="official_documents_ids" widget="preview_many2many"/>
                     </group>