jikimo/test
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

4
sf_base/static/src/scss/test.scss
View File

@@ -34,6 +34,6 @@ div:has(.o_required_modifier)>label::before {
display: inline !important;
}
.o_required_modifier {
display: flex !important;
td.o_required_modifier {
display: table-cell !important;
}

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"/>

18
sf_base/views/common_view.xml
View File

@@ -23,7 +23,7 @@
<record model="ir.ui.view" id="sf_processing_technology_tree">
<field name="model">sf.processing.technology</field>
<field name="arch" type="xml">
<tree string="加工工艺" create="0" edit="0" delete="0">
<tree string="加工工艺" create="0" edit="0" delete="1">
<field name="process_encode"/>
<field name="name"/>
</tree>
@@ -45,7 +45,7 @@
<record model="ir.ui.view" id="sf_production_process_category_form">
<field name="model">sf.production.process.category</field>
<field name="arch" type="xml">
<form string="表面工艺类别" create="0" edit="0" delete="0">
<form string="表面工艺类别" create="0" edit="0" delete="1">
<sheet>
<div class="oe_title">
<h1>
@@ -80,7 +80,7 @@
<record model="ir.ui.view" id="sf_production_process_category_tree">
<field name="model">sf.production.process.category</field>
<field name="arch" type="xml">
<tree string="表面工艺类别" default_order="sequence, id" create="0" edit="0" delete="0">
<tree string="表面工艺类别" default_order="sequence, id" create="0" edit="0" delete="1">
<field name="sequence" widget="handle" string="序号"/>
<field name="code" />
<field name="name" string="名称"/>
@@ -104,7 +104,7 @@
<record model="ir.ui.view" id="sf_production_process_tree">
<field name="model">sf.production.process</field>
<field name="arch" type="xml">
<tree string="表面工艺" create="0" edit="0" delete="0">
<tree string="表面工艺" create="0" edit="0" delete="1">
<field name="process_encode" />
<field name="name" string="名称"/>
<field name="remark"/>
@@ -115,7 +115,7 @@
<record model="ir.ui.view" id="sf_production_process_form">
<field name="model">sf.production.process</field>
<field name="arch" type="xml">
<form string="表面工艺" create="0" edit="0" delete="0">
<form string="表面工艺" create="0" edit="0" delete="1">
<sheet>
<div class="oe_title">
<h1>
@@ -195,7 +195,7 @@
<record model="ir.ui.view" id="sf_materials_model_form">
<field name="model">sf.materials.model</field>
<field name="arch" type="xml">
<form string="材料型号" create="0" edit="1" delete="0">
<form string="材料型号" create="0" edit="1" delete="1">
<sheet>
<div class="oe_title">
<h1>
@@ -238,7 +238,7 @@
<record model="ir.ui.view" id="sf_materials_model_tree">
<field name="model">sf.materials.model</field>
<field name="arch" type="xml">
<tree string="材料型号" create="0" delete="0">
<tree string="材料型号" create="0" delete="1">
<field name="materials_no" readonly="1"/>
<field name="name" readonly="1"/>
<field name="gain_way"/>
@@ -266,7 +266,7 @@
<record model="ir.ui.view" id="sf_production_materials_form">
<field name="model">sf.production.materials</field>
<field name="arch" type="xml">
<form string="材料" create="0" edit="0" delete="0">
<form string="材料" create="0" edit="0" delete="1">
<sheet>
<div class="oe_title">
<h1>
@@ -302,7 +302,7 @@
<record model="ir.ui.view" id="sf_production_materials_tree">
<field name="model">sf.production.materials</field>
<field name="arch" type="xml">
<tree string="材料" create="0" edit="0" delete="0">
<tree string="材料" create="0" edit="0" delete="1">
<field name="materials_no" readonly="1"/>
<field name="name" string="名称"/>
</tree>

4
sf_base/views/fixture_view.xml
View File

@@ -22,7 +22,7 @@
<field name="name">夹具物料</field>
<field name="model">sf.fixture.material</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" string="名称"/>
<field name="category"/>
@@ -87,7 +87,7 @@
<field name="name">联装类型</field>
<field name="model">sf.multi_mounting.type</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" string="名称"/>
<field name="remark"/>

2
sf_base/views/functional_fixture_view.xml
View File

@@ -23,7 +23,7 @@
<field name="name">功能夹具类型</field>
<field name="model">sf.functional.fixture.type</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" string="名称"/>
<field name="remark"/>

10
sf_base/views/tool_views.xml
View File

@@ -6,7 +6,7 @@
<field name="name">sf.cutting.tool.material.tree</field>
<field name="model">sf.cutting.tool.material</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" string="名称"/>
<field name="remark"/>
@@ -153,7 +153,7 @@
<field name="name">sf.cutter.function.tree</field>
<field name="model">sf.functional.cutting.tool.model</field>
<field name="arch" type="xml">
<tree string="功能刀具类型" create="0" delete="0" edit="0">
<tree string="功能刀具类型" create="0" delete="0" edit="1">
<field name="name" string="名称"/>
<field name="code"/>
<field name="remark"/>
@@ -198,7 +198,7 @@
<field name="name">sf.cutting.tool.model.tree</field>
<field name="model">sf.cutting.tool.model</field>
<field name="arch" type="xml">
<tree string="刀具型号" edit="0" delete="0" create="0">
<tree string="刀具型号" edit="0" delete="0" create="1">
<field name="code"/>
<field name="name" string="名称"/>
<field name="cutting_tool_material_id"/>
@@ -210,7 +210,7 @@
<field name="name">sf.cutting.tool.model.form</field>
<field name="model">sf.cutting.tool.model</field>
<field name="arch" type="xml">
<form string="刀具型号" edit="0" delete="0" create="0">
<form string="刀具型号" edit="0" delete="0" create="1">
<sheet>
<div class="oe_title">
<h1>
@@ -345,7 +345,7 @@
<field name="name">sf.cutting.tool.type.tree</field>
<field name="model">sf.cutting.tool.type</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" string="名称"/>
<field name="cutting_tool_material_id"/>