!12517 !12516 通知公告

Merge pull request !12517 from 李鹏宇/dev

soong_workflow/models/soong_workflow_mixin.py

@@ -1422,22 +1422,6 @@ class SoongWorkflowMixin(models.AbstractModel):
             approval_el.set("invisible", "1")
             header_el.append(approval_el)
 
-            if header_el:
-                # 彩带
-                ribbon_pass = etree.Element("widget")
-                ribbon_pass.set("name", "web_ribbon")
-                ribbon_pass.set("title", "通过")
-                ribbon_pass.set("bg_color", "text-bg-success")
-                ribbon_pass.set("invisible", "approval_result != 'pass'")
-                header_el.insert(0, ribbon_pass)
-
-                ribbon_fail = etree.Element("widget")
-                ribbon_fail.set("name", "web_ribbon")
-                ribbon_fail.set("title", "不通过")
-                ribbon_fail.set("bg_color", "text-bg-danger")
-                ribbon_fail.set("invisible", "approval_result != 'fail'")
-                header_el.insert(0, ribbon_fail)
-
             is_transfer_el = etree.Element("field")
             is_transfer_el.set("name", "is_show_transfer")
             is_transfer_el.set("invisible", "1")
@@ -1474,6 +1458,23 @@ class SoongWorkflowMixin(models.AbstractModel):
                 if visible_seq:
                     state_el.set("statusbar_visible", ",".join(visible_seq))
                 header_el.append(state_el)
+
+                # 审批结果徽章（注入到 header 末尾，inline 不影响 sheet 布局，全局生效）
+                # 通过 → 绿色徽章，不通过 → 红色徽章，无结果时不显示
+                result_badge = etree.Element("span")
+                result_badge.set("class", "o_approval_result ms-2")
+                result_badge.set("invisible", "approval_result not in ('pass', 'fail')")
+                # 通过：绿色徽章
+                pass_badge = etree.SubElement(result_badge, "span")
+                pass_badge.set("class", "badge text-bg-success")
+                pass_badge.set("invisible", "approval_result != 'pass'")
+                pass_badge.text = "通过"
+                # 不通过：红色徽章
+                fail_badge = etree.SubElement(result_badge, "span")
+                fail_badge.set("class", "badge text-bg-danger")
+                fail_badge.set("invisible", "approval_result != 'fail'")
+                fail_badge.text = "不通过"
+                header_el.append(result_badge)
         res["arch"] = etree.tostring(arch, encoding="unicode").replace("\t", "")
         return res
 

yuthon_notice/views/yuthon_notice_views.xml

@@ -202,7 +202,8 @@
 
     <record id="approval_notice_action2" model="ir.actions.act_window">
         <field name="name">通知公告管理</field>
-        <field name="domain">[('is_company', '=', True)]</field>
+        <!-- 过滤：每个人只能看到自己发布的公告，uid 为当前登录用户ID -->
+        <field name="domain">[('is_company', '=', True), ('users_id', '=', uid)]</field>
         <field name="res_model">yuthon.notice</field>
         <field name="view_mode">tree,form</field>
     </record>