From 8dc48f3328d021224351f26fea16d4a6100610e7 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: Wed, 24 Sep 2025 20:07:20 +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

---
 .../report/lease_contract_templates.xml       |  56 +++------
 .../report/purchase_workflow_templates.xml    | 119 +++++++++---------
 yuthon_trade/report/business_templates.xml    |  36 +++---
 3 files changed, 93 insertions(+), 118 deletions(-)

diff --git a/yuthon_property_approval/report/lease_contract_templates.xml b/yuthon_property_approval/report/lease_contract_templates.xml
index 1deda3e68..36372dab6 100644
--- a/yuthon_property_approval/report/lease_contract_templates.xml
+++ b/yuthon_property_approval/report/lease_contract_templates.xml
@@ -24,34 +24,39 @@
                         table {
                             border-collapse: collapse;
                         }
+                        .approval-table td {
+                            border:1px solid #000000 !important;
+                        }
                     </style>
 
                     <div class="main-title">租赁合同审批报表</div>
-
-                    <!-- 合同编号 -->
                     <table width="100%" style="table-layout:fixed;">
                         <tr>
                             <td width="15%"><strong>合同编号：</strong></td>
-                            <td width="85%"><span t-field="o.contract_code"/></td>
+                            <td width="35%"><span t-field="o.contract_code"/></td>
+                            <td width="15%"><strong>租金：</strong></td>
+                            <td width="35%"><span t-field="o.rent"/></td>
                         </tr>
                     </table>
 
-                    <!-- 承租方 -->
                     <table width="100%" style="table-layout:fixed;">
                         <tr>
                             <td width="15%"><strong>承租方：</strong></td>
-                            <td width="85%">
+                            <td width="35%">
                                 <span t-if="o.lessee_id"><span t-field="o.lessee_id.name"/></span>
                                 <span t-if="not o.lessee_id">无</span>
                             </td>
+                            <td width="15%"><strong>押金/履约保证金：</strong></td>
+                            <td width="35%"><span t-field="o.deposit"/></td>
                         </tr>
                     </table>
 
-                    <!-- 物业信息 -->
                     <table width="100%" style="table-layout:fixed;">
                         <tr>
                             <td width="15%"><strong>物业信息：</strong></td>
-                            <td width="85%"><span t-field="o.property_name"/></td>
+                            <td width="35%"><span t-field="o.property_name"/></td>
+                            <td width="15%"><strong>单价：</strong></td>
+                            <td width="35%"><span t-field="o.unit_price"/></td>
                         </tr>
                     </table>
 
@@ -79,39 +84,14 @@
                         </tr>
                     </table>
 
-                    <!-- 租金 -->
-                    <table width="100%" style="table-layout:fixed;">
-                        <tr>
-                            <td width="15%"><strong>租金：</strong></td>
-                            <td width="85%">
-                                <span t-field="o.rent"/>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <!-- 押金/履约保证金 -->
-                    <table width="100%" style="table-layout:fixed;">
-                        <tr>
-                            <td width="15%"><strong>押金/履约保证金：</strong></td>
-                            <td width="85%">
-                                <span t-field="o.deposit"/>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <!-- 单价 -->
-                    <table width="100%" style="table-layout:fixed;">
-                        <tr>
-                            <td width="15%"><strong>单价：</strong></td>
-                            <td width="85%">
-                                <span t-field="o.unit_price"/>
-                            </td>
-                        </tr>
-                    </table>
-
+                    <!-- 审批明细 -->
                     <t t-if="o.log_ids">
-                        <div class="title">审批明细</div>
                         <table width="100%" style="table-layout:fixed;">
+                            <tr>
+                                <td width="100%" style="text-align:center;">审批明细</td>
+                            </tr>
+                        </table>
+                        <table width="100%" style="table-layout:fixed;" class="approval-table">
                             <thead>
                                 <tr>
                                     <td width="20%"><strong>节点</strong></td>
diff --git a/yuthon_purchase/report/purchase_workflow_templates.xml b/yuthon_purchase/report/purchase_workflow_templates.xml
index 6874c1a0c..484c8e73a 100644
--- a/yuthon_purchase/report/purchase_workflow_templates.xml
+++ b/yuthon_purchase/report/purchase_workflow_templates.xml
@@ -32,34 +32,63 @@
                             margin: 2px 0;
                             display: block;
                         }
+                        /* 明细标题盒子样式：带边框、字体居中 */
+                        .detail-title-box {
+                            width: 100%;
+                            border-collapse: collapse;
+                            margin: 15px 0 5px 0; /* 与上方间距15px，与下方明细表格间距5px */
+                        }
+                        .detail-title-box td {
+                            text-align: center;
+                            font-weight: bold;
+                            font-size: 16px;
+                            border:1px solid #000000;
+                            padding: 5px 8px;
+                        }
                     </style>
 
                     <div class="main-title">采购审批单</div>
 
-                    <!-- 编号 -->
+                    <!-- 编号 + 供应商 -->
                     <table width="100%" style="table-layout:fixed;">
                         <tr>
                             <td width="15%"><strong>编号：</strong></td>
