diff --git a/yuthon_hr_employee_approval/__manifest__.py b/yuthon_hr_employee_approval/__manifest__.py
index 975bcf01b..dca4eebeb 100644
--- a/yuthon_hr_employee_approval/__manifest__.py
+++ b/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',
diff --git a/yuthon_hr_employee_approval/data/yuthon_contract_type_data.xml b/yuthon_hr_employee_approval/data/yuthon_contract_type_data.xml
new file mode 100644
index 000000000..b0fca19e8
--- /dev/null
+++ b/yuthon_hr_employee_approval/data/yuthon_contract_type_data.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+ 服务咨询合同
+
+
+
+ 投资合同
+
+
+
+ 运营合同
+
+
+
+ 采购合同
+
+
+
+ 资金合同
+
+
+
+ 战略合作协议
+
+
+
+ 其他合同
+
+
+
\ No newline at end of file
diff --git a/yuthon_hr_employee_approval/data/yuthon_formation_method_data.xml b/yuthon_hr_employee_approval/data/yuthon_formation_method_data.xml
new file mode 100644
index 000000000..58144749b
--- /dev/null
+++ b/yuthon_hr_employee_approval/data/yuthon_formation_method_data.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+ 投标
+
+
+
+ 议标
+
+
+
+ 询价
+
+
+
+ 战略合作
+
+
+
+ 委托形成
+
+
+
\ No newline at end of file
diff --git a/yuthon_hr_employee_approval/models/contract_review_approval.py b/yuthon_hr_employee_approval/models/contract_review_approval.py
index 826ea24e2..092a8ce85 100644
--- a/yuthon_hr_employee_approval/models/contract_review_approval.py
+++ b/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
diff --git a/yuthon_hr_employee_approval/models/yuthon_employee_setting.py b/yuthon_hr_employee_approval/models/yuthon_employee_setting.py
index 889c36df6..57df87a2c 100644
--- a/yuthon_hr_employee_approval/models/yuthon_employee_setting.py
+++ b/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="名称")
\ No newline at end of file
+ name = fields.Char(string="名称")
+
+class YuthonServiceContractType(models.Model):
+ _name = 'yuthon.contract.type'
+ _description = '合同类型和形成方式'
+
+ name = fields.Char(string="名称", required=True)
+
+
+
+
+
+
+
+
+
diff --git a/yuthon_hr_employee_approval/security/ir.model.access.csv b/yuthon_hr_employee_approval/security/ir.model.access.csv
index c22a515ef..14c33e4af 100644
--- a/yuthon_hr_employee_approval/security/ir.model.access.csv
+++ b/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
\ No newline at end of file
diff --git a/yuthon_hr_employee_approval/views/contract_review_approval_views.xml b/yuthon_hr_employee_approval/views/contract_review_approval_views.xml
index f528ae1c0..cdfa0e43f 100644
--- a/yuthon_hr_employee_approval/views/contract_review_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/contract_review_approval_views.xml
@@ -42,12 +42,23 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -60,5 +71,4 @@
contract.review.approval
tree,form
-
-
+
\ No newline at end of file