!2877 添加功能

Merge pull request !2877 from 李鹏宇/dev_zhou

yuthon_property/models/yuthon_precinct_message.py

@@ -8,4 +8,17 @@ class YuthonPrecinctMessage(models.Model):
     _order = 'sequence'
 
     name = fields.Char(string='片区名称')
-    sequence = fields.Integer(string='片区序号')
+    employee_id = fields.Many2one('hr.employee', string='管理员')
+    sequence = fields.Integer(string='片区序号')
+
+    @api.depends('name', 'employee_id.name')
+    def _compute_display_name(self):
+        for record in self:
+            if record.name and record.employee_id:
+                record.display_name = f"{record.name}{record.employee_id.name}"
+            elif record.name:
+                record.display_name = record.name
+            elif record.employee_id:
+                record.display_name = f"由{record.employee_id.name}管理的片区"
+            else:
+                record.display_name = f"片区 #{record.id}"

yuthon_property/models/yuthon_property.py

@@ -299,12 +299,6 @@ class YuthonProperty(models.Model):
             }
         }
 
-    @api.depends('precinct_id', 'admin_id')
-    def _compute_display_name(self):
-        for record in self:
-            if record.precinct_id and record.admin_id:
-                record.display_name = record.precinct_id.name + record.admin_id.name
-
     def put_assessment_approval(self):
         for record in self:
             self.env['property.evaluation.plan'].create({

yuthon_property/views/yuthon_precinct_message_views.xml

@@ -6,6 +6,7 @@
         <field name="arch" type="xml">
             <tree string="片区管理" editable="bottom" limit="20">
                 <field name="sequence" widget="handle"/>
+                <field name="employee_id"/>
                 <field name="name"/>
             </tree>
         </field>