Merge branch 'feature/优化客户' into develop

2023-12-25 11:34:37 +08:00
parent ca2f30fdbd 4c92c08f84
commit e8a0b3da93
16 changed files with 617 additions and 134 deletions
--- a/sf_base/manifest.py
+++ b/sf_base/manifest.py
@@ -10,7 +10,7 @@
    """,
    'category': 'sf',
    'website': 'https://www.sf.jikimo.com',
-    'depends': ['account', 'base', 'mrp_workorder', 'sale', 'purchase', 'sales_team'],
+    'depends': ['base', 'mrp_workorder', 'sale', 'purchase', 'sales_team'],
    'data': [
        'security/group_security.xml',
        'security/ir.model.access.csv',
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -42,11 +42,53 @@
                    </group>
                </page>
                <page name="inventory" position="attributes">
-                    <attribute name="groups">stock.group_stock_user,product.group_stock_packaging</attribute>
+                    <attribute name="groups">
+                        stock.group_stock_user,product.group_stock_packaging,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director
+                    </attribute>
                </page>
            </field>
        </record>

+        <record id="product_template_form_view_procurement_button_inherit_sf" model="ir.ui.view">
+            <field name="name">product.template_procurement.form.inherit.sf</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="stock.product_template_form_view_procurement_button"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@name='action_open_quants']" position="attributes">
+                    <attribute name="groups">
+                        stock.group_stock_user,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director
+                    </attribute>
+                </xpath>
+                <xpath expr="//button[@name='action_product_tmpl_forecast_report']" position="attributes">
+                    <attribute name="groups">
+                        stock.group_stock_user,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director
+                    </attribute>
+                </xpath>
+                <xpath expr="//button[@name='action_view_stock_move_lines']" position="attributes">
+                    <attribute name="groups">
+                        stock.group_stock_user,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director
+                    </attribute>
+                </xpath>
+                <xpath expr="//button[@name='action_view_orderpoints']" position="attributes">
+                    <attribute name="groups">
+                        stock.group_stock_user,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director
+                    </attribute>
+                </xpath>
+
+                <xpath expr="//button[@name='action_view_related_putaway_rules']" position="attributes">
+                    <attribute name="groups">
+                        stock.group_stock_user,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director
+                    </attribute>
+                </xpath>
+
+                <!--                 <xpath expr="//button[@name='action_view_orderpoints']" position="attributes">-->
+                <!--                     <attribute name="groups">-->
+                <!--                        stock.group_stock_user,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director-->
+                <!--                    </attribute>-->
+                <!--                </xpath>-->
+            </field>
+        </record>
+
        <record id="view_mrp_bom_form_inherit_sf" model="ir.ui.view">
            <field name="name">mrp.bom.form.inherit.sf</field>
            <field name="model">mrp.bom</field>
@@ -80,5 +122,6 @@
                </xpath>
            </field>
        </record>
+
    </data>
 </odoo>
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -201,17 +201,18 @@ class StockRule(models.Model):

                sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
                if sale_order:
+                    sale_order.write({'schedule_status': 'to schedule'})
                    self.env['sf.production.plan'].sudo().with_company(company_id). \
                        create({
-                            'name': production.name,
-                            'order_deadline': sale_order.deadline_of_delivery,
-                            'production_id': production.id,
-                            'date_planned_start': production.date_planned_start,
-                            'origin': production.origin,
-                            'product_qty': production.product_qty,
-                            'product_id': production.product_id.id,
-                            'state': 'draft',
-                        })
+                        'name': production.name,
+                        'order_deadline': sale_order.deadline_of_delivery,
+                        'production_id': production.id,
+                        'date_planned_start': production.date_planned_start,
+                        'origin': production.origin,
+                        'product_qty': production.product_qty,
+                        'product_id': production.product_id.id,
+                        'state': 'draft',
+                    })
        return True


--- a/sf_quality/security/ir.model.access.csv
+++ b/sf_quality/security/ir.model.access.csv
@@ -53,8 +53,13 @@ access_product_template_group_equipment_manager,product_template_group_equipment
 access_quality_alert_stage_group_quality,quality_alert_stage_group_quality,quality.model_quality_alert_stage,sf_base.group_quality,1,0,0,0
 access_quality_alert_stage_group_quality_director,quality_alert_stage_group_quality_director,quality.model_quality_alert_stage,sf_base.group_quality_director,1,0,0,0

+access_quality_point_test_type_group_quality,quality_point_test_type_group_quality,quality.model_quality_point_test_type,sf_base.group_quality,1,0,0,0
+access_quality_point_test_type_group_quality_director,quality_point_test_type_group_quality_director,quality.model_quality_point_test_type,sf_base.group_quality_director,1,0,0,0
+
+access_quality_point_test_type_group_quality,quality_point_test_type_group_quality,quality.model_quality_point_test_type,sf_base.group_quality,1,0,0,0
+access_quality_point_test_type_group_quality_director,quality_point_test_type_group_quality_director,quality.model_quality_point_test_type,sf_base.group_quality_director,1,0,0,0
+

-access_quality_alert_stage,quality.alert.stage,quality.model_quality_alert_stage,sf_base.group_plan_dispatch,1,0,0,0



--- a/sf_sale/manifest.py
+++ b/sf_sale/manifest.py
@@ -10,13 +10,15 @@
    """,
    'category': 'sf',
    'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale', 'sale_management', 'web_widget_model_viewer', 'sf_base'],
+    'depends': ['sale', 'sale_management', 'web_widget_model_viewer', 'sf_base', 'account', 'purchase'],
    'data': [
        'security/group_security.xml',
        'security/ir.model.access.csv',
        'wizard/sale_order_wizard_views.xml',
+        'wizard/purchase_order_wizard_views.xml',
        'views/sale_team.xml',
        'views/sale_order_view.xml',
+        'views/res_partner_view.xml',
        'views/purchase_order_view.xml',
        'views/quick_easy_order_view.xml'
    ],
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -1,7 +1,7 @@
 import datetime
 import base64
