From 29acd4d87900e2a5f19484234e7ce0d6df21d9a4 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 31 May 2023 17:44:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8F=8A=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_wxwork_approval/__manifest__.py            |  3 +-
 sf_wxwork_approval/models/__init__.py         |  2 +-
 sf_wxwork_approval/models/wxwork_approval.py  | 27 +++++++++
 .../security/ir.model.access.csv              |  1 +
 sf_wxwork_approval/views/views.xml            |  9 +--
 sf_wxwork_approval/views/wxwork_approval.xml  | 55 +++++++++++++++++++
 6 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 sf_wxwork_approval/models/wxwork_approval.py
 create mode 100644 sf_wxwork_approval/views/wxwork_approval.xml

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 96798de7..c97e010b 100644
--- a/sf_wxwork_approval/models/__init__.py
+++ b/sf_wxwork_approval/models/__init__.py
@@ -5,5 +5,5 @@ from . import wxwork_approval_template_controls
 from . import wxwork_settings
 from . import wxwork_approval_template_summary
 from . import we_approval_record
-
+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..8d5cdbd8
--- /dev/null
+++ b/sf_wxwork_approval/models/wxwork_approval.py
@@ -0,0 +1,27 @@
+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.Char(string='审批模板id')
+    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 = "审批"
+
+    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='状态')
diff --git a/sf_wxwork_approval/security/ir.model.access.csv b/sf_wxwork_approval/security/ir.model.access.csv
index e3840580..a5ea9e77 100644
--- a/sf_wxwork_approval/security/ir.model.access.csv
+++ b/sf_wxwork_approval/security/ir.model.access.csv
@@ -6,6 +6,7 @@ access_wxwork_approval_template_controls,wxwork.approval.template.controls,model
 access_wxwork_approval_approver_line,wxwork.approval.approver_line,model_wxwork_approval_approver_line,base.group_user,1,1,1,1
 access_wxwork_settings,wxwork.settings,model_wxwork_settings,base.group_user,1,1,1,1
 access_wxwork_approval_template_summary,wxwork.approval.template.summary,model_wxwork_approval_template_summary,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 @@
 		</field>
 	</record>
 
-	<record id="action_wxwork_approval" model="ir.actions.act_window">
+	<record id="action_wxwork_approval_template" model="ir.actions.act_window">
         <field name="name">审批记录</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">wxwork.approval.record</field>
@@ -49,10 +49,11 @@
     </record>
 
     <menuitem
-        id="menu_wxwork_approval"
+        id="menu_wxwork_approval_template"
         name="审批"
-        sequence="1"
-        action="action_wxwork_approval"
+        sequence="2"
+        action="action_wxwork_approval_template"
     />
 
+
 </odoo>
\ 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..51af6cc4
--- /dev/null
+++ b/sf_wxwork_approval/views/wxwork_approval.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="wxwork_approval_tree_view" model="ir.ui.view">
+        <field name="name">审批</field>
+        <field name="model">wxwork.approval</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="id"/>
+                <field name="business_model"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="wxwork_approval_form" model="ir.ui.view">
+        <field name="name">审批</field>
+        <field name="model">wxwork.approval</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="id"/>
+                        <field name="business_model" widget="many2many_tags"/>
+                    </group>
+                </sheet>
+<!--                <div class="oe_chatter">-->
+<!--                    <field name="message_follower_ids"/>-->
+<!--                    <field name="activity_ids"/>-->
+<!--                    <field name="message_ids" options="{'post_refresh': 'recipients'}"/>-->
+<!--                </div>-->
+            </form>
+        </field>
+    </record>
+
+    <record id="action_wxwork_approval" model="ir.actions.act_window">
+        <field name="name">审批</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">wxwork.approval</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                [审批记录] 还没有哦！点左上角的[创建]按钮，沙发归你了!
+            </p>
+            <p>
+            </p>
+        </field>
+    </record>
+
+    <menuitem
+            id="menu_wxwork_approval"
+            name="审批"
+            sequence="1"
+            action="action_wxwork_approval"
+    />
+
+</odoo>

From bb9c4d1c27365ff3a678787a11385e4be6d46c6f Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 1 Jun 2023 17:27:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=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 @@
                 <sheet>
                     <group>
                         <field name="id"/>
+                        <field name="template_id"/>
                         <field name="business_model" widget="many2many_tags"/>
                     </group>
                 </sheet>