!8186 !8185 添加功能

Merge pull request !8186 from 李鹏宇/dev

yuthon_issue/views/issue_boss_approval_views.xml

@@ -36,12 +36,12 @@
                     </group>
                     <field name="line_ids" readonly="1">
                             <tree editable="bottom">
+                                <button name="open_record" type="object" string="详情" class="btn-primary"/>
                                 <field name="boss_approval_id" column_invisible="1"/>
                                 <field name="issue_id" column_invisible="1"/>
                                 <field name="name"/>
                                 <field name="will_based"/>
                                 <field name="department_id"/>
-                                <button name="open_record" type="object" string="详情" class="btn-primary"/>
                             </tree>
                     </field>
                 </sheet>

yuthon_issue/views/issue_class_approval_views.xml

@@ -36,12 +36,12 @@
                     </group>
                     <field name="line_ids" readonly="1">
                             <tree editable="bottom">
+                                 <button name="open_record" type="object" string="详情" class="btn-primary"/>
                                 <field name="class_approval_id" column_invisible="1"/>
                                 <field name="issue_id" column_invisible="1"/>
                                 <field name="name"/>
                                 <field name="will_based"/>
                                 <field name="department_id"/>
-                                <button name="open_record" type="object" string="详情" class="btn-primary"/>
                             </tree>
                     </field>
                 </sheet>

yuthon_issue/views/issue_party_approval_views.xml

@@ -36,6 +36,7 @@
                     </group>
                     <field name="line_ids" readonly="1">
                             <tree editable="bottom">
+                                <button name="open_record" type="object" string="详情" class="btn-primary"/>
                                 <field name="party_approval_id" column_invisible="1"/>
                                 <field name="issue_id" column_invisible="1"/>
                                 <button name="open_record" type="object" string="详情" class="btn-primary"/>

yuthon_official/models/yuthon_file_processing.py

@@ -108,17 +108,25 @@ class YuthonFileProcessing(models.Model):
         for processing in processing_ids:
             processing._compute_workflow()
 
-
     @api.depends_context('uid')
     @api.depends('users_ids')
     def _compute_is_display(self):
-        current_user = self.env.user  #
+        current_user = self.env.user
+        is_system_admin = current_user.has_group('base.group_system') or current_user.has_group('base.group_admin')
+        current_user = self.env.user
         for record in self:
             record._compute_workflow()
-            record.is_display = current_user in record.users_ids
+            if is_system_admin:
+                record.is_display = True
+            else:
+                record.is_display = current_user in record.users_ids
 
     def _search_part_of_company(self, operator, value):
-        current_user_id = self.env.uid
+        current_user = self.env.user
+        is_system_admin = current_user.has_group('base.group_system') or current_user.has_group('base.group_admin')
+        current_user_id = current_user.id
+        if is_system_admin:
+            return []
         if value:
             if operator == "=":
                 return [("users_ids", "in", [current_user_id])]

yuthon_official/models/yuthon_sub_enterprises.py

@@ -57,13 +57,22 @@ class YuthonSubEnterprises(models.Model):
     @api.depends_context('uid')
     @api.depends('users_ids')
     def _compute_is_display(self):
-        current_user = self.env.user  #
+        current_user = self.env.user
+        is_system_admin = current_user.has_group('base.group_system') or current_user.has_group('base.group_admin')
+        current_user = self.env.user
         for record in self:
             record._compute_workflow()
-            record.is_display = current_user in record.users_ids
+            if is_system_admin:
+                record.is_display = True
+            else:
+                record.is_display = current_user in record.users_ids
 
     def _search_part_of_company(self, operator, value):
-        current_user_id = self.env.uid
+        current_user = self.env.user
+        is_system_admin = current_user.has_group('base.group_system') or current_user.has_group('base.group_admin')
+        current_user_id = current_user.id
+        if is_system_admin:
+            return []
         if value:
             if operator == "=":
                 return [("users_ids", "in", [current_user_id])]