-                            <td width="85%"><span t-field="o.code"/></td>
+                            <td width="35%"><span t-field="o.code"/></td>
+                            <td width="15%"><strong>供应商：</strong></td>
+                            <td width="35%">
+                                <span t-if="o.partner_id"><span t-field="o.partner_id.name"/></span>
+                                <span t-if="not o.partner_id">未设置</span>
+                            </td>
                         </tr>
                     </table>
 
-                    <!-- 标题 -->
+                    <!-- 标题 + 采购类型 -->
                     <table width="100%" style="table-layout:fixed;">
                         <tr>
                             <td width="15%"><strong>标题：</strong></td>
-                            <td width="85%"><span t-field="o.name"/></td>
+                            <td width="35%"><span t-field="o.name"/></td>
+                            <td width="15%"><strong>采购类型：</strong></td>
+                            <td width="35%">
+                                <span t-if="o.purchase_type == 'fixed'">固定资产</span>
+                                <span t-if="o.purchase_type == 'low'">低值易耗</span>
+                                <span t-if="o.purchase_type == 'service'">服务</span>
+                            </td>
                         </tr>
                     </table>
 
-                    <!-- 申请人 -->
+                    <!-- 申请人 + 付款方式 -->
                     <table width="100%" style="table-layout:fixed;">
                         <tr>
                             <td width="15%"><strong>申请人：</strong></td>
-                            <td width="85%">
+                            <td width="35%">
                                 <span t-if="o.user_id"><span t-field="o.user_id.name"/></span>
                                 <span t-if="not o.user_id">未知</span>
                             </td>
+                            <td width="15%"><strong>付款方式：</strong></td>
+                            <td width="35%">
+                                <span t-if="o.pay_way == 'onetime'">一次性</span>
+                                <span t-if="o.pay_way == 'installment'">分期</span>
+                            </td>
                         </tr>
                     </table>
 
@@ -71,40 +100,6 @@
                         </tr>
                     </table>
 
-                    <!-- 供应商 -->
-                    <table width="100%" style="table-layout:fixed;">
-                        <tr>
-                            <td width="15%"><strong>供应商：</strong></td>
-                            <td width="85%">
-                                <span t-if="o.partner_id"><span t-field="o.partner_id.name"/></span>
-                                <span t-if="not o.partner_id">未设置</span>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <!-- 采购类型 -->
-                    <table width="100%" style="table-layout:fixed;">
-                        <tr>
-                            <td width="15%"><strong>采购类型：</strong></td>
-                            <td width="85%">
-                                <span t-if="o.purchase_type == 'fixed'">固定资产</span>
-                                <span t-if="o.purchase_type == 'low'">低值易耗</span>
-                                <span t-if="o.purchase_type == 'service'">服务</span>
-                            </td>
-                        </tr>
-                    </table>
-
-                    <!-- 付款方式 -->
-                    <table width="100%" style="table-layout:fixed;">
-                        <tr>
-                            <td width="15%"><strong>付款方式：</strong></td>
-                            <td width="85%">
-                                <span t-if="o.pay_way == 'onetime'">一次性</span>
-                                <span t-if="o.pay_way == 'installment'">分期</span>
-                            </td>
-                        </tr>
-                    </table>
-
                     <!-- 合计金额 -->
                     <table width="100%" style="table-layout:fixed;">
                         <tr>
@@ -146,22 +141,18 @@
                                 <td width="85%"><span t-field="o.service_start_date"/></td>
                             </tr>
                         </table>
-
                         <table width="100%" style="table-layout:fixed;">
                             <tr>
                                 <td width="15%"><strong>服务结束日期：</strong></td>
                                 <td width="85%"><span t-field="o.service_end_date"/></td>
                             </tr>
                         </table>
-
                         <table width="100%" style="table-layout:fixed;">
                             <tr>
                                 <td width="15%"><strong>服务年限：</strong></td>
                                 <td width="85%"><span t-field="o.service_year"/></td>
                             </tr>
                         </table>
-
-                        <!-- 服务相关附件 -->
                         <table width="100%" style="table-layout:fixed;">
                             <tr>
                                 <td width="15%"><strong>营业执照：</strong></td>
@@ -171,7 +162,6 @@
                                 </td>
                             </tr>
                         </table>
-
                         <table width="100%" style="table-layout:fixed;">
                             <tr>
                                 <td width="15%"><strong>资质：</strong></td>
@@ -181,7 +171,6 @@
                                 </td>
                             </tr>
                         </table>
-
                         <table width="100%" style="table-layout:fixed;">
                             <tr>
                                 <td width="15%"><strong>合同：</strong></td>
@@ -193,11 +182,12 @@
                         </table>
                     </t>
 
-                    <!-- 明细行 -->
-
-                    <!-- 固定资产明细 -->
                     <t t-if="o.purchase_type == 'fixed'">
