From 202fafac841e7e1e8c0c4fe3e10c71f89a1839fa Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 16 Dec 2024 17:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=A8=A1=E5=9D=97=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96=E3=80=81=E9=87=87=E8=B4=AD=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=96=B0=E5=A2=9E=E3=80=90=E5=B7=A5=E5=BA=8F=E5=A4=96?=
 =?UTF-8?q?=E5=8D=8F=E3=80=91=E3=80=81=E3=80=90=E5=A4=96=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E3=80=91=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/__manifest__.py                  |  1 +
 sf_sale/models/sale_order.py             | 10 ++++++----
 sf_sale/static/src/css/purchase_list.css |  3 +++
 sf_sale/views/purchase_order_view.xml    |  3 +++
 sf_sale/views/sale_order_view.xml        |  7 +++++++
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 sf_sale/static/src/css/purchase_list.css

diff --git a/sf_sale/__manifest__.py b/sf_sale/__manifest__.py
index 45c95030..0ca6457c 100644
--- a/sf_sale/__manifest__.py
+++ b/sf_sale/__manifest__.py
@@ -26,6 +26,7 @@
     'assets': {
         'web.assets_backend': [
             'sf_sale/static/js/setTableWidth.js',
+            'sf_sale/static/src/css/purchase_list.css',
         ]
     },
     'demo': [
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 11fa0096..a0e321a0 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -55,8 +55,9 @@ class ReSaleOrder(models.Model):
         store=True, readonly=False, copy=False, precompute=True,
         states=READONLY_FIELD_STATES, default=fields.Datetime.now)
 
-    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
-                                        tracking=True)
+    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')],
+                                        default='normal',
+                                        string='时效', tracking=True)
 
     order_code = fields.Char('平台订单号', readonly=True)
 
@@ -278,8 +279,9 @@ class RePurchaseOrder(models.Model):
         compute='_compute_user_id',
         store=True)
 
-    purchase_type = fields.Selection([('standard', '标准采购'), ('consignment', '委外加工')], string='采购类型',
-                                     default='standard')
+    purchase_type = fields.Selection(
+        [('standard', '标准采购'), ('consignment', '委外加工'), ('outsourcing', '工序外协'), ('outside', '外购订单')],
+        string='采购类型', default='standard')
 
     origin_sale_id = fields.Many2one('sale.order', string='销售订单号', compute='_compute_origin_sale_id')
 
diff --git a/sf_sale/static/src/css/purchase_list.css b/sf_sale/static/src/css/purchase_list.css
new file mode 100644
index 00000000..2deacb9c
--- /dev/null
+++ b/sf_sale/static/src/css/purchase_list.css
@@ -0,0 +1,3 @@
+.purchase_order_list_name {
+    min-width: 62px !important;
+}
\ No newline at end of file
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 28890cbd..f70dbb6d 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -235,6 +235,9 @@
                 <xpath expr="//field[@name='name']" position="after">
                     <field name="purchase_type"/>
                 </xpath>
+                <xpath expr="//field[@name='name']" position="attributes">
+                    <attribute name="class">purchase_order_list_name</attribute>
+                </xpath>
             </field>
         </record>
 
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 641e4278..4373689d 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -261,6 +261,10 @@
                     <separator/>
                     <filter string="预警" name="filter_order_warning" domain="[('delivery_warning', '=', 'warning')]"/>
                     <filter string="逾期" name="filter_order_overdue" domain="[('delivery_warning', '=', 'overdue')]"/>
+                    <searchpanel>
+                        <field name="delivery_warning" string="交期状态" icon="fa-filter" enable_counters="1"/>
+                        <field name="state" icon="fa-filter" enable_counters="1"/>
+                    </searchpanel>
                 </xpath>
             </field>
         </record>
@@ -293,6 +297,9 @@
                 <xpath expr="//field[@name='invoice_status']" position="after">
                     <field name="state"/>
                 </xpath>
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="delivery_warning" string="交期状态"/>
+                </xpath>
             </field>
         </record>