!8309 !8308 添加功能

Merge pull request !8309 from 李鹏宇/dev

yuthon_official/models/yuthon_sub_enterprises.py

@@ -28,6 +28,8 @@ class YuthonSubEnterprises(models.Model):
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')
     work_end = fields.Boolean(string="结束")
+    employee_ids = fields.Many2many('hr.employee', string="经办人")
+
     def _get_default_name_title(self):
         return self._description if self._description else self._name
 
@@ -41,7 +43,7 @@ class YuthonSubEnterprises(models.Model):
         default=lambda self: [(6, 0, [self.env.user.id])]
     )
     users_ids = fields.Many2many('res.users',
-        string="当前经办人",
+        string="用户",
         relation='yuthon_sub_enterprises_users_rel',
         column1='enterprise_id',
         column2='compute_user_id',
@@ -90,12 +92,14 @@ class YuthonSubEnterprises(models.Model):
             record.users_ids = False
             record.approve_state = False
             record.soong_state = False
+            record.employee_ids = False
             workflow = self.env['soong.workflow.record'].sudo().search(
                 [('code', '=', record.code)],
                 limit=1
             )
             if workflow:
-                record.users_ids = workflow.employee_ids.mapped('user_id')
+                record.employee_ids = workflow.employee_ids.ids
+                record.users_ids = workflow.users_ids.ids
                 record.approve_state = workflow.approve_state
                 record.soong_state = workflow.soong_state
 

yuthon_official/views/yuthon_sub_enterprises_view.xml

@@ -8,7 +8,8 @@
                 <field name="code"/>
                 <field name="name"/>
                 <field name="approve_state" widget="badge" decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
-                 <field name="users_ids" widget="many2many_tags"/>
+                <field name="employee_ids" widget="many2many_tags"/>
+                 <field name="users_ids" widget="many2many_tags" column_invisible="1"/>
                  <field name="soong_state"/>
             </tree>
         </field>

yuthon_salary/views/yuthon_salary_active_views.xml

@@ -4,7 +4,7 @@
         <field name="name">yuthon.salary.active.tree</field>
         <field name="model">yuthon.salary.active</field>
         <field name="arch" type="xml">
-            <tree string="工资单归档" create="0" edit="0" delete="0">
+            <tree string="工资单归档" create="1" edit="0" delete="1">
                 <!-- 核心关联字段：员工 -->
                 <button type="object" name="payslip_transmit" string="发送" class="oe_highlight"/>
                 <field name="confirm_status"/>