-                        <div class="title">固定资产明细</div>
+                        <table width="100%" style="table-layout:fixed;">
+                            <tr>
+                                <td width="100%" style="text-align:center;">固定资产明细</td>
+                            </tr>
+                        </table>
                         <table width="100%" style="table-layout:fixed;">
                             <thead>
                                 <tr>
@@ -226,9 +216,12 @@
                         </table>
                     </t>
 
-                    <!-- 低值易耗明细 -->
                     <t t-if="o.purchase_type == 'low'">
-                        <div class="title">低值易耗明细</div>
+                        <table width="100%" style="table-layout:fixed;">
+                            <tr>
+                                <td width="100%" style="text-align:center;">低值易耗明细</td>
+                            </tr>
+                        </table>
                         <table width="100%" style="table-layout:fixed;">
                             <thead>
                                 <tr>
@@ -256,10 +249,12 @@
                             </tbody>
                         </table>
                     </t>
-
-                    <!-- 服务明细 -->
                     <t t-if="o.purchase_type == 'service'">
-                        <div class="title">服务明细</div>
+                        <table width="100%" style="table-layout:fixed;">
+                            <tr>
+                                <td width="100%" style="text-align:center;">服务明细</td>
+                            </tr>
+                        </table>
                         <table width="100%" style="table-layout:fixed;">
                             <thead>
                                 <tr>
@@ -286,9 +281,12 @@
                         </table>
                     </t>
 
-                    <!-- 付款详情（仅分期付款显示） -->
                     <t t-if="o.pay_way == 'installment'">
-                        <div class="title">付款详情</div>
+                        <table width="100%" style="table-layout:fixed;">
+                            <tr>
+                                <td width="100%" style="text-align:center;">付款详情</td>
+                            </tr>
+                        </table>
                         <table width="100%" style="table-layout:fixed;">
                             <thead>
                                 <tr>
@@ -325,9 +323,12 @@
                         </table>
                     </t>
 
-                    <!-- 审批明细 -->
                     <t t-if="o.log_ids">
-                        <div class="title">审批明细</div>
+                        <table width="100%" style="table-layout:fixed;">
+                            <tr>
+                                <td width="100%" style="text-align:center;">审批明细</td>
+                            </tr>
+                        </table>
                         <table width="100%" style="table-layout:fixed;">
                             <thead>
                                 <tr>
diff --git a/yuthon_trade/report/business_templates.xml b/yuthon_trade/report/business_templates.xml
index 8cca18efa..08e10e952 100644
--- a/yuthon_trade/report/business_templates.xml
+++ b/yuthon_trade/report/business_templates.xml
@@ -22,7 +22,6 @@
                         table {
                             border-collapse: collapse;
                             width: 100%;
-                            margin-bottom: 15px;
                         }
                         .reason-content {
                             white-space: pre-wrap;
@@ -32,43 +31,32 @@
 
                     <div class="main-title">业务审批单</div>
 
-                    <!-- 流水号 -->
+                    <!-- 第一行：流水号 + 申请人 -->
                     <table>
                         <tr>
                             <td width="15%" class="section-title"><strong>流水号：</strong></td>
-                            <td width="85%"><span t-field="o.code"/></td>
-                        </tr>
-                    </table>
-
-                    <!-- 标题 -->
-                    <table>
-                        <tr>
-                            <td width="15%" class="section-title"><strong>标题：</strong></td>
-                            <td width="85%"><span t-field="o.name"/></td>
-                        </tr>
-                    </table>
-
-                    <!-- 申请人 -->
-                    <table>
-                        <tr>
+                            <td width="35%"><span t-field="o.code"/></td>
                             <td width="15%" class="section-title"><strong>申请人：</strong></td>
-                            <td width="85%">
+                            <td width="35%">
                                 <span t-if="o.users_id"><span t-field="o.users_id.name"/></span>
                                 <span t-if="not o.users_id">未知</span>
                             </td>
                         </tr>
                     </table>
 
-                    <!-- 部门 -->
+                    <!-- 第二行：标题 + 部门 -->
                     <table>
                         <tr>
+                            <td width="15%" class="section-title"><strong>标题：</strong></td>
+                            <td width="35%"><span t-field="o.name"/></td>
                             <td width="15%" class="section-title"><strong>部门：</strong></td>
-                            <td width="85%">
+                            <td width="35%">
                                 <span t-if="o.department_id"><span t-field="o.department_id.name"/></span>
                                 <span t-if="not o.department_id">未设置</span>
                             </td>
                         </tr>
                     </table>
+
                     <!-- 正文 -->
                     <table>
                         <tr>
@@ -95,8 +83,14 @@
                             </tr>
                         </table>
                     </t>
+
+                    <!-- 审批明细 -->
                     <t t-if="o.log_ids">
-                        <div class="title">审批明细</div>
+                        <table>
+                            <tr>
+                                <td width="100%" style="text-align:center;" class="section-title"><strong>审批明细</strong></td>
+                            </tr>
+                        </table>
                         <table width="100%" style="table-layout:fixed;">
                             <thead>
                                 <tr>