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

!12587 议题

Browse Source 
Merge pull request !12587 from 李鹏宇/dev_wang
This commit is contained in:
李鹏宇
2026-08-06 10:03:28 +00:00
committed by Gitee
parent d7a5069eb5 d1a846fe88
commit 2bc774548b
3 changed files with 18 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_issue/models/inherit_room_booking.py
+5 -7
View File
@@ -177,16 +177,16 @@ class RoomBooking(models.Model):
# 前置会议必须早于当前会议
if tb.start_datetime >= record.start_datetime:
raise UserError(
f'议题“{issue.name}”的{target_type_name}会议时间（{tb.start_datetime} ~ {tb.stop_datetime}）'
f'必须早于{record.meeting_type_id.name}会议时间（{record.start_datetime} ~ {record.stop_datetime}）！'
f'议题“{issue.name}”的{target_type_name}会议时间（{tb.start_datetime + timedelta(hours=8)} ~ {tb.stop_datetime + timedelta(hours=8)}）'
f'必须早于{record.meeting_type_id.name}会议时间（{record.start_datetime + timedelta(hours=8)} ~ {record.stop_datetime + timedelta(hours=8)}）！'
)
# 时间不能重叠
if _has_overlap(record.start_datetime, record.stop_datetime,
tb.start_datetime, tb.stop_datetime):
raise UserError(
f'议题“{issue.name}”的{target_type_name}会议时间（{tb.start_datetime} ~ {tb.stop_datetime}）'
f'与{record.meeting_type_id.name}会议时间（{record.start_datetime} ~ {record.stop_datetime}）有重叠！'
f'议题“{issue.name}”的{target_type_name}会议时间（{tb.start_datetime + timedelta(hours=8)} ~ {tb.stop_datetime + timedelta(hours=8)}）'
f'与{record.meeting_type_id.name}会议时间（{record.start_datetime + timedelta(hours=8)} ~ {record.stop_datetime + timedelta(hours=8)}）有重叠！'
)
# ========== 班子会：党的 party_char 非空（党已上会），班子必须晚于党，且时间不能重叠 ==========
@@ -458,20 +458,18 @@ class IssueMeetingLine(models.Model):
meeting_type_name = str(record.meeting_booking_id.meeting_type_id.name).strip()
suffix_list = ['(通过)', '(未通过)']
record.meeting_booking_id._check_name()
is_push = True
# 统一处理通过/不通过标识
if record.decision_results == 'agree':
is_agree = 'pass'
agree_name = '(通过)'
is_push = True
elif record.decision_results == 'rejected':
is_agree = 'reject'
agree_name = '(未通过)'
is_push = False
else:
is_agree = None
agree_name = ''
is_push = False
record.issue_library_id.is_push_depart = True
record.issue_library_id.issue_state = False
yuthon_issue/models/issue_library.py
+5 -5
View File
@@ -712,9 +712,9 @@ class IssueLibrary(models.Model):
issue_details = []
target_meeting_type_id = False
meeting_priority = [
('is_party', 'is_party_passed', None),
('is_class', 'is_class_passed', '班子'),
('is_boss', 'is_boss_passed', '董事'),
('is_party', 'party_char', None),
('is_class', 'class_char', '班子'),
('is_boss', 'boss_char', '董事'),
]
def get_all_sub_departments(department):
@@ -740,7 +740,7 @@ class IssueLibrary(models.Model):
if not getattr(issue, field_flag, False):
continue
passed_result = getattr(issue, field_passed, '')
if passed_result in (False, 'reject'):
if passed_result == False:
# 班子上会：党的 party_char 不能为空
if idx == 1 and ras.is_party == True:
clean_party = re.sub(r'<[^>]+>', '', issue.party_char or '').strip()
@@ -763,7 +763,7 @@ class IssueLibrary(models.Model):
if meeting_type:
target_meeting_type_id = meeting_type.id
break
elif passed_result == 'pass':
else:
continue
# 天河粮储 套会逻辑
yuthon_issue/views/issue_library_views.xml
+8 -30
View File
@@ -8,10 +8,6 @@
decoration-info="issue_state == 'will'"
decoration-success="issue_state == 'done'"
decoration-muted="issue_state == 'cancel'">
<header>
<button name="remove_duplicate_lines" type="object" string="去重明细行" class="btn btn-warning"
confirm="确定要删除当前选中议题的重复关联流程和关联会议明细吗？重复的只保留一条，此操作不可恢复！"/>
</header>
<field name="name" column_invisible="1"/>
<field name="topic_type"/>
<field name="name_text" class="list_width"/>
@@ -63,9 +59,6 @@
decoration-muted="issue_state == 'cancel'">
<header>
<button name="all_meeting_issue" type="object" string="会议安排" class="oe_highlight" groups="yuthon_salary.group_lc_user"/>
<!-- <button name="batch_add_ci_char" type="object" string="批量补'次'字" class="oe_highlight"/>-->
<button name="remove_duplicate_lines" type="object" string="去重明细行" class="btn btn-warning"
confirm="确定要删除当前选中议题的重复关联流程和关联会议明细吗？重复的只保留一条，此操作不可恢复！"/>
</header>
<field name="code"/>
<field name="name" column_invisible="1"/>
@@ -118,11 +111,6 @@
decoration-info="issue_state == 'will'"
decoration-success="issue_state == 'done'"
decoration-muted="issue_state == 'cancel'">
<header>
<button name="all_issue_pull" string="提交议题审报" type="object"/>
<button name="remove_duplicate_lines" type="object" string="去重明细行" class="btn btn-warning"
confirm="确定要删除当前选中议题的重复关联流程和关联会议明细吗？重复的只保留一条，此操作不可恢复！"/>
</header>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
<field name="is_party" groups="yuthon_salary.group_jtbb_user" string="党总支"/>
@@ -466,8 +454,6 @@
<header>
<button name="all_meeting_issue" type="object" string="会议安排" class="oe_highlight"/>
<button name="issue_party1_approval" type="object" string="批量审批" class="oe_highlight"/>
<button name="remove_duplicate_lines" type="object" string="去重明细行" class="btn btn-warning"
confirm="确定要删除当前选中议题的重复关联流程和关联会议明细吗？重复的只保留一条，此操作不可恢复！"/>
</header>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
@@ -488,8 +474,8 @@
<field name="company_id" column_invisible="1"/>
<field name="is_confirm" column_invisible="1"/>
<field name="issue_approval_id" column_invisible="1"/>
<button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"
invisible="issue_state_party != 'will' or is_party_passed == 'pass' or issue_state_party == False"/>
<!-- <button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"-->
<!-- invisible="issue_state_party != 'will' or is_party_passed == 'pass' or issue_state_party == False"/>-->
<button name="meeting_record" string="会议详情" type="object" class="btn btn-blue"
invisible="issue_state_party == 'will'"/>
<button name="approval_details" string="审批详情" type="object" class="btn btn-blue"
@@ -515,8 +501,6 @@
<button name="all_meeting_issue" type="object" string="会议安排" class="oe_highlight"/>
<button name="issue_party_approval" type="object" string="批量审批" class="oe_highlight"/>
<button name="batch_add_ci_char" type="object" string="批量修复" class="oe_highlight"/>
<button name="remove_duplicate_lines" type="object" string="去重明细行" class="btn btn-warning"
confirm="确定要删除当前选中议题的重复关联流程和关联会议明细吗？重复的只保留一条，此操作不可恢复！"/>
</header>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
@@ -537,8 +521,8 @@
<field name="company_id" column_invisible="1"/>
<field name="is_confirm" column_invisible="1"/>
<field name="issue_approval_id" column_invisible="1"/>
<button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"
invisible="issue_state_party != 'will' or is_party_passed == 'pass' or issue_state_party == False"/>
<!-- <button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"-->
<!-- invisible="issue_state_party != 'will' or is_party_passed == 'pass' or issue_state_party == False"/>-->
<button name="meeting_record" string="会议详情" type="object" class="btn btn-blue"
invisible="issue_state_party == 'will'"/>
<button name="approval_details" string="审批详情" type="object" class="btn btn-blue"
@@ -732,9 +716,6 @@
<header>
<button name="all_meeting_issue" type="object" string="会议安排" class="oe_highlight"/>
<button name="issue_class_approval" type="object" string="批量审批" class="oe_highlight"/>
<!-- <button name="batch_add_ci_char" type="object" string="批量补'次'字" class="oe_highlight"/>-->
<button name="remove_duplicate_lines" type="object" string="去重明细行" class="btn btn-warning"
confirm="确定要删除当前选中议题的重复关联流程和关联会议明细吗？重复的只保留一条，此操作不可恢复！"/>
</header>
<field name="name"/>
<field name="department_id"/>
@@ -752,8 +733,8 @@
<field name="is_class_passed" column_invisible="1"/>
<field name="is_confirm" column_invisible="1"/>
<field name="issue_approval_id" column_invisible="1"/>
<button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"
invisible="issue_state_class != 'will' or is_class_passed == 'pass' or issue_state_class == False"/>
<!-- <button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"-->
<!-- invisible="issue_state_class != 'will' or is_class_passed == 'pass' or issue_state_class == False"/>-->
<button name="meeting_record" string="会议详情" type="object" class="btn btn-blue"
invisible="issue_state_class == 'will'"/>
<button name="approval_details" string="审批详情" type="object" class="btn btn-blue"
@@ -932,9 +913,6 @@
decoration-muted="issue_state_boss == 'cancel'">
<header>
<button name="all_meeting_issue" type="object" string="会议安排" class="oe_highlight"/>
<button name="issue_boss_approval" type="object" string="批量审批" class="oe_highlight"/>
<button name="remove_duplicate_lines" type="object" string="去重明细行" class="btn btn-warning"
confirm="确定要删除当前选中议题的重复关联流程和关联会议明细吗？重复的只保留一条，此操作不可恢复！"/>
</header>
<field name="name"/>
<field name="department_id"/>
@@ -952,8 +930,8 @@
<field name="is_boss_passed" column_invisible="1"/>
<field name="is_confirm" column_invisible="1"/>
<field name="issue_approval_id" column_invisible="1"/>
<button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"
invisible="issue_state_boss != 'will' or is_boss_passed == 'pass' or issue_state_boss == False"/>
<!-- <button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"-->
<!-- invisible="issue_state_boss != 'will' or is_boss_passed == 'pass' or issue_state_boss == False"/>-->
<button name="meeting_record" string="会议详情" type="object" class="btn btn-blue"
invisible="issue_state_boss == 'will'"/>
<button name="approval_details" string="审批详情" type="object" class="btn btn-blue"