From 85789d137bc8bb9e449861bedbae5699cfbec9de Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 24 Mar 2025 13:35:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=BF=E4=B8=8Apdf?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=8A=A5=E5=91=8A=E5=8F=98=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/insepection_report_template.xml      | 76 ++++++++++---------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/sf_quality/data/insepection_report_template.xml b/sf_quality/data/insepection_report_template.xml
index 9a4e821d..cd7998a3 100644
--- a/sf_quality/data/insepection_report_template.xml
+++ b/sf_quality/data/insepection_report_template.xml
@@ -31,7 +31,7 @@
         <!-- 定义页脚模板 -->
         <template id="report_quality_footer">
             <div class="footer">
-                <div style="border-top: 2px solid black;"></div>
+                <div style="border-top: 3px solid black;"></div>
 
                 <div class="row">
                     <div class="col-6">
@@ -44,10 +44,10 @@
                         <p>加工工厂: <span t-field="o.company_id.factory_name"/></p>
                     </div>
                 </div>
-                <div style="border-top: 2px solid black;"></div>
-                <!-- <div class="text-center">
+                <!-- <div style="border-top: 2px solid black;"></div> -->
+                <div class="text-center">
                     <span>第<span class="page"/> 页/共 <span class="topage"/>页</span>
-                </div> -->
+                </div>
             </div>
         </template>
     <template id="report_quality_inspection">
@@ -57,7 +57,7 @@
                     <t t-call="sf_quality.report_quality_header"/>
 
 
-                    <div class="page">
+                    <div class="page" style="min-height: 800px; position: relative; padding-bottom: 150px;">
                         
                         <table class="table table-sm o_main_table mt-4" style="border: 1px solid black;">
                             <tr>
@@ -117,36 +117,35 @@
                         <img src="/sf_quality/static/img/pass.png" style="width: 200px; height: 200px;position: absolute; bottom: 20px; right: 20%;"/>
 
                         </div>
-                        <div class="row mt-4">
-                            <div class="col-12">
-                                <h5 style="font-size: 18px;">检验结论: 
-                                    <span t-if="o.report_result == 'OK'" style="margin-left: 30px;">
-                                        <svg width="20" height="20" style="vertical-align: -3px;">
-                                            <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
-                                            <path d="M4 10 L9 15 L16 6" stroke="black" stroke-width="2" fill="none"/>
-                                        </svg>
-                                        <span style="margin-left: 5px;">合格</span>
-                                    </span>
-                                    <span t-else="" style="margin-left: 30px;">
-                                        <svg width="20" height="20" style="vertical-align: -3px;">
-                                            <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
-                                        </svg>
-                                        <span style="margin-left: 5px;">合格</span>
-                                    </span>
-                                    <span t-if="o.report_result == 'NG'" style="margin-left: 50px;">
-                                        <svg width="20" height="20" style="vertical-align: -3px;">
-                                            <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
-                                            <path d="M4 10 L9 15 L16 6" stroke="black" stroke-width="2" fill="none"/>
-                                        </svg>
-                                        <span style="margin-left: 5px;">不合格</span>
-                                    </span>
-                                    <span t-else="" style="margin-left: 50px;">
-                                        <svg width="20" height="20" style="vertical-align: -3px;">
-                                            <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
-                                        </svg>
-                                        <span style="margin-left: 5px;">不合格</span>
-                                    </span>
-                                </h5>
+                        <div style="clear: both; margin-top: 30px; padding-top: 10px;">
+                            <div style="display: inline-block;">
+                                <span style="font-size: 18px; font-weight: bold;">检验结论: </span>
+                                <span t-if="o.report_result == 'OK'" style="margin-left: 30px; display: inline-block;">
+                                    <svg width="20" height="20" style="vertical-align: middle;">
+                                        <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
+                                        <path d="M4 10 L9 15 L16 6" stroke="black" stroke-width="2" fill="none"/>
+                                    </svg>
+                                    <span style="margin-left: 5px;">合格</span>
+                                </span>
+                                <span t-else="" style="margin-left: 30px; display: inline-block;">
+                                    <svg width="20" height="20" style="vertical-align: middle;">
+                                        <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
+                                    </svg>
+                                    <span style="margin-left: 5px;">合格</span>
+                                </span>
+                                <span t-if="o.report_result == 'NG'" style="margin-left: 50px; display: inline-block;">
+                                    <svg width="20" height="20" style="vertical-align: middle;">
+                                        <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
+                                        <path d="M4 10 L9 15 L16 6" stroke="black" stroke-width="2" fill="none"/>
+                                    </svg>
+                                    <span style="margin-left: 5px;">不合格</span>
+                                </span>
+                                <span t-else="" style="margin-left: 50px; display: inline-block;">
+                                    <svg width="20" height="20" style="vertical-align: middle;">
+                                        <rect x="1" y="1" width="18" height="18" fill="none" stroke="black" stroke-width="1.5"/>
+                                    </svg>
+                                    <span style="margin-left: 5px;">不合格</span>
+                                </span>
                             </div>
                         </div>
                         
@@ -158,17 +157,20 @@
                                 <p><strong>质检员: </strong> <span t-field="o.quality_manager"/></p>
                             </div>
                         </div>
+                        <div style="border-top: 3px solid black;"></div>
 
                         <!-- 添加合格标签 -->
 
                         <!-- <div class="row mt-5">
                             <div class="col-12 text-center">
-                                <p>(以下空白)</p>
+                                <p></p>
                             </div>
                         </div> -->
                         
-                        <!-- 调用自定义页脚 -->
+                        <!-- 页脚固定在底部 -->
+                    <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
                         <t t-call="sf_quality.report_quality_footer"/>
+                    <!-- </div> -->
                     </div>
                 </t>
             </t>

From 956cefbd9f90754c483420da695e353334f162ec Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 24 Mar 2025 13:39:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=98=BE=E9=9A=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml
index 6d80f04c..7d7a2580 100644
--- a/quality_control/views/quality_views.xml
+++ b/quality_control/views/quality_views.xml
@@ -332,12 +332,12 @@
                         <!-- 测量page内有一个添加测量值按钮，点击可以新增一行测量值，新增的行在tree视图中显示，显示的列有：序号、检测项目、测量值1、测量值2、测量值3、测量值4、测量值5、判定、备注。其中检测项目、测量值1、测量值2、测量值3、测量值4、测量值5为必填项，判定为下拉框，默认选中合格，备注为文本框。 -->
                         <page string="测量" name="measure" attrs="{'invisible': [('is_out_check', '=', False)]}">
                             <div class="o_row">
-                            <button name="add_measure_line" type="object" class="btn-primary" string="添加测量值"/>
-                            <button name="remove_measure_line" type="object" class="btn-primary" string="删除测量值"/>
+                            <button name="add_measure_line" type="object" class="btn-primary" string="添加测量值" attrs="{'invisible': [('publish_status', '=', 'published')]}"/>
+                            <button name="remove_measure_line" type="object" class="btn-primary" string="删除测量值" attrs="{'invisible': [('publish_status', '=', 'published')]}"/>
                             <button name="%(quality_control.import_complex_model_wizard)d" string="上传"
                                 type="action"
                                 class="btn-primary"
-                                attrs="{'force_show':1}"
+                                attrs="{'force_show':1, 'invisible': [('publish_status', '=', 'published')]}"
                                 context="{'default_model_name': 'quality.check.measure.line', 'default_check_id': id}"/>
                             </div>
                             <br/>