-from odoo import models, fields, api
-from odoo.osv import expression
+from odoo import models, fields, api, _
+from odoo.exceptions import UserError


 class ReSaleOrder(models.Model):
@@ -13,14 +13,18 @@ class ReSaleOrder(models.Model):
    address_of_delivery = fields.Char('交货人地址')
    payments_way = fields.Selection([('现结', '现结'), ('月结', '月结')], '结算方式', default='现结', tracking=True)
    pay_way = fields.Selection([('转账', '转账'), ('微信', '微信'), ('支付宝', '支付宝')], '支付方式')
-    check_status = fields.Selection([('unchecked', '未审核'), ('checked', '已审核')], '审核状态', default='unchecked')
-
+    check_status = fields.Selection([('pending', '待审核'), ('approved', '已审核'), ('fail', '不通过')], '审核状态')
+    schedule_status = fields.Selection(
+        [('to schedule', '待排程'), ('to process', '待加工'), ('to deliver', '待发货'), ('to receive', '待收货'),
+         ('received', '已收货')],
+        '进度状态')
    payment_term_id = fields.Many2one(
        comodel_name='account.payment.term',
        string="交付条件",
        compute='_compute_payment_term_id',
        store=True, readonly=False, precompute=True, check_company=True, tracking=True,
        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]")
+    remark = fields.Text('备注')

    # 业务平台分配工厂后在智能工厂先创建销售订单
    def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
@@ -32,7 +36,7 @@ class ReSaleOrder(models.Model):
            'date_order': now_time,
            'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time),
            'partner_id': partner.id,
-            'check_status': 'checked',
+            'check_status': 'approved',
            'state': 'draft',
            'person_of_delivery': delivery_name,
            'telephone_of_delivery': delivery_telephone,
@@ -43,9 +47,16 @@ class ReSaleOrder(models.Model):
        })
        return order_id

-    # 审核
-    def action_check(self):
-        self.check_status = 'checked'
+    def write(self, vals):
+        if self.env.user.has_group('sf_base.group_sale_director'):
+            if vals.get('check_status'):
+                if vals['check_status'] in ('pending', False):
+                    vals['check_status'] = 'approved'
+        return super().write(vals)
+
+    # 提交
+    def submit(self):
+        self.check_status = 'pending'

    def get_customer(self):
        customer = self.env['res.partner'].search([('name', '=', '业务平台')])
@@ -80,18 +91,103 @@ class ResaleOrderLine(models.Model):
 class RePurchaseOrder(models.Model):
    _inherit = 'purchase.order'

-    check_status = fields.Selection([('unchecked', '未审核'), ('checked', '已审核')], '审核状态', default='unchecked')
+    check_status = fields.Selection([('pending', '待审核'), ('approved', '已审核'), ('fail', '不通过')], '审核状态')
+    remark = fields.Text('备注')
+
+    def write(self, vals):
+        if self.env.user.has_group('sf_base.group_purchase_director'):
+            if vals.get('check_status'):
+                if vals['check_status'] in ('pending', False):
+                    vals['check_status'] = 'approved'
+        return super().write(vals)
+
+    # @api.model_create_multi
+    # def create(self, vals_list):
+    #     # res = super().create(vals_list)
+    #     if self.env.user.has_group('sf_base.group_purchase'):
+    #         view = self.env.ref('sf_sale.action_purchase_order_submit_wizard')
+    #         return {
+    #             'name': _('确认?'),
+    #             'type': 'ir.actions.act_window',
+    #             'view_mode': 'form',
+    #             'res_model': 'purchase.order.wizard',
+    #             'views': [(view.id, 'form')],
+    #             'view_id': view.id,
+    #             'target': 'new',
+    #             'context': dict(self.env.context),
+    #         }
+    #     res = super().create(vals_list)
+    #     return res


 class ResPartnerToSale(models.Model):
    _inherit = 'res.partner'

+    purchase_user_id = fields.Many2one('res.users', '采购员')
+
+    @api.constrains('name')
+    def _check_name(self):
+        obj = self.sudo().search([('name', '=', self.name), ('id', '!=', self.id)])
+        if obj:
+            raise UserError('该名称已存在,请重新输入')
+
+    @api.constrains('vat')
+    def _check_vat(self):
+        obj = self.sudo().search([('vat', '=', self.vat), ('id', '!=', self.id)])
+        if obj:
+            raise UserError('该税ID已存在,请重新输入')
+
+    @api.constrains('email')
+    def _check_email(self):
+        if self.customer_rank > 0:
+            obj = self.sudo().search([('email', '=', self.email), ('id', '!=', self.id)])
+            if obj:
+                raise UserError('该邮箱已存在,请重新输入')
+
    @api.model
    def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None):
        if self._context.get('is_customer'):
            if self.env.user.has_group('sf_base.group_sale_director'):
