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 
# Conflicts:
#	sf_base/views/base_view.xml
This commit is contained in:
jinling.yang
2023-08-17 18:03:12 +08:00
parent 8a99bd8589 42066865be
commit 97fcf6d91f
16 changed files with 1038 additions and 1557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
sf_base/views/base_view.xml
View File

@@ -11,9 +11,9 @@
<field name="name" string="模糊搜索"
filter_domain="['|',('name', 'ilike', self),('code', 'ilike', self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
<!-- <searchpanel>-->
<!-- <field name="tag_ids" icon="fa-filter"/>-->
<!-- </searchpanel>-->
<!-- <searchpanel>-->
<!-- <field name="tag_ids" icon="fa-filter"/>-->
<!-- </searchpanel>-->
</search>
</field>
</record>
@@ -109,7 +109,11 @@
</div>
<group>
<group>
<field name="name" required="1" string="名称"/>
<label for="name"/>
<h1>
<field name="name" string="设备名称" placeholder="e.g. LED Monitor"/>
</h1>
<field name="code" force_save="1" readonly="1"/>
<field name="brand_id" required="1"
domain="[('tag_ids', '=', '机床')]"
options="{'no_create': True}"/>
@@ -194,7 +198,7 @@
</group>
<group string="主轴">
<field name="taper" required="1"/>
<field name="rotate_speed" string="主轴转速(min)" required="1"
<field name="rotate_speed" string="主轴转速(r/min)" required="1"
options="{'format': false}"/>
<field name="heightened_way" required="1"/>
<field name="torque" required="1"/>
@@ -219,11 +223,11 @@
<div class="test_model">
<label for="tool_diameter_min" string="最小(min)"/>
<field name="tool_diameter_min" class="o_address_zip" required="1"
options="{'format': false}"/>
options="{'format': false}"/>Φ
<span>&amp;nbsp;</span>
<label for="tool_diameter_max" string="最大(max)"/>
<field name="tool_diameter_max" class="o_address_zip" required="1"
options="{'format': false}"/>
options="{'format': false}"/>Φ
</div>
<field name="tool_quality_max" required="1"/>
</group>
@@ -359,21 +363,38 @@
</h1>
</div>
<group string="基本信息">
<!-- <group>-->
<!-- <field name="brand_id"-->
<!-- required="1"-->
<!-- domain="[('tag_ids', '=', '机床')]"-->
<!-- options="{'no_create': True}"/>-->
<!-- </group>-->
<group>
<field name="brand_id"
required="1"
domain="[('tag_ids', '=', '机床')]"
options="{'no_create': True}"/>
</group>
<group>
<field name="name" required="1"/>
<field name="name" required="1" string="设备名称" placeholder="e.g. LED Monitor"/>
<field name="type_id" required="1" options="{'no_create': True}"
domain="[('brand_id', '=', brand_id)]"
attrs="{'invisible': [('brand_id','=',False)]}"/>
</group>
<group>
<field name="code" readonly="1" string="行业编码" force_save="1"/>
<!-- <div class="oe_title">-->
<!-- <label for="name"/>-->
<!-- <h1><field name="name" string="设备名称" placeholder="e.g. LED Monitor"/></h1>-->
<!-- </div>-->
<group string="基本信息">
<group>
<field name="MTcode" string="编码"/>
<field name="brand_id"
required="1"
domain="[('tag_ids', '=', '机床')]"
options="{'no_create': True}"/>
</group>
<group>
<field name="type_id" required="1" options="{'no_create': True}"
domain="[('brand_id', '=', brand_id)]"
attrs="{'invisible': [('brand_id','=',False)]}"/>
</group>
<group>
<field name="code" readonly="1" string="行业编码" force_save="1"/>
</group>
</group>
</group>
<notebook>