Merge branch 'feature/auxiliary_files_upload' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化加工质检

This commit is contained in:
jinling.yang
2024-10-16 11:49:37 +08:00
3 changed files with 29 additions and 33 deletions

View File

@@ -54,7 +54,7 @@
<field name="context">{ 'search_default_filter_waiting':1}</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
请先创建一个加工质检单
暂无加工质检单
</p>
</field>
</record>
@@ -125,44 +125,33 @@
<field name="name">quality.cnc.test.view.kanban</field>
<field name="model">quality.cnc.test</field>
<field name="arch" type="xml">
<kanban class="oe_background_grey o_kanban_dashboard o_quality_kanban" create="0">
<kanban sample="1" class="o_kanban_product_template">
<templates>
<t t-name="kanban-box">
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click">
<div class="add_flex">
<div class="o_kanban_card_header">
<div class="o_kanban_card_header_title">
<div class="oe_kanban_card oe_kanban_global_click">
<div class="oe_kanban_details">
<div class="o_kanban_record_top mb-0">
<div class="o_kanban_record_headings">
<strong class="o_kanban_record_title">
<field name="name"/>
</div>
</div>
<!-- 内容 -->
<div class="container o_kanban_card_content">
<div>
<field name="production_id"/>
</div>
<div>
<field name="processing_panel"/>
</div>
<div>
<field name="state"
widget="label_selection"
options="{'classes': {'waiting': 'warning', 'done': 'success'}}"/>
</div>
</strong>
</div>
</div>
<div>
<div>
<field name="production_id"/>
</div>
<div>
<field name="processing_panel"/>
</div>
<div>
<field name="test_results"
widget="label_selection"
options="{'classes': {'合格': 'success', '返工': 'warning', '报废': 'danger'}}"/>
</div>
</div>
<!-- <div class="show_state" t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click-->
<!-- ">-->
<!-- <div t-attf-class="#{record.result.raw_value == 'pass' ? 'color_1' : ''}"></div>-->
<!-- <div t-attf-class="#{record.result.raw_value == 'fail' ? 'color_2' : ''}"></div>-->
<!-- <p class="o_kanban_record_bottom"-->
<!-- t-attf-class="#{record.result.raw_value == 'pass' ? 'font_color_1' : ''}-->
<!-- #{record.state.result == 'fail' ? 'font_color_2' : ''}}">-->
<!-- <field name="result"/>-->
<!-- </p>-->
<!-- </div>-->
</div>
</t>
</div>
</t>
</templates>
</kanban>
@@ -186,6 +175,7 @@
<field name="view_id" ref="quality_cnc_test_view_kanban"/>
<field name="search_view_id" ref="quality_cnc_test_search"/>
<field name="domain">[]</field>
<field name="context">{ 'search_default_filter_waiting':1}</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
暂无加工质检单