From 2fdcd3a0094d674a044812357c59b30ede0cf4ac Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 30 Aug 2023 16:19:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/quick_easy_order.py      |  7 ++++---
 sf_sale/views/quick_easy_order_view.xml | 24 +++++++++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index fac229f5..eed2be57 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -37,11 +37,11 @@ class QuickEasyOrder(models.Model):
     quantity = fields.Integer('数量', default=1)
     unit_price = fields.Float('单价')
     price = fields.Float('总价')
-    model_file = fields.Binary('模型文件')
-    upload_model_file = fields.Many2many('ir.attachment', 'upload_qf_model_file_attachment_ref', string='模型文件')
+    model_file = fields.Binary('glb模型文件')
+    upload_model_file = fields.Many2many('ir.attachment', 'upload_qf_model_file_attachment_ref', string='上传模型文件')
     delivery_time = fields.Date('交货日期')
     customer_id = fields.Many2one('res.partner', string='客户', default=lambda self: self.env.user.partner_id.id)
-    state = fields.Selection([('草稿', '草稿'), ('待付款', '待付款'), ('待派单', '待派单'),
+    state = fields.Selection([('草稿', '草稿'), ('待派单', '待派单'),
                               ('待接单', '待接单'), ('加工中', '加工中'),
                               ('物流中', '物流中'), ('已交付', '已交付')], string='订单状态', default='草稿',
                              readonly=True)
@@ -82,6 +82,7 @@ class QuickEasyOrder(models.Model):
         obj = super(QuickEasyOrder, self).create(vals)
         self.model_coloring(obj)
         self.distribute_to_factory(obj)
+        obj.state = '待接单'
         return obj
 
     # 将attach的datas内容转为glb文件
diff --git a/sf_sale/views/quick_easy_order_view.xml b/sf_sale/views/quick_easy_order_view.xml
index c140dad7..a5ce9da2 100644
--- a/sf_sale/views/quick_easy_order_view.xml
+++ b/sf_sale/views/quick_easy_order_view.xml
@@ -16,13 +16,16 @@
             <field name="model">quick.easy.order</field>
             <field name="arch" type="xml">
                 <tree string="快速订单">
-                    <field optional="show" name="name" string="订单号"/>
-                    <field optional="show" name="customer_id" string="客户"/>
-                    <field optional="show" name="material_id"/>
-                    <field optional="show" name="material_model_id"/>
-                    <field optional="show" name="parameter_ids"/>
-                    <field optional="show" name="quantity"/>
-                    <field optional="show" name="price"/>
+                    <field name="state" widget="label_selection"
+                           options="{'classes': {'待接单': 'default', '加工中':'primary','物流中':'warning','已交付': 'success'}}"/>
+                    <field name="name" string="订单号"/>
+                    <field name="customer_id" string="客户"/>
+                    <field name="material_id"/>
+                    <field name="material_model_id"/>
+                    <field name="parameter_ids" string="表面工艺参数" widget="many2many_tags"/>
+                    <field name="quantity"/>
+                    <field name="unit_price"/>
+                    <field name="price"/>
                     <field optional="hide" name="delivery_time"/>
                 </tree>
             </field>
@@ -33,6 +36,9 @@
             <field name="model">quick.easy.order</field>
             <field name="arch" type="xml">
                 <form string="快速订单">
+                    <header>
+                        <field name="state" widget="statusbar"/>
+                    </header>
                     <sheet>
                         <h1>
                             <field name="name" readonly="True"/>
@@ -42,7 +48,7 @@
                                 <field name="customer_id" readonly="1" force_save="1"/>
                                 <field name="material_id"/>
                                 <field name="material_model_id"/>
-<!--                                <field name="process_id"/>-->
+                                <!--                                <field name="process_id"/>-->
                                 <field name="parameter_ids" widget="many2many_tags" string="表面工艺参数"/>
                                 <field name="machining_precision"/>
                                 <field name="quantity"/>
@@ -81,7 +87,7 @@
             <field name="arch" type="xml">
                 <search string="快速订单">
                     <field name="name" string="模糊搜索"
-                           filter_domain="['|', ('name', 'ilike', self), '|', ('receive_name', 'ilike', self),'|', ('receive_phone', 'ilike', self),('customer_id', 'ilike', self)]"/>
+                           filter_domain="['|', ('name', 'ilike', self), '|',('customer_id', 'ilike', self)]"/>
                     <separator/>
                     <field name="customer_id"/>
                 </search>

From e64cf88809bea0b22d2ed4ea0bc2733bc6983517 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 30 Aug 2023 16:26:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=8A=A0=E5=B7=A5=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89form=E8=A1=A8=E5=8D=95=E5=B1=95=E7=A4=BA=202.?=
 =?UTF-8?q?=E6=9C=BA=E5=BA=8A=E5=9E=8B=E5=8F=B7=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/base_view.xml   | 13 +++++++------
 sf_base/views/common_view.xml |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index 5c3fd3ad..8c8e1632 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -159,11 +159,11 @@
                                     <field name="feed_speed" required="1"/>
                                     <label for="precision_min" string="X轴定位精度(mm)"/>
                                     <div class="test_model">
-                                        <label for="precision_min" string="最小(min)"/>
+                                        <label for="precision_min" string="最小"/>
                                         <field name="precision_min" class="o_address_zip" required="1"
                                                options="{'format': false}"/>
                                         <span>&amp;nbsp;</span>
-                                        <label for="precision_max" string="最大(max)"/>
+                                        <label for="precision_max" string="最大"/>
                                         <field name="precision_max" class="o_address_zip" required="1"
                                                options="{'format': false}"/>
                                     </div>
@@ -210,27 +210,28 @@
                                     <field name="motor_power" required="1"/>
                                     <label for="distance_min" string="主轴端面-工作台距离(mm)"/>
                                     <div class="test_model">
-                                        <label for="distance_min" string="最小(min)"/>
+                                        <label for="distance_min" string="最小"/>
                                         <field name="distance_min" class="o_address_zip" required="1"
                                                options="{'format': false}"/>
                                         <span>&amp;nbsp;</span>
-                                        <label for="distance_max" string="最大(max)"/>
+                                        <label for="distance_max" string="最大"/>
                                         <field name="distance_max" class="o_address_zip" required="1"
                                                options="{'format': false}"/>
                                     </div>
                                     <field name="guide_rail" required="1"/>
                                 </group>
+                                <group></group>
                                 <group string="刀具">
                                     <field name="knife_type" required="1"/>
                                     <field name="tool_speed" required="1"/>
                                     <field name="tool_long_max" required="1"/>
                                     <label for="tool_diameter_min" string="刀具刀径(mm)"/>
                                     <div class="test_model">
-                                        <label for="tool_diameter_min" string="最小(min)"/>
+                                        <label for="tool_diameter_min" string="最小"/>
                                         <field name="tool_diameter_min" class="o_address_zip" required="1"
                                                options="{'format': false}"/>Φ
                                         <span>&amp;nbsp;</span>
-                                        <label for="tool_diameter_max" string="最大(max)"/>
+                                        <label for="tool_diameter_max" string="最大"/>
                                         <field name="tool_diameter_max" class="o_address_zip" required="1"
                                                options="{'format': false}"/>Φ
                                     </div>
diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index aab5cf1f..f0ff3a07 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -350,7 +350,7 @@
             <field name="name">加工工艺</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.processing.technology</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree</field>
         </record>
 
         <record id="sf_production_process_category" model="ir.actions.act_window">