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

!9530 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 !9530 from 李鹏宇/dev_wang
This commit is contained in:
李鹏宇
2026-03-10 08:28:21 +00:00
committed by Gitee
parent bd6008153d 1a042b2594
commit bcef18beff
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_issue/models/issue_library.py
+2 -1
View File
@@ -82,9 +82,10 @@ class IssueLibrary(models.Model):
users_role_ids = fields.Many2many('soong.user.role', string='角色范围', related='employee_id.user_role_ids')
company_id = fields.Many2one('res.company', string='公司', related='employee_id.company_id', store=True)
is_legal_trial = fields.Selection([('no', '否'), ('yes', '是')], string="是否法审", default='no')
co_organizer_dept = fields.Char(string="协办部门/单位")
workflow_id = fields.Many2one('soong.workflow.record', string="流程")
department_personnel_ids = fields.Many2many('res.users', string='部门人员')
is_external_person = fields.Selection([('no', '否'), ('yes', '是')], string="是否有外部人员", default='no')
is_external_person = fields.Selection([('no', '否'), ('yes', '是')], string="外部人员参会", default='no')
is_admin = fields.Boolean(string='是否管理员', compute='_compute_is_admin')
issue_attendee_line_ids = fields.One2many('issue.library.attendee.line', 'issue_library_id', string='列席人员信息')
issue_external_person_line_ids = fields.One2many('issue.library.external.person.line', 'issue_library_id', string='外部参会人员')
yuthon_issue/views/issue_library_views.xml
+14
View File
@@ -19,15 +19,18 @@
<field name="is_boss" groups="yuthon_salary.group_jtbb_user"/>
<field name="boss_char"/>
<field name="is_legal_trial"/>
<field name="co_organizer_dept" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
<field name="is_district_state"/>
<field name="is_district_government"/>
<field name="is_district_party"/>
<field name="is_external_person"/>
<field name="issue_state"/>
<field name="code" column_invisible="1"/>
<field name="company_id" column_invisible="1"/>
<field name="creart_datetime" column_invisible="1"/>
<field name="member_of_department" column_invisible="1"/>
<field name="is_push_depart" column_invisible="1"/>
<field name="is_admin" column_invisible="1"/>
<button name="depart_push" string="推送" type="object" class="oe_highlight"
invisible="issue_state != 'to_do'"/>
<button name="revoke" string="撤销" type="object" class="oe_highlight"
@@ -65,9 +68,11 @@
<field name="is_boss" groups="yuthon_salary.group_jtbb_user"/>
<field name="boss_char"/>
<field name="is_legal_trial"/>
<field name="co_organizer_dept" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
<field name="is_district_state"/>
<field name="is_district_government"/>
<field name="is_district_party"/>
<field name="is_external_person"/>
<field name="issue_state"/>
<field name="code" column_invisible="1"/>
<field name="company_id" column_invisible="1"/>
@@ -75,6 +80,7 @@
<field name="member_of_department" column_invisible="1"/>
<field name="is_push_depart" column_invisible="1"/>
<field name="push_invisible" column_invisible="1"/>
<field name="is_admin" 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"/>
@@ -109,15 +115,18 @@
<field name="is_boss" groups="yuthon_salary.group_jtbb_user"/>
<field name="boss_char"/>
<field name="is_legal_trial"/>
<field name="co_organizer_dept" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify']"/>
<field name="is_district_state"/>
<field name="is_district_government"/>
<field name="is_district_party"/>
<field name="is_external_person"/>
<field name="issue_state"/>
<field name="code" column_invisible="1"/>
<field name="company_id" column_invisible="1"/>
<field name="creart_datetime" column_invisible="1"/>
<field name="member_of_department" column_invisible="1"/>
<field name="is_push_depart" column_invisible="1"/>
<field name="is_admin" column_invisible="1"/>
<!-- <button name="single_issue_pull" string="提交" type="object" class="oe_highligh"/>-->
<button name="approval_details" string="审批详情" type="object" class="oe_highlight"
invisible="issue_state in ['draft', 'to_do']"/>
@@ -174,6 +183,7 @@
<field name="is_legal_trial" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_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']"/>
<field name="department_personnel_ids" widget="many2many_tags" invisible="1"/>
<field name="is_admin" invisible="1"/>
<field name="issue_state" groups="soong_workflow.group_soong_workflow_manager"/>
@@ -361,6 +371,7 @@
<field name="is_district_state"/>
<field name="is_district_government"/>
<field name="is_district_party"/>
<field name="is_external_person"/>
<field name="issue_state" string="审批状态" />
<field name="issue_state_party"/>
<field name="is_party_passed" column_invisible="1"/>
@@ -398,6 +409,7 @@
<field name="is_district_state"/>
<field name="is_district_government"/>
<field name="is_district_party"/>
<field name="is_external_person"/>
<field name="issue_state" string="审批状态" />
<field name="issue_state_party"/>
<field name="is_party_passed" column_invisible="1"/>
@@ -573,6 +585,7 @@
<field name="is_district_state"/>
<field name="is_district_government"/>
<field name="is_district_party"/>
<field name="is_external_person"/>
<field name="issue_state" string="审批状态" />
<field name="issue_state_class"/>
<field name="company_id" column_invisible="1"/>
@@ -733,6 +746,7 @@
<field name="is_district_state"/>
<field name="is_district_government"/>
<field name="is_district_party"/>
<field name="is_external_person"/>
<field name="issue_state" string="审批状态" />
<field name="issue_state_boss"/>
<field name="company_id" optional="hide"/>