Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
This commit is contained in:
@@ -332,12 +332,12 @@
|
|||||||
<!-- 测量page内有一个添加测量值按钮,点击可以新增一行测量值,新增的行在tree视图中显示,显示的列有:序号、检测项目、测量值1、测量值2、测量值3、测量值4、测量值5、判定、备注。其中检测项目、测量值1、测量值2、测量值3、测量值4、测量值5为必填项,判定为下拉框,默认选中合格,备注为文本框。 -->
|
<!-- 测量page内有一个添加测量值按钮,点击可以新增一行测量值,新增的行在tree视图中显示,显示的列有:序号、检测项目、测量值1、测量值2、测量值3、测量值4、测量值5、判定、备注。其中检测项目、测量值1、测量值2、测量值3、测量值4、测量值5为必填项,判定为下拉框,默认选中合格,备注为文本框。 -->
|
||||||
<page string="测量" name="measure" attrs="{'invisible': [('is_out_check', '=', False)]}">
|
<page string="测量" name="measure" attrs="{'invisible': [('is_out_check', '=', False)]}">
|
||||||
<div class="o_row">
|
<div class="o_row">
|
||||||
<button name="add_measure_line" type="object" class="btn-primary" string="添加测量值" attrs="{'invisible': [('publish_status', '!=', 'published')]}"/>
|
<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="remove_measure_line" type="object" class="btn-primary" string="删除测量值" attrs="{'invisible': [('publish_status', '=', 'published')]}"/>
|
||||||
<button name="%(quality_control.import_complex_model_wizard)d" string="上传"
|
<button name="%(quality_control.import_complex_model_wizard)d" string="上传"
|
||||||
type="action"
|
type="action"
|
||||||
class="btn-primary"
|
class="btn-primary"
|
||||||
attrs="{'force_show':1, 'invisible': [('publish_status', '!=', 'published')]}"
|
attrs="{'force_show':1, 'invisible': [('publish_status', '=', 'published')]}"
|
||||||
context="{'default_model_name': 'quality.check.measure.line', 'default_check_id': id}"/>
|
context="{'default_model_name': 'quality.check.measure.line', 'default_check_id': id}"/>
|
||||||
</div>
|
</div>
|
||||||
<br/>
|
<br/>
|
||||||
|
|||||||
Reference in New Issue
Block a user