From c632926348d31a23fbd4d14a0e698e535b59f4b7 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 13 Mar 2025 17:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=A5=E8=A1=A8=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/views/quality_views.xml       |  1 +
 .../data/insepection_report_template.xml      | 34 +++++++++----------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml
index cf804f1c..18eb945b 100644
--- a/quality_control/views/quality_views.xml
+++ b/quality_control/views/quality_views.xml
@@ -274,6 +274,7 @@
                             <field name="check_qty" attrs="{'invisible': [('measure_on', '!=', 'product')]}"/>
 <!--                             <field name="categ_type"/> -->
                             <field name="report_number_id"/>
+                            <field name="column_nums"/>
                             <field name="show_lot_text" invisible="1"/>
                             <field name="move_line_id" invisible="1"/>
                             <field name="product_tracking" invisible="1"/>
diff --git a/sf_quality/data/insepection_report_template.xml b/sf_quality/data/insepection_report_template.xml
index d8df704a..c99e16dc 100644
--- a/sf_quality/data/insepection_report_template.xml
+++ b/sf_quality/data/insepection_report_template.xml
@@ -80,32 +80,32 @@
                         <table class="table table-sm mt-2" style="border: 1px solid black;">
                             <thead>
                                 <tr>
-                                    <th style="border: 1px solid black;">检测项目</th>
-                                    <th style="border: 1px solid black;" colspan="5">测量值</th>
-                                    <th style="border: 1px solid black;">判定</th>
-                                    <th style="border: 1px solid black;">备注</th>
+                                    <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>
                                 </tr>
                                 <tr>
                                     <th style="border: 1px solid black;"></th>
-                                    <th style="border: 1px solid black;">1</th>
-                                    <th style="border: 1px solid black;">2</th>
-                                    <th style="border: 1px solid black;">3</th>
-                                    <th style="border: 1px solid black;">4</th>
-                                    <th style="border: 1px solid black;">5</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>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr t-foreach="o.measure_line_ids" t-as="line">
-                                    <td style="border: 1px solid black;"><span t-field="line.measure_item"/></td>
-                                    <td style="border: 1px solid black;"><span t-field="line.measure_value1"/></td>
-                                    <td style="border: 1px solid black;"><span t-field="line.measure_value2"/></td>
-                                    <td style="border: 1px solid black;"><span t-field="line.measure_value3"/></td>
-                                    <td style="border: 1px solid black;"><span t-field="line.measure_value4"/></td>
-                                    <td style="border: 1px solid black;"><span t-field="line.measure_value5"/></td>
-                                    <td style="border: 1px solid black;"><span t-field="line.measure_result"/></td>
-                                    <td style="border: 1px solid black;"><span t-field="line.remark"/></td>
+                                    <td style="border: 1px solid black;" class="text-center"><span t-field="line.measure_item"/></td>
+                                    <td style="border: 1px solid black;" t-if="o.column_nums >= 1" class="text-center"><span t-field="line.measure_value1"/></td>
+                                    <td style="border: 1px solid black;" t-if="o.column_nums >= 2" class="text-center"><span t-field="line.measure_value2"/></td>
+                                    <td style="border: 1px solid black;" t-if="o.column_nums >= 3" class="text-center"><span t-field="line.measure_value3"/></td>
+                                    <td style="border: 1px solid black;" t-if="o.column_nums >= 4" class="text-center"><span t-field="line.measure_value4"/></td>
+                                    <td style="border: 1px solid black;" t-if="o.column_nums >= 5" class="text-center"><span t-field="line.measure_value5"/></td>
+                                    <td style="border: 1px solid black;" class="text-center"><span t-field="line.measure_result"/></td>
+                                    <td style="border: 1px solid black;" class="text-center"><span t-field="line.remark"/></td>
                                 </tr>
                             </tbody>
                         </table>