From c23aa4de7522df2585cb6ca0d2db1ca42071e31c Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 14 Mar 2025 11:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=A5=E5=91=8A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/models/quality.py             |  1 +
 .../data/insepection_report_template.xml      | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py
index a94ed623..73a0c534 100644
--- a/quality_control/models/quality.py
+++ b/quality_control/models/quality.py
@@ -317,6 +317,7 @@ class QualityCheck(models.Model):
 
         # 更新流水号
         self.serial_number += 1
+        self.quality_manager = self.env.user.id
 
         # 返回成功消息
         return True
diff --git a/sf_quality/data/insepection_report_template.xml b/sf_quality/data/insepection_report_template.xml
index 7392838f..3edbe087 100644
--- a/sf_quality/data/insepection_report_template.xml
+++ b/sf_quality/data/insepection_report_template.xml
@@ -4,8 +4,12 @@
 <!-- 定义页眉模板 -->
         <template id="report_quality_header">
     <div class="header">
-        <div class="pdf-viewer-toolbar">
+        <div class="pdf-viewer-toolbar" style="display:flex;justify-content:space-between;align-items:center;">
             <img t-if="o.company_id.favicon" t-att-src="image_data_uri(o.company_id.favicon)" style="max-height: 70px;" alt="Logo"/>
+
+            <div class="text-center">
+                <h2>出厂检验报告</h2>
+            </div>
             <div class="float-right" style="text-align: right;">
                 <!-- 使用完整URL的二维码生成方式 -->
                 <t t-set="base_url" t-value="request.env['ir.config_parameter'].sudo().get_param('web.base.url')"/>
@@ -45,9 +49,6 @@
 
 
                     <div class="page">
-                        <div class="text-center">
-                            <h2>出厂检验报告</h2>
-                        </div>
                             <!-- <div class="col-6">
                                 <div t-if="o.company_id.favicon" class="float-right">
                                     <img t-att-src="image_data_uri(o.company_id.favicon)" style="max-height: 45px;" alt="Logo"/>
@@ -81,20 +82,20 @@
                         <table class="table table-sm mt-2" style="border: 1px solid black;">
                             <thead>
                                 <tr>
-                                    <th style="border: 1px solid black;" class="text-center">检测项目</th>
-                                    <th style="border: 1px solid black;" colspan="o.column_nums" class="text-center">测量值</th>
-                                    <th style="border: 1px solid black;" class="text-center">判定</th>
-                                    <th style="border: 1px solid black;" class="text-center">备注</th>
+                                    <th style="border: 1px solid black;" class="text-center" rowspan="2">检测项目<br/>(图示尺寸)</th>
+                                    <th style="border: 1px solid black;" t-att-colspan="o.column_nums" class="text-center">测量值</th>
+                                    <th style="border: 1px solid black; vertical-align: middle;" class="text-center" rowspan="2">判定</th>
+                                    <th style="border: 1px solid black; vertical-align: middle;" class="text-center" rowspan="2">备注</th>
                                 </tr>
                                 <tr>
-                                    <th style="border: 1px solid black;"></th>
+                                    <!-- <th style="border: 1px solid black;"></th> -->
                                     <th style="border: 1px solid black;" t-if="o.column_nums >= 1" class="text-center">1</th>
                                     <th style="border: 1px solid black;" t-if="o.column_nums >= 2" class="text-center">2</th>
                                     <th style="border: 1px solid black;" t-if="o.column_nums >= 3" class="text-center">3</th>
                                     <th style="border: 1px solid black;" t-if="o.column_nums >= 4" class="text-center">4</th>
                                     <th style="border: 1px solid black;" t-if="o.column_nums >= 5" class="text-center">5</th>
-                                    <th style="border: 1px solid black;"></th>
-                                    <th style="border: 1px solid black;"></th>
+                                    <!-- <th style="border: 1px solid black;"></th>
+                                    <th style="border: 1px solid black;"></th> -->
                                 </tr>
                             </thead>
                             <tbody>