From a29d54e258109229831b3ae9af2d461de102208d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Sun, 18 Jan 2026 17:00:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/hr_leave_batch_report_action.xml   |  7 ++++
 .../report/hr_leave_batch_report_template.xml | 34 ++++++++-------
 .../report/go_approval_templates.xml          |  8 ++--
 .../report/overtime_approval_report.xml       |  7 ++++
 .../report/overtime_approval_templates.xml    | 37 +++++++----------
 .../views/inherit_hr_job_views.xml            |  2 +-
 .../report/contract_review_report.xml         | 11 ++---
 .../contract_review_report_templates.xml      | 21 +++++-----
 .../report/leaving_approval_report.xml        |  1 +
 .../leaving_approval_report_templates.xml     | 11 +++--
 .../property_lease_contract_print_report.xml  |  2 +
 ...roperty_lease_contract_print_templates.xml | 36 ++++++----------
 .../report/business_approval_print_report.xml |  5 ++-
 .../business_approval_print_templates.xml     | 18 ++++----
 yuthon_trade/report/seal_approval_report.xml  |  2 +
 .../report/seal_approval_templates.xml        | 41 +++++++++----------
 .../views/yuthon_will_task_views.xml          |  4 +-
 17 files changed, 129 insertions(+), 118 deletions(-)

diff --git a/yuthon_holiday/report/hr_leave_batch_report_action.xml b/yuthon_holiday/report/hr_leave_batch_report_action.xml
index cf4c63371..892aad0fe 100644
--- a/yuthon_holiday/report/hr_leave_batch_report_action.xml
+++ b/yuthon_holiday/report/hr_leave_batch_report_action.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
   <data>
+    <record id="paperformat_hr_leave_batch_small" model="report.paperformat">
+      <field name="name">Leave Batch Portrait</field>
+      <field name="format">A4</field>
+      <field name="margin_top">5</field>
+      <field name="orientation">Portrait</field>
+    </record>
     <record id="action_hr_leave_batch_print" model="ir.actions.report">
       <field name="name">请假单</field>
       <field name="model">hr.leave.batch</field>
@@ -8,6 +14,7 @@
       <!-- 与 QWeb 模板 t-name / template id 对应 -->
       <field name="report_name">yuthon_holiday.hr_leave_batch_print</field>
       <field name="report_file">yuthon_holiday.hr_leave_batch_print</field>
+      <field name="paperformat_id" ref="yuthon_holiday.paperformat_hr_leave_batch_small"/>
       <!-- 绑定模型，使用系统自动生成的 model external id -->
       <field name="binding_model_id" ref="model_hr_leave_batch"/>
       <field name="binding_type">report</field>
diff --git a/yuthon_holiday/report/hr_leave_batch_report_template.xml b/yuthon_holiday/report/hr_leave_batch_report_template.xml
index 952f5939d..7b9b69755 100644
--- a/yuthon_holiday/report/hr_leave_batch_report_template.xml
+++ b/yuthon_holiday/report/hr_leave_batch_report_template.xml
@@ -8,8 +8,8 @@
                     <t t-call="web.external_layout">
 
                         <style type="text/css">
