!1786 !1785 Merge branch 'dev' into dev_zhou

Merge pull request !1786 from 李鹏宇/dev

soong_workflow/views/soong_workflow_record.xml

@@ -8,7 +8,12 @@
                 <search string="流程查询">
                     <field name="name"/>
                     <field name="workflow_id" string="审批类型"/>
-                    <filter string="待我审批" name="to_do_approvals" domain="[('users_ids', 'in', [uid])]"/>
+                    <header_search>
+                        <quick_filter string="待办审批">
+                             <filter string="待我审批" name="user_id" domain="[('employee_ids.user_id', 'in', [uid])]"/>
+                            <filter string="与我相关" name="user_other" domain="[('users_ids', 'in', [uid])]"/>
+                        </quick_filter>
+                    </header_search>
                 </search>
             </field>
         </record>
@@ -99,13 +104,13 @@
                 </tree>
             </field>
         </record>
-
         <record id="soong_workflow_record_action" model="ir.actions.act_window">
             <field name="name">流程查询</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">soong.workflow.record</field>
-            <field name="view_mode">tree,kanban</field>
-            <field name="domain">[('users_ids', 'in', [uid]), ('reclaim_state', '=', False)]</field>
+            <field name="view_mode">tree,kanban,search</field>
+            <field name="domain">[('reclaim_state', '=', False)]</field>
+<!--            <field name="context">{'search_default_group_by_employee': 1 }</field>-->
             <field name="search_view_id" ref="soong_workflow_record_search"/>
         </record>
 

yuthon_property_approval/models/property_evaluate_application.py

@@ -19,7 +19,6 @@ class PropertyEvaluateApplication(models.Model):
     related_issues_id = fields.Many2one('issue.library', string="关联议题")
     is_experts = fields.Boolean(string="是否需要专家评审")
     notice_documents_ids = fields.Many2many('ir.attachment', string='议题附件')
-    issue_library_id = fields.Many2one('issue.library', string='关联议题')
     evaluate_application_ids = fields.One2many('evaluate.application.line', 'property_message_id', string='物业信息明细行')
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')

yuthon_property_approval/views/property_evaluate_application_views.xml

@@ -46,7 +46,7 @@
                         <field name="notice_documents_ids" widget="preview_many2many"/>
                     </group>
                     <group>
-                        <field name="users_id" invisible="1"/>
+                        <field name="users_id" invisible="1"/>premises_id
                         <field name="department_id" invisible="1"/>
                         <field name="is_experts"/>
                     </group>