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:
jinling.yang
2023-08-15 17:31:49 +08:00
parent 9fe58a1fba 0ecd4e4c3b
commit 8a99bd8589
110 changed files with 27374 additions and 1649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sf_base/views/functional_fixture_view.xml
View File

@@ -14,7 +14,7 @@
filter_domain="[('name', 'ilike', self)]"/>
<field name="remark" string="备注"
filter_domain="[('remark', 'ilike', self)]"/>
<filter name="filter_active" string="未启用" domain="[('active','=',False)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
</search>
</field>
</record>
@@ -25,9 +25,9 @@
<field name="arch" type="xml">
<tree string="功能夹具类型" create="0" edit="0" delete="0">
<field name="code"/>
<field name="name"/>
<field name="name" string="名称"/>
<field name="remark"/>
<field name="active" string="启用"/>
<!-- <field name="active" string="启用"/>-->
</tree>
</field>
</record>
@@ -73,6 +73,7 @@
filter_domain="[('code', 'ilike', self)]"/>
<field name="name" string="名称"
filter_domain="[('name', 'ilike', self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
</search>
</field>
</record>
@@ -83,7 +84,7 @@
<field name="arch" type="xml">
<tree string="功能夹具">
<field name="code"/>
<field name="name"/>
<field name="name" string="名称"/>
<field name="type_id"/>
</tree>
</field>
@@ -94,16 +95,20 @@
<field name="model">sf.functional.fixture</field>
<field name="arch" type="xml">
<form string="功能夹具">
<!-- <header>-->
<!-- <field name="registration_status" invisible="1"/>-->
<!-- <button type="object" class="oe_highlight" name='register_functional_fixture' string="注册"-->
<!-- attrs="{'invisible': [('registration_status','=','已注册')]}"/>-->
<!-- </header>-->
<!-- <header>-->
<!-- <field name="registration_status" invisible="1"/>-->
<!-- <button type="object" class="oe_highlight" name='register_functional_fixture' string="注册"-->
<!-- attrs="{'invisible': [('registration_status','=','已注册')]}"/>-->
<!-- </header>-->
<sheet>
<div class="oe_title">
<h1>
<field name="code"/>
</h1>
</div>
<group string="基本信息">
<group>
<field name="code"/>
<field name="name"/>
<field name="name" string="名称"/>
<field name="type_id"/>
<field name="type" invisible="1"/>
<field name="zero_chuck_model_ids" widget="many2many_tags" options="{'no_create': True}"/>