From 084dc500b76359a2bbd7f64d9ccbd33a660b5e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Fri, 10 Oct 2025 19:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_official/models/yuthon_official.py     | 14 +++----
 .../views/yuthon_official_views.xml           | 41 +++++++------------
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/yuthon_official/models/yuthon_official.py b/yuthon_official/models/yuthon_official.py
index 57c2294da..967e8da5f 100644
--- a/yuthon_official/models/yuthon_official.py
+++ b/yuthon_official/models/yuthon_official.py
@@ -13,26 +13,26 @@ class YuthonOfficial(models.Model):
 
     name = fields.Char(string="标题")
     code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('official_code'))
-    official_type_id = fields.Many2one('official.type', string="公文种类")
+    official_type_id = fields.Many2one('official.type', string="文件类型")
     reference_cold = fields.Integer(string="发文字号")
     major_event_category = fields.Integer(string="重大事项所属类别")
     official_partner_id = fields.Many2one('official.partner', string="来文单位")
     remarks = fields.Char(string="备注事项")
-    main_text = fields.Text(string='正文')
+    main_text = fields.Text(string='文件内容')
     come_file_id = fields.Char(string="来文编号")
     incoming_file_id = fields.Char(string="收文编号")
-    main_flats = fields.Char(string="主送")
-    copy_flats = fields.Char(string="抄送")
+    main_flats = fields.Char(string="主送单位")
+    copy_flats = fields.Char(string="抄送单位")
     department_ids = fields.Many2many('hr.department', string='部门范围')
     employee_ids = fields.Many2many('hr.employee', string='人员范围')
     users_role_ids = fields.Many2many('soong.user.role', string='角色范围')
     servings_number = fields.Integer(string="份数")
     urgency_level = fields.Selection([('normal', '一般'), ('urgent', '紧急'), ('extra_urgent', '特急')], string="紧急程度", default='normal')
     secret_level = fields.Selection([('normal', '一般'), ('urgent', '秘密'), ('secret', '机密'), ('so_secret', '绝密')], string="密级")
-    date = fields.Datetime(string="日期", default=fields.Datetime.now)
+    date = fields.Datetime(string="拟稿日期", default=fields.Datetime.now)
     official_statu = fields.Selection([('done', '办结'), ('approval', '审核')], string="公文环节")
-    users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user)
-    department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
+    users_id = fields.Many2one('res.users', string="拟稿人", default=lambda self: self.env.user)
+    department_id = fields.Many2one(related='users_id.employee_id.department_id', string="拟稿部门")
     company_id = fields.Many2one(related="users_id.employee_id.company_id", string="公司", store=True)
     is_meet = fields.Boolean(string="是否上会")
     issues_result = fields.Html(string="会议结果")
diff --git a/yuthon_official/views/yuthon_official_views.xml b/yuthon_official/views/yuthon_official_views.xml
index ae03947ef..16516b626 100644
--- a/yuthon_official/views/yuthon_official_views.xml
+++ b/yuthon_official/views/yuthon_official_views.xml
@@ -7,7 +7,6 @@
             <tree>
                 <field name="name"/>
                 <field name="department_id"/>
-                <field name="official_partner_id"/>
                 <field name="date"/>
             </tree>
         </field>
@@ -20,7 +19,7 @@
             <form create="0">
                 <header>
 <!--                    <button name="done_publish" string="发布" type="object" class="btn-primary"/>-->
-                    <button name="supervising_button" string="督办" type="object" class="btn-primary" invisible="not is_supervising"/>
+<!--                    <button name="supervising_button" string="督办" type="object" class="btn-primary" invisible="not is_supervising"/>-->
                 </header>
                 <sheet>
                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
@@ -54,41 +53,31 @@
                             <field name="name" required="1"/>
                         </h1>
                     </div>
-                    <group>
-                        <group>
-                            <field name="users_id"/>
+                    <group string="文件基本信息">
+                        <group col="2">
                             <field name="company_id" invisible="1"/>
-                            <field name="official_partner_id"/>
                             <field name="work_end" invisible="1"/>
                             <field name="reference_cold"/>
-                            <field name="major_event_category"/>
                             <field name="secret_level"/>
+                            <field name="official_type_id"/>
+                        </group>
+                        <group>
+                            <field name="copy_flats"/>
                             <field name="date"/>
-                            <field name="deadline"/>
+                        </group>
+                    </group>
+                    <group col="2" string="拟稿信息">
+                        <group>
+                             <field name="users_id"/>
                             <field name="official_documents_ids" widget="many2many_tags"/>
                         </group>
                         <group>
-                            <field name="department_id" widget="ztree_select" invisible="1"/>
-                            <field name="come_file_id"/>
-                            <field name="incoming_file_id"/>
-                            <field name="main_flats"/>
-                            <field name="copy_flats"/>
-                            <field name="servings_number"/>
-                            <field name="department_ids" widget="many2many_tags"/>
-                            <field name="employee_ids" widget="many2many_tags" options="{'no_create': True}"/>
-                            <field name="users_role_ids" widget="many2many_tags"/>
+                            <field name="department_id"/>
                         </group>
                     </group>
-                    <group>
-                        <field name="main_text"/>
-                        <field name="remarks"/>
-                        <field name="is_supervising"/>
+                    <group string="文件内容">
+                        <field name="main_text" string=" "/>
                     </group>
-                    <notebook>
-                        <page string="督办事项" invisible="not is_supervising">
-                            <field name="workflow_inspector_ids"/>
-                        </page>
-                    </notebook>
                 </sheet>
             </form>
         </field>