-                domain = [('customer_rank', '=', 1)]
-            else:
-                domain = [('user_id', '=', self.env.user.id)]
+                domain = [('customer_rank', '>', 0)]
+            elif self.env.user.has_group('sf_base.group_sale_salemanager'):
+                customer = self.env['res.partner'].search(
+                    [('customer_rank', '>', 0), ('user_id', '=', self.env.user.id)])
+                if customer:
+                    ids = [t.id for t in customer]
+                    domain = [('id', 'in', ids)]
+            return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
+        return super()._name_search(name, args, operator, limit, name_get_uid)
+
+    @api.onchange('user_id')
+    def _get_salesman(self):
+        if self.customer_rank > 0:
+            self.user_id = self.env.user.id
+
+    @api.onchange('purchase_user_id')
+    def _get_purchaseman(self):
+        if self.supplier_rank > 0:
+            self.purchase_user_id = self.env.user.id
+
+
+class ResUserToSale(models.Model):
+    _inherit = 'res.users'
+
+    @api.model
+    def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None):
+        if self._context.get('is_sale'):
+            if self.env.user.has_group('sf_base.group_sale_director'):
+                domain = []
+            elif self.env.user.has_group('sf_base.group_sale_salemanager'):
+                domain = [('id', '=', self.env.user.id)]
+            return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
+        elif self._context.get('supplier_rank'):
+            if self.env.user.has_group('sf_base.group_purchase_director'):
+                domain = [('supplier_rank', '>', 0)]
+            elif self.env.user.has_group('sf_base.group_purchase'):
+                supplier = self.env['res.partner'].search(
+                    [('supplier_rank', '>', 0), ('purchase_user_id', '=', self.env.user.id)])
+                if supplier:
+                    ids = [t.id for t in supplier]
+                    domain = [('id', 'in', ids)]
            return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
        return super()._name_search(name, args, operator, limit, name_get_uid)
--- a/sf_sale/security/group_security.xml
+++ b/sf_sale/security/group_security.xml
@@ -11,7 +11,7 @@
        </record>

        <record model="ir.rule" id="crm_team_rule_director">
-            <field name="name">销售总监查看所有的订单</field>
+            <field name="name">销售总监查看所有团队</field>
            <field name="model_id" ref="sales_team.model_crm_team"/>
            <field name="domain_force">[(1,'=',1)]</field>
            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>
@@ -23,7 +23,7 @@
        <record model="ir.rule" id="sale_customer_rule_director">
            <field name="name">销售总监查看所有客户</field>
            <field name="model_id" ref="base.model_res_partner"/>
-            <field name="domain_force">[(1,'=',1),('customer_rank','=',1)]</field>
+            <field name="domain_force">[(1,'=',1),('customer_rank','>',0)]</field>
            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>
            <field name="perm_read" eval="1"/>
            <field name="perm_write" eval="1"/>
@@ -32,7 +32,8 @@
        <record model="ir.rule" id="sale_customer_rule_my">
            <field name="name">销售经理查看自己的客户</field>
            <field name="model_id" ref="base.model_res_partner"/>
-            <field name="domain_force">['|',('user_id','=',user.id),('create_uid', '=',user.id)]</field>
+            <field name="domain_force">[('user_id','=',user.id),('customer_rank','>',0)]
+            </field>
            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>
            <field name="perm_read" eval="1"/>
            <field name="perm_write" eval="1"/>
@@ -40,11 +41,11 @@
        </record>


-        <record model="ir.rule" id="sale_order_rule_salemanager">
-            <field name="name">销售经理查看自己的订单</field>
+        <record model="ir.rule" id="sale_order_rule_director">
+            <field name="name">销售总监查看所有订单</field>
            <field name="model_id" ref="model_sale_order"/>
-            <field name="domain_force">[('user_id', '=',user.id)]</field>
-            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>
+            <field name="domain_force">[(1,'=',1)]</field>
+            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>
            <field name="perm_read" eval="1"/>
            <field name="perm_write" eval="1"/>
            <field name="perm_create" eval="1"/>
@@ -65,7 +66,7 @@
            <field name="domain_force">['|',('user_id','=',user.id),('create_uid', '=',user.id)]</field>
            <field name="groups" eval="[(4, ref('sf_base.group_purchase'))]"/>
            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
+            <field name="perm_write" eval="0"/>
            <field name="perm_create" eval="1"/>
        </record>

@@ -73,7 +74,7 @@
        <record model="ir.rule" id="purchase_supplier_rule_director">
            <field name="name">采购总监查看所有供应商</field>
            <field name="model_id" ref="base.model_res_partner"/>
-            <field name="domain_force">[(1,'=',1)]</field>
+            <field name="domain_force">[(1,'=',1),('supplier_rank','>', 0)]</field>
            <field name="groups" eval="[(4, ref('sf_base.group_purchase_director'))]"/>
            <field name="perm_read" eval="1"/>
            <field name="perm_write" eval="1"/>
@@ -82,7 +83,7 @@
        <record model="ir.rule" id="purchase_supplier_rule_my">
            <field name="name">采购岗查看自己的供应商</field>
            <field name="model_id" ref="base.model_res_partner"/>
-            <field name="domain_force">['|',('user_id','=',user.id),('create_uid', '=',user.id)]</field>
+            <field name="domain_force">[('user_id','=',user.id),('supplier_rank','>', 0)]</field>
            <field name="groups" eval="[(4, ref('sf_base.group_purchase'))]"/>
            <field name="perm_read" eval="1"/>
            <field name="perm_write" eval="1"/>
--- a/sf_sale/security/ir.model.access.csv
+++ b/sf_sale/security/ir.model.access.csv
@@ -38,13 +38,36 @@ access_uom_category_group_purchase_director,uom_category_group_purchase_director
 access_sale_order_check_wizard_group_sale_salemanager,sale_order_check_wizard_group_sale_salemanager,model_sale_order_check_wizard,sf_base.group_sale_salemanager,1,1,1,0
 access_sale_order_check_wizard_group_sale_director,sale_order_check_wizard_group_sale_director,model_sale_order_check_wizard,sf_base.group_sale_director,1,1,1,0

