From a2c000a9d973a0eaa9d55b628494a0724d40e147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Thu, 25 Jun 2026 16:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_base/__manifest__.py                   |  1 +
 yuthon_base/models/__init__.py                |  1 +
 yuthon_base/models/res_groups.py              | 14 ++++
 yuthon_base/views/res_groups_views.xml        | 71 +++++++++++++++++++
 .../views/property_fee_form_views.xml         |  6 +-
 5 files changed, 89 insertions(+), 4 deletions(-)
 create mode 100644 yuthon_base/models/res_groups.py
 create mode 100644 yuthon_base/views/res_groups_views.xml

diff --git a/yuthon_base/__manifest__.py b/yuthon_base/__manifest__.py
index 00b5706a4..1c1393971 100644
--- a/yuthon_base/__manifest__.py
+++ b/yuthon_base/__manifest__.py
@@ -17,6 +17,7 @@
         'views/base_month_year_views.xml',
         'views/yuthon_phone_lotter.xml',
         'views/menu.xml',
+        'views/res_groups_views.xml',
     ],
     'assets': {
         'web.assets_backend': [
diff --git a/yuthon_base/models/__init__.py b/yuthon_base/models/__init__.py
index 2f7af145a..cdbba2453 100644
--- a/yuthon_base/models/__init__.py
+++ b/yuthon_base/models/__init__.py
@@ -11,3 +11,4 @@ from . import system_logs
 from . import res_users
 from . import mail_thread
 from . import ir_ui_menu
+from . import res_groups
diff --git a/yuthon_base/models/res_groups.py b/yuthon_base/models/res_groups.py
new file mode 100644
index 000000000..e4d4a5759
--- /dev/null
+++ b/yuthon_base/models/res_groups.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields
+
+
+class ResGroups(models.Model):
+    """继承 res.groups 模型，添加自定义字段"""
+    _inherit = 'res.groups'
+
+    # 是否在使用——标记群组是否正在被使用
+    x_is_in_use = fields.Boolean(
+        string='是否在使用',
+        default=False,
+        help='勾选表示该群组当前正在使用中，不勾选表示已废弃或未启用'
+    )
diff --git a/yuthon_base/views/res_groups_views.xml b/yuthon_base/views/res_groups_views.xml
new file mode 100644
index 000000000..e3302eb5f
--- /dev/null
+++ b/yuthon_base/views/res_groups_views.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <!-- res.groups 列表视图（tree） -->
+        <record id="view_res_groups_tree" model="ir.ui.view">
+            <field name="name">res.groups.tree</field>
+            <field name="model">res.groups</field>
+            <field name="arch" type="xml">
+                <tree string="用户组" editable="top">
+                    <field name="full_name" readonly="1"/>
+                    <!-- 是否在使用——便于用户标记和筛选群组 -->
+                    <field name="x_is_in_use"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- 搜索视图：添加"是否在使用"过滤器 -->
+        <record id="view_res_groups_search_inherit" model="ir.ui.view">
+            <field name="name">res.groups.search.inherit</field>
+            <field name="model">res.groups</field>
+            <field name="inherit_id" ref="base.view_groups_search"/>
+            <field name="arch" type="xml">
+                <field name="share" position="after">
+                    <!-- 是否在使用 字段，支持搜索 -->
+                    <field name="x_is_in_use"/>
+                    <!-- 快捷过滤：已使用 / 未使用 -->
+                    <filter name="filter_in_use"
+                            string="正在使用"
+                            domain="[('x_is_in_use', '=', True)]"/>
+                    <filter name="filter_not_in_use"
+                            string="未在使用"
+                            domain="[('x_is_in_use', '=', False)]"/>
+                </field>
+            </field>
+        </record>
+
+        <!-- 表单视图：在 share 字段下方添加"是否在使用" -->
+        <record id="view_res_groups_form_inherit" model="ir.ui.view">
+            <field name="name">res.groups.form.inherit</field>
+            <field name="model">res.groups</field>
+            <field name="inherit_id" ref="base.view_groups_form"/>
+            <field name="arch" type="xml">
+                <field name="share" position="after">
+                    <!-- 是否在使用 勾选框 -->
+                    <field name="x_is_in_use"/>
+                </field>
+            </field>
+        </record>
+
+        <!-- 将 tree 视图关联到 base.action_res_groups 动作 -->
+        <record id="base.action_res_groups" model="ir.actions.act_window">
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <!-- 指定动作的 tree 视图 -->
+        <record id="act_res_groups_tree_view" model="ir.actions.act_window.view">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_res_groups_tree"/>
+            <field name="act_window_id" ref="base.action_res_groups"/>
+        </record>
+
+        <!-- 指定动作的 form 视图 -->
+        <record id="act_res_groups_form_view" model="ir.actions.act_window.view">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="base.view_groups_form"/>
+            <field name="act_window_id" ref="base.action_res_groups"/>
+        </record>
+    </data>
+</odoo>
diff --git a/yuthon_property_approval/views/property_fee_form_views.xml b/yuthon_property_approval/views/property_fee_form_views.xml
index cb4f38664..807267e09 100644
--- a/yuthon_property_approval/views/property_fee_form_views.xml
+++ b/yuthon_property_approval/views/property_fee_form_views.xml
@@ -6,15 +6,13 @@
         <field name="arch" type="xml">
             <tree string="费用支出" default_order="create_date desc">
                 <field name="code" string="流水号"/>
+                <field name="pay_date"/>
                 <field name="name"/>
                 <field name="company_id1" options="{'no_create': True}"/>
+                <field name="tenure_type"/>
                 <field name="form_fee"/>
                 <field name="expenses_type"/>
                 <field name="users_id"/>
-                <!-- 支付日期：与表单视图一致 -->
-                <field name="pay_date"/>
-                <!-- 权属类型：selection字段，与表单视图一致 -->
-                <field name="tenure_type"/>
                 <field name="approve_state" widget="badge"
                        decoration-danger="approve_state == 'end'"
                        decoration-success="approve_state == 'pending'"/>