From 04dd583c3e595914e3e9c0255c0ddabd91c9d1d6 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, 5 Mar 2026 17:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_salary/models/yuthon_salary_party.py       | 2 +-
 yuthon_salary/views/yuthon_salary_party_views.xml | 1 +
 yuthon_salary/wizard/party_send_wizard.py         | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/yuthon_salary/models/yuthon_salary_party.py b/yuthon_salary/models/yuthon_salary_party.py
index 5f7a33419..d0c01d9aa 100644
--- a/yuthon_salary/models/yuthon_salary_party.py
+++ b/yuthon_salary/models/yuthon_salary_party.py
@@ -20,7 +20,7 @@ class YuthonSalaryParty(models.Model):
     select_year = fields.Selection(selection=[(str(i), str(i)) for i in range(2024, 2040)], string='年份',
                                    default=lambda self: str(datetime.now().year))
     party_state = fields.Selection([('to_do', '待发送'), ('done', '已发送')], string='状态', default='to_do')
-    toll_state = fields.Selection([('to_do', '未缴'), ('done', '已缴')], string='状态', default='to_do')
+    toll_state = fields.Selection([('to_do', '待缴'), ('done', '已缴')], string='缴费状态', default='to_do')
 
     def toll_confirm(self):
         self.toll_state = 'done'
diff --git a/yuthon_salary/views/yuthon_salary_party_views.xml b/yuthon_salary/views/yuthon_salary_party_views.xml
index fcc6918cb..eede7f7d7 100644
--- a/yuthon_salary/views/yuthon_salary_party_views.xml
+++ b/yuthon_salary/views/yuthon_salary_party_views.xml
@@ -13,6 +13,7 @@
                 <field name="payment"/>
                 <field name="total_payment"/>
                 <field name="company_id"/>
+                <field name="toll_state"/>
                 <field name="party_state"/>
                 <button name="send_party" string="发送" type="object" class="oe_highlight"/>
             </tree>
diff --git a/yuthon_salary/wizard/party_send_wizard.py b/yuthon_salary/wizard/party_send_wizard.py
index 56d72c4d3..5deb07073 100644
--- a/yuthon_salary/wizard/party_send_wizard.py
+++ b/yuthon_salary/wizard/party_send_wizard.py
@@ -44,7 +44,8 @@ class PartySendWizard(models.TransientModel):
         employee_list = []
         party_ids = self.env['yuthon.salary.party'].search([('select_time', '=', self.party_month),
                                                             ('select_year', '=', self.party_year),
-                                                            ('party_state', '=', 'to_do')
+                                                            ('party_state', '=', 'to_do'),
+                                                            ('toll_state', '=', 'to_do')
                                                             ])
         for party_id in party_ids:
             employee_list.append(party_id.employee_id.id)
@@ -56,7 +57,8 @@ class PartySendWizard(models.TransientModel):
             for employee in self.employee_ids:
                 party = self.env['yuthon.salary.party'].search([('employee_id', '=', employee.id),
                                                                 ('select_time', '=', self.select_time),
-                                                                ('select_year', '=', self.select_year)])
+                                                                ('select_year', '=', self.select_year),
+                                                                ('toll_state', '=', 'to_do')])
                 self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
                                                                          user_id=employee.wecom_userid,
                                                                          title="缴纳党费提醒",