!7395 !7394 添加功能

Merge pull request !7395 from 李鹏宇/dev

yuthon_hr_employee_approval/models/contract_review_approval.py

@@ -11,7 +11,7 @@ class ContractReviewApproval(models.Model):
     name = fields.Char(string='合同名称')
     user_id = fields.Many2one('res.users', string='合同经办人', default=lambda self: self.env.user)
     is_issues = fields.Boolean(string='是否上会')
-    business_type = fields.Char(string="业务类型")
+    information_categories_ids = fields.Many2many('yuthon.information.categories', string='业务类型')
     issues_result = fields.Html(string="会议结果")
     related_issues_id = fields.Many2one('issue.library', string="关联议题")
     department_id = fields.Many2one('hr.department', string='送审部门')

yuthon_hr_employee_approval/views/contract_review_approval_views.xml

@@ -48,13 +48,13 @@
                             <field name="is_back" invisible="1"/>
                             <field name="work_end" invisible="1"/>
                             <field name="user_id" invisible="1"/>
-                            <field name="department_id"/>
-                            <field name="business_type"/>
-                            <field name="contract_type"/>
+                            <field name="amount"/>
                         </group>
                         <group>
+                            <field name="department_id"/>
+                            <field name="information_categories_ids"/>
+                            <field name="contract_type"/>
                             <field name="purchase_type"/>
-                            <field name="amount"/>
                         </group>
                     </group>
                     <group>