From e0f43fa9fe8f7444316fabc59d98874a46e96b4a Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Tue, 15 Aug 2023 17:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E5=BA=8A=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=B7=E5=8F=82=E6=95=B0=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/base.py                     |  4 ++--
 sf_base/static/src/scss/test.scss          |  9 ++++++++-
 sf_base/views/base_view.xml                | 19 ++++++++++++++-----
 sf_maintenance/models/sf_maintenance.py    |  4 ++--
 sf_maintenance/views/maintenance_views.xml |  2 +-
 5 files changed, 27 insertions(+), 11 deletions(-)

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 @@
         <field name="model">sf.machine_tool.type</field>
         <field name="arch" type="xml">
             <form string="机床型号" create="0" edit="0" delete="0">
+
                 <sheet>
+                    <div class="oe_title">
+                        <label for="name"/>
+                        <h1><field name="name" string="设备名称" placeholder="e.g. LED Monitor"/></h1>
+                    </div>
                     <group>
                         <group>
                             <field name="code" force_save="1" readonly="1"/>
-                            <field name="name" required="1"/>
+
                             <field name="brand_id" required="1"
                                    domain="[('tag_ids', '=', '机床')]"
                                    options="{'no_create': True}"/>
@@ -191,7 +196,7 @@
                                 </group>
                                 <group string="主轴">
                                     <field name="taper" required="1"/>
-                                    <field name="rotate_speed" string="主轴转速(min)" required="1"
+                                    <field name="rotate_speed" string="主轴转速(r/min)" required="1"
                                            options="{'format': false}"/>
                                     <field name="heightened_way" required="1"/>
                                     <field name="torque" required="1"/>
@@ -216,11 +221,11 @@
                                       <div class="test_model">
                                         <label for="tool_diameter_min" string="最小(min)"/>
                                         <field name="tool_diameter_min" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
+                                               options="{'format': false}"/>Φ
                                         <span>&amp;nbsp;</span>
                                         <label for="tool_diameter_max" string="最大(max)"/>
                                         <field name="tool_diameter_max" class="o_address_zip" required="1"
-                                               options="{'format': false}"/>
+                                               options="{'format': false}"/>Φ
                                     </div>
                                     <field name="tool_quality_max" required="1"/>
                                 </group>
@@ -348,6 +353,10 @@
                     <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"
                             attrs="{'invisible': [('code','!=',False)]}"/>
                 </header>
+                 <div class="oe_title">
+                        <label for="name"/>
+                        <h1><field name="name" string="设备名称" placeholder="e.g. LED Monitor"/></h1>
+                    </div>
                 <group string="基本信息">
                     <group>
                         <field name="MTcode" string="编码"/>
@@ -357,7 +366,7 @@
                                options="{'no_create': True}"/>
                     </group>
                     <group>
-                        <field name="name" required="1"/>
+
                         <field name="type_id" required="1" options="{'no_create': True}"
                                domain="[('brand_id', '=', brand_id)]" attrs="{'invisible': [('brand_id','=',False)]}"/>
                     </group>
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 @@
                                 </group>
                                 <group string="主轴">
                                     <field name="taper" required="1"/>
-                                    <field name="rotate_speed" string="主轴转速(min)" required="1"
+                                    <field name="rotate_speed" string="主轴转速(min/s)" required="1"
                                            options="{'format': false}"/>
                                     <field name="heightened_way" required="1"/>
                                     <field name="torque" required="1"/>