+access_account_move_line_group_purchase,account_move_line_group_purchase,account.model_account_move_line,sf_base.group_purchase,1,1,1,0
+access_account_move_line_group_purchase_director,account_move_line_group_purchase_director,account.model_account_move_line,sf_base.group_purchase_director,1,1,1,0
+
+access_res_users_group_purchase,res_user_group_purchase,model_res_users,sf_base.group_purchase,1,1,1,0
+access_res_users_group_purchase_director,res_users_group_purchase_director,model_res_users,sf_base.group_purchase_director,1,1,1,0
+access_res_users_group_sale_salemanager,res_users_group_sale_salemanager,model_res_users,sf_base.group_sale_salemanager,1,0,0,0
+access_res_users_group_sale_director,res_users_group_sale_director,model_res_users,sf_base.group_sale_director,1,1,1,0
+
+access_mrp_bom_byproduct_group_purchase,mrp_bom_byproduct_group_purchase,mrp.model_mrp_bom_byproduct,sf_base.group_purchase,1,1,1,0
+access_mrp_bom_byproduct_group_purchase_director,mrp_bom_byproduct_group_purchase_director,mrp.model_mrp_bom_byproduct,sf_base.group_purchase_director,1,1,1,0
+access_mrp_bom_byproduct_group_sale_salemanager,mrp_bom_byproduct_group_sale_salemanager,mrp.model_mrp_bom_byproduct,sf_base.group_sale_salemanager,1,0,0,0
+access_mrp_bom_byproduct_group_sale_director,mrp_bom_byproduct_group_sale_director,mrp.model_mrp_bom_byproduct,sf_base.group_sale_director,1,1,1,0
+
+access_purchase_order_group_purchase,purchase_order_group_purchase,purchase.model_purchase_order,sf_base.group_purchase,1,1,1,0
+access_purchase_order_group_purchase_director,purchase_order_group_purchase_director,purchase.model_purchase_order,sf_base.group_purchase_director,1,1,1,0
+
+access_purchase_order_line_group_purchase,purchase_order_line_group_purchase,purchase_stock.model_purchase_order_line,sf_base.group_purchase,1,1,1,0
+access_purchase_order_line_group_purchase_director,purchase_order_line_group_purchase_director,purchase_stock.model_purchase_order_line,sf_base.group_purchase_director,1,1,1,0
+access_purchase_order_line_group_sale_salemanager,purchase_order_line_group_sale_salemanager,purchase_stock.model_purchase_order_line,sf_base.group_sale_salemanager,1,0,0,0
+access_purchase_order_line_group_sale_director,purchase_order_line_group_sale_director,purchase_stock.model_purchase_order_line,sf_base.group_sale_director,1,1,1,0
+
+access_purchase_order_wizard_group_purchase,purchase_order_wizard_group_purchase,model_purchase_order_wizard,sf_base.group_purchase,1,1,1,0
+access_purchase_order_wizard_group_purchase_director,purchase_order_wizard_group_purchase_director,model_purchase_order_wizard,sf_base.group_purchase_director,1,1,1,0
+
+





-
-access_sale_order,sale_order,model_sale_order,sf_base.group_plan_dispatch,1,0,0,0



--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -6,62 +6,136 @@
            <field name="model">purchase.order</field>
            <field name="inherit_id" ref="purchase.purchase_order_form"/>
            <field name="arch" type="xml">
-<!--                <xpath expr="//form/header/button[@name='button_confirm[1]']" position="after">-->
-<!--                    <field name="check_status" invisible="1"/>-->
-<!--                    <button name="action_check" string="审核" type="object"-->
-<!--                            attrs="{'invisible': [('check_status','=', 'checked')]}"-->
-<!--                            class="oe_highlight"/>-->
-<!--                </xpath>-->
-<!--                <xpath expr="//form/header/button[@name='button_confirm'][2]" position="attributes">-->
-<!--                    <attribute name="attrs">{'invisible': [('check_status', '=', 'unchecked'),('state', 'in',-->
-<!--                        ['draft'])]}-->
-<!--                    </attribute>-->
-<!--                </xpath>-->
-<!--                <xpath expr="//form/header/button[@name='button_confirm[2]']" position="after">-->
-<!--                    <field name="check_status" invisible="1"/>-->
-<!--                    <button name="action_check" string="审核" type="object"-->
-<!--                            attrs="{'invisible': [('check_status','=', 'checked')]}"-->
-<!--                            class="oe_highlight"/>-->
-<!--                </xpath>-->
-<!--                <xpath expr="//form/header/button[@name='action_rfq_send[1]']" position="attributes">-->
-<!--                    <attribute name="groups">sf_base.group_purchase</attribute>-->
-<!--                </xpath>-->
-<!--                <xpath expr="//form/header/button[@name='action_rfq_send[2]']" position="attributes">-->
-<!--                    <attribute name="groups">sf_base.group_purchase</attribute>-->
-<!--                </xpath>-->
-<!--                <xpath expr="//form/header/button[@name='print_quotation[1]']" position="attributes">-->
-<!--                    <attribute name="groups">sf_base.group_purchase</attribute>-->
-<!--                </xpath>-->
-<!--                <xpath expr="//form/header/button[@name='print_quotation[2]']" position="attributes">-->
-<!--                    <attribute name="groups">sf_base.group_purchase</attribute>-->
-<!--                </xpath>-->
-                <xpath expr="//form/header/button[@name='button_approve']" position="attributes">
-                    <attribute name="groups">sf_base.group_purchase</attribute>
+                <field name="currency_id" position="after">
+                    <field name="check_status" invisible="1"/>
+                    <!--                    <field name="state"/>-->
+                    <field name="remark"/>
+                </field>
+                <xpath expr="//form/header/button[@name='action_rfq_send'][1]" position="after">
+                    <button name="sf_sale.action_purchase_order_check_wizard" string="审核" type="action"
+                            context="{'default_order_id':active_id}" groups="sf_base.group_purchase_director"
+                            attrs="{'invisible': ['&amp;',('check_status','in', ['approved']),('state', 'in', ['draft','send','purchase'])]}"
+                            class="oe_highlight"/>
+                </xpath>
+                <xpath expr="//form/header/button[@name='button_confirm'][2]" position="replace">
+                    <button name="button_confirm" type="object" context="{'validate_analytic': True}"
+                            string="确认订单" id="draft_confirm"
+                            attrs="{'invisible': ['|','&amp;',('check_status','in', ['approved','fail']),('state', 'in', ['draft','purchase']),('check_status','=',False ),('state', 'in', ['purchase'])]}"
+                    />
                </xpath>

