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

!9549 Merge branch 'master' into dev_zhou

Browse Source 
Merge pull request !9549 from dev_zhou
This commit is contained in:
李鹏宇
2026-03-10 10:59:07 +00:00
committed by Gitee
parent 0564084ade 424c4b973a
commit e802f96aa1
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_issue/models/issue_approval.py
+11 -1
View File
@@ -115,16 +115,26 @@ class IssueApprovalLine(models.Model):
is_class = fields.Boolean(string="班子会")
is_boss = fields.Boolean(string="董事会")
is_note = fields.Boolean(string="上级单位")
is_modify = fields.Boolean(string="修改")
def open_record(self):
self.ensure_one()
is_modify = False
if self.issue_approval_id and self.issue_approval_id.state == '申请人':
if self.employee_id and self.issue_library_id and self.employee_id == self.issue_library_id.employee_id:
is_modify = True
self.write({'is_modify': is_modify})
return {
'type': 'ir.actions.act_window',
'res_model': 'issue.library',
'res_id': self.issue_library_id.id,
'view_mode': 'form',
'target': 'current',
}
'context': {
'default_is_modify': is_modify,
}
}
class IssueRoomApproval(models.Model):
_name = 'issue.room.approval'
yuthon_issue/models/issue_library.py
+1
View File
@@ -98,6 +98,7 @@ class IssueLibrary(models.Model):
work_end = fields.Boolean(string="结束")
member_of_department = fields.Boolean("是否是本部门数据", compute='_compute_part_of_department',
search='_search_part_of_department')
is_modify = fields.Boolean(string="是否修改")
is_party_passed = fields.Selection([('',''), ('pass', '通过'), ('reject', '未通过')])
is_class_passed = fields.Selection([('',''), ('pass', '通过'), ('reject', '未通过')])
yuthon_issue/views/issue_library_views.xml
+16 -16
View File
@@ -165,13 +165,13 @@
</div>
<group>
<field name="name" required="1" force_save="1" invisible="is_invisible_workflow"
readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
<field name="topic_content" invisible="is_invisible_workflow"
readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
<field name="handling_situation" string="办理情况" placeholder="(存在问题)"
readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
<field name="deliberation_content" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
<field name="will_based" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
<field name="deliberation_content" readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
<field name="will_based" readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
</group>
<group>
<group>
@@ -180,16 +180,16 @@
<!-- <field name="handling_situation" string="办理情况(存在问题)" readonly="issue_state not in ['to_do', 'cancel','to_modify']"/>-->
<!-- <field name="deliberation_content" readonly="issue_state not in ['to_do', 'cancel','to_modify']"/>-->
<!-- <field name="will_based" readonly="issue_state not in ['to_do', 'cancel','to_modify']"/>-->
<field name="is_legal_trial" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
<field name="is_legal_trial" readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
<field name="is_external_person"
readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
<field name="co_organizer_dept" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
<field name="department_personnel_ids" widget="many2many_tags" invisible="1"/>
<field name="is_admin" invisible="1"/>
<field name="is_modify"/>
<field name="issue_state" groups="soong_workflow.group_soong_workflow_manager"/>
<field name="workflow_id" string="法审流程" invisible="is_legal_trial == 'no'"
domain="[('res_model', '=', 'contract.review.approval'), ('create_uid', 'in', department_personnel_ids)]"
readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
<!--<field name="documents_ids" widget="preview_many2many" invisible="is_invisible_workflow" readonly="issue_state not in ['to_do', 'cancel','to_modify']"/>-->
<field name="is_invisible_workflow" invisible="1"/>
<field name="name_text" invisible="1"/>
@@ -205,21 +205,21 @@
</group>
<group>
<field name="documents_ids" widget="preview_many2many" invisible="is_invisible_workflow"
readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
</group>
<group col="5" string="决策程序">
<group>
<field name="is_party" groups="yuthon_salary.group_jtbb_user" string="党总支"
readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
<field name="is_party" groups="yuthon_salary.group_lc_user,yuthon_salary.group_wg_user"
string="党支部会" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
string="党支部会" readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
</group>
<group>
<field name="is_class" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
<field name="is_class" readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
</group>
<group>
<field name="is_boss" groups="yuthon_salary.group_jtbb_user"
readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)"/>
</group>
<group>
<field name="is_note" invisible="1"/>
@@ -249,7 +249,7 @@
</page>
<page string="列席人员信息">
<field name="issue_attendee_line_ids"
readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']">
readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="attendee_name"/>
@@ -261,7 +261,7 @@
</page>
<page string="外部参会人员" invisible="is_external_person != 'yes'">
<field name="issue_external_person_line_ids"
readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']">
readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify'] or is_modify)">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="person_name"/>