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

---
 .../views/overtime_approval.xml                |  2 +-
 .../report/contract_review_report.xml          |  5 +++++
 .../contract_review_report_templates.xml       |  8 +++-----
 .../report/lease_contract_templates.xml        |  2 +-
 .../report/property_construction_templates.xml |  2 +-
 .../property_lease_contract_print_report.xml   |  5 +++++
 ...property_lease_contract_print_templates.xml | 12 +++++-------
 .../report/purchase_order_print_report.xml     |  5 +++++
 .../report/purchase_order_print_templates.xml  | 14 ++++++--------
 .../report/business_approval_print_report.xml  |  5 +++++
 .../business_approval_print_templates.xml      | 10 +++++-----
 yuthon_trade/report/business_templates.xml     | 18 +++++++++++++-----
 yuthon_work_brand/views/purchase_menus.xml     | 10 +++++-----
 13 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml
index 1f0a0c05b..61fc833ee 100644
--- a/yuthon_hr_attendance/views/overtime_approval.xml
+++ b/yuthon_hr_attendance/views/overtime_approval.xml
@@ -54,6 +54,7 @@
                         <group>
                             <field name="is_back" invisible="1"/>
                             <field name="users_id"/>
+                            <field name="employee_ids" widget="many2many_tags" options="{'no_create': True}"/>
                             <field name="company_id" invisible="1"/>
                             <field name="overtime_methods"/>
                             <field name="work_end" invisible="1"/>
@@ -97,7 +98,6 @@
                     </group>
                     <group col="2">
                         <group>
-                            <field name="employee_ids" widget="many2many_tags" options="{'no_create': True}"/>
                             <field name="department_id" invisible="1"/>
                             <field name="attendance_id" invisible="1"/>
                             <button name="open_record" string="考勤详情" type="object" class="btn btn-primary button_width"/>
diff --git a/yuthon_hr_employee_approval/report/contract_review_report.xml b/yuthon_hr_employee_approval/report/contract_review_report.xml
index 18cbcfd33..ce4e09f37 100644
--- a/yuthon_hr_employee_approval/report/contract_review_report.xml
+++ b/yuthon_hr_employee_approval/report/contract_review_report.xml
@@ -1,8 +1,13 @@
 <?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="margin_top">5</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"/>
             <field name="model">contract.review.approval</field>
             <field name="report_type">qweb-pdf</field>
             <field name="report_name">yuthon_hr_employee_approval.contract_review_report_document</field>
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 059104e87..90f98be55 100644
--- a/yuthon_hr_employee_approval/report/contract_review_report_templates.xml
+++ b/yuthon_hr_employee_approval/report/contract_review_report_templates.xml
@@ -12,7 +12,7 @@
                                 text-align:center; 
                                 font-weight:bold; 
                                 font-size:18px; 
-                                margin:15px 0 0 0;
+                                margin:5px 0 0 0;
                                 background-color: #2c5f8d;
                                 color: white;
                                 padding: 12px;
@@ -35,12 +35,10 @@
                         <div class="title">合同审查单</div>
                         <table width="100%" style="table-layout:fixed;">
                             <tr>
-                                <td width="15%" class="header-cell"><strong>承办部门</strong></td>
+                                <td width="30%" class="header-cell"><strong>承办部门</strong></td>
                                 <td width="20%"><span t-esc="doc.department_id.name"/></td>
-                                <td width="15%" class="header-cell"><strong>承办人</strong></td>
-                                <td width="20%"><span t-esc="doc.user_id.name"/></td>
                                 <td width="15%" class="header-cell"><strong>申请日期</strong></td>
-                                <td width="15%"><span t-esc="doc.create_date.strftime('%Y%m%d')"/></td>
+                                <td width="35%" colspan="3"><span t-esc="doc.create_date.strftime('%Y-%m-%d')"/></td>
                             </tr>
                             <tr>
                                 <td class="header-cell"><strong>合同名称</strong></td>
