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

Merge pull request !9923 from 李鹏宇/dev
2026-03-19 06:56:55 +00:00
parent de7ff9cd45 571560aa10
commit d2e9958d0a
3 changed files with 3 additions and 3 deletions
@@ -148,7 +148,7 @@
            </xpath>
            <xpath expr="//field[@name='department_id']" position="after">
                <field name="department_ids" widget="many2many_tags"/>
-                <field name="role_group_ids" column_invisible="1" widget="many2many_tags"/>
+                <field name="role_group_ids" widget="many2many_tags"/>
            </xpath>
            <xpath expr="//field[@name='bank_account_id']" position="attributes">
                <attribute name="invisible">1</attribute>
@@ -24,7 +24,7 @@ class YuthonRenewalApproval(models.Model):
    work_end = fields.Boolean(string="结束")

    employee_id = fields.Many2one('hr.employee', string="续签员工")
-    contract_signing_entity = fields.Char(string="合同签约主体")
+    contract_signing_entity = fields.Many2one('yuthon.party.setting', string="合同签约主体")
    card = fields.Char(related='employee_id.identification_id', string="身份证号")
    department1_id = fields.Many2one('hr.department', string="续签部门")
    user_sex = fields.Selection(related='employee_id.user_sex', string="性别")
@@ -66,12 +66,12 @@
                            <field name="card"/>
                            <field name="department1_id" options="{'no_create': True}"/>
                            <field name="current_status"/>
-                            <field name="renewal_date"/>
                        </group>
                        <group>
                            <field name="user_sex"/>
                            <field name="degree"/>
                            <field name="onboard_time"/>
+                            <field name="renewal_date"/>
                        </group>
                    </group>
                    <group string="合同信息">