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

!7541 添加功能

Browse Source 
Merge pull request !7541 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2026-01-03 09:53:01 +00:00
committed by Gitee
parent 808cfa3a60 88764c65e8
commit 9cf3ffbb01
4 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_issue/models/issue_approval.py
+10
View File
@@ -70,3 +70,13 @@ class IssueApprovalLine(models.Model):
is_class = fields.Boolean(string="班子会")
is_boss = fields.Boolean(string="董事会")
is_note = fields.Boolean(string="上级单位")
def open_record(self):
self.ensure_one()
return {
'type': 'ir.actions.act_window',
'res_model': 'issue.library',
'res_id': self.issue_library_id.id,
'view_mode': 'form',
'target': 'current',
}
yuthon_issue/models/issue_library.py
+6 -3
View File
@@ -433,17 +433,20 @@ class IssueLibraryApprovalLine(models.Model):
res_model = fields.Char(string="模型", compute='compute_issue_soong')
res_id = fields.Char(string="id", compute='compute_issue_soong')
@api.depends('code')
def compute_issue_soong(self):
for rec in self:
workflow_record_id = self.env['soong.workflow.record'].search([('code', '=', self.code)], limit=1)
workflow_record_id = self.env['soong.workflow.record'].search([('code', '=', rec.code)], limit=1)
if workflow_record_id:
rec.approval_type = workflow_record_id.workflow_id.name
rec.res_model = workflow_record_id.res_model
rec.res_id = workflow_record_id.res_id
rec.workflow_name = workflow_record_id.name
else:
rec.approval_type = ''
rec.res_model = ''
rec.res_id = ''
rec.workflow_name = ''
def open_record(self):
return {
yuthon_issue/views/issue_approval_views.xml
+5 -3
View File
@@ -4,11 +4,12 @@
<field name="name">issue.approval.tree</field>
<field name="model">issue.approval</field>
<field name="arch" type="xml">
<tree string="议题审批">
<tree string="议题审批" order="create_time desc">
<field name="name"/>
<field name="department_id"/>
<field name="issue_display"/>
<field name="decision_display"/>
<field name="create_time"/>
</tree>
</field>
</record>
@@ -60,9 +61,10 @@
<page string="关联议题">
<field name="issue_approval_ids">
<tree editable="bottom">
<button name="open_record" type="object" string="详情" class="oe_highlight"/>
<field name="issue_approval_id" column_invisible="1"/>
<field name="issue_library_id"/>
<field name="employee_id" widget="ztree_select" options="{'no_create': True}"/>
<field name="issue_library_id" options="{'no_open': True, 'no_create': True}"/>
<field name="employee_id" widget="ztree_select" options="{'no_open': True, 'no_create': True}"/>
<field name="approval_decision_sequence"/>
<field name="is_party" groups="yuthon_salary.group_jtbb_user" string="党总支"/>
<field name="is_party" groups="yuthon_salary.group_lc_user,yuthon_salary.group_wg_user" string="党支委会"/>
yuthon_issue/views/issue_library_views.xml
+20 -20
View File
@@ -107,15 +107,15 @@
</div>
<group>
<group>
<field name="name" required="1" force_save="1" invisible="is_invisible_workflow"/>
<field name="topic_content" invisible="is_invisible_workflow"/>
<field name="will_based"/>
<field name="is_legal_trial"/>
<field name="name" required="1" force_save="1" invisible="is_invisible_workflow" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="topic_content" invisible="is_invisible_workflow" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="will_based" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="is_legal_trial" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="department_personnel_ids" widget="many2many_tags" invisible="1"/>
<field name="workflow_id" invisible="is_legal_trial == 'no'" domain="[('res_model', '=', 'contract.review.approval'), ('create_uid', 'in', department_personnel_ids)]"/>
<field name="handling_situation"/>
<field name="deliberation_content"/>
<field name="documents_ids" widget="preview_many2many" invisible="is_invisible_workflow"/>
<field name="workflow_id" invisible="is_legal_trial == 'no'" domain="[('res_model', '=', 'contract.review.approval'), ('create_uid', 'in', department_personnel_ids)]" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="handling_situation" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="deliberation_content" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="documents_ids" widget="preview_many2many" invisible="is_invisible_workflow" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="is_invisible_workflow" invisible="1"/>
<field name="name_text" invisible="1"/>
<field name="work_end" invisible="1"/>
@@ -131,14 +131,14 @@
</group>
<group col="5" string="决策程序">
<group>
<field name="is_party" groups="yuthon_salary.group_jtbb_user" string="党总支"/>
<field name="is_party" groups="yuthon_salary.group_lc_user,yuthon_salary.group_wg_user" string="党支委会"/>
<field name="is_party" groups="yuthon_salary.group_jtbb_user" string="党总支" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="is_party" groups="yuthon_salary.group_lc_user,yuthon_salary.group_wg_user" string="党支委会" readonly="issue_state not in ['draft', 'cancel']"/>
</group>
<group>
<field name="is_class"/>
<field name="is_class" readonly="issue_state not in ['draft', 'cancel']"/>
</group>
<group>
<field name="is_boss" groups="yuthon_salary.group_jtbb_user"/>
<field name="is_boss" groups="yuthon_salary.group_jtbb_user" readonly="issue_state not in ['draft', 'cancel']"/>
</group>
<group>
<field name="is_note" invisible="1"/>
@@ -290,14 +290,14 @@
</group>
<group>
<group>
<field name="name" required="1" force_save="1"/>
<field name="name" required="1" force_save="1" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="name_text" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="approval_decision_sequence" invisible="1"/>
<field name="creart_datetime" invisible="1"/>
<field name="topic_content"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="topic_content" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="documents_ids" widget="preview_many2many" readonly="issue_state not in ['draft', 'cancel']"/>
</group>
<group>
<field name="employee_id" invisible="1"/>
@@ -446,14 +446,14 @@
</group>
<group>
<group>
<field name="name" required="1" force_save="1"/>
<field name="name" required="1" force_save="1" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="name_text" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="approval_decision_sequence" invisible="1"/>
<field name="creart_datetime" invisible="1"/>
<field name="topic_content"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="topic_content" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="documents_ids" widget="preview_many2many" readonly="issue_state not in ['draft', 'cancel']"/>
</group>
<group>
<field name="employee_id" invisible="1"/>
@@ -596,8 +596,8 @@
<field name="company_id" invisible="1"/>
<field name="approval_decision_sequence" invisible="1"/>
<field name="creart_datetime" invisible="1"/>
<field name="topic_content"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="topic_content" readonly="issue_state not in ['draft', 'cancel']"/>
<field name="documents_ids" widget="preview_many2many" readonly="issue_state not in ['draft', 'cancel']"/>
</group>
<group>
<field name="employee_id" invisible="1"/>