diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py index 396d2a55..7992021f 100644 --- a/quality_control/models/quality.py +++ b/quality_control/models/quality.py @@ -774,8 +774,8 @@ class QualityCheckMeasureLine(models.Model): # 判定结果 measure_result = fields.Selection([ - ('OK', 'OK'), - ('NG', 'NG') + ('OK', '合格'), + ('NG', '不合格') ], string='判定', default='OK') remark = fields.Char('备注') diff --git a/quality_control/static/src/js/quality.check.measures.line.js b/quality_control/static/src/js/quality.check.measures.line.js index 03ae4eea..b64f3feb 100644 --- a/quality_control/static/src/js/quality.check.measures.line.js +++ b/quality_control/static/src/js/quality.check.measures.line.js @@ -27,7 +27,7 @@ patch(ListRenderer.prototype, 'custom_measure_line_tree_patch', { owl.onRendered(() => { setTimeout(() => { const $dom = $(this.__owl__?.bdom?.el) - if(!$dom || $dom.length) return + if(!$dom || !$dom.length) return const $thead = $dom.find('thead').find('th'); if(!this.props.list.records || this.props.list.records.length == 0) return const $total_qty = this.props.list.records[0].data.column_nums; diff --git a/sf_quality/data/insepection_report_template.xml b/sf_quality/data/insepection_report_template.xml index c99e16dc..7392838f 100644 --- a/sf_quality/data/insepection_report_template.xml +++ b/sf_quality/data/insepection_report_template.xml @@ -77,6 +77,7 @@

检验结果

+
@@ -109,7 +110,9 @@
- + + +
检验结论: @@ -129,7 +132,9 @@

质检员:

- + + +

(以下空白)

diff --git a/sf_quality/static/img/pass.png b/sf_quality/static/img/pass.png new file mode 100644 index 00000000..2c5fef0c Binary files /dev/null and b/sf_quality/static/img/pass.png differ