-                            /* 借鉴已正常打印的合同审查单，使用外部布局字体，固定宽度居中 */
-                            table { border-collapse: collapse; width: 800px; margin: 0 auto; table-layout: fixed; }
+                            /* 借鉴已正常打印的合同审查单，使用外部布局字体，居中且最大800px */
+                            table { border-collapse: collapse; width: 100%; max-width: 800px; margin: 0 auto; table-layout: fixed; }
                             td { border: 1px solid #000; padding: 6px; text-align: left; vertical-align: middle; font-size: 14px; }
                             .title { text-align: center; font-weight: bold; font-size: 18px; padding: 8px 0 12px 0; }
                             .header-cell { font-weight: bold; background-color: #d4e6f1; text-align: center; }
@@ -51,9 +51,13 @@
                         <!-- 标题 -->
                         <div class="title">请假单</div>
 
+                        <div style="margin-bottom:8px; text-align:left;">
+                            流水号：<span t-esc="doc.code or ''"/>
+                        </div>
+
                         <table>
                             <colgroup>
-                                <col style="width:20%"/>
+                                <col style="width:6em"/>
                                 <col style="width:30%"/>
                                 <col style="width:20%"/>
                                 <col style="width:30%"/>
@@ -61,19 +65,19 @@
 
                             <!-- 事由 -->
                             <tr>
-                                <td class="header-cell">事由</td>
+                                <td class="header-cell" style="text-align:center;"><strong>事由</strong></td>
                                 <td colspan="3"><span t-esc="doc.text"/></td>
                             </tr>
 
                             <!-- 可用额度 -->
                             <tr>
-                                <td class="header-cell">可用额度</td>
+                                <td class="header-cell" style="text-align:center;"><strong>可用额度</strong></td>
                                 <td colspan="3"><span t-esc="doc.holiday_allowance"/></td>
                             </tr>
 
                             <!-- 总时长（= 可用额度中年假+补休） -->
                             <tr>
-                                <td class="header-cell">时长</td>
+                                <td class="header-cell" style="text-align:center;"><strong>时长</strong></td>
                                 <td colspan="3">
                                     <span t-esc="allow_total"/> 天
                                 </td>
@@ -85,10 +89,10 @@
                                     <td class="section-cell" colspan="4">按天请假</td>
                                 </tr>
                                 <tr>
-                                    <td class="header-cell">天</td>
-                                    <td class="header-cell">休假类型</td>
-                                    <td class="header-cell">开始日期</td>
-                                    <td class="header-cell">结束日期</td>
+                                    <td class="header-cell"><strong>天</strong></td>
+                                    <td class="header-cell"><strong>休假类型</strong></td>
+                                    <td class="header-cell"><strong>开始日期</strong></td>
+                                    <td class="header-cell"><strong>结束日期</strong></td>
                                 </tr>
                                 <t t-foreach="day_leaves" t-as="l">
                                     <tr>
@@ -106,10 +110,10 @@
                                     <td class="section-cell" colspan="4">按小时请假</td>
                                 </tr>
                                 <tr>
-                                    <td class="header-cell">请假小时</td>
-                                    <td class="header-cell">休假类型</td>
-                                    <td class="header-cell">请假日期</td>
-                                    <td class="header-cell">开始-结束时间</td>
+                                    <td class="header-cell"><strong>请假小时</strong></td>
+                                    <td class="header-cell"><strong>休假类型</strong></td>
+                                    <td class="header-cell"><strong>请假日期</strong></td>
+                                    <td class="header-cell"><strong>开始-结束时间</strong></td>
                                 </tr>
                                 <t t-foreach="hour_leaves" t-as="hl">
                                     <tr>
@@ -131,7 +135,7 @@
                                 <tr>
                                     <!-- 节点名称：保留center -->
                                     <!-- 若节点名称带“（物管）”等后缀，这里只取左侧文字 -->
-                                    <td class="center" colspan="1">
+                                    <td class="center" colspan="1" style="width:6em;">
                                         <span t-esc="log.name and log.name.split('（')[0] or ''"/>
                                     </td>
                                     <!-- 意见：添加approval-center 强制居中 -->
diff --git a/yuthon_hr_attendance/report/go_approval_templates.xml b/yuthon_hr_attendance/report/go_approval_templates.xml
index f0d4d3600..7fb9301f0 100644
--- a/yuthon_hr_attendance/report/go_approval_templates.xml
+++ b/yuthon_hr_attendance/report/go_approval_templates.xml
@@ -58,7 +58,7 @@
                         <table width="100%" style="table-layout:fixed;">
                             <tr>
                                 <td width="15%"><strong>开始日期</strong></td>
-                                <td width="35%"><span t-field="o.statr_date"/></td>
+                                <td width="35%"><span t-field="o.start_date"/></td>
                                 <td width="15%"><strong>结束日期</strong></td>
                                 <td width="35%"><span t-field="o.end_date"/></td>
                             </tr>
@@ -69,12 +69,12 @@
                         </table>
                     </t>
 
-                    <!-- 按半天 -->
-                    <t t-if="o.is_half">
+                    <!-- 按半天：若配置了上下半天选择，则显示 -->
+                    <t t-if="o.start_day_selection or o.end_day_selection">
                         <table width="100%" style="table-layout:fixed;">
                             <tr>
                                 <td width="15%"><strong>开始日期</strong></td>
-                                <td width="35%"><span t-field="o.statr_date"/></td>
+                                <td width="35%"><span t-field="o.start_date"/></td>
                                 <td width="15%"><strong>结束日期</strong></td>
                                 <td width="35%"><span t-field="o.end_date"/></td>
                             </tr>
diff --git a/yuthon_hr_attendance/report/overtime_approval_report.xml b/yuthon_hr_attendance/report/overtime_approval_report.xml
index 324549d35..60ba4cd8c 100644
--- a/yuthon_hr_attendance/report/overtime_approval_report.xml
+++ b/yuthon_hr_attendance/report/overtime_approval_report.xml
@@ -1,10 +1,17 @@
 <odoo>
+  <record id="paperformat_overtime_approval_small" model="report.paperformat">
+    <field name="name">Overtime Approval Portrait</field>
+    <field name="format">A4</field>
+    <field name="margin_top">5</field>
+    <field name="orientation">Portrait</field>
+  </record>
   <record id="action_overtime_approval_print" model="ir.actions.report">
     <field name="name">加班单</field>
     <field name="model">overtime.approval</field>
     <field name="report_type">qweb-pdf</field>
     <field name="report_name">yuthon_hr_attendance.overtime_approval_print_template</field>
     <field name="report_file">yuthon_hr_attendance.overtime_approval_print_template</field>
+    <field name="paperformat_id" ref="yuthon_hr_attendance.paperformat_overtime_approval_small"/>
     <field name="print_report_name">'加班单-%s' % (object.code or object.name)</field>
     <field name="binding_model_id" ref="model_overtime_approval"/>
     <field name="binding_type">report</field>
diff --git a/yuthon_hr_attendance/report/overtime_approval_templates.xml b/yuthon_hr_attendance/report/overtime_approval_templates.xml
index 95022ab3e..7e664ad00 100644
--- a/yuthon_hr_attendance/report/overtime_approval_templates.xml
+++ b/yuthon_hr_attendance/report/overtime_approval_templates.xml
@@ -6,19 +6,16 @@
         <t t-foreach="docs" t-as="doc">
           <t t-call="web.external_layout">
             <style type="text/css">
-              /* 核心修改：表格宽度改为固定值，不撑满 */
-              table { border-collapse: collapse; width: 800px; margin: 0 auto; table-layout: fixed; }
-              td { border: 1px solid #000; padding: 6px; }
+              /* 纵向版：表格自适应，最大 800px 居中 */
+              table { border-collapse: collapse; width: 100%; max-width: 800px; margin: 0 auto; table-layout: fixed; }
+              td { border: 1px solid #000; padding: 6px; vertical-align: middle; }
               .title { text-align: center; font-weight: bold; font-size: 18px; margin: 5px 0 10px 0; }
-              .meta { display: table; width: 800px; /* 与表格宽度一致 */ margin: 0 auto 10px auto; font-weight: bold; }
-              .meta .left { display: table-cell; width: 50%; text-align: left; }
-              .meta .right { display: table-cell; width: 50%; text-align: right; }
               .hdr { background: #f0f0f0; font-weight: bold; width: 12em; text-align: center; }
               .section { text-align: center; font-weight: bold; background: #d4e6f1; }
               .cell-content { text-align: left; word-wrap: break-word; word-break: break-all; }
               .approval-name { text-align: center; }
               /* 核心修改：调整审批列宽占比（缩小审批人列宽度） */
-              .approval-col1 { width: 20%; }  /* 节点名称列 */
+              .approval-col1 { width: 6em; }  /* 节点名称列 */
               .approval-col2 { width: 50%; }  /* 意见列（加宽） */
               .approval-col3 { width: 30%; }  /* 审批人-操作时间列（缩窄） */
               /* 新增：隐藏意见列右侧边框 */
@@ -33,30 +30,26 @@
 
             <div class="title">加班单</div>
 
-            <div class="meta">
-              <div class="left">
-                <strong>部门：</strong><span t-esc="doc.department_id.name or ''"/>
-              </div>
-              <div class="right">
-                <strong>申请日期：</strong><span t-esc="doc.create_date and doc.create_date.strftime('%Y-%m-%d') or ''"/>
-              </div>
+            <div style="margin-bottom:8px; text-align:left;">
+              部门：<span t-esc="doc.department_id.name or ''"/>
+              <span style="margin-left:40px;">流水号：<span t-esc="doc.code or ''"/></span>
             </div>
 
             <table>
-              <!-- 核心修改：调整colgroup列宽占比 -->
+              <!-- 核心修改：调整colgroup列宽，首列固定 6em，其余自适应 -->
               <colgroup>
-                <col style="width:12em"/>
-                <col style="width:50%"/>  <!-- 意见列加宽 -->
-                <col style="width:30%"/>  <!-- 审批人列缩窄 -->
+                <col style="width:6em"/>
+                <col/>
+                <col/>
               </colgroup>
               <tr>
-                <td class="hdr">事由</td>
+                <td class="hdr" style="text-align:center;">事由</td>
                 <td colspan="2" class="cell-content">
                   <span t-esc="doc.reason_application or ''"/>
                 </td>
               </tr>
               <tr>
-                <td class="hdr">加班人</td>
+                <td class="hdr" style="text-align:center;">加班人</td>
                 <td colspan="2" class="cell-content">
                   <t t-foreach="doc.employee_ids" t-as="emp">
                     <span t-esc="emp.name"/><br/>  <!-- 彻底修复：规范的XML自闭合标签 -->
@@ -64,7 +57,7 @@
                 </td>
               </tr>
               <tr>
-                <td class="hdr">时间</td>
+                <td class="hdr" style="text-align:center;">时间</td>
                 <td colspan="2" class="cell-content">
                   <span t-esc="doc.start_time and doc.start_time.strftime('%Y-%m-%d %H:%M') or ''"/> 至
                   <span t-esc="doc.end_time and doc.end_time.strftime('%Y-%m-%d %H:%M') or ''"/>，
@@ -76,7 +69,7 @@
               <tr><td class="section" colspan="3">审批详情</td></tr>
               <t t-foreach="doc.log_ids.sorted('sequence')" t-as="log">
                 <tr>
-                  <td class="cell-content approval-name approval-col1"><span t-esc="log.name"/></td>
+                  <td class="cell-content approval-name approval-col1" style="text-align:center;"><span t-esc="log.name"/></td>
                   <td class="cell-content approval-col2 no-right-border approval-center"><span t-esc="log.comment"/></td>
                   <td class="cell-content approval-col3 no-left-border approval-center approval-pull-left">
                     <t t-if="log.done_by">
diff --git a/yuthon_hr_employee/views/inherit_hr_job_views.xml b/yuthon_hr_employee/views/inherit_hr_job_views.xml
index 845d9b0d1..312856978 100644
--- a/yuthon_hr_employee/views/inherit_hr_job_views.xml
+++ b/yuthon_hr_employee/views/inherit_hr_job_views.xml
@@ -82,7 +82,7 @@
                 <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//field[@name='department_id']" position="after">
-<!--                <field name="allowed_user_ids" invisible="1"/>-->
+                <field name="allowed_user_ids" invisible="1"/>
                 <field name="number"/>
                 <field name="establishment_quotas"/>
                 <field name="no_of_employee" string="在编人数"/>
diff --git a/yuthon_hr_employee_approval/report/contract_review_report.xml b/yuthon_hr_employee_approval/report/contract_review_report.xml
index 7c88db649..cf5417bcd 100644
--- a/yuthon_hr_employee_approval/report/contract_review_report.xml
+++ b/yuthon_hr_employee_approval/report/contract_review_report.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="paperformat_hr_employee_approval_small" model="report.paperformat">
-            <field name="name">Lease Contract Small Top Margin</field>
-            <field name="format">A4</field>
-            <field name="margin_top">5</field>
-        </record>
+    <record id="paperformat_hr_employee_approval_small" model="report.paperformat">
+        <field name="name">Lease Contract Small Top Margin</field>
+        <field name="format">A4</field>
+        <field name="margin_top">5</field>
+        <field name="orientation">Portrait</field>
+    </record>
         <record id="action_contract_review_report" model="ir.actions.report">
             <field name="name">合同审查单</field>
             <field name="paperformat_id" ref="yuthon_hr_employee_approval.paperformat_hr_employee_approval_small"/>
diff --git a/yuthon_hr_employee_approval/report/contract_review_report_templates.xml b/yuthon_hr_employee_approval/report/contract_review_report_templates.xml
index 207f802c9..a0d1ca290 100644
--- a/yuthon_hr_employee_approval/report/contract_review_report_templates.xml
+++ b/yuthon_hr_employee_approval/report/contract_review_report_templates.xml
@@ -6,9 +6,9 @@
                 <t t-foreach="docs" t-as="doc">
                     <t t-call="web.external_layout">
                         <style type="text/css">
-                            /* 核心修改:表格宽度改为800px固定值,添加margin:0 auto居中 */
-                            table { border-collapse: collapse; width: 800px; margin: 0 auto; table-layout: fixed; }
-                            td { border: 1px solid #000; padding: 6px; text-align: center; }
+                            /* 表格纵向版式：自适应，最大800px 居中 */
+                            table { border-collapse: collapse; width: 100%; max-width: 800px; margin: 0 auto; table-layout: fixed; }
+                            td { border: 1px solid #000; padding: 6px; text-align: center; vertical-align: middle; }
                             .title {
                                 text-align: center;
                                 font-weight: bold;
@@ -17,10 +17,9 @@
                             }
                             .header-cell { font-weight: bold; background-color: #d4e6f1;}
 
-                            .dept-container { width: 800px; margin: 0 auto 10px auto; font-weight:bold; text-align:left; }
-                            /* 新增:附件清单左对齐 */
+                            /* 附件清单左对齐 */
                             .attachment-list { text-align: left; }
-                            /* 新增:隐藏意见和审批人之间的竖边框 */
+                            /* 隐藏意见和审批人之间的竖边框 */
                             .no-right-border { border-right: none !important; }
                             .no-left-border { border-left: none !important; }
                         </style>
@@ -30,15 +29,15 @@
                             会审意见表
                         </div>
 
-                        <!-- 承办部门 - 不在表格内(修改:使用新增的样式类,宽度与表格一致) -->
-                        <div class="dept-container">
-                            <span style="display:inline-block; margin-right:50px;"><strong>承办部门:</strong><span t-esc="doc.department_id.name"/></span>
-                            <span style="display:inline-block;"><strong>流水号:</strong><span t-esc="doc.code"/></span>
+                        <!-- 承办部门/流水号行：左对齐，取消固定宽度容器 -->
+                        <div style="margin-bottom:8px; text-align:left;">
+                            承办部门：<span t-esc="doc.department_id.name or ''"/>
+                            <span style="margin-left:40px;">流水号：<span t-esc="doc.code or ''"/></span>
                         </div>
 
                         <table>
                             <colgroup>
-                                <col style="width:20%"/>
+                                <col style="width:6em"/>
                                 <col style="width:30%"/>
                                 <col style="width:20%"/>
                                 <col style="width:30%"/>
diff --git a/yuthon_hr_employee_approval/report/leaving_approval_report.xml b/yuthon_hr_employee_approval/report/leaving_approval_report.xml
index 5dfc41931..9fb386188 100644
--- a/yuthon_hr_employee_approval/report/leaving_approval_report.xml
+++ b/yuthon_hr_employee_approval/report/leaving_approval_report.xml
@@ -5,6 +5,7 @@
             <field name="name">Leaving Approval Small Top Margin</field>
             <field name="format">A4</field>
             <field name="margin_top">5</field>
+            <field name="orientation">Portrait</field>
         </record>
         <record id="action_leaving_approval_report" model="ir.actions.report">
             <field name="name">离职申请</field>
diff --git a/yuthon_hr_employee_approval/report/leaving_approval_report_templates.xml b/yuthon_hr_employee_approval/report/leaving_approval_report_templates.xml
index 64285cade..127d56c27 100644
--- a/yuthon_hr_employee_approval/report/leaving_approval_report_templates.xml
+++ b/yuthon_hr_employee_approval/report/leaving_approval_report_templates.xml
@@ -6,8 +6,8 @@
                 <t t-foreach="docs" t-as="doc">
                     <t t-call="web.external_layout">
                         <style type="text/css">
-                            table { border-collapse: collapse; width: 800px; margin: 0 auto; table-layout: fixed; }
-                            td { border: 1px solid #000; padding: 6px; text-align: center; }
+                            table { border-collapse: collapse; width: 100%; max-width: 800px; margin: 0 auto; table-layout: fixed; }
+                            td { border: 1px solid #000; padding: 6px; text-align: center; vertical-align: middle; }
                             .title {
                                 text-align: center;
                                 font-weight: bold;
@@ -26,9 +26,14 @@
                             离职申请
                         </div>
 
+                        <div style="margin-bottom:8px; text-align:left;">
+                            部门：<span t-esc="doc.department_id.name or ''"/>
+                            <span style="margin-left:40px;">流水号：<span t-esc="doc.code or ''"/></span>
+                        </div>
+
                         <table>
                             <colgroup>
-                                <col style="width:20%"/>
+                                <col style="width:6em"/>
                                 <col style="width:30%"/>
                                 <col style="width:20%"/>
                                 <col style="width:30%"/>
diff --git a/yuthon_property_approval/report/property_lease_contract_print_report.xml b/yuthon_property_approval/report/property_lease_contract_print_report.xml
index 187ad41b5..718209013 100644
--- a/yuthon_property_approval/report/property_lease_contract_print_report.xml
+++ b/yuthon_property_approval/report/property_lease_contract_print_report.xml
@@ -3,7 +3,9 @@
     <!-- 租赁合同审批单打印报表 -->
     <record id="paperformat_property_lease_contract_small" model="report.paperformat">
         <field name="name">Lease Contract Small Top Margin</field>
+        <field name="format">A4</field>
         <field name="margin_top">5</field>
+        <field name="orientation">Portrait</field>
     </record>
     <record id="action_property_lease_contract_print_report" model="ir.actions.report">
         <field name="name">租赁合同审批单</field>
diff --git a/yuthon_property_approval/report/property_lease_contract_print_templates.xml b/yuthon_property_approval/report/property_lease_contract_print_templates.xml
index ecd78ecd7..6a58ddb41 100644
--- a/yuthon_property_approval/report/property_lease_contract_print_templates.xml
+++ b/yuthon_property_approval/report/property_lease_contract_print_templates.xml
@@ -8,7 +8,7 @@
                         <div class="page">
                             <style type="text/css">
                                 td { border:1px solid #000; padding:6px; }
-                                table { border-collapse: collapse; width: 800px; margin: 0 auto; table-layout: fixed; }
+                                table { border-collapse: collapse; width: 100%; max-width: 800px; margin: 0 auto; table-layout: fixed; }
                                 .title {
                                     text-align:center;
                                     font-weight:bold;
@@ -22,17 +22,7 @@
                                 table tr:nth-child(even) {
                                     background-color: #f9f9f9;
                                 }
-                                .info-container {
-                                    width: 800px;
-                                    margin: 0 auto 10px auto;
-                                    font-weight:bold;
-                                    display: flex;
-                                    justify-content: space-between;
-                                    align-items: center;
-                                }
-                                .info-container span, .info-container div {
-                                    border: none !important;
-                                }
+                                /* 部门/流水号行改为普通左对齐行，无固定宽度容器 */
                                 /* 审批详情列宽（匹配上方表格的5列结构） */
                                 .approval-col1 { width: 20%; }  /* 匹配上方"合同编号"等标题列宽度 */
                                 .approval-col2 { width: 40%; border-right: none !important; }  /* 匹配上方内容列宽度 */
@@ -41,15 +31,15 @@
 
                             <div class="title">租赁合同审批单</div>
 
-                            <div class="info-container">
-                                <span style="display:inline-block; margin-right:50px;"><strong>部门：</strong><span t-esc="doc.department_id.name or ''"/></span>
-                                <span style="display:inline-block;"><strong>流水号：</strong><span t-esc="doc.code or ''"/></span>
+                            <div style="margin-bottom:8px; text-align:left;">
+                                部门：<span t-esc="doc.department_id.name or ''"/>
+                                <span style="margin-left:40px;">流水号：<span t-esc="doc.code or ''"/></span>
                             </div>
 
                             <table>
-                                <!-- 上方表格：1列标题（20%） + 4列内容（合并为80%），共5列 -->
+                                <!-- 上方表格：左侧标题列固定 6em，右侧合并 4 列 -->
                                 <tr>
-                                    <td class="header-cell" style="width:20%;"><strong>合同编号</strong></td>
+                                    <td class="header-cell" style="width:6em; text-align:center;"><strong>合同编号</strong></td>
                                     <td colspan="4" style="width:80%;"><span t-esc="doc.contract_code or ''"/>
                                         <t t-if="doc.contract_type">
                                             <t t-if="doc.contract_type == 'first'">（首租）</t>
@@ -62,17 +52,17 @@
                                 </tr>
 
                                 <tr>
-                                    <td class="header-cell" style="width:20%;"><strong>承租方</strong></td>
+                                    <td class="header-cell" style="width:6em; text-align:center;"><strong>承租方</strong></td>
                                     <td colspan="4" style="width:80%;"><span t-esc="doc.lessee_id.name or ''"/></td>
                                 </tr>
 
                                 <tr>
-                                    <td class="header-cell" style="width:20%;"><strong>物业地址</strong></td>
+                                    <td class="header-cell" style="width:6em; text-align:center;"><strong>物业地址</strong></td>
                                     <td colspan="4" style="width:80%;"><span t-esc="doc.property_name or ''"/></td>
                                 </tr>
 
                                 <tr>
-                                    <td class="header-cell" style="width:20%;"><strong>租期</strong></td>
+                                    <td class="header-cell" style="width:6em; text-align:center;"><strong>租期</strong></td>
                                     <td colspan="4" style="width:80%;">
                                         <span t-esc="doc.term_start_time and doc.term_start_time.strftime('%Y-%m-%d') or ''"/>至<span t-esc="doc.term_end_time and doc.term_end_time.strftime('%Y-%m-%d') or ''"/>
                                         <t t-if="doc.rent_free_period_month or doc.rent_free_period_days">
@@ -84,7 +74,7 @@
                                 </tr>
 
                                 <tr>
-                                    <td class="header-cell" style="width:20%;"><strong>租金</strong></td>
+                                    <td class="header-cell" style="width:6em; text-align:center;"><strong>租金</strong></td>
                                     <td colspan="4" style="width:80%;">
                                         <span t-esc="'%.2f' % doc.rent if doc.rent else '0.00'"/>元
                                         单价<span t-esc="'%.2f' % doc.unit_price if doc.unit_price else '0.00'"/>元/m²
@@ -104,7 +94,7 @@
                                 </tr>
 
                                 <tr>
-                                    <td class="header-cell" style="width:20%;"><strong>履约保证金</strong></td>
+                                    <td class="header-cell" style="width:6em; text-align:center;"><strong>履约保证金</strong></td>
                                     <td colspan="4" style="width:80%;">
                                         <t t-if="doc.deposit_type == 'performance'">
                                             <span t-esc="'%.2f' % doc.deposit if doc.deposit else '0.00'"/>元
@@ -114,7 +104,7 @@
                                 </tr>
 
                                 <tr>
-                                    <td class="header-cell" style="width:20%;"><strong>附件</strong></td>
+                                    <td class="header-cell" style="width:6em; text-align:center;"><strong>附件</strong></td>
                                     <td colspan="4" style="width:80%;">
                                         <t t-if="doc.property_documents_ids">
                                             <t t-foreach="doc.property_documents_ids" t-as="att">
diff --git a/yuthon_trade/report/business_approval_print_report.xml b/yuthon_trade/report/business_approval_print_report.xml
index 8fffd927e..f460a9584 100644
--- a/yuthon_trade/report/business_approval_print_report.xml
+++ b/yuthon_trade/report/business_approval_print_report.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="paperformat_trade_small" model="report.paperformat">
+        <record id="paperformat_label_sheet_a44" model="report.paperformat">
             <field name="name">Lease Contract Small Top Margin</field>
             <field name="format">A4</field>
             <field name="margin_top">5</field>
+            <field name="orientation">Portrait</field>
         </record>
         <record id="action_business_approval_print_report" model="ir.actions.report">
             <field name="name">业务审批单</field>
-            <field name="paperformat_id" ref="yuthon_trade.paperformat_trade_small"/>
+            <field name="paperformat_id" ref="yuthon_trade.paperformat_label_sheet_a44"/>
             <field name="model">yuthon.business.approval</field>
             <field name="report_type">qweb-pdf</field>
             <field name="report_name">yuthon_trade.business_approval_print_report_document</field>
diff --git a/yuthon_trade/report/business_approval_print_templates.xml b/yuthon_trade/report/business_approval_print_templates.xml
index 1dc9eec57..3242eb58c 100644
--- a/yuthon_trade/report/business_approval_print_templates.xml
+++ b/yuthon_trade/report/business_approval_print_templates.xml
@@ -7,7 +7,7 @@
                     <t t-call="web.external_layout">
                         <style type="text/css">
                             td { border:1px solid #000; padding:6px; }
-                            table { border-collapse: collapse; width: 1000px; margin: 0 auto; table-layout: fixed; }
+                            table { border-collapse: collapse; width: 100%; max-width: 800px; margin: 0 auto; table-layout: fixed; }
                             .title { text-align:center; font-weight:bold; font-size:22px; padding: 12px 0; }
                             .section-title { font-weight:bold; font-size:16px; margin:0; background-color: #e8f4f8; padding: 8px; border-left: 4px solid #2c5f8d; }
                             .hdr { background: #f0f0f0; font-weight: bold; width: 6em; text-align: center; vertical-align: middle; }
@@ -15,25 +15,25 @@
                             .cell-content { text-align: left; word-wrap: break-word; word-break: break-all; vertical-align: middle; }
                             .approval-name { text-align: center; }
                             .approval-col1 { width: 20%; }
-                            .approval-col2 { width: 50%; }
-                            .approval-col3 { width: 30%; }
+                            .approval-col2 { width: 55%; }
+                            .approval-col3 { width: 25%; }
                             .no-right-border { border-right: none !important; }
                             .no-left-border { border-left: none !important; }
                             .approval-center { text-align: center !important; }
                             .approval-pull-left { padding-left: 0 !important; }
-                            .dept-container { width: 1000px; margin: 0 auto 10px auto; font-weight:bold; text-align:left; border: none !important; }
+                            .dept-container { width: 100%; max-width: 800px; margin: 0 auto 10px auto; font-weight:bold; text-align:left; border: none !important; }
                             .attachment-list { text-align: left !important; }
                         </style>
                         <div class="title" style="text-align:center; font-weight:bold; font-size:22px; padding:12px 0; margin-bottom:10px;">业务审批单</div>
-                        <div class="dept-container">
-                            <span style="display:inline-block; margin-right:50px;"><strong>部门:</strong><span t-esc="doc.department_id.name"/></span>
-                            <span style="display:inline-block;"><strong>流水号:</strong><span t-esc="doc.code"/></span>
+                        <div style="margin-bottom:8px; text-align:left;">
+                            部门：<span t-esc="doc.department_id.name or ''"/>
+                            <span style="margin-left:40px;">流水号：<span t-esc="doc.code or ''"/></span>
                         </div>
                         <table>
                             <colgroup>
                                 <col style="width:6em"/>
-                                <col style="width:50%"/>
-                                <col style="width:30%"/>
+                                <col style="width:55%"/>
+                                <col style="width:25%"/>
                             </colgroup>
                             <tr><td class="hdr"><strong>事项标题</strong></td><td colspan="2" class="cell-content"><span t-esc="doc.name"/></td></tr>
                             <tr><td class="hdr"><strong>业务类型</strong></td><td colspan="2" class="cell-content"><t t-foreach="doc.information_categories_ids" t-as="category"><span t-esc="category.name"/><t t-if="not category_last">、</t></t></td></tr>
diff --git a/yuthon_trade/report/seal_approval_report.xml b/yuthon_trade/report/seal_approval_report.xml
index dc3175369..0124bd7d1 100644
--- a/yuthon_trade/report/seal_approval_report.xml
+++ b/yuthon_trade/report/seal_approval_report.xml
@@ -3,7 +3,9 @@
     <data>
         <record id="paperformat_seal_approval_small" model="report.paperformat">
             <field name="name">Lease Contract Small Top Margin</field>
+            <field name="format">A4</field>
             <field name="margin_top">5</field>
+            <field name="orientation">Portrait</field>
         </record>
         <record id="action_seal_approval_report_report" model="ir.actions.report">
             <field name="name">用章申请报表</field>
diff --git a/yuthon_trade/report/seal_approval_templates.xml b/yuthon_trade/report/seal_approval_templates.xml
index 3f59c2ba8..879b37326 100644
--- a/yuthon_trade/report/seal_approval_templates.xml
+++ b/yuthon_trade/report/seal_approval_templates.xml
@@ -6,8 +6,8 @@
                 <t t-call="web.external_layout">
                     <div class="page">
                         <style type="text/css">
-                            td { border:1px solid #000; padding:6px; }
-                            table { border-collapse: collapse; width: 800px; margin: 0 auto; table-layout: fixed; }
+                            td { border:1px solid #000; padding:6px; vertical-align: middle; }
+                            table { border-collapse: collapse; width: 100%; max-width: 800px; margin: 0 auto; table-layout: fixed; }
                             .title {
                                 text-align:center;
                                 font-weight:bold;
@@ -17,21 +17,11 @@
                                 color: black !important;
                                 padding: 0 !important;
                             }
-                            /* 核心修改：部门文本左对齐，居左显示 */
-                            .info-container {
-                                    width: 800px;
-                                    margin: 0 auto 10px auto;
-                                    font-weight:bold;
-                                    display: flex;
-                                    justify-content: space-between;
-                                    align-items: center;
-                                }
-                            .info-container span, .info-container div {
-                                    border: none !important;
-                                }
+                            /* 附件与审批内容左/中对齐工具类 */
                             .header-cell {
                                 background-color: #d4e6f1;
                                 font-weight: bold;
+                                text-align: center;
                             }
                             table tr:nth-child(even) {
                                 background-color: #f9f9f9;
@@ -40,20 +30,29 @@
                             .no-left-border { border-left: none !important; }
                             .approval-center { text-align: center !important; }
                             .approval-pull-left { padding-left: 0 !important; }
-                            .approval-col1 { width: 20%; }
+                            .approval-col1 { width: 6em; }
                             .approval-col2 { width: 50%; }
                             .approval-col3 { width: 30%; }
                         </style>
 
                         <div class="title">用章申请</div>
 
-                        <!-- 部门文本：800px宽度容器内左对齐，显示在表格上方最左侧 -->
-                        <div class="info-container">
-                            <span style="display:inline-block; margin-right:50px;"><strong>部门：</strong><span t-esc="doc.department_id.name or ''"/></span>
-                            <span style="display:inline-block;"><strong>流水号：</strong><span t-esc="doc.code or ''"/></span>
+                        <!-- 部门/流水号：左对齐，移除固定宽度容器 -->
+                        <div style="margin-bottom:8px; text-align:left;">
+                            部门：<span t-esc="doc.department_id.name or ''"/>
+                            <span style="margin-left:40px;">流水号：<span t-esc="doc.code or ''"/></span>
                         </div>
 
                         <table>
+                            <colgroup>
+                                <col style="width:6em"/>
+                                <col/>
+                                <col/>
+                                <col/>
+                                <col/>
+                                <col/>
+                                <col/>
+                            </colgroup>
                             <tr>
                                 <td class="header-cell"><strong>事项</strong></td>
                                 <td colspan="6"><span t-esc="doc.name or ''"/></td>
@@ -107,8 +106,8 @@
                             <t t-if="doc.log_ids">
                                 <t t-foreach="doc.log_ids.sorted('sequence')" t-as="log">
                                     <tr>
-                                        <td class="approval-col1 approval-center" colspan="2"><span t-esc="log.name"/></td>
-                                        <td class="approval-col2 no-right-border approval-center" colspan="3"><span t-esc="log.comment"/></td>
+                                        <td class="approval-col1 approval-center" colspan="1" style="width:6em;"><span t-esc="log.name"/></td>
+                                        <td class="approval-col2 no-right-border approval-center" colspan="4"><span t-esc="log.comment"/></td>
                                         <td class="approval-col3 no-left-border approval-center approval-pull-left" colspan="2">
                                             <t t-if="log.done_by">
                                                 <span t-esc="log.done_by.name"/>  <span t-esc="log.lase_click_date and log.lase_click_date.strftime('%Y%m%d') or ''"/>
diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml
index d2ee39c5a..ba66cb633 100644
--- a/yuthon_will_task/views/yuthon_will_task_views.xml
+++ b/yuthon_will_task/views/yuthon_will_task_views.xml
@@ -24,7 +24,7 @@
 <!--                <field name='user_role_ids' widget="many2many_tags" column_invisible="1"/>-->
 <!--                <field name="employee_id" optional="hide"/>-->
 <!--                 <field name='creation_time' optional="hide"/>-->
-                <button name="button_add_comment" string="提醒" type="object" class="oe_highlight" invisible="task_state == 'cancel'"/>
+                <button name="button_add_comment" string="提醒" type="object" class="oe_highlight" invisible="task_state in ['done', 'cancel']"/>
 <!--                <button name="back_wecom_msg" string="测试撤销" type="object" class="oe_highlight"/>-->
                 <button name="button_add_comment_cancel" string="取消" type="object" class="oe_highlight" invisible="task_state == 'cancel'"/>
                 <button name="schedule_reminders" string="提醒任务" type="object" class="oe_highlight" groups="base.group_system"/>
@@ -133,7 +133,7 @@
 <!--                <field name='user_role_ids' widget="many2many_tags" column_invisible="1"/>-->
 <!--                <field name="employee_id" optional="hide"/>-->
 <!--                 <field name='creation_time' optional="hide"/>-->
-                <button name="button_add_comment" string="提醒" type="object" class="oe_highlight" invisible="task_state == 'cancel'"/>
+                <button name="button_add_comment" string="提醒" type="object" class="oe_highlight" invisible="task_state in ['done', 'cancel']"/>
                 <button name="button_add_comment_cancel" string="取消" type="object" class="oe_highlight" invisible="task_state == 'cancel'"/>
             </tree>
         </field>

From 3f0dd02bd3f31aabc1031b7480b2613c66ce8b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Sun, 18 Jan 2026 17:24:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=B8=E5=90=8C=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/business_approval_print_templates.xml    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/yuthon_trade/report/business_approval_print_templates.xml b/yuthon_trade/report/business_approval_print_templates.xml
index 3242eb58c..ebb960ad7 100644
--- a/yuthon_trade/report/business_approval_print_templates.xml
+++ b/yuthon_trade/report/business_approval_print_templates.xml
@@ -42,7 +42,18 @@
                             <tr t-if="doc.is_chapter == 'yes'"><td class="hdr"><strong>用章范围</strong></td><td colspan="2" class="cell-content"><t t-foreach="doc.scope_chapter_ids" t-as="scope"><span t-esc="scope.name"/><t t-if="not scope_last">、</t></t></td></tr>
                             <tr><td class="hdr"><strong>附件清单</strong></td><td colspan="2" class="cell-content attachment-list"><t t-foreach="doc.document_ids" t-as="att"><div><t t-esc="att.name"/></div></t></td></tr>
                             <tr><td class="section" colspan="3"><strong>审批详情</strong></td></tr>
-                            <t t-foreach="doc.log_ids.sorted('sequence')" t-as="log">
+                            <!-- 按 sequence 逆序去重（同名节点保留最新） -->
+                            <t t-set="logs_sorted" t-value="doc.log_ids.sorted('sequence', reverse=True)"/>
+                            <t t-set="seen" t-value="set()"/>
+                            <t t-set="logs_dedup" t-value="[]"/>
+                            <t t-foreach="logs_sorted" t-as="log_tmp">
+                                <t t-if="(log_tmp.name or '') not in seen">
+                                    <t t-set="seen" t-value="seen | {log_tmp.name or ''}"/>
+                                    <t t-set="logs_dedup" t-value="logs_dedup + [log_tmp]"/>
+                                </t>
+                            </t>
+                            <t t-set="logs_final" t-value="logs_dedup"/>
+                            <t t-foreach="logs_final" t-as="log">
                                 <tr>
                                     <td class="cell-content approval-name approval-col1"><span t-esc="log.name"/></td>
                                     <td class="cell-content approval-col2 no-right-border approval-center"><span t-esc="log.comment"/></td>

From 547f0c696224438f179e026917d2b47fc3936bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Sun, 18 Jan 2026 17:48:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_holiday/report/hr_leave_batch_report_action.xml   | 6 +++---
 yuthon_hr_attendance/report/overtime_approval_report.xml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/yuthon_holiday/report/hr_leave_batch_report_action.xml b/yuthon_holiday/report/hr_leave_batch_report_action.xml
index 892aad0fe..f983fb2d4 100644
--- a/yuthon_holiday/report/hr_leave_batch_report_action.xml
+++ b/yuthon_holiday/report/hr_leave_batch_report_action.xml
@@ -2,10 +2,10 @@
 <odoo>
   <data>
     <record id="paperformat_hr_leave_batch_small" model="report.paperformat">
-      <field name="name">Leave Batch Portrait</field>
-      <field name="format">A4</field>
+      <field name="name">Leave Batch A5 Landscape</field>
+      <field name="format">A5</field>
       <field name="margin_top">5</field>
-      <field name="orientation">Portrait</field>
+      <field name="orientation">Landscape</field>
     </record>
     <record id="action_hr_leave_batch_print" model="ir.actions.report">
       <field name="name">请假单</field>
diff --git a/yuthon_hr_attendance/report/overtime_approval_report.xml b/yuthon_hr_attendance/report/overtime_approval_report.xml
index 60ba4cd8c..25ba2824b 100644
--- a/yuthon_hr_attendance/report/overtime_approval_report.xml
+++ b/yuthon_hr_attendance/report/overtime_approval_report.xml
@@ -1,9 +1,9 @@
 <odoo>
   <record id="paperformat_overtime_approval_small" model="report.paperformat">
-    <field name="name">Overtime Approval Portrait</field>
-    <field name="format">A4</field>
+    <field name="name">Overtime Approval A5 Landscape</field>
+    <field name="format">A5</field>
     <field name="margin_top">5</field>
-    <field name="orientation">Portrait</field>
+    <field name="orientation">Landscape</field>
   </record>
   <record id="action_overtime_approval_print" model="ir.actions.report">
     <field name="name">加班单</field>