!8708 !8707 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…

Merge pull request !8708 from 李鹏宇/dev

soong_workflow/static/src/js/urgency_level_widget.js

@@ -17,8 +17,8 @@ export class UrgencyLevelWidget extends Component {
         // 如果是急件，返回黄色样式类名
         if (level === 'urgent') {
             return 'urgency-urgent';
-        // 如果是特急件，返回红色样式类名
-        } else if (level === 'emergency') {
+        // 如果是特急件，返回红色样式类名（支持emergency和extra_urgent两种值）
+        } else if (level === 'emergency' || level === 'extra_urgent') {
             return 'urgency-emergency';
         }
         // 默认返回白色样式类名（普件）

yuthon_official/models/yuthon_official_incoming_normal.py

@@ -10,6 +10,7 @@ class YuthonOfficialIncomingNormal(models.Model):
     _rec_name = 'name'
 
     name = fields.Char(string="标题")
+    text = fields.Text(string="标题", compute='_compute_text', store=True)
     code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('official_code'))
     official_type_id = fields.Many2one('official.type', string="公文种类")
     reference_date = fields.Date(string='来问日期')
@@ -52,6 +53,14 @@ class YuthonOfficialIncomingNormal(models.Model):
         store=True
     )
     
+    @api.depends('name')
+    def _compute_text(self):
+        """
+        计算text字段，值等于name字段
+        """
+        for record in self:
+            record.text = record.name or ''
+    
     @api.depends('log_ids', 'write_date')
     def _compute_display_end_time(self):
         """

yuthon_official/views/yuthon_official_incoming_normal_views.xml

@@ -5,7 +5,11 @@
         <field name="model">yuthon.official.incoming.normal</field>
         <field name="arch" type="xml">
             <tree default_order="display_end_time">
-                <field name="name"/>
+                <field name="code"/>
+                <field name="urgency_level" column_invisible="1"/>
+                <field name="urgency_level" widget="urgency_level_badge" nolabel="1" optional="show"/>
+                <field name="text" string="标题"/>
+                <field name="create_uid" string="创建人"/>
                 <field name="department_id"/>
                 <field name="time_date"/>
                 <field name="display_end_time" string="办结时间" optional="show"/>