From 66442c0ffb2cc8339cd5a9fd395b5033dd415cd9 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Mon, 11 Nov 2024 20:27:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../models/yuthon_plan_approval.py | 2 +-
.../models/yuthon_plan_management.py | 48 ++--
.../security/ir.model.access.csv | 4 +-
.../views/yuthon_plan_approval.xml | 134 +++++------
.../views/yuthon_plan_management.xml | 215 +++++++++++++++---
5 files changed, 276 insertions(+), 127 deletions(-)
diff --git a/yuthon_performance/models/yuthon_plan_approval.py b/yuthon_performance/models/yuthon_plan_approval.py
index f21201512..ee6a76ac5 100644
--- a/yuthon_performance/models/yuthon_plan_approval.py
+++ b/yuthon_performance/models/yuthon_plan_approval.py
@@ -9,4 +9,4 @@ class YuthonPlanApproval(models.Model):
job_id = fields.Many2one('hr.job', string="岗位")
reason_text = fields.Html(string='申请事由')
- change_plan_ids = fields.One2many("yuthon.plan.management.line",'change_plan_id',string="个人计划变更明细")
+ # change_plan_ids = fields.One2many("yuthon.plan.management.line",'change_plan_id',string="个人计划变更明细")
diff --git a/yuthon_performance/models/yuthon_plan_management.py b/yuthon_performance/models/yuthon_plan_management.py
index 32cde3713..207eeb400 100644
--- a/yuthon_performance/models/yuthon_plan_management.py
+++ b/yuthon_performance/models/yuthon_plan_management.py
@@ -1,31 +1,35 @@
-
from odoo import models, fields, api, exceptions, _
+import datetime
+
class YuthonPlanManagement(models.Model):
_name = 'yuthon.plan.management'
- _description = "计划管理"
+ _description = "个人工作任务"
_rec_name = 'name'
name = fields.Char('标题')
- creation_time = fields.Datetime(string='填报日期', default=lambda self: fields.Datetime.now())
- job_id = fields.Many2one('hr.job', string="岗位")
- employee_id = fields.Many2one('hr.employee', string="员工")
- department_id = fields.Many2one('hr.department', string="部门")
- plan_ids = fields.One2many('yuthon.plan.management.line','plan_id' ,'计划明细')
+ select_time = fields.Selection([('January','一月'), ('February','二月'), ('March','三月'), ('April','四月'),
+ ('May','五月'), ('June','六月'), ('July','七月'), ('August','八月'),
+ ('September','九月'), ('October','十月'), ('November','十一月'), ('December','十二月')
+ ,('half','上半年'), ('later','下半年')],string='选择时间')
+
+ work_tasks_line_ids = fields.One2many('yuthon.work.tasks.line','plan_id',string='工作任务明细')
+
+
+class YuthonWorkTasksLine(models.Model):
+ _name = 'yuthon.work.tasks.line'
+ _description = "工作任务明细"
+
+ plan_id = fields.Many2one('yuthon.plan.management','关联个人工作任务')
+ task_type = fields.Selection([('KPI','KPI'),('GS','GS')],string='任务类型')
+ task_name = fields.Many2one('yuthon.index.management',string='任务名称')
+ plan = fields.Char('计划安排及具体措施行动')
+ goal = fields.Char('目标',help="质量、数量、成本等方面要求")
+ resource_requirements = fields.Text('资源需求')
+ summarize = fields.Text('完成情况总结')
+
+
+
+
-class YuthonPlanManagementLine(models.Model):
- _name = 'yuthon.plan.management.line'
- _description = "计划管理明细"
-
- plan_id = fields.Many2one('yuthon.plan.management','计划明细')
- change_plan_id = fields.Many2one('yuthon.plan.approval','个人计划变更明细')
-
- index_name = fields.Char('工作任务名称')
- index_plan = fields.Char('计划安排及具体措施/行动')
- index_type = fields.Selection([('kpi', 'KPI'),
- ('gs', 'GS'),
- ('refused_index', '否决指标'),],'指标类别')
- expected_goals = fields.Char('预期目标')
- resource_requirements = fields.Char('资源要求')
- completion_summary = fields.Char('完成情况总结')
diff --git a/yuthon_performance/security/ir.model.access.csv b/yuthon_performance/security/ir.model.access.csv
index d602c24f2..b92ea5d3a 100644
--- a/yuthon_performance/security/ir.model.access.csv
+++ b/yuthon_performance/security/ir.model.access.csv
@@ -2,7 +2,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_yuthon_index_management,yuthon_index_management,model_yuthon_index_management,base.group_user,1,1,1,1
access_yuthon_duty_management,yuthon_duty_management,model_yuthon_duty_management,base.group_user,1,1,1,1
access_yuthon_plan_management,yuthon_plan_management,model_yuthon_plan_management,base.group_user,1,1,1,1
-access_yuthon_plan_management_line,yuthon_plan_management_line,model_yuthon_plan_management_line,base.group_user,1,1,1,1
access_yuthon_index_approval,yuthon_index_approval,model_yuthon_index_approval,base.group_user,1,1,1,1
access_yuthon_kpi_line,yuthon_kpi_line,model_yuthon_kpi_line,base.group_user,1,1,1,1
access_yuthon_gs_line,yuthon_gs_line,model_yuthon_gs_line,base.group_user,1,1,1,1
@@ -25,4 +24,5 @@ access_yuthon_index_employee_line,yuthon_index_employee_line,model_yuthon_index_
access_new_index_management_line,new_index_management_line,model_new_index_management_line,base.group_user,1,1,1,1
access_new_employee_library_line,new_employee_library_line,model_new_employee_library_line,base.group_user,1,1,1,1
access_new_kpi_duty_approval,new_kpi_duty_approval,model_new_kpi_duty_approval,base.group_user,1,1,1,1
-access_new_gs_duty_approval,new_gs_duty_approval,model_new_gs_duty_approval,base.group_user,1,1,1,1
\ No newline at end of file
+access_new_gs_duty_approval,new_gs_duty_approval,model_new_gs_duty_approval,base.group_user,1,1,1,1
+access_yuthon_work_tasks_line,yuthon_work_tasks_line,model_yuthon_work_tasks_line,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_plan_approval.xml b/yuthon_performance/views/yuthon_plan_approval.xml
index 80a6a9766..94ba0f5eb 100644
--- a/yuthon_performance/views/yuthon_plan_approval.xml
+++ b/yuthon_performance/views/yuthon_plan_approval.xml
@@ -1,72 +1,72 @@
-
-
- yuthon.plan.approval.tree
- yuthon.plan.approval
-
-
-
-
-
-
-
-
-
- yuthon.plan.approval.form
- yuthon.plan.approval
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- yuthon.plan.approval.search
- yuthon.plan.approval
-
-
-
-
-
-
-
-
- 个人计划变更
- yuthon.plan.approval
- tree,form
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yuthon_performance/views/yuthon_plan_management.xml b/yuthon_performance/views/yuthon_plan_management.xml
index 3ad7ca190..f8257e1ea 100644
--- a/yuthon_performance/views/yuthon_plan_management.xml
+++ b/yuthon_performance/views/yuthon_plan_management.xml
@@ -6,10 +6,7 @@
-
-
-
-
+
@@ -27,26 +24,188 @@
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,23 +214,9 @@
-
-
- yuthon.plan.management.search
- yuthon.plan.management
-
-
-
-
-
-
-
-
-
-
- 计划管理
+ 个人工作任务
yuthon.plan.management
tree,form