From 527622ca669c27c9cf345f86abcfb563d51e9fa4 Mon Sep 17 00:00:00 2001
From: pengyuthon <pengyuthon@163.com>
Date: Thu, 5 Feb 2026 19:44:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_issue/models/issue_library.py       | 6 +++---
 yuthon_issue/views/issue_library_views.xml | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py
index a2c34f115..588970d7d 100644
--- a/yuthon_issue/models/issue_library.py
+++ b/yuthon_issue/models/issue_library.py
@@ -25,11 +25,11 @@ class IssueLibrary(models.Model):
                                     ('on_approval', '已上会审批'), ('cancel', '已取消')],
                              default='draft', string="议题状态")
     issue_state_party = fields.Selection([('will', '待上会'), ('meeting', '上会中'), ('on_meet', '已上会')],
-                                         default='will', string="议题状态")
+                                         default='will', string="会议状态")
     issue_state_class = fields.Selection([('will', '待上会'), ('meeting', '上会中'), ('on_meet', '已上会')],
-                                         default='will', string="议题状态")
+                                         default='will', string="会议状态")
     issue_state_boss = fields.Selection([('will', '待上会'), ('meeting', '上会中'), ('on_meet', '已上会')],
-                                         default='will', string="议题状态")
+                                         default='will', string="会议状态")
 
     is_party = fields.Boolean(string="党总支", store=True)
     party_char = fields.Char(string=' ')
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index 45a759f54..6cb0e6448 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -371,7 +371,7 @@
                 <field name="is_district_state"/>
                 <field name="is_district_government"/>
                 <field name="is_district_party"/>
-                <field name="issue_state" column_invisible="1"/>
+                <field name="issue_state"/>
                 <field name="issue_state_party"/>
                 <field name="is_party_passed" column_invisible="1"/>
                 <field name="company_id" column_invisible="1"/>
@@ -546,7 +546,7 @@
                 <field name="is_district_state"/>
                 <field name="is_district_government"/>
                 <field name="is_district_party"/>
-                <field name="issue_state" column_invisible="1"/>
+                <field name="issue_state"/>
                 <field name="issue_state_class"/>
                 <field name="company_id" column_invisible="1"/>
                 <field name="is_class_passed" column_invisible="1"/>
@@ -706,10 +706,9 @@
                 <field name="is_district_state"/>
                 <field name="is_district_government"/>
                 <field name="is_district_party"/>
-                <field name="issue_state" column_invisible="1"/>/>
+                <field name="issue_state"/>
                 <field name="issue_state_boss"/>
                 <field name="company_id" optional="hide"/>
-<!--                <field name="issue_state"/>-->
                 <field name="is_boss_passed" column_invisible="1"/>
                 <button name="single_meeting_issue" string="上会" type="object" class="oe_highlight"
                         invisible="issue_state_boss != 'will' or is_boss_passed == 'pass'"/>