-<!--                <xpath expr="//form/header/button[@name='action_create_invoice[1]']" position="attributes">-->
-<!--                    <attribute name="groups">sf_base.group_purchase</attribute>-->
-<!--                </xpath>-->
-<!--                <xpath expr="//form/header/button[@name='action_create_invoice[2]']" position="attributes">-->
-<!--                    <attribute name="groups">sf_base.group_purchase</attribute>-->
-<!--                </xpath>-->
+                <!--                <xpath expr="//form/header/button[@name='action_rfq_send[1]']" position="attributes">-->
+                <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
+                <!--                </xpath>-->
+                <!--                <xpath expr="//form/header/button[@name='action_rfq_send[2]']" position="attributes">-->
+                <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
+                <!--                </xpath>-->
+                <!--                <xpath expr="//form/header/button[@name='print_quotation[1]']" position="attributes">-->
+                <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
+                <!--                </xpath>-->
+                <!--                <xpath expr="//form/header/button[@name='print_quotation[2]']" position="attributes">-->
+                <!--                    <attribute name="groups">sf_base.group_purchase</attribute>-->
+                <!--                </xpath>-->
+                <xpath expr="//form/header/button[@name='button_approve']" position="attributes">
+                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
+                </xpath>
+
+                <!--                <xpath expr="//form/header/button[@name='action_create_invoice[1]']" position="attributes">-->
+                <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
+                <!--                </xpath>-->
+                <!--                <xpath expr="//form/header/button[@name='action_create_invoice[2]']" position="attributes">-->
+                <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
+                <!--                </xpath>-->
                <xpath expr="//form/header/button[@name='confirm_reminder_mail']" position="attributes">
-                    <attribute name="groups">sf_base.group_purchase</attribute>
+                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
                </xpath>

                <xpath expr="//form/header/button[@name='button_draft']" position="attributes">
-                    <attribute name="groups">sf_base.group_purchase</attribute>
+                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
                </xpath>
                <xpath expr="//form/header/button[@name='button_cancel']" position="attributes">
-                    <attribute name="groups">sf_base.group_purchase</attribute>
+                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
                </xpath>

                <xpath expr="//form/header/button[@name='button_unlock']" position="attributes">
-                    <attribute name="groups">sf_base.group_purchase</attribute>
+                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
                </xpath>
                <xpath expr="//form/header/button[@name='button_done']" position="attributes">
-                    <attribute name="groups">sf_base.group_purchase</attribute>
+                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
                </xpath>
+                <xpath expr="//field[@name='order_line']" position="attributes">
+                    <attribute name="attrs">{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
+                        ['approved'])]}
+                    </attribute>
+                </xpath>
+                <field name="partner_ref" position="attributes">
+                    <attribute name="attrs">{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
+                        ['approved'])]}
+                    </attribute>
+                </field>
+                <field name="date_planned" position="attributes">
+                    <attribute name="attrs">{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
+                        ['approved'])]}
+                    </attribute>
+                </field>
+                <field name="receipt_reminder_email" position="attributes">
+                    <attribute name="attrs">{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
+                        ['approved'])]}
+                    </attribute>
+                </field>
+                <field name="user_id" position="attributes">
+                    <attribute name="attrs">{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
+                        ['approved'])]}
+                    </attribute>
+                </field>
+                <field name="origin" position="attributes">
+                    <attribute name="attrs">{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
+                        ['approved'])]}
+                    </attribute>
+                </field>
+                <field name="payment_term_id" position="attributes">
+                    <attribute name="attrs">{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
+                        ['approved'])]}
+                    </attribute>
+                </field>
+                <field name="fiscal_position_id" position="attributes">
+                    <attribute name="attrs">{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
+                        ['approved'])]}
+                    </attribute>
+                </field>
+            </field>
+        </record>
+
+
+        <record id="purchase_stock_order_view_form_inherit_sf" model="ir.ui.view">
+            <field name="name">purchase.stock.order.form.inherit.sf</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase_stock.purchase_order_view_form_inherit"/>
+            <field name="arch" type="xml">
+                <field name="incoterm_id" position="attributes">
+                    <attribute name="attrs">{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
+                        ['approved'])]}
+                    </attribute>
+                </field>
+                <field name="incoterm_location" position="attributes">
+                    <attribute name="attrs">{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
+                        ['approved'])]}
+                    </attribute>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_purchase_order_kpis_tree_inherit_sf" model="ir.ui.view">
+            <field name="name">purchase.order.tree.inherit.sf</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_kpis_tree"/>
+            <field name="arch" type="xml">
+                <field name="state" position="after">
+                    <field name="check_status" widget="badge"
+                           decoration-success="check_status == 'approved'"
+                           decoration-warning="check_status == 'pending'"
+                           decoration-danger="check_status == 'fail'"/>
+                </field>
            </field>
        </record>
    </data>
