diff --git a/sf_base/models/base.py b/sf_base/models/base.py index 0a1face8..f6a945aa 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -31,13 +31,13 @@ class MachineBrand(models.Model): _name = 'sf.machine.brand' _description = '品牌' + code = fields.Char('编码') name = fields.Char('名称') tag_ids = fields.Many2many('sf.machine.brand.tags', 'rel_machine_brand_tags', string='类别') image_brand = fields.Image("品牌图片") manufacturer_model_number = fields.Char('厂家型号', size=10) + remark = fields.Text('备注') active = fields.Boolean('有效', default=True) - code = fields.Char('编码') - # 机床 class MachineTool(models.Model): diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index be7e220c..eadd81f2 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -21,41 +21,47 @@ tree.sf.machine.brand sf.machine.brand - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + form.sf.machine.brand + sf.machine.brand + +
+ + + + + + + + + + + + + + + + + + + +
+
+
品牌 @@ -81,7 +87,7 @@ tree.sf.machine_tool.type sf.machine_tool.type - + @@ -96,81 +102,110 @@ sf.machine_tool.type
- + - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -207,7 +242,7 @@ tree.sf.machine_tool.category sf.machine_tool.category - + @@ -216,42 +251,35 @@ - - form.sf.machine_tool.category - sf.machine_tool.category - -
- - - - - - - - - + + + + + + + + + + + + + + - - - + + + -
-
-
+ + + 机床类型 ir.actions.act_window sf.machine_tool.category - tree,form - -

- [机床类型] 还没有哦!点左上角的[创建]按钮,沙发归你了! -

-

-

-
+ tree
#------------------机床注册------------------ @@ -378,13 +406,13 @@
- #------------------控制系统------------------ + #------------------数控系统------------------ search.sf.machine.control_system sf.machine.control_system - + @@ -395,7 +423,7 @@ tree.sf.machine.control_system sf.machine.control_system - + @@ -424,7 +452,7 @@ - 控制系统 + 数控系统 ir.actions.act_window sf.machine.control_system tree diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml index f73e4dcf..e15d644c 100644 --- a/sf_base/views/common_view.xml +++ b/sf_base/views/common_view.xml @@ -2,24 +2,24 @@ - - sf.processing.technology - -
- - - - - - - - - - - -
-
-
+ + + + + + + + + + + + + + + + + + sf.processing.technology @@ -75,7 +75,7 @@ sf.production.process.category - + @@ -131,7 +131,7 @@ - + @@ -186,44 +186,50 @@ sf.materials.model -
- + + - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + - - - - - - - - - - - - - - - +
sf.materials.model - - - - - + + + + + + @@ -247,28 +253,33 @@ sf.production.materials
- + - + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - +
@@ -372,14 +383,16 @@
- - - + + + + + + + + - - - - +
diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml index 75a55392..65cf2ce1 100644 --- a/sf_base/views/fixture_view.xml +++ b/sf_base/views/fixture_view.xml @@ -177,7 +177,7 @@
- + @@ -193,60 +193,68 @@ attrs="{'invisible': [('model_file', '=', False)]}"/> - - - - - - - - - - - - - + + + + + + + + + +
diff --git a/sf_base/views/functional_fixture_view.xml b/sf_base/views/functional_fixture_view.xml index a790c1d6..4239ceba 100644 --- a/sf_base/views/functional_fixture_view.xml +++ b/sf_base/views/functional_fixture_view.xml @@ -94,11 +94,11 @@ sf.functional.fixture
-
- -
+ + + + + diff --git a/sf_base/views/menu_view.xml b/sf_base/views/menu_view.xml index 1806e42a..9525bbd3 100644 --- a/sf_base/views/menu_view.xml +++ b/sf_base/views/menu_view.xml @@ -139,7 +139,7 @@ diff --git a/sf_base/views/tool_menu.xml b/sf_base/views/tool_menu.xml index a1c976d5..91d95b37 100644 --- a/sf_base/views/tool_menu.xml +++ b/sf_base/views/tool_menu.xml @@ -7,14 +7,14 @@ 刀具物料 ir.actions.act_window sf.cutting.tool.material - tree,form + tree 刀具类型 ir.actions.act_window sf.cutting.tool.type - tree,form + tree @@ -35,7 +35,7 @@ 功能刀具类型 ir.actions.act_window sf.functional.cutting.tool.model - tree,form + tree diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml index 4b02fefb..ccb98a7d 100644 --- a/sf_base/views/tool_views.xml +++ b/sf_base/views/tool_views.xml @@ -1,99 +1,114 @@ - - - sf.cutting.tool.material.tree - sf.cutting.tool.material - - - - - - - - + + + sf.cutting.tool.material.tree + sf.cutting.tool.material + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sf.cutting.tool.material.search + sf.cutting.tool.material + + + + + + + + + + + + sf.functional.cutting.tool.tree + sf.functional.cutting.tool + + + + + + + + + + + + + + + + + + sf.functional.cutting.tool.form + sf.functional.cutting.tool + + + + + + + + + + + + + + + + + + + + - - sf.cutting.tool.material.form - sf.cutting.tool.material - - - - - - - - - - - - - - - - - - - - - sf.cutting.tool.material.search - sf.cutting.tool.material - - - - - - - - - - - - sf.functional.cutting.tool.tree - sf.functional.cutting.tool - - - - - - - - - - - - - - - - - - sf.functional.cutting.tool.form - sf.functional.cutting.tool - -
- - - - - - - - - - - - - - - - - - - - @@ -114,284 +129,365 @@ - - -
-
-
+
+
+ +
+
- - sf.functional.cutting.tool.search - sf.functional.cutting.tool - - - - - - - + + sf.functional.cutting.tool.search + sf.functional.cutting.tool + + + + + + + - - - sf.cutter.function.tree - sf.functional.cutting.tool.model - - - - - - - - - - sf.cutter.function.form - sf.functional.cutting.tool.model - -
- - - - - - - - - - - -
-
-
+ + + sf.cutter.function.tree + sf.functional.cutting.tool.model + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - sf.cutter.function.search - sf.functional.cutting.tool.model - - - - - - - + + + sf.cutter.function.search + sf.functional.cutting.tool.model + + + + + + + - - - sf.cutting.tool.model.tree - sf.cutting.tool.model - - - - - - - - - + + + sf.cutting.tool.model.tree + sf.cutting.tool.model + + + + + + + + + - - sf.cutting.tool.model.form - sf.cutting.tool.model - -
- - - - - - - - - - + + sf.cutting.tool.model.form + sf.cutting.tool.model + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + sf.cutting.tool.model.search + sf.cutting.tool.model + + + + + + + + - - - - - + + + sf.cutting.tool.type.tree + sf.cutting.tool.type + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- - - - sf.cutting.tool.model.search - sf.cutting.tool.model - - - - - - - - - - - - - sf.cutting.tool.type.tree - sf.cutting.tool.type - - - - - - - - - - - - sf.cutting.tool.type.form - sf.cutting.tool.type - -
- - - - - - - - - - - - -
-
-
- - - - sf.cutting.tool.type.search - sf.cutting.tool.type - - - - - - - - + + + sf.cutting.tool.type.search + sf.cutting.tool.type + + + + + + + +