采购模块界面优化、采购类型新增【工序外协】、【外购订单】选项

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': [

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')
 

sf_sale/static/src/css/purchase_list.css

@@ -0,0 +1,3 @@
+.purchase_order_list_name {
+    min-width: 62px !important;
+}

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>
 

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>