From 1408ca98c5ffff71b870928229f4e31e4c403f59 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 4 Aug 2025 10:39:31 +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

---
 .../views/property_early_quitting.xml         |  4 +---
 .../models/yuthon_message_approval.py         |  2 +-
 .../views/yuthon_message_approval_views.xml   | 22 +++++++++++--------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/yuthon_property_approval/views/property_early_quitting.xml b/yuthon_property_approval/views/property_early_quitting.xml
index 34b48afa9..041a98cb9 100644
--- a/yuthon_property_approval/views/property_early_quitting.xml
+++ b/yuthon_property_approval/views/property_early_quitting.xml
@@ -50,6 +50,7 @@
                         <field name="reason"/>
                         <field name="issues_result" invisible="is_issues == False"/>
                         <field name="contract_id" widget="preview_many2one"/>
+                        <field name="early_quitting_date"/>
                         <field name="property_documents_ids" widget="preview_many2many"/>
                     </group>
                     <group col="3" string="出租信息">
@@ -63,9 +64,6 @@
                             <field name="lessee_id"/>
                             <field name="end_data"/>
                         </group>
-                        <group>
-                            <field name="early_quitting_date"/>
-                        </group>
                     </group>
                 </sheet>
             </form>
diff --git a/yuthon_trade/models/yuthon_message_approval.py b/yuthon_trade/models/yuthon_message_approval.py
index 2b459f365..8ee239c32 100644
--- a/yuthon_trade/models/yuthon_message_approval.py
+++ b/yuthon_trade/models/yuthon_message_approval.py
@@ -15,7 +15,7 @@ class YuthonMessageApproval(models.Model):
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="发布部门")
     phone = fields.Char(related='users_id.employee_id.mobile_phone', string="联系方式")
     documents_ids = fields.Many2many('ir.attachment', string="附件")
-    publish_ids = fields.Many2many('yuthon.publish.type', string="发布平台")
+    publish_ids = fields.Many2many('yuthon.publish.type', string="公众号，网站")
     publish_date = fields.Date(string="发布日期")
     is_original = fields.Boolean(string="原创声明勾选")
     norms = fields.Text(string="审核与执行规范")
diff --git a/yuthon_trade/views/yuthon_message_approval_views.xml b/yuthon_trade/views/yuthon_message_approval_views.xml
index 659632bb0..b0c1c13d7 100644
--- a/yuthon_trade/views/yuthon_message_approval_views.xml
+++ b/yuthon_trade/views/yuthon_message_approval_views.xml
@@ -37,6 +37,13 @@
                             <field name="name_title" readonly="1"/>
                         </h1>
                     </div>
+                    <group string="基础信息">
+                        <group>
+                            <field name="users_id"/>
+                            <field name="department_id"/>
+                            <field name="phone"/>
+                        </group>
+                    </group>
                     <group string="审批事项">
                         <group>
                             <field name="work_end" invisible="1"/>
@@ -45,16 +52,13 @@
                             <field name="documents_ids" widget="preview_many2many"/>
                         </group>
                     </group>
-                    <group string="基础信息">
-                        <field name="users_id"/>
-                        <field name="department_id"/>
-                        <field name="phone"/>
-                    </group>
                     <group string="发布设置">
-                        <field name="publish_ids" widget="many2many_tags"/>
-                        <field name="publish_date"/>
-                        <field name="is_original"/>
-                        <field name="norms"/>
+                        <group>
+                            <field name="publish_ids" widget="many2many_tags"/>
+                            <field name="publish_date"/>
+                            <field name="is_original"/>
+                            <field name="norms"/>
+                        </group>
                     </group>
                 </sheet>
             </form>