diff --git a/sf_wxwork_approval/__manifest__.py b/sf_wxwork_approval/__manifest__.py index ad336c83..e97bf414 100644 --- a/sf_wxwork_approval/__manifest__.py +++ b/sf_wxwork_approval/__manifest__.py @@ -12,7 +12,7 @@ 'category': 'bfm', 'author': 'jikimo', 'website': 'https://bfm.r.jikimo.com', - 'depends': ['web'], + 'depends': ['web', 'mail', 'sf_sale'], 'data': [ # 定义权限组放在最上面 # 权限组 @@ -22,6 +22,7 @@ 'views/wxwork_config_view.xml', 'views/views.xml', 'views/wxwork_settings_view.xml', + 'views/wxwork_approval.xml', 'views/wxwork_approval_template_view.xml', 'views/wxwork_approval_approval_line.xml', diff --git a/sf_wxwork_approval/models/__init__.py b/sf_wxwork_approval/models/__init__.py index 9c7125e6..795635d9 100644 --- a/sf_wxwork_approval/models/__init__.py +++ b/sf_wxwork_approval/models/__init__.py @@ -7,4 +7,5 @@ from . import wxwork_approval_template_summary from . import we_approval_record from . import wx_work_api +from . import wxwork_approval # from . import res_config_setting diff --git a/sf_wxwork_approval/models/wxwork_approval.py b/sf_wxwork_approval/models/wxwork_approval.py new file mode 100644 index 00000000..e2bff878 --- /dev/null +++ b/sf_wxwork_approval/models/wxwork_approval.py @@ -0,0 +1,24 @@ +import logging +from odoo import api, fields, models +from odoo.exceptions import UserError + +_logger = logging.getLogger(__name__) + + +class WxworkApproval(models.Model): + _name = 'wxwork.approval' + _description = "审批" + inherit = ['mail.thread', 'mail.activity.mixin'] + _order = 'id desc' + + 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='状态') + + +class WxworkApprovalHistory(models.Model): + _name = 'wxwork.approval.history' + _description = "审批历史记录" + + approve_id = fields.Many2one('wxwork.approval', string='审批') diff --git a/sf_wxwork_approval/security/ir.model.access.csv b/sf_wxwork_approval/security/ir.model.access.csv index b4f4c359..92e890d5 100644 --- a/sf_wxwork_approval/security/ir.model.access.csv +++ b/sf_wxwork_approval/security/ir.model.access.csv @@ -18,6 +18,7 @@ access_wxwork_approval_contact_config,wxwork.approval.contact.config,model_wxwor access_wxwork_approval_table_config,wxwork.approval.table.config,model_wxwork_approval_table_config,base.group_user,1,1,1,1 access_wxwork_approval_attendance_config,wxwork.approval.attendance.config,model_wxwork_approval_attendance_config,base.group_user,1,1,1,1 access_wxwork_approval_file_config,wxwork.approval.file.config,model_wxwork_approval_file_config,base.group_user,1,1,1,1 +access_wxwork_approval,wxwork.approval,model_wxwork_approval,base.group_user,1,1,1,1 diff --git a/sf_wxwork_approval/views/views.xml b/sf_wxwork_approval/views/views.xml index a35629d0..b715de99 100644 --- a/sf_wxwork_approval/views/views.xml +++ b/sf_wxwork_approval/views/views.xml @@ -34,7 +34,7 @@ - + 审批记录 ir.actions.act_window wxwork.approval.record @@ -49,10 +49,11 @@ + \ No newline at end of file diff --git a/sf_wxwork_approval/views/wxwork_approval.xml b/sf_wxwork_approval/views/wxwork_approval.xml new file mode 100644 index 00000000..5a32a9e1 --- /dev/null +++ b/sf_wxwork_approval/views/wxwork_approval.xml @@ -0,0 +1,56 @@ + + + + 审批 + wxwork.approval + + + + + + + + + + 审批 + wxwork.approval + +
+ + + + + + + + + + + + +
+
+
+ + + 审批 + ir.actions.act_window + wxwork.approval + tree,form + +

+ [审批记录] 还没有哦!点左上角的[创建]按钮,沙发归你了! +

+

+

+
+
+ + + +