Accept Merge Request #393: (feature/修改机床参数bug -> develop)
Merge Request: BT50 Created By: @龚启豪 Accepted By: @龚启豪 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/393?initial=true
This commit is contained in:
@@ -76,7 +76,7 @@ class SfMaintenanceEquipment(models.Model):
|
|||||||
code = fields.Char('机台号')
|
code = fields.Char('机台号')
|
||||||
name = fields.Char('名称')
|
name = fields.Char('名称')
|
||||||
knife_type = fields.Selection(
|
knife_type = fields.Selection(
|
||||||
[("BT40", "BT40"), ("BT30", "BT30")],
|
[("BT40", "BT40"), ("BT30", "BT30"), ("BT50", "BT50")],
|
||||||
default="", string="刀把类型")
|
default="", string="刀把类型")
|
||||||
number_of_knife_library = fields.Integer('刀库数量(把)')
|
number_of_knife_library = fields.Integer('刀库数量(把)')
|
||||||
rotate_speed = fields.Integer('转速')
|
rotate_speed = fields.Integer('转速')
|
||||||
|
|||||||
@@ -53,8 +53,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//field[@name='category_id']" position="after">
|
<xpath expr="//field[@name='category_id']" position="after">
|
||||||
<field name="state_zc" readonly="1"/>
|
<field name="state_zc"/>
|
||||||
<field name="code" readonly="1"/>
|
<field name="code"/>
|
||||||
|
|
||||||
<field name="equipment_type" invisible="1"/>
|
<field name="equipment_type" invisible="1"/>
|
||||||
<field name="brand_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"
|
<field name="brand_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"
|
||||||
@@ -178,14 +178,18 @@
|
|||||||
</page>
|
</page>
|
||||||
|
|
||||||
<page string="加工能力">
|
<page string="加工能力">
|
||||||
|
|
||||||
<field name='image_id' widget="custom_many2many_checkboxes">
|
<field name='image_id' widget="custom_many2many_checkboxes">
|
||||||
<tree editable="bottom">
|
|
||||||
|
<tree>
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="image" widget="image"
|
<field name="image" widget="image"
|
||||||
options="{'size': [100, 100], 'click enlarge': True}"/>
|
options="{'size': [100, 100], 'click enlarge': True}"/>
|
||||||
|
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
|
|
||||||
|
|
||||||
</page>
|
</page>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user