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

添加功能

Browse Source
This commit is contained in:
李鹏宇
2026-01-20 16:41:53 +08:00
parent f703b01ab5
commit e68657338f
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_issue/models/issue_approval_decision.py
+1 -1
View File
@@ -13,7 +13,7 @@ class IssueApprovalDecision(models.Model):
specifics = fields.Text(string='具体事项')
by_law = fields.Selection([('yes', '是'), ('no', '否')], string='是否经过法律审核')
is_filing = fields.Selection([('yes', '备'), ('no', '否')], string='是否备案')
council_id = fields.Many2one('issue.library.type', string='党总委员会')
council_id = fields.Many2one('issue.library.type', string='党总支')
team_meet_id = fields.Many2one('issue.library.type', string='经营班子会')
board_meet_id = fields.Many2one('issue.library.type', string='董事会')
district_state_id = fields.Many2one('issue.library.type', string="区国资局",)
yuthon_issue/models/issue_boss_approval.py
-1
View File
@@ -33,7 +33,6 @@ class IssueBossApproval(models.Model):
line.issue_id.is_state_updated = True
line.issue_id.issue_state = 'will'
class IssueBossApprovalLine(models.Model):
_name = 'issue.boss.approval.line'
_description = '议题审批流程'
yuthon_issue/models/issue_library.py
+2 -5
View File
@@ -226,7 +226,7 @@ class IssueLibrary(models.Model):
continue
if record.issue_state in ['will', 'on_meet']:
if record.push_invisible:
if record.push_invisible :
record.issue_state = 'on_meet'
else:
record.issue_state = 'will'
@@ -285,9 +285,6 @@ class IssueLibrary(models.Model):
def library_push(self):
for rec in self:
if rec.is_state_updated:
continue
push_update_vals = {}
if rec.is_party and (rec.is_party_passed == 'reject' or not rec.is_party_passed):
push_update_vals['is_push_party'] = True
@@ -616,7 +613,7 @@ class IssueLibraryLine(models.Model):
issue_library_id = fields.Many2one('issue.library')
issue_approval_decision_id = fields.Many2one('issue.approval.decision', string="上会依据")
council_id = fields.Many2one(related='issue_approval_decision_id.council_id', string='党总委员会')
council_id = fields.Many2one(related='issue_approval_decision_id.council_id', string='党总支')
team_meet_id = fields.Many2one(related='issue_approval_decision_id.team_meet_id', string='经营班子会')
board_meet_id = fields.Many2one(related='issue_approval_decision_id.board_meet_id', string='董事会')
district_state_id = fields.Many2one(related='issue_approval_decision_id.district_state_id', string="区国资局")
yuthon_issue/views/issue_library_views.xml
+3 -3
View File
@@ -69,7 +69,7 @@
<field name="is_push_depart" column_invisible="1"/>
<field name="push_invisible" column_invisible="1"/>
<!-- <button name="single_issue_pull" string="提交" type="object" class="oe_highlight"/>-->
<button name="library_push" string="推送" type="object" class="oe_highlight" invisible="push_invisible"/>
<button name="library_push" string="推送" type="object" class="oe_highlight" invisible="not push_invisible"/>
<button name="revoke" string="撤销" type="object" class="oe_highlight" invisible="issue_state == 'draft'"/>
<button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
<button name="unlink" string="删除" type="object" class="oe_highlight"/>
@@ -199,8 +199,8 @@
<field name="ordinal"/>
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id" class="list_ids_width"/>
<field name="council_id" readonly="1" groups="yuthon_salary.group_jtbb_user" string="党总委员会"/>
<field name="council_id" readonly="1" groups="yuthon_salary.group_wg_user, yuthon_salary.group_lc_user" string="党支委员会"/>
<field name="council_id" readonly="1" groups="yuthon_salary.group_jtbb_user" string="党总支"/>
<field name="council_id" readonly="1" groups="yuthon_salary.group_wg_user, yuthon_salary.group_lc_user" string="党支部"/>
<field name="team_meet_id" readonly="1"/>
<field name="board_meet_id" readonly="1"/>
<field name="district_state_id" readonly="1"/>