--- a/sf_sale/views/res_partner_view.xml
+++ b/sf_sale/views/res_partner_view.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record model="ir.ui.view" id="view_partner_form_inherit_sf">
+            <field name="name">res.partner.form.inherit.sf</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <field name="vat" position="after">
+                    <field name="customer_rank" invisible="1"/>
+                    <field name="supplier_rank" invisible="1"/>
+                </field>
+                <field name="vat" position="attributes">
+                    <attribute name="required">1</attribute>
+                </field>
+                <field name="email" position="replace">
+                    <field name="email" attrs="{'required' : [('customer_rank','>', 0)]}"/>
+                </field>
+                <field name="mobile" position="attributes">
+                    <attribute name="attrs">{'required': [('phone', '=', False)]}
+                    </attribute>
+                </field>
+                <field name="phone" position="attributes">
+                    <attribute name="attrs">{'required': [('mobile', '=', False)]}
+                    </attribute>
+                </field>
+                <field name="street" position="attributes">
+                    <attribute name="attrs">{'required': [('supplier_rank','>', 0)]}
+                    </attribute>
+                </field>
+                <field name="street2" position="attributes">
+                    <attribute name="attrs">{'required': [('supplier_rank','>', 0)]}
+                    </attribute>
+                </field>
+                <field name="city" position="attributes">
+                    <attribute name="attrs">{'required': [('supplier_rank','>', 0)]}
+                    </attribute>
+                </field>
+                <field name="country_id" position="attributes">
+                    <attribute name="attrs">{'required': [('supplier_rank','>', 0)]}
+                    </attribute>
+                </field>
+                <xpath expr="//group[@name='sale']/field[@name='user_id']" position="replace">
+                    <field name="user_id" widget="many2one_avatar_user" context="{'is_sale': True }"
+                           attrs="{'required' : [('customer_rank','>', 0)],'readonly': [('supplier_rank','>', 0)]}"/>
+                </xpath>
+                <field name="category_id" position="attributes">
+                    <attribute name="required">1</attribute>
+                    <!--                    <attribute name="attrs">{'required': ['|',('customer_rank','>', 0),('supplier_rank','>', 0)]}</attribute>-->
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_partner_property_form_inherit_sf">
+            <field name="name">res.partner.property.form.inherit.sf</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="account.view_partner_property_form"/>
+            <field name="arch" type="xml">
+                <field name="property_supplier_payment_term_id" position="before">
+                    <field name="purchase_user_id" context="{'supplier_rank': supplier_rank }"
+                           widget="many2one_avatar_user"
+                           attrs="{'required' : [('supplier_rank','>', 0)],'readonly': [('customer_rank','>', 0)]}"/>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_partner_property_form_inherit_sf">
+            <field name="name">res.partner.property.form.inherit.sf</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_tree"/>
+            <field name="arch" type="xml">
+                <field name="function" position="before">
+                    <field name="customer_rank" invisible="1"/>
+                    <field name="supplier_rank" invisible="1"/>
+                </field>
+                <field name="user_id" position="attributes">
+                    <attribute name="attrs">{'invisible': [('customer_rank','=', 0)]}
+                    </attribute>
+                </field>
+                <field name="user_id" position="before">
+                    <field name="purchase_user_id" widget="many2one_avatar_user"
+                           attrs="{'invisible' : [('supplier_rank','=', 0)]}"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</odoo>
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -1,65 +1,117 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
    <data>
-
-        <!--        <record id="sale_order_view_search_inherit_quotation_inherit_sf" model="ir.ui.view">-->
-        <!--            <field name="name">sale.order.search.quotation.inherit.sf</field>-->
-        <!--            <field name="model">sale.order</field>-->
-        <!--            &lt;!&ndash;            <field name="inherit_id" ref="sale.view_sales_order_filter"/>&ndash;&gt;-->
-
-        <!--            <field name="inherit_id" ref="sale.sale_order_view_search_inherit_quotation"/>-->
-        <!--            <field name="arch" type="xml">-->
-        <!--                <xpath expr="//filter[@name='my_sale_orders_filter']" position="replace">-->
-        <!--                    &lt;!&ndash;                    <field name="campaign_id"/>&ndash;&gt;-->
-        <!--                    &lt;!&ndash;                    <separator/>&ndash;&gt;-->
-        <!--                    &lt;!&ndash;                    <filter string="Quotations" name="draft" domain="[('state','in',('draft', 'sent'))]"/>&ndash;&gt;-->
-        <!--                    &lt;!&ndash;                    <filter string="Sales Orders" name="sales" domain="[('state','in',('sale','done'))]"/>&ndash;&gt;-->
-        <!--                    &lt;!&ndash;                    <separator/>&ndash;&gt;-->
-        <!--                    <filter string="Create Date" name="filter_create_date" date="create_date"/>-->
-        <!--                </xpath>-->
-        <!--            </field>-->
-        <!--        </record>-->
-
-
        <record model="ir.ui.view" id="view_sale_order_form_inherit_sf">
            <field name="name">sale.order.form.inherit.sf</field>
            <field name="model">sale.order</field>
            <field name="inherit_id" ref="sale.view_order_form"/>
            <field name="arch" type="xml">
+                <xpath expr="//form/header/button[@name='action_quotation_send'][1]" position="replace">
+                    <button name="action_quotation_send" string="通过EMAIL发送" type="object"
+                            class="btn-primary" data-hotkey="g" context="{'validate_analytic': True}"
+                            attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel'])]}"/>
+                </xpath>
                <xpath expr="//form/header/button[@name='action_confirm']" position="after">
-                    <field name="check_status" invisible="1"/>
-                    <button name="sf_sale.action_sale_order_check_wizard" string="审核" type="action"
+                    <button name="submit" string="提交" type="object"
                            context="{'default_order_id':active_id}"
-                            attrs="{'invisible': [('check_status','=', 'checked')]}"
+                            attrs="{'invisible': [('check_status','!=', False)]}"
                            class="oe_highlight"/>
                </xpath>
