From 2ae7b2c8ecd7c7bbad84c4e9aaae092ec431df29 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 23 Aug 2023 10:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=90=8D=E7=A7=B0=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=A7=E9=86=92=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/base_view.xml               | 22 +++++++++++-----------
 sf_base/views/common_view.xml             | 16 ++++++++--------
 sf_base/views/fixture_view.xml            |  8 ++++----
 sf_base/views/functional_fixture_view.xml |  4 ++--
 sf_base/views/tool_views.xml              |  4 ++--
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index 88a2dd86..4e7e5290 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -41,16 +41,16 @@
             <form string="品牌" create="0" edit="0" delete="1">
                 <sheet>
                     <!--                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>-->
-                    <field name="image_brand" widget='image' class="oe_avatar"
-                           options="{'preview_image': 'image_128'}" string="log"/>
                     <div class="oe_title">
                         <h1>
-                            <field name="code" readonly="1"/>
+                            <field name="name" readonly="1"/>
                         </h1>
+                        <field name="image_brand" widget='image' class="oe_avatar"
+                               options="{'preview_image': 'image_128'}" string="log"/>
                     </div>
                     <group>
                         <group>
-                            <field name="name" string="名称"/>
+                            <field name="code"/>
                             <field name="tag_ids"
                                    widget="many2many_tags"
                                    options="{'color_field': 'color', 'no_create_edit': True}"
@@ -108,15 +108,15 @@
                 <sheet>
                     <div class="oe_title">
                         <h1>
-                            <field name="code"/>
+                            <field name="name" placeholder="e.g. LED Monitor"/>
                         </h1>
                     </div>
                     <group>
                         <group>
-                            <label for="name"/>
-                            <h1>
-                                <field name="name" string="设备名称" placeholder="e.g. LED Monitor"/>
-                            </h1>
+                            <!--                            <label for="name"/>-->
+                            <!--                            <h1>-->
+                            <!--                                <field name="name" string="设备名称" placeholder="e.g. LED Monitor"/>-->
+                            <!--                            </h1>-->
                             <field name="code" force_save="1" readonly="1"/>
                             <field name="brand_id" required="1"
                                    domain="[('tag_ids', '=', '机床')]"
@@ -363,7 +363,7 @@
                 <sheet>
                     <div class="oe_title">
                         <h1>
-                            <field name="MTcode"/>
+                            <field name="name" placeholder="e.g. LED Monitor"/>
                         </h1>
                     </div>
                     <group string="基本信息">
@@ -374,7 +374,7 @@
                         <!--                                   options="{'no_create': True}"/>-->
                         <!--                        </group>-->
                         <group>
-                            <field name="name" required="1" string="设备名称" placeholder="e.g. LED Monitor"/>
+                            <field name="MTcode" required="1"/>
                             <field name="type_id" required="1" options="{'no_create': True}"
                                    domain="[('brand_id', '=', brand_id)]"
                                    attrs="{'invisible': [('brand_id','=',False)]}"/>
diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index afa7d88b..58d2419b 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -49,7 +49,7 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code"/>
+                                <field name="name" required="1"/>
                             </h1>
                         </div>
                         <group>
@@ -57,7 +57,7 @@
                                 <field name="sequence"/>
                             </group>
                             <group>
-                                <field name="name" required="1"/>
+                                <field name="code" force_save="1" readonly="1"/>
                             </group>
                         </group>
                         <notebook>
@@ -119,12 +119,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="process_encode"/>
+                                <field name="name" required="1"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" required="1" string="名称"/>
+                                <field name="process_encode"/>
                             </group>
                             <notebook>
                                 <page string="可选参数">
@@ -199,12 +199,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="materials_no" readonly="1" force_save="1"/>
+                                <field name="name" readonly="1"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" readonly="1"/>
+                                <field name="materials_no" readonly="1" force_save="1"/>
                                 <field name="gain_way" required="1"/>
                                 <field name="tensile_strength" required="1"/>
                                 <field name="hardness" required="1"/>
@@ -278,12 +278,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="materials_no"/>
+                                <field name="name" required="1"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" required="1" string="名称"/>
+                                <field name="materials_no"/>
                             </group>
                             <notebook>
                                 <page string="型号">
diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index 6a402681..e363b039 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -163,7 +163,7 @@
         <field name="name">夹具型号</field>
         <field name="model">sf.fixture.model</field>
         <field name="arch" type="xml">
-            <tree string="夹具型号">
+            <tree string="夹具型号" create="0" edit="0"  delete="1">
                 <field name="code"/>
                 <field name="name" string="名称"/>
                 <field name="brand_id"/>
@@ -177,16 +177,16 @@
         <field name="name">夹具型号</field>
         <field name="model">sf.fixture.model</field>
         <field name="arch" type="xml">
-            <form string="夹具型号">
+            <form string="夹具型号" create="0" edit="0"  delete="1" >
                 <sheet>
                     <div class="oe_title">
                         <h1>
-                            <field name="code" force_save="1" readonly="1"/>
+                            <field name="name" />
                         </h1>
                     </div>
                     <group>
                         <group>
-                            <field name="name" string="名称"/>
+                            <field name="code" force_save="1" readonly="1"/>
                             <field name="fixture_material_id" options="{'no_create': True}"/>
                             <field name="fixture_material_type" invisible="1"/>
                             <field name="multi_mounting_type_id" options="{'no_create': True}"/>
diff --git a/sf_base/views/functional_fixture_view.xml b/sf_base/views/functional_fixture_view.xml
index e366f701..ff57215d 100644
--- a/sf_base/views/functional_fixture_view.xml
+++ b/sf_base/views/functional_fixture_view.xml
@@ -103,12 +103,12 @@
                 <sheet>
                     <div class="oe_title">
                         <h1>
-                            <field name="code"/>
+                            <field name="name"/>
                         </h1>
                     </div>
                     <group string="基本信息">
                         <group>
-                            <field name="name" string="名称"/>
+                            <field name="code" />
                             <field name="type_id"/>
                             <field name="type" invisible="1"/>
                             <field name="zero_chuck_model_ids" widget="many2many_tags" options="{'no_create': True}"/>
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index 5b78270d..bfc405f9 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -214,12 +214,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code"/>
+                                <field name="name" placeholder="e.g. LED Monitor"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" string="名称"/>
+                                <field name="code" />
                                 <field name="cutting_tool_material_id"
                                        options="{'no_create': True, 'no_quick_create': True}"/>
                                 <field name="cutting_tool_type" invisible="1"/>