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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/创建工作日历代码测试

Browse Source
This commit is contained in:
yuxianghui
2023-07-18 16:27:42 +08:00
parent 2462c3774d baf13117dc
commit b5484ecda6
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sf_base/views/fixture_view.xml
View File

@@ -25,6 +25,8 @@
<field name="code"/>
<field name="name"/>
<field name="remark"/>
<field name="create_uid" string="创建人"/>
<field name="create_date" string="创建时间"/>
</tree>
</field>
</record>
@@ -87,6 +89,8 @@
<field name="code"/>
<field name="name"/>
<field name="remark"/>
<field name="create_uid" string="创建人"/>
<field name="create_date" string="创建时间"/>
</tree>
</field>
</record>
@@ -138,12 +142,15 @@
<field name="multi_mounting_type_id" string="联装类型"
filter_domain="[('multi_mounting_type_id.name', 'ilike', self)]"/>
<group expand="0" string="Group By...">
<filter string='品牌' name="default_unit_of_measure" domain="[]"
<filter string='品牌' name="brand_id" domain="[]"
context="{'group_by' : 'brand_id'}"/>
<filter string="夹具物料" name="product" domain="[]" context="{'group_by': 'fixture_material_id'}"/>
<filter string='联装类型' name="group_by_type" domain="[]"
<filter string="夹具物料" name="fixture_material_id" domain="[]" context="{'group_by': 'fixture_material_id'}"/>
<filter string='联装类型' name="multi_mounting_type_id" domain="[]"
context="{'group_by' : 'multi_mounting_type_id'}"/>
</group>
<searchpanel class="account_root">
<field name="fixture_material_id" icon="fa-filter"/>
</searchpanel>
</search>
</field>
</record>
@@ -180,7 +187,7 @@
<field name="multi_mounting_type_id"/>
</group>
<group>
<!-- <field name="upload_model_file" widget="many2many_binary"/>-->
<!-- <field name="upload_model_file" widget="many2many_binary"/>-->
<field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
attrs="{'invisible': [('model_file', '=', False)]}"/>
</group>

5
sf_base/views/functional_fixture_view.xml
View File

@@ -26,6 +26,8 @@
<field name="code"/>
<field name="name"/>
<field name="remark"/>
<field name="create_uid" string="创建人"/>
<field name="create_date" string="创建时间"/>
</tree>
</field>
</record>
@@ -83,7 +85,8 @@
<field name="code"/>
<field name="name"/>
<field name="type_id"/>
<field name="zero_chuck_model_ids" widget="many2many_tags"/>
<field name="create_uid" string="创建人"/>
<field name="create_date" string="创建时间"/>
</tree>
</field>
</record>