diff --git a/sf_wxwork_approval/models/wxwork_approval.py b/sf_wxwork_approval/models/wxwork_approval.py index 8d5cdbd8..e2bff878 100644 --- a/sf_wxwork_approval/models/wxwork_approval.py +++ b/sf_wxwork_approval/models/wxwork_approval.py @@ -11,7 +11,7 @@ class WxworkApproval(models.Model): inherit = ['mail.thread', 'mail.activity.mixin'] _order = 'id desc' - template_id = fields.Char(string='审批模板id') + template_id = fields.Many2one('wxwork.approval.template', string='审批模板') business_model = fields.Many2many('sale.order', 'sale_approval_rel', 'sale_id', 'approval_id', string='业务类型') approve_history_ids = fields.One2many('wxwork.approval.history', 'approve_id', string='审批流程') state = fields.Char(string='状态') @@ -19,9 +19,6 @@ class WxworkApproval(models.Model): class WxworkApprovalHistory(models.Model): _name = 'wxwork.approval.history' - _description = "审批" + _description = "审批历史记录" - template_id = fields.Char(string='审批模板id') - business_model = fields.Many2many('sale.order', 'sale_approval_rel', 'sale_id', 'approval_id', string='业务类型') - approve_flow = fields.Char(string='审批流程') - state = fields.Char(string='状态') + approve_id = fields.Many2one('wxwork.approval', string='审批') diff --git a/sf_wxwork_approval/views/wxwork_approval.xml b/sf_wxwork_approval/views/wxwork_approval.xml index 51af6cc4..5a32a9e1 100644 --- a/sf_wxwork_approval/views/wxwork_approval.xml +++ b/sf_wxwork_approval/views/wxwork_approval.xml @@ -19,6 +19,7 @@ +