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 @@
-
+
-
+
@@ -210,27 +210,28 @@
-
+
-
+
+
-
+
Φ
-
+
Φ
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 @@
加工工艺
ir.actions.act_window
sf.processing.technology
- tree,form
+ tree
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 @@
quick.easy.order
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -33,6 +36,9 @@
quick.easy.order