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

!12604 排版

Browse Source 
Merge pull request !12604 from 李鹏宇/dev_wang
This commit is contained in:
李鹏宇
2026-08-12 07:04:28 +00:00
committed by Gitee
parent dbb30eb3bb 4cde1c3b81
commit 977dc3486c
3 changed files with 79 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
room/views/room_booking_views.xml
+5
View File
@@ -138,10 +138,15 @@
<button name="action_print_room_booking_agenda" string="打印" type="object" class="btn-primary"/>
</header>
<sheet>
<!-- 顶部信息行：流水号 / 本公司 / 紧急度（保持不动） -->
<group col="3">
<group>
<field name="code" string="流水号" readonly="1"/>
</group>
<group>
<label for="is_this_company"/>
<div><field name="is_this_company"/></div>
</group>
<group>
<field name="urgency_level" readonly="1"/>
</group>
yuthon_issue/views/issue_approval_decision_type_views.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<field name="name">issue.approval.decision.type.tree</field>
<field name="model">issue.approval.decision.type</field>
<field name="arch" type="xml">
<tree string="事项类别配置">
<tree string="事项类别配置" editable="bottom">
<field name="sequence"/>
<field name="name"/>
<field name="decision_type_id"/>
yuthon_issue/views/issue_library_views.xml
+73 -64
View File
@@ -19,7 +19,7 @@
<field name="class_char" readonly="not is_admin" force_save="1"/>
<field name="is_boss" groups="yuthon_salary.group_jtbb_user"/>
<field name="boss_char" readonly="not is_admin" force_save="1"/>
<field name="is_legal_trial"/>
<field name="is_legal_trial" widget="radio"/>
<field name="co_organizer_dept" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<field name="is_district_state" column_invisible="1"/>
<field name="is_district_government" column_invisible="1"/>
@@ -73,7 +73,7 @@
<field name="class_char" readonly="not is_admin" force_save="1"/>
<field name="is_boss" groups="yuthon_salary.group_jtbb_user"/>
<field name="boss_char" readonly="not is_admin" force_save="1"/>
<field name="is_legal_trial"/>
<field name="is_legal_trial" widget="radio" />
<field name="co_organizer_dept" readonly="not is_admin and issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<field name="is_district_state"/>
<field name="is_district_government"/>
@@ -197,13 +197,13 @@
<!-- <field name="handling_situation" string="办理情况(存在问题)" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>-->
<!-- <field name="deliberation_content" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>-->
<!-- <field name="will_based" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>-->
<field name="is_legal_trial" readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify', 'draft'] or is_modify)"/>
<field name="is_legal_trial" widget="radio" readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify', 'draft'] or is_modify)"/>
<field name="is_external_person"
readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify', 'draft'] or is_modify)"/>
<field name="department_personnel_ids" widget="many2many_tags" invisible="1"/>
<field name="is_admin" invisible="1"/>
<field name="is_modify" invisible="1"/>
<field name="issue_state" groups="soong_workflow.group_soong_workflow_manager"/>
<!-- <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 or issue_state in ['to_do', 'cancel','to_modify', 'draft'] or is_modify)"/>
@@ -562,29 +562,32 @@
<field name="issue_state" readonly="1"/>
</group>
</group>
<!-- 主信息分组（扁平结构：Char 按 col=2 自动分两列，Text/preview_many2many 横跨整行） -->
<group>
<group>
<field name="name" required="1" force_save="1"
readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<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="issue_state"/>
<field name="topic_content" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<field name="deliberation_content" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<field name="documents_ids" widget="preview_many2many"
readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
</group>
<group>
<field name="employee_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="users_role_ids" invisible="1" widget="many2many_tags"/>
<field name="cs_party" invisible="1"/>
<field name="cs_class" invisible="1"/>
<field name="cs_boss" invisible="1"/>
</group>
<!-- 议题名称：必填，根据议题状态判定是否只读 -->
<field name="name" required="1" force_save="1"
readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<!-- 事项背景：根据议题状态判定是否只读 -->
<field name="topic_content" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<!-- 请示事项：根据议题状态判定是否只读 -->
<field name="deliberation_content" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<!-- 议题附件：根据议题状态判定是否只读 -->
<field name="documents_ids" widget="preview_many2many"
readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<!-- 议题状态字段（可编辑） -->
<field name="issue_state"/>
<!-- 后台逻辑用，不可显示 -->
<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="employee_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="users_role_ids" invisible="1" widget="many2many_tags"/>
<field name="cs_party" invisible="1"/>
<field name="cs_class" invisible="1"/>
<field name="cs_boss" invisible="1"/>
</group>
<group col="2">
<group>
@@ -774,26 +777,29 @@
<field name="issue_state" readonly="1"/>
</group>
</group>
<!-- 主信息分组（扁平结构：Char 按 col=2 自动分两列，Text/preview_many2many 横跨整行） -->
<group>
<group>
<field name="name" required="1" force_save="1"
readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<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" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<field name="issue_state" groups="soong_workflow.group_soong_workflow_manager"/>
<field name="deliberation_content" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<field name="documents_ids" widget="preview_many2many"
readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
</group>
<group>
<field name="employee_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="users_role_ids" invisible="1" widget="many2many_tags"/>
</group>
<!-- 议题名称：必填，根据议题状态判定是否只读 -->
<field name="name" required="1" force_save="1"
readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<!-- 事项背景：根据议题状态判定是否只读 -->
<field name="topic_content" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<!-- 议题状态：仅工作流管理员组可见 -->
<field name="issue_state" groups="soong_workflow.group_soong_workflow_manager"/>
<!-- 请示事项：根据议题状态判定是否只读 -->
<field name="deliberation_content" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<!-- 议题附件：根据议题状态判定是否只读 -->
<field name="documents_ids" widget="preview_many2many"
readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<!-- 后台逻辑用，不可显示 -->
<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="employee_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="users_role_ids" invisible="1" widget="many2many_tags"/>
</group>
<group col="2">
<group>
@@ -971,26 +977,29 @@
<field name="issue_state" readonly="1"/>
</group>
</group>
<!-- 主信息分组（扁平结构：Char 按 col=2 自动分两列，Text/preview_many2many 横跨整行） -->
<group>
<group>
<field name="name" required="1" force_save="1"/>
<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" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<field name="issue_state" invisible="1"/>
<field name="issue_state_boss"/>
<field name="deliberation_content" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<field name="documents_ids" widget="preview_many2many"
readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
</group>
<group>
<field name="employee_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="users_role_ids" invisible="1" widget="many2many_tags"/>
</group>
<!-- 议题名称：必填 -->
<field name="name" required="1" force_save="1"/>
<!-- 事项背景：根据议题状态判定是否只读 -->
<field name="topic_content" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<!-- 董事会议题状态 -->
<field name="issue_state_boss"/>
<!-- 请示事项：根据议题状态判定是否只读 -->
<field name="deliberation_content" readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<!-- 议题附件：根据议题状态判定是否只读 -->
<field name="documents_ids" widget="preview_many2many"
readonly="issue_state not in ['to_do', 'cancel','to_modify', 'draft']"/>
<!-- 后台逻辑用，不可显示 -->
<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="issue_state" invisible="1"/>
<field name="employee_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="users_role_ids" invisible="1" widget="many2many_tags"/>
</group>
<group col="2">
<group>