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/修改机床参数bug

Browse Source
This commit is contained in:
qihao.gong@jikimo.com
2023-08-21 10:28:12 +08:00
parent 82322b5024 78ddf4e52f
commit ff60824291
11 changed files with 338 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sf_base/views/base_view.xml
View File

@@ -25,7 +25,7 @@
<field name="name">tree.sf.machine.brand</field>
<field name="model">sf.machine.brand</field>
<field name="arch" type="xml">
<tree string="品牌" create="0" edit="0" delete="0">
<tree string="品牌" create="0" edit="0" delete="1">
<field name="code"/>
<field name="name"/>
<field name="tag_ids" widget="many2many_tags" optional="hide"/>
@@ -38,7 +38,7 @@
<field name="name">form.sf.machine.brand</field>
<field name="model">sf.machine.brand</field>
<field name="arch" type="xml">
<form string="品牌" create="0" edit="0" delete="0">
<form string="品牌" create="0" edit="0" delete="1">
<sheet>
<!-- <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>-->
<field name="image_brand" widget='image' class="oe_avatar"
@@ -89,7 +89,7 @@
<field name="name">tree.sf.machine_tool.type</field>
<field name="model">sf.machine_tool.type</field>
<field name="arch" type="xml">
<tree string="机床型号" create="0" delete="0" edit="0">
<tree string="机床型号" create="0" delete="1" edit="0">
<field name="code"/>
<field name="name" string="名称"/>
<field name="machine_tool_category"/>
@@ -104,7 +104,7 @@
<field name="name">form.sf.machine_tool.type</field>
<field name="model">sf.machine_tool.type</field>
<field name="arch" type="xml">
<form string="机床型号" create="0" edit="0" delete="0">
<form string="机床型号" create="0" edit="1" delete="0">
<sheet>
<div class="oe_title">
<h1>
@@ -279,7 +279,7 @@
<field name="name">tree.sf.machine_tool.category</field>
<field name="model">sf.machine_tool.category</field>
<field name="arch" type="xml">
<tree string="机床类型" create="0" edit="0" delete="0">
<tree string="机床类型" create="0" edit="1" delete="0">
<field name="code"/>
<field name="name" string="名称"/>
<field name="category"/>
@@ -486,7 +486,7 @@
<field name="name">tree.sf.machine.control_system</field>
<field name="model">sf.machine.control_system</field>
<field name="arch" type="xml">
<tree string="数控系统" create="0" edit="0" delete="0">
<tree string="数控系统" create="0" edit="0" delete="1">
<field name="code"/>
<field name="name"/>
<field name="brand_id"/>