pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!11272 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang

Browse Source 
Merge pull request !11272 from 李鹏宇/dev_wang
This commit is contained in:
李鹏宇
2026-05-06 02:18:09 +00:00
committed by Gitee
parent 979087e997 1d92d3ed4b
commit 0a4770849e
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/wizard/export_date_wizard.py
+1 -1
View File
@@ -55,7 +55,7 @@ class ExportDateWizard(models.TransientModel):
"""导出请假情况"""
active_ids = json.loads(self.active_ids) if self.active_ids else []
domain = [('date_from', '>=', start_date), ('date_from', '<', end_date)]
domain = [('date_from', '>=', start_date), ('date_from', '<', end_date), ('state', '!=', 'refuse')]
if active_ids:
domain = [('id', 'in', active_ids)] + domain
yuthon_issue/views/issue_library_views.xml
+3 -3
View File
@@ -251,9 +251,9 @@
string="党支部"/>
<field name="team_meet_id" readonly="1"/>
<field name="board_meet_id" readonly="1"/>
<field name="district_state_id" readonly="1"/>
<field name="district_government_id" readonly="1"/>
<field name="district_party_id" readonly="1"/>
<field name="district_state_id" readonly="1" column_invisible="True"/>
<field name="district_government_id" readonly="1" column_invisible="True"/>
<field name="district_party_id" readonly="1" column_invisible="True"/>
<field name="remarks" readonly="1"/>
</tree>
</field>
yuthon_will_task/views/yuthon_will_task_views.xml
+2 -3
View File
@@ -286,7 +286,6 @@
<field name="request_hour_from"/>
<field name="request_hour_to"/>
<field name="employee_ids"/>
<field name="employee_ids_short"/>
<field name="address"/>
<field name="remarks"/>
<templates>
@@ -317,13 +316,13 @@
<!-- 参与人 -->
<t t-if="record.employee_ids.raw_value and record.employee_ids.raw_value.length">
<div style="color: #555; font-size: 13px; margin-bottom: 4px;">
参与人 <field name="employee_ids_short"/>等共<t t-esc="record.employee_ids.raw_value.length"/>人
参与人 <field name="employee_ids" widget="many2many_tags"/>共<t t-esc="record.employee_ids.raw_value.length"/>人
</div>
</t>
<!-- 会议室 -->
<t t-if="record.address.raw_value">
<div style="color: #555; font-size: 13px; margin-bottom: 4px;">
会议室 <field name="address"/>
地点 <field name="address"/>
</div>
</t>
<!-- 备注 -->