diff --git a/sf_base/models/base.py b/sf_base/models/base.py index 1d8be5da..60c999b1 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -64,7 +64,7 @@ class MachineTool(models.Model): knife_type = fields.Selection( [("BT40", "BT40"), ("BT30", "BT30")], default="", string="刀把类型") - number_of_knife_library = fields.Integer('刀库数量') + number_of_knife_library = fields.Integer('刀库数量(把)') rotate_speed = fields.Integer('转速') number_of_axles = fields.Selection( [("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴")], @@ -281,7 +281,7 @@ class MachineToolType(models.Model): distance_min = fields.Char('主轴端面至工作台面距离MIN(mm)') distance_max = fields.Char('主轴端面至工作台面距离MIN(mm)') taper = fields.Char('主轴锥度(°)') - torque = fields.Char('主轴点击扭矩(n/m)') + torque = fields.Char('主轴电机扭矩(n/m)') motor_power = fields.Char('主轴电机功率(kw)') tool_quality_max = fields.Char('刀具最大质量(kg)') tool_long_max = fields.Char('刀具最大长度(mm)') diff --git a/sf_base/static/src/scss/test.scss b/sf_base/static/src/scss/test.scss index bb7d8929..e351acc2 100644 --- a/sf_base/static/src/scss/test.scss +++ b/sf_base/static/src/scss/test.scss @@ -5,4 +5,11 @@ margin-left: 20px; margin-right: 0px !important; white-space: nowrap; -} \ No newline at end of file +} +.o_form_label.o_field_invalid::after { + content: '*' !important; + color: red !important; + padding: 0 4px !important; + vertical-align: top !important; + font-size: 1.5rem !important; + } \ No newline at end of file diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index 52d8950f..e25cf7cd 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -102,11 +102,16 @@ sf.machine_tool.type + + + + + - + @@ -191,7 +196,7 @@ - @@ -216,11 +221,11 @@ + options="{'format': false}"/>Φ + options="{'format': false}"/>Φ @@ -348,6 +353,10 @@ + + + + @@ -357,7 +366,7 @@ options="{'no_create': True}"/> - + diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index 6b1d76f4..7f6104ba 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -72,7 +72,7 @@ class SfMaintenanceEquipment(models.Model): knife_type = fields.Selection( [("BT40", "BT40"), ("BT30", "BT30")], default="", string="刀把类型") - number_of_knife_library = fields.Integer('刀库数量') + number_of_knife_library = fields.Integer('刀库数量(把)') rotate_speed = fields.Integer('转速') number_of_axles = fields.Selection( [("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴")], @@ -116,7 +116,7 @@ class SfMaintenanceEquipment(models.Model): distance_min = fields.Char('主轴端面至工作台面距离MIN(mm)') distance_max = fields.Char('主轴端面至工作台面距离MIN(mm)') taper = fields.Char('主轴锥度(°)') - torque = fields.Char('主轴点击扭矩(n/m)') + torque = fields.Char('主轴电机扭矩(n/m)') motor_power = fields.Char('主轴电机功率(kw)') tool_quality_max = fields.Char('刀具最大质量(kg)') tool_long_max = fields.Char('刀具最大长度(mm)') diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 508325f1..b1d914a0 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -111,7 +111,7 @@ -