Merge remote-tracking branch 'origin/dev' into dev

2026-01-24 20:09:52 +08:00
parent 0821ef3364 0eb500fd5e
commit b92bef97eb
9 changed files with 76 additions and 35 deletions
@@ -82,8 +82,8 @@ class SoongWorkflowRecord(models.Model):

    is_company = fields.Boolean(string="本公司", default=True, compute='_compute_is_company',search='_search_part_of_company')

-    # 节点更新时间（上一节点的结束时间）
-    node_update_time = fields.Datetime(string="节点更新时间")
+    # 办结时间（上一节点的结束时间）
+    node_update_time = fields.Datetime(string="办结时间")

    @api.depends_context('uid', 'company')
    @api.depends('company_id')
@@ -8,10 +8,18 @@
            <field name="name">User</field>
            <field name="category_id" ref="module_category_soong_workflow"/>
        </record>
+
+        <record id="group_soong_workflow_hr" model="res.groups">
+            <field name="name">工作流--人事分组</field>
+            <field name="category_id" ref="module_category_soong_workflow"/>
+            <field name="implied_ids" eval="[(4, ref('group_soong_workflow_user'))]"/>
+            <field name="users" eval="[(4, ref('base.user_admin'))]"/>
+        </record>
+
        <record id="group_soong_workflow_manager" model="res.groups">
            <field name="name">Manager</field>
            <field name="category_id" ref="module_category_soong_workflow"/>
-            <field name="implied_ids" eval="[(4, ref('group_soong_workflow_user'))]"/>
+            <field name="implied_ids" eval="[(4, ref('group_soong_workflow_user')),(4, ref('group_soong_workflow_hr'))]"/>
            <field name="users" eval="[(4, ref('base.user_admin'))]"/>
        </record>

@@ -38,17 +46,5 @@
            <field name="perm_unlink" eval="True"/>
        </record>

-        <!-- 当前用户可以访问当前部门以及下属部门的数据-->
-<!--        <record id="rule_soong_workflow_record_user_department_read" model="ir.rule">-->
-<!--            <field name="name">当前用户可以访问当前部门以及下属部门的数据</field>-->
-<!--            <field name="model_id" ref="model_soong_workflow_record"/>-->
-<!--            <field name="groups" eval="[(4, ref('group_soong_workflow_user'))]"/>-->
-<!--            <field name="domain_force">[('is_department_record', '=', True)]</field>-->
-<!--            <field name="perm_read" eval="True"/>-->
-<!--            <field name="perm_write" eval="True"/>-->
-<!--            <field name="perm_create" eval="True"/>-->
-<!--            <field name="perm_unlink" eval="True"/>-->
-<!--        </record>-->
-
    </data>
 </odoo>
@@ -243,7 +243,7 @@
                           decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
                    <field name="create_uid"/>
                    <field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width"/>
-                    <field name="soong_state"/><field name="node_update_time" string="节点更新时间" optional="show"/>
+                    <field name="soong_state"/><field name="node_update_time" string="办结时间" optional="show"/>
                    <field name="is_manager" column_invisible="1"/>
                    <field name="is_unlink" column_invisible="1"/>
                    <field name="is_log2" column_invisible="1"/>
@@ -252,7 +252,42 @@
                            invisible="not is_unlink"/>
                    <button name="greater_record" type="object" string="更多" class="btn-primary" invisible="not is_log2"/>
                    <button name="reminders_record" type="object" string="催办" class="btn-primary"
-                            invisible="soong_state != 'done' or create_uid != uid or approve_state == 'end'"/>
+                            invisible="create_uid != uid or approve_state == 'end'"/>
+                    <button name="revoke_record" type="object" string="撤销" class="btn-primary"
+                            groups="soong_workflow.group_soong_workflow_manager"/>
+                </tree>
+            </field>
+        </record>
+        <!-- 已办流程视图 -->
+        <record id="soong_workflow_record_done_tree" model="ir.ui.view">
+            <field name="name">soong.workflow.done.record.tree</field>
+            <field name="model">soong.workflow.record</field>
+            <field name="arch" type="xml">
+                <tree string="已办流程" action="open_record" type="object"
+                      decoration-muted="approve_state == 'end'" decoration-warning="approve_state != 'end'"
+                      delete="false"
+                      create="false" default_order="write_date2 desc, id desc" expand="1" limit="10">
+                    <header>
+                        <button name="admin_end" type="object" string="管理员强制结束" class="oe_highlight"
+                                groups="soong_workflow.group_soong_workflow_manager"/>
+                        <button name="delete_record" type="object" string="删除" class="oe_highlight"
+                                groups="soong_workflow.group_soong_workflow_manager"/>
+                    </header>
+                    <field name="priority" optional="show" widget="priority" nolabel="1"/>
+                    <field name="code"/>
+                    <field name="workflow_id" string="审批类型"/>
+                    <field name="name"/>
+                    <field name="approve_state" string="审批状态" widget="badge"
+                           decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
+                    <field name="create_uid"/>
+                    <field name="node_update_time" string="办结时间" optional="show"/>
+                    <field name="is_manager" column_invisible="1"/>
+                    <field name="is_unlink" column_invisible="1"/>
+                    <field name="is_log2" column_invisible="1"/>
+                    <button name="delete_record" type="object" string="删除" class="btn-primary"
+                            confirm="你确定要删除吗?"
+                            invisible="not is_unlink"/>
+                    <button name="greater_record" type="object" string="更多" class="btn-primary" invisible="not is_log2"/>
                    <button name="revoke_record" type="object" string="撤销" class="btn-primary"
                            groups="soong_workflow.group_soong_workflow_manager"/>
                </tree>
@@ -294,6 +329,7 @@
                        <button name="delete_record" type="object" string="删除" class="oe_highlight"
                                groups="soong_workflow.group_soong_workflow_manager"/>
                    </header>
+                    <field name="priority" optional="show" widget="priority" nolabel="1"/>
                    <field name="code"/>
                    <field name="workflow_id" string="审批类型"/>
                    <field name="name"/>
@@ -301,7 +337,7 @@
                           decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
                    <field name="create_uid"/>
                    <field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width"/>
-                    <field name="soong_state"/>
+                    <field name="soong_state"/><field name="node_update_time" string="办结时间" optional="show"/>
                    <field name="is_manager" column_invisible="1"/>
                </tree>
            </field>
@@ -393,7 +429,7 @@
                ['done', 'active']), ('is_company', '=', True)]
            </field>
            <field name="search_view_id" ref="soong_workflow_record_search1"/>
-            <field name="view_id" ref="soong_workflow_record_my_tree"/>
+            <field name="view_id" ref="soong_workflow_record_done_tree"/>
        </record>
        <record id="soong_workflow_department_record_action" model="ir.actions.act_window">
            <field name="name">流程查询</field>