From bb9c4d1c27365ff3a678787a11385e4be6d46c6f Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Thu, 1 Jun 2023 17:27:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_wxwork_approval/models/wxwork_approval.py | 9 +++------ sf_wxwork_approval/views/wxwork_approval.xml | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) 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 @@ +