完成合同审批模块的代码调整

yuthon_hr_employee_approval/__manifest__.py

@@ -19,9 +19,11 @@
         'data/stage_approval_data.xml',
         'data/tage_approval_data.xml',
         'data/leaving_retired_data.xml',
+        'data/yuthon_contract_type_data.xml',
+        'data/yuthon_formation_method_data.xml',
         'views/inherit_hr_applicant_views.xml',
         'views/inherit_room_booking_views.xml',
-        'views/inherit_hr_job_views.xml',
+        # 'views/inherit_hr_job_views.xml',
         'views/inherit_hr_employee_views.xml',
         'views/yuthon_message_login_views.xml',
         'views/yuthon_onboard_approval_views.xml',

yuthon_hr_employee_approval/data/yuthon_contract_type_data.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <!-- 合同类型数据 -->
+        <record id="contract_type_service_consulting" model="yuthon.contract.type">
+            <field name="name">服务咨询合同</field>
+        </record>
+
+        <record id="contract_type_investment" model="yuthon.contract.type">
+            <field name="name">投资合同</field>
+        </record>
+
+        <record id="contract_type_operation" model="yuthon.contract.type">
+            <field name="name">运营合同</field>
+        </record>
+
+        <record id="contract_type_procurement" model="yuthon.contract.type">
+            <field name="name">采购合同</field>
+        </record>
+
+        <record id="contract_type_capital" model="yuthon.contract.type">
+            <field name="name">资金合同</field>
+        </record>
+
+        <record id="contract_type_strategic_cooperation" model="yuthon.contract.type">
+            <field name="name">战略合作协议</field>
+        </record>
+
+        <record id="contract_type_other" model="yuthon.contract.type">
+            <field name="name">其他合同</field>
+        </record>
+    </data>
+</odoo>

yuthon_hr_employee_approval/data/yuthon_formation_method_data.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <!-- 形成方式数据 -->
+        <record id="formation_method_bidding" model="yuthon.contract.type">
+            <field name="name">投标</field>
+        </record>
+
+        <record id="formation_method_negotiation" model="yuthon.contract.type">
+            <field name="name">议标</field>
+        </record>
+
+        <record id="formation_method_inquiry" model="yuthon.contract.type">
+            <field name="name">询价</field>
+        </record>
+
+        <record id="formation_method_strategic_cooperation" model="yuthon.contract.type">
+            <field name="name">战略合作</field>
+        </record>
+
+        <record id="formation_method_entrustment" model="yuthon.contract.type">
+            <field name="name">委托形成</field>
+        </record>
+    </data>
+</odoo>

yuthon_hr_employee_approval/models/contract_review_approval.py

@@ -13,7 +13,7 @@ class ContractReviewApproval(models.Model):
     is_issues = fields.Boolean(string='是否上会')
     issues_result = fields.Html(string="会议结果")
     related_issues_id = fields.Many2one('issue.library', string="关联议题")
-    department_id = fields.Many2one('hr.department', string='部门')
+    department_id = fields.Many2one('hr.department', string='送审部门')
     amount = fields.Float(string='合同金额')
     remarks = fields.Text(string='情况说明')
     documents_ids = fields.Many2many('ir.attachment', string="附件")
@@ -21,6 +21,11 @@ class ContractReviewApproval(models.Model):
                                      default='normal')
     active = fields.Boolean('Active', default=True, tracking=True)
     work_end = fields.Boolean(string="结束")
+    contract_type = fields.Many2one('yuthon.contract.type', string="合同类型")
+    formation_method = fields.Many2one('yuthon.contract.type', string="形成方式")
+    submitting_unit = fields.Char(string="送审单位")
+    sign_date = fields.Date(string="合同签订日期")
+    performance_term_day = fields.Integer(string='履约期限')
 
     def _get_default_name_title(self):
         return self._description if self._description else self._name

yuthon_hr_employee_approval/models/yuthon_employee_setting.py

@@ -6,4 +6,19 @@ class YuthonServiceType(models.Model):
     _name = 'yuthon.service.type'
     _description = '服务类型'
 
-    name = fields.Char(string="名称")
+    name = fields.Char(string="名称")
+
+class YuthonServiceContractType(models.Model):
+    _name = 'yuthon.contract.type'
+    _description = '合同类型和形成方式'
+
+    name = fields.Char(string="名称", required=True)
+
+
+
+
+
+
+
+
+

yuthon_hr_employee_approval/security/ir.model.access.csv

@@ -57,3 +57,4 @@ access_awards_line, awards_line,model_awards_line,base.group_user,1,1,1,1
 access_yuthon_employee_add,yuthon_employee_add,model_yuthon_employee_add,base.group_user,1,1,1,1
 access_yuthon_pre_examination,yuthon_pre_examination,model_yuthon_pre_examination,base.group_user,1,1,1,1
 access_yuthon_service_type,yuthon_service_type,model_yuthon_service_type,base.group_user,1,1,1,1
+access_yuthon_contract_type,yuthon_contract_type,model_yuthon_contract_type,base.group_user,1,1,1,1

yuthon_hr_employee_approval/views/contract_review_approval_views.xml

@@ -42,12 +42,23 @@
                             <field name="name_title" readonly="1"/>
                         </h1>
                     </div>
-                    <group string="审批信息">
-                        <field name="name" required="1"/>
-                        <field name="work_end" invisible="1"/>
-                        <field name="user_id"/>
-                        <field name="department_id"/>
-                        <field name="amount"/>
+                    <group string="审批信息" col="2">
+                        <group>
+                            <field name="name" required="1"/>
+                            <field name="work_end" invisible="1"/>
+                            <field name="user_id"/>
+                            <field name="department_id"/>
+                            <field name="contract_type"/>
+                            <field name="formation_method"/>
+                        </group>
+                        <group>
+                            <field name="amount"/>
+                            <field name="submitting_unit"/>
+                            <field name="sign_date"/>
+                            <field name="performance_term_day" string="履约期限(天)"/>
+                        </group>
+                    </group>
+                    <group>
                         <field name="remarks"/>
                         <field name="documents_ids" widget="preview_many2many"/>
                     </group>
@@ -60,5 +71,4 @@
         <field name="res_model">contract.review.approval</field>
         <field name="view_mode">tree,form</field>
     </record>
-</odoo>
-
+</odoo>