-                <xpath expr="//form/header/button[@name='action_confirm'][1]" position="attributes">
-                    <attribute name="attrs">{'invisible': [('check_status', '=', 'unchecked'),('state', 'not in',
-                        ['sent'])]}
+                <xpath expr="//form/header/button[@name='action_confirm']" position="after">
+                    <field name="check_status" invisible="1"/>
+                    <field name="schedule_status" invisible="1"/>
+                    <button name="sf_sale.action_sale_order_check_wizard" string="审核" type="action"
+                            context="{'default_order_id':active_id}" groups="sf_base.group_sale_director"
+                            attrs="{'invisible': ['|',('check_status','in', ['approved',False]),('state', 'in', ['cancel'])]}"
+                            class="oe_highlight"/>
+                </xpath>
+                <!--                <xpath expr="//form/header/button[@name='action_confirm'][1]" position="attributes">-->
+                <!--                    <attribute name="attrs">{'invisible': [('check_status', '!=', 'approved'),('state', 'not in',-->
+                <!--                        ['sent'])]}-->
+                <!--                    </attribute>-->
+                <!--                </xpath>-->
+                <xpath expr="//form/header/button[@name='action_confirm'][2]" position="replace">
+                    <button name="action_confirm" data-hotkey="v"
+                            string="确认" type="object" context="{'validate_analytic': True}"
+                            attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel'])]}"/>
+                </xpath>
+                <xpath expr="//form/header/button[@name='action_cancel']" position="attributes">
+                    <attribute name="attrs">{'invisible': ['|',('check_status', '!=', 'approved'),('schedule_status',
+                        'not in', ['to schedule',False])]}
                    </attribute>
                </xpath>
-                <xpath expr="//form/header/button[@name='action_confirm'][2]" position="attributes">
-                    <attribute name="attrs">{'invisible': [('check_status', '=', 'unchecked'),('state', 'in',
-                        ['draft'])]}
-                    </attribute>
+                <xpath expr="//form/header/button[@name='action_draft']" position="attributes">
+                    <attribute name="invisible">1</attribute>
                </xpath>
+                <!--                <xpath expr="//form/header/button[@name='action_draft']" position="replace">-->
+                <!--                    <button name="action_draft" states="cancel" type="object" string="设为报价" data-hotkey="w"-->
+                <!--                            invisible="1"/>-->
+                <!--                </xpath>-->
                <field name="partner_id" position="replace">
                    <field name="partner_id" widget="res_partner_many2one" context="{'is_customer': True }"
                           options='{"always_reload": True}'/>
                </field>
+                <field name="payment_term_id" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
                <field name="payment_term_id" position="after">
-                    <field name="deadline_of_delivery"/>
-                    <field name="payments_way"/>
-                    <field name="pay_way"/>
+                    <field name="deadline_of_delivery" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
+                    <field name="payments_way" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
+                    <field name="pay_way" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
+                    <field name="schedule_status" readonly="1"
+                           attrs="{'invisible': [('state', 'in', ('sale','cancel'))]}"/>
                </field>
                <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="before">
                    <field name="model_glb_file" widget="Viewer3D" optional="show"
                           string="模型文件"/>
                </xpath>
+                <xpath expr="//field[@name='order_line']" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </xpath>
                <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="replace">
                    <field name="name" widget="section_and_note_text" optional="show"
                           string="参数说明(长/宽/高/体积/精度/材质)"/>
                </xpath>
+                <field name="user_id" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+                <field name="team_id" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+                <field name="fiscal_position_id" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+                <field name="client_order_ref" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+
+                <field name="tag_ids" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+                <field name="commitment_date" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+                <field name="origin" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+                <field name="campaign_id" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+                <field name="medium_id" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+                <field name="source_id" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+                <field name="signed_by" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+                <field name="signed_on" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
+                <field name="signature" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
+                </field>
            </field>
        </record>

@@ -73,16 +125,13 @@
                    <attribute name="string">下单日期</attribute>
                </field>
                <field name="sale_order_template_id" position="after">
-                    <!--                    <label for="person_of_delivery" string="交货信息"/>-->
-                    <!--                    <div>-->
-                    <field name="person_of_delivery" string="交货人"/>
-                    <!--                        <span>&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;-->
-                    <!--                        </span>-->
-                    <field name="telephone_of_delivery" string="交货人联系方式"/>
-                    <!--                        <span>&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;-->
-                    <!--                        </span>-->
-                    <field name="address_of_delivery" string="交货人地址"/>
-                    <!--                    </div>-->
+                    <field name="person_of_delivery" string="交货人"
+                           attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
+                    <field name="telephone_of_delivery" string="交货人联系方式"
+                           attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
+                    <field name="address_of_delivery" string="交货人地址"
+                           attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
+                    <field name="remark" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
                </field>
            </field>
        </record>
@@ -102,8 +151,10 @@
                    <attribute name="string">下单时间</attribute>
                </field>
                <field name="state" position="after">
-                    <field name="check_status" widget="label_selection"
-                           options="{'classes': {'unchecked':'warning','checked': 'success'}}"/>
+                    <field name="check_status" widget="badge"
+                           decoration-success="check_status == 'approved'"
+                           decoration-warning="check_status == 'pending'"
+                           decoration-danger="check_status == 'fail'"/>
                </field>
            </field>
        </record>
@@ -113,9 +164,20 @@
            <field name="model">sale.order</field>
            <field name="inherit_id" ref="sale.view_order_tree"/>
            <field name="arch" type="xml">
+                <tree position="attributes">
+                    <attribute name="create">False</attribute>
+                </tree>
                <field name="name" position="attributes">
                    <attribute name="string">订单号</attribute>
                </field>