diff --git a/yuthon_property_approval/report/lease_contract_templates.xml b/yuthon_property_approval/report/lease_contract_templates.xml
index 8058b6cd1..9933654c3 100644
--- a/yuthon_property_approval/report/lease_contract_templates.xml
+++ b/yuthon_property_approval/report/lease_contract_templates.xml
@@ -13,7 +13,7 @@
                             text-align:center;
                             font-weight:bold;
                             font-size:16px;
-                            margin:15px 0;
+                            margin:5px 0;
                         }
                         .main-title {
                             font-weight:bold;
diff --git a/yuthon_property_approval/report/property_construction_templates.xml b/yuthon_property_approval/report/property_construction_templates.xml
index 9de4107cd..95bc8efb7 100644
--- a/yuthon_property_approval/report/property_construction_templates.xml
+++ b/yuthon_property_approval/report/property_construction_templates.xml
@@ -13,7 +13,7 @@
                             text-align:center;
                             font-weight:bold;
                             font-size:16px;
-                            margin:15px 0;
+                            margin:5px 0;
                         }
                         .main-title {
                             font-weight:bold;
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 03d0c9e64..7407114ba 100644
--- a/yuthon_property_approval/report/property_lease_contract_print_report.xml
+++ b/yuthon_property_approval/report/property_lease_contract_print_report.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
     <!-- 租赁合同审批单打印报表 -->
+    <record id="paperformat_property_lease_contract_small" model="report.paperformat">
+        <field name="name">Lease Contract Small Top Margin</field>
+        <field name="margin_top">5</field>
+    </record>
     <record id="action_property_lease_contract_print_report" model="ir.actions.report">
         <field name="name">租赁合同审批单</field>
+<!--        <field name="paperformat_id" ref="yuthon_property_approval.paperformat_property_lease_contract_small"/>-->
         <field name="model">property.lease.contract</field>
         <field name="report_type">qweb-pdf</field>
         <field name="report_name">yuthon_property_approval.property_lease_contract_print_template</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 587e7231f..d7e81d433 100644
--- a/yuthon_property_approval/report/property_lease_contract_print_templates.xml
+++ b/yuthon_property_approval/report/property_lease_contract_print_templates.xml
@@ -12,7 +12,7 @@
                                 text-align:center;
                                 font-weight:bold;
                                 font-size:18px;
-                                margin:15px 0 0 0;
+                                margin:5px 0 0 0;
                                 background-color: #2c5f8d;
                                 color: white;
                                 padding: 12px;
@@ -30,12 +30,10 @@
 
                         <table>
                             <tr>
-                                <td width="12%" class="header-cell"><strong>部门</strong></td>
-                                <td width="21%" colspan="2"><span t-esc="doc.department_id.name or ''"/></td>
-                                <td width="12%" class="header-cell"><strong>承办人</strong></td>
-                                <td width="21%" colspan="2"><span t-esc="doc.users_id.name or ''"/></td>
-                                <td width="12%" class="header-cell"><strong>申请日期</strong></td>
-                                <td width="21%" colspan="2"><span t-esc="doc.create_date and doc.create_date.strftime('%Y-%m-%d') or ''"/></td>
+                                <td class="header-cell" colspan="1"><strong>部门</strong></td>
+                                <td colspan="4"><span t-esc="doc.department_id.name or ''"/></td>
+                                <td class="header-cell" colspan="1"><strong>申请日期</strong></td>
+                                <td colspan="3"><span t-esc="doc.create_date and doc.create_date.strftime('%Y-%m-%d') or ''"/></td>
                             </tr>
 
                             <tr>
diff --git a/yuthon_purchase/report/purchase_order_print_report.xml b/yuthon_purchase/report/purchase_order_print_report.xml
index d90b5b8c3..ef8d7f7cb 100644
--- a/yuthon_purchase/report/purchase_order_print_report.xml
+++ b/yuthon_purchase/report/purchase_order_print_report.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
     <!-- 采购审批单打印报表 -->
+    <record id="paperformat_property_order_print_small" model="report.paperformat">
+        <field name="name">Lease Contract Small Top Margin</field>
+        <field name="margin_top">5</field>
+    </record>
     <record id="action_purchase_order_print_report" model="ir.actions.report">
         <field name="name">采购审批单</field>
+        <field name="paperformat_id" ref="yuthon_purchase.paperformat_property_order_print_small"/>
         <field name="model">purchase.order</field>
         <field name="report_type">qweb-pdf</field>
         <field name="report_name">yuthon_purchase.purchase_order_print_template</field>
diff --git a/yuthon_purchase/report/purchase_order_print_templates.xml b/yuthon_purchase/report/purchase_order_print_templates.xml
index 1a9481ecd..79d3848be 100644
--- a/yuthon_purchase/report/purchase_order_print_templates.xml
+++ b/yuthon_purchase/report/purchase_order_print_templates.xml
@@ -12,7 +12,7 @@
                                 text-align:center;
                                 font-weight:bold;
                                 font-size:18px;
-                                margin:15px 0 0 0;
+                                margin:5px 0 0 0;
                                 background-color: #2c5f8d;
                                 color: white;
                                 padding: 12px;
@@ -30,12 +30,10 @@
 
                         <table>
                             <tr>
-                                <td width="12%" class="header-cell"><strong>部门</strong></td>
-                                <td width="21%" colspan="2"><span t-esc="doc.department_id.name or ''"/></td>
-                                <td width="12%" class="header-cell"><strong>承办人</strong></td>
-                                <td width="21%" colspan="2"><span t-esc="doc.user_id.name or ''"/></td>
-                                <td width="12%" class="header-cell"><strong>申请日期</strong></td>
-                                <td width="21%" colspan="2"><span t-esc="doc.start_date and doc.start_date.strftime('%Y-%m-%d') or ''"/></td>
+                                <td class="header-cell" colspan="1"><strong>部门</strong></td>
+                                <td colspan="4"><span t-esc="doc.department_id.name or ''"/></td>
+                                <td class="header-cell" colspan="1"><strong>申请日期</strong></td>
+                                <td colspan="3"><span t-esc="doc.start_date and doc.start_date.strftime('%Y-%m-%d') or ''"/></td>
                             </tr>
 
                             <tr>
@@ -81,7 +79,7 @@
 
                             <!-- 采购明细标题行 -->
                             <tr>
-                                <td colspan="9" style="text-align:center; background-color:#ffc; font-weight:bold; border:1px solid #000;">采购明细</td>
+                                <td colspan="9" style="text-align:center;  background-color: #d4e6f1; font-weight:bold; border:1px solid #000;">采购明细</td>
                             </tr>
                             <tr>
                                 <td width="25%" class="header-cell"><strong>产品</strong></td>
diff --git a/yuthon_trade/report/business_approval_print_report.xml b/yuthon_trade/report/business_approval_print_report.xml
index a7f9a2c39..bbdf6ad03 100644
--- a/yuthon_trade/report/business_approval_print_report.xml
+++ b/yuthon_trade/report/business_approval_print_report.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
+        <record id="paperformat_trade_small" model="report.paperformat">
+            <field name="name">Lease Contract Small Top Margin</field>
+            <field name="margin_top">5</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="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 0c9fe5868..ad17aaca5 100644
--- a/yuthon_trade/report/business_approval_print_templates.xml
+++ b/yuthon_trade/report/business_approval_print_templates.xml
@@ -12,7 +12,7 @@
                                 text-align:center;
                                 font-weight:bold;
                                 font-size:18px;
-                                margin:15px 0 0 0;
+                                margin:5px 0 0 0;
                                 background-color: #2c5f8d;
                                 color: white;
                                 padding: 12px;
@@ -37,12 +37,12 @@
 
                         <table width="100%" style="table-layout:fixed;">
                             <tr>
-                                <td width="15%" class="header-cell"><strong>部门</strong></td>
+                                <td width="30%" class="header-cell"><strong>部门</strong></td>
                                 <td width="20%"><span t-esc="doc.department_id.name"/></td>
-                                <td width="15%" class="header-cell"><strong>承办人</strong></td>
-                                <td width="20%"><span t-esc="doc.users_id.name"/></td>
+<!--                                <td width="15%" class="header-cell"><strong>承办人</strong></td>-->
+<!--                                <td width="20%"><span t-esc="doc.users_id.name"/></td>-->
                                 <td width="15%" class="header-cell"><strong>申请日期</strong></td>
-                                <td width="15%"><span t-esc="doc.create_date.strftime('%Y%m%d')"/></td>
+                                <td width="35%"><span t-esc="doc.create_date.strftime('%Y-%m-%d')"/></td>
                             </tr>
                             <tr>
                                 <td class="header-cell"><strong>事项标题</strong></td>
diff --git a/yuthon_trade/report/business_templates.xml b/yuthon_trade/report/business_templates.xml
index 08e10e952..f6ee416c7 100644
--- a/yuthon_trade/report/business_templates.xml
+++ b/yuthon_trade/report/business_templates.xml
@@ -13,7 +13,7 @@
                             font-weight: bold;
                             font-size: 18px;
                             text-align: center;
-                            margin: 20px 0;
+                            margin: 5px 0;
                         }
                         .section-title {
                             font-weight: bold;
@@ -36,10 +36,10 @@
                         <tr>
                             <td width="15%" class="section-title"><strong>流水号：</strong></td>
                             <td width="35%"><span t-field="o.code"/></td>
-                            <td width="15%" class="section-title"><strong>申请人：</strong></td>
+                            <td width="15%" class="section-title"><strong>申请日期：</strong></td>
                             <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>
+                                <span t-if="o.create_date"><span t-esc="o.create_date.strftime('%Y-%m-%d')"/></span>
+                                <span t-if="not o.create_date"></span>
                             </td>
                         </tr>
                     </table>
@@ -97,7 +97,8 @@
                                     <td width="20%"><strong>节点</strong></td>
                                     <td width="30%"><strong>意见</strong></td>
                                     <td width="20%"><strong>审批人</strong></td>
-                                    <td width="30%"><strong>操作时间</strong></td>
+                                    <td width="15%"><strong>操作时间</strong></td>
+                                    <td width="15%"><strong>附件</strong></td>
                                 </tr>
                             </thead>
                             <tbody>
@@ -107,6 +108,13 @@
                                         <td><span t-field="log.comment"/></td>
                                         <td><span t-field="log.done_by"/></td>
                                         <td><span t-field="log.date_create"/></td>
+                                        <td>
+                                            <t t-if="log.document_ids">
+                                                <t t-foreach="log.document_ids" t-as="doc_att">
+                                                    <div><span t-esc="doc_att.name"/></div>
+                                                </t>
+                                            </t>
+                                        </td>
                                     </tr>
                                 </t>
                             </tbody>
diff --git a/yuthon_work_brand/views/purchase_menus.xml b/yuthon_work_brand/views/purchase_menus.xml
index 89c00b53e..f8c9be708 100644
--- a/yuthon_work_brand/views/purchase_menus.xml
+++ b/yuthon_work_brand/views/purchase_menus.xml
@@ -13,11 +13,11 @@
 <!--              parent="purchase_menus_order_root"-->
 <!--              action="yuthon_purchase.view_purchase_workflow_action"-->
 <!--              sequence="1"/>-->
-    <menuitem id="purchase_fixe_assets_rfq_root"
-              name="询价"
-              parent="purchase_menus_order_root"
-              action="purchase.purchase_rfq"
-              sequence="3"/>
+<!--    <menuitem id="purchase_fixe_assets_rfq_root"-->
+<!--              name="询价"-->
+<!--              parent="purchase_menus_order_root"-->
+<!--              action="purchase.purchase_rfq"-->
+<!--              sequence="3"/>-->
     <menuitem id="purchase_fixe_assets_root"
               name="采购单"
               parent="purchase_menus_order_root"