处理bug

This commit is contained in:
qihao.gong@jikimo.com
2023-06-16 10:56:25 +08:00
parent 018fecfc59
commit 23aba08c87
12 changed files with 286 additions and 99 deletions

View File

@@ -30,7 +30,7 @@
'web.assets_qweb': [
],
'web.assets_backend': [
'sf_base/static/src/scss/format_img.scss',
'sf_base/static/src/scss/*.scss',
],
},

View File

@@ -85,7 +85,7 @@ class MachineTool(models.Model):
[("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
default='正常', string="机床状态")
#0606新增字段
machine_tool_picture = fields.Binary('机床图片')
machine_tool_picture = fields.Binary('图片')
heightened_way = fields.Selection([
('sifudianji', '伺服电机驱动'),
('youyagang', '油压缸驱动'),
@@ -260,7 +260,7 @@ class MachineToolType(models.Model):
rotate_speed = fields.Integer('转速')
#0606新增字段
created_user = fields.Many2one('res.users', string='创建人', default=lambda self: self.env.user)
machine_tool_picture = fields.Binary('机床图片')
machine_tool_picture = fields.Binary('图片')
heightened_way = fields.Selection([
('sifudianji', '伺服电机驱动'),
('youyagang', '油压缸驱动'),

View File

@@ -0,0 +1,7 @@
.test_model {
display: flex !important;
}
.test_model>.o_form_label {
margin-left: 20px;
margin-right: 0px !important;
}

View File

@@ -96,23 +96,25 @@
</field>
</record>
<record model="ir.ui.view" id="form_sf_machine_tool_type">
<record model="ir.ui.view" id="form_sf_machine_tool_type">
<field name="name">form.sf.machine_tool.type</field>
<field name="model">sf.machine_tool.type</field>
<field name="arch" type="xml">
<form string="机床型号">
<field name="machine_tool_picture" widget="image"/>
<group string="基本信息">
<group>
<field name="code" force_save="1" readonly="1"/>
<field name="name" required="1"/>
</group>
<group>
<field name="machine_tool_category"/>
<field name="machine_tool_category" required="1"/>
<field name="brand_id" required="1"
domain="[('tag_ids', '=', '机床')]"
options="{'no_create': True}" />
</group>
<group>
<field name="machine_tool_picture" widget="image" nolabel="1"/>
</group>
</group>
<group string="参数">
<group>
@@ -177,6 +179,7 @@
</field>
</record>
<record id="action_sf_machine_tool_type" model="ir.actions.act_window">
<field name="name">机床型号</field>
<field name="type">ir.actions.act_window</field>
@@ -249,7 +252,7 @@
<field name="view_mode">tree,form</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
[机床型] 还没有哦!点左上角的[创建]按钮,沙发归你了!
[机床型] 还没有哦!点左上角的[创建]按钮,沙发归你了!
</p>
<p>
</p>