!328 zhou

Merge pull request !328 from 李鹏宇/dev

yuthon_issue/models/issue_approval_decision.py

@@ -8,6 +8,7 @@ class IssueApprovalDecision(models.Model):
     _rec_name = 'specifics'
 
     decision_type_id = fields.Many2one('issue.approval.decision.type', string='事项类别')
+    decision_type_on_id = fields.Many2one('issue.approval.decision.type', string='事项类别上级')
     sequence = fields.Char(string='序号', store=True)
     specifics = fields.Char(string='具体事项')
     council = fields.Selection([('approval', '审'), ('decide', '决')], string='党总委员会')
@@ -32,6 +33,8 @@ class IssueApprovalDecision(models.Model):
                 seq.sequence = seq.sequence + '.' + str(num+1)
             else:
                 seq.sequence = ''
+            if seq.decision_type_id.decision_type_id:
+                seq.decision_type_on_id = seq.decision_type_id.decision_type_id
 
 
 

yuthon_issue/views/issue_approval_decision_views.xml

@@ -7,6 +7,7 @@
             <tree string="决策清单">
                 <field name="sequence"/>
                 <field name="decision_type_id"/>
+                <field name="decision_type_on_id"/>
                 <field name="specifics" required="1"/>
                 <field name="council"/>
                 <field name="team_meet"/>
@@ -35,9 +36,8 @@
                     </div>
                     <group col="2">
                         <group>
-                            <!--                            <field name="decision_id"/>-->
-                            <!--                            <field name="child_ids" force_save="1" invisible="1"/>-->
                             <field name="sequence" force_save="1"/>
+                            <field name="decision_type_on_id" force_save="1"/>
                             <field name="council"/>
                         </group>
                         <group>
@@ -69,11 +69,13 @@
         <field name="arch" type="xml">
             <search>
                 <searchpanel>
-                    <field name="decision_type_id"/>
+                    <field name="decision_type_on_id"/>
                 </searchpanel>
-                 <group expand="1">
-                    <filter name="group_state" string="事项类别" context="{'group_by': 'decision_type_id'}"/>
-                 </group>
+                <group expand="1">
+                    <filter name="group_decision_type_on_id" string="事项类别上级"
+                            context="{'group_by': 'decision_type_on_id'}"/>
+                    <filter name="group_decision_type_id" string="事项类别" context="{'group_by': 'decision_type_id'}"/>
+                </group>
             </search>
         </field>
     </record>
@@ -82,6 +84,7 @@
         <field name="name">决策清单</field>
         <field name="res_model">issue.approval.decision</field>
         <field name="view_mode">tree,form</field>
-        <field name="context">{'search_default_group_state': True,}</field>
+        <field name="context">{'search_default_group_decision_type_on_id': True, 'search_default_group_decision_type_id': True}
+        </field>
     </record>
 </odoo>

yuthon_issue/views/menus.xml

@@ -36,7 +36,6 @@
               action="issue_library_action_cancel"
               sequence="15"/>
 
-
     <menuitem id="issue_approval_menu"
               parent="tianhe_issue_library_menu_root"
               name="议题审批"
@@ -282,6 +281,7 @@
               name="已取消"
               action="issue_library_action_cancel10"
               sequence="9"/>
+    
     <!--物管议题库-->
     <menuitem id="tianhe_issue_library_menu_root11"
               parent="tianhe_issue_library_menu_root"

yuthon_work_brand/__manifest__.py

@@ -10,9 +10,6 @@
     'depends': ['base',
                 'board',
                 'spreadsheet_dashboard',
-                'yuthon_notice',
-                'soong_workflow',
-                'yuthon_issue',
                 'room',
                 'hr_recruitment',
                 'hr',