Merge branch 'refs/heads/develop' into feature/tool_standard_library_process

# Conflicts:
#	sf_manufacturing/models/product_template.py
This commit is contained in:
liaodanlong
2025-03-26 17:01:13 +08:00
20 changed files with 256 additions and 114 deletions

View File

@@ -16,13 +16,24 @@
<!-- 二维码和报告编号 -->
<div style="position: absolute; top: 0; right: 0; text-align: right;">
<img t-att-src="'/report/barcode/QR/%s' % o.get_report_url()" style="width:100px;height:100px"/>
<div style="font-size: 14px; margin-top: 5px;">
报告编号:<span t-if="o.report_number_id" t-field="o.report_number_name"/><span t-else="">ceshi</span>
</div>
<div style="font-size: 12px; margin-top: 5px;">
扫描二维码查看PDF报告
</div>
<t t-if="o.report_number_id">
<img t-att-src="'/report/barcode/QR/%s' % o.get_report_url()" style="width:100px;height:100px"/>
<div style="font-size: 14px; margin-top: 5px;">
报告编号:<span t-field="o.report_number_id"/>
</div>
<div style="font-size: 12px; margin-top: 5px;">
扫描二维码查看PDF报告
</div>
</t>
<t t-else="">
<img t-att-src="'/report/barcode/QR/%s' % o.get_report_url()" style="width:100px;height:100px"/>
<div style="font-size: 14px; margin-top: 5px;">
报告编号:<span>ceshi</span>
</div>
<div style="font-size: 12px; margin-top: 5px;">
扫描二维码查看PDF报告
</div>
</t>
</div>
</div>