+                <field name="amount_total" position="after">
+                    <field name="schedule_status" widget="badge"
+                           decoration-success="schedule_status == 'received'"
+                           decoration-warning="schedule_status == 'to process'"
+                           decoration-danger="schedule_status == 'to receive'"
+                           decoration-muted="schedule_status == 'to process'"
+                           decoration-info="schedule_status == 'to schedule'"/>
+                </field>
            </field>
        </record>

--- a/sf_sale/wizard/init.py
+++ b/sf_sale/wizard/init.py
@@ -1 +1,2 @@
 from . import sale_order_wizard
+from . import purchase_order_wizard
--- a/sf_sale/wizard/purchase_order_wizard.py
+++ b/sf_sale/wizard/purchase_order_wizard.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from odoo import models, api, fields
+from odoo.exceptions import UserError
+
+
+class PurchaseOrderWizard(models.TransientModel):
+    _name = 'purchase.order.wizard'
+    _description = '采购向导'
+
+    order_id = fields.Many2one('purchase.order')
+    # check_state = fields.Selection([('pass', '通过'), ('back', '退回')], '处理意见', default='pass')
+    check_audit = fields.Text('审核意见')
+
+    def submit(self):
+        self.order_id.check_status = 'approved'
+        self.order_id.remark = self.check_audit
+
+    def back(self):
+        if not self.check_audit:
+            raise UserError('请输入原因')
+        else:
+            self.order_id.write({'check_status': 'fail', 'remark': self.check_audit})
+
+    def confirm(self):
+        self.order_id.check_status = 'pending'
--- a/sf_sale/wizard/purchase_order_wizard_views.xml
+++ b/sf_sale/wizard/purchase_order_wizard_views.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record model="ir.ui.view" id="purchase_order_check_wizard_form_view">
+        <field name="name">purchase.order.check.wizard.form.view</field>
+        <field name="model">purchase.order.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <field name="order_id" invisible="True"/>
+                <group>
+                    <!--                    <field name="check_state" widget="radio" options="{'horizontal': true}" required="True" string=""/>-->
+                    <field name="check_audit" placeholder="原因.." nolabel="1" colspan="2"/>
+                </group>
+                <footer>
+                    <button string="通过" name="submit" type="object" class="oe_highlight"/>
+                    <button string="退回" name="back" type="object" class="btn btn-secondary"/>
+                    <!--                    <button string="提交" name="submit" type="object" class="oe_highlight"/>-->
+                    <!--                    <button string="取消" class="btn btn-secondary" special="cancel"/>-->
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_purchase_order_check_wizard" model="ir.actions.act_window">
+        <field name="name">审核</field>
+        <field name="res_model">purchase.order.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
+    <record model="ir.ui.view" id="purchase_order_submit_wizard_form_view">
+        <field name="name">purchase.order.submit.wizard.form.view</field>
+        <field name="model">purchase.order.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <field name="order_id" invisible="True"/>
+                <div>
+                    提交后不可更改,是否确定提交？
+                </div>
+                <footer>
+                    <button string="确认" name="confirm" type="object" class="oe_highlight"/>
+                    <button string="取消" class="btn btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+      <record id="action_purchase_order_submit_wizard" model="ir.actions.act_window">
+        <field name="name">提交</field>
+        <field name="res_model">purchase.order.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
+</odoo>
--- a/sf_sale/wizard/sale_order_wizard.py
+++ b/sf_sale/wizard/sale_order_wizard.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from odoo import models, api, fields
+from odoo.exceptions import UserError


 class saleOrderCheckWizard(models.TransientModel):
@@ -8,9 +9,15 @@ class saleOrderCheckWizard(models.TransientModel):
    _description = '报价/销售订单审核向导'

    order_id = fields.Many2one('sale.order')
-    check_state = fields.Selection([('pass', '通过'), ('back', '退回')], '审核状态', default='pass')
+    # check_state = fields.Selection([('pass', '通过'), ('back', '退回')], '处理意见', default='pass')
    check_audit = fields.Text('审核意见')

    def submit(self):
-        self.order_id.check_status = 'unchecked' if not self.check_state == 'pass' else 'checked'
-        self.order_id.message_ids = '1'
+        self.order_id.check_status = 'approved'
+        self.order_id.remark = self.check_audit
+
+    def back(self):
+        if not self.check_audit:
+            raise UserError('请输入原因')
+        else:
+            self.order_id.write({'check_status': 'fail', 'remark': self.check_audit})
--- a/sf_sale/wizard/sale_order_wizard_views.xml
+++ b/sf_sale/wizard/sale_order_wizard_views.xml
@@ -6,20 +6,22 @@
        <field name="arch" type="xml">
            <form>
                <field name="order_id" invisible="True"/>
-               <group>
-                    <field name="check_state"  required="True"/>
-                    <field name="check_audit"  attrs="{'required': [('check_state', '=', 'back')]}"/>
-               </group>
+                <group>
+<!--                    <field name="check_state" widget="radio" options="{'horizontal': true}" required="True" string=""/>-->
+                    <field name="check_audit" placeholder="原因.." nolabel="1" colspan="2"/>
+                </group>
                <footer>
-                    <button string="提交" name="submit" type="object" class="oe_highlight"/>
-                    <button string="取消" class="btn btn-secondary" special="cancel"/>
+                     <button string="通过" name="submit" type="object" class="oe_highlight"/>
+                    <button string="退回" name="back" type="object" class="btn btn-secondary" />
+<!--                    <button string="提交" name="submit" type="object" class="oe_highlight"/>-->
+<!--                    <button string="取消" class="btn btn-secondary" special="cancel"/>-->
                </footer>
            </form>
        </field>
    </record>

    <record id="action_sale_order_check_wizard" model="ir.actions.act_window">
-        <field name="name">销售订单审核向导</field>
+        <field name="name">审核</field>
        <field name="res_model">sale.order.check.wizard</field>
        <field name="view_mode">form</field>
        <field name="target">new</field>