jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Browse Source
This commit is contained in:
hyyy
2025-03-13 17:07:26 +08:00
parent 73ce21ef99 c632926348
commit 6de31608d1
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
quality_control/views/quality_views.xml
View File

@@ -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"/>

34
sf_quality/data/insepection_report_template.xml
View File

@@ -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>