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:
龚启豪
2023-09-15 14:28:25 +08:00
committed by Coding
2 changed files with 8 additions and 4 deletions

View File

@@ -76,7 +76,7 @@ class SfMaintenanceEquipment(models.Model):
code = fields.Char('机台号')
name = fields.Char('名称')
knife_type = fields.Selection(
[("BT40", "BT40"), ("BT30", "BT30")],
[("BT40", "BT40"), ("BT30", "BT30"), ("BT50", "BT50")],
default="", string="刀把类型")
number_of_knife_library = fields.Integer('刀库数量(把)')
rotate_speed = fields.Integer('转速')

View File

@@ -53,8 +53,8 @@
</div>
</xpath>
<xpath expr="//field[@name='category_id']" position="after">
<field name="state_zc" readonly="1"/>
<field name="code" readonly="1"/>
<field name="state_zc"/>
<field name="code"/>
<field name="equipment_type" invisible="1"/>
<field name="brand_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"
@@ -178,14 +178,18 @@
</page>
<page string="加工能力">
<field name='image_id' widget="custom_many2many_checkboxes">
<tree editable="bottom">
<tree>
<field name="name"/>
<field name="image" widget="image"
options="{'size': [100, 100], 'click enlarge': True}"/>
</tree>
</field>
</page>