From 9d5cb888c32e45f1b87ce1993c00d8bf8f381a98 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: Sun, 28 Dec 2025 16:25:11 +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

---
 .../models/contract_review_approval.py                    | 4 ++++
 .../views/contract_review_approval_views.xml              | 1 +
 yuthon_property/data/yuthon_new_property.xml              | 4 ++--
 yuthon_trade/views/yuthon_business_approval_viwes.xml     | 8 ++++----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/yuthon_hr_employee_approval/models/contract_review_approval.py b/yuthon_hr_employee_approval/models/contract_review_approval.py
index adf6e1f8e..df8920d11 100644
--- a/yuthon_hr_employee_approval/models/contract_review_approval.py
+++ b/yuthon_hr_employee_approval/models/contract_review_approval.py
@@ -16,6 +16,10 @@ class ContractReviewApproval(models.Model):
     department_id = fields.Many2one('hr.department', string='送审部门')
     amount = fields.Float(string='合同金额')
     remarks = fields.Text(string='情况说明')
+    purchase_type = fields.Selection(
+        [('fixed', '固定资产'), ('low', '低值易耗'), ('service', '服务'), ('day', '日常消耗品')],
+        string="采购类型", required=True, default='fixed')
+
     documents_ids = fields.Many2many('ir.attachment', string="附件")
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
diff --git a/yuthon_hr_employee_approval/views/contract_review_approval_views.xml b/yuthon_hr_employee_approval/views/contract_review_approval_views.xml
index 5d67a19e1..b1f3e9283 100644
--- a/yuthon_hr_employee_approval/views/contract_review_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/contract_review_approval_views.xml
@@ -51,6 +51,7 @@
                             <field name="contract_type"/>
                         </group>
                         <group>
+                            <field name="purchase_type"/>
                             <field name="amount"/>
                         </group>
                     </group>
diff --git a/yuthon_property/data/yuthon_new_property.xml b/yuthon_property/data/yuthon_new_property.xml
index 9ab1c244e..72ec96269 100644
--- a/yuthon_property/data/yuthon_new_property.xml
+++ b/yuthon_property/data/yuthon_new_property.xml
@@ -44,7 +44,7 @@
             <field name="name">定时任务:更新电表停用状态</field>
             <field name="model_id" ref="model_property_meter_archives"/>
             <field name="state">code</field>
-            <field name="code">model.update_ele_state</field>
+            <field name="code">model.update_ele_state()</field>
             <field eval="True" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
@@ -57,7 +57,7 @@
             <field name="name">定时任务:更新水表停用状态</field>
             <field name="model_id" ref="model_property_meter_water"/>
             <field name="state">code</field>
-            <field name="code">model.update_water_state</field>
+            <field name="code">model.update_water_state()</field>
             <field eval="True" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
diff --git a/yuthon_trade/views/yuthon_business_approval_viwes.xml b/yuthon_trade/views/yuthon_business_approval_viwes.xml
index 1a53f58e6..041dde8f3 100644
--- a/yuthon_trade/views/yuthon_business_approval_viwes.xml
+++ b/yuthon_trade/views/yuthon_business_approval_viwes.xml
@@ -46,13 +46,13 @@
                     <group string="审批事项">
                         <field name="is_back" invisible="1"/>
                         <field name="work_end" invisible="1"/>
-                        <field name="name"/>
+                        <field name="name" string="事项标题"/>
                         <field name="users_id"/>
+                        <field name="information_categories_ids" widget="many2many_tags" string="业务类型"/>
+                        <field name="reason" string="事项说明"/>
+                        <field name="document_ids" widget="preview_many2many" string="附件清单"/>
                         <field name="type_stamp_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" invisible="is_chapter == 'no' or not is_chapter"/>
                         <field name="scope_chapter_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" invisible="is_chapter == 'no' or not is_chapter"/>
-                        <field name="information_categories_ids" widget="many2many_tags"/>
-                        <field name="reason"/>
-                        <field name="document_ids" widget="preview_many2many"/>
                         <field name="department_id" invisible="1"/>
                     </group>
                 </sheet>