diff --git a/list_view_sticky_header_and_column/static/src/scss/list_view_sticky_header_and_column.scss b/list_view_sticky_header_and_column/static/src/scss/list_view_sticky_header_and_column.scss
index d6e7285c0..72dc1ebfa 100644
--- a/list_view_sticky_header_and_column/static/src/scss/list_view_sticky_header_and_column.scss
+++ b/list_view_sticky_header_and_column/static/src/scss/list_view_sticky_header_and_column.scss
@@ -63,3 +63,5 @@ th:hover .fa-thumb-tack,
th.clicked-header .fa-thumb-tack {
display: block;
}
+
+//.o_input:hover{background: #b3c8df!important;}
diff --git a/soong_workflow/views/soong_hr_employee_views.xml b/soong_workflow/views/soong_hr_employee_views.xml
index c51a30d4b..60c2bdbfd 100644
--- a/soong_workflow/views/soong_hr_employee_views.xml
+++ b/soong_workflow/views/soong_hr_employee_views.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/yuthon_property/__manifest__.py b/yuthon_property/__manifest__.py
index 877967f29..4eed42589 100644
--- a/yuthon_property/__manifest__.py
+++ b/yuthon_property/__manifest__.py
@@ -12,6 +12,11 @@
'data/data_yuthon_resource_mgmt_config.xml',
'views/yuthon_property_views.xml',
'views/property_type_views.xml',
+ 'views/property_patrol_duty.xml',
+ 'views/property_patrol_plan.xml',
+ 'views/property_route_management.xml',
+ 'views/property_patrol_position.xml',
+ 'views/property_patrol_standard.xml',
'views/yuthon_draw_result_views.xml',
'views/yuthon_expert_database_views.xml',
'views/yuthon_resource_mgmt_config_views.xml',
@@ -19,7 +24,7 @@
'views/menuitem.xml',
],
'demo': [],
- 'depends': ['mail'],
+ 'depends': ['mail','documents','soong_workflow'],
'installable': True,
'application': True,
}
diff --git a/yuthon_property/models/__init__.py b/yuthon_property/models/__init__.py
index 0b1365487..dcf016523 100644
--- a/yuthon_property/models/__init__.py
+++ b/yuthon_property/models/__init__.py
@@ -1,5 +1,10 @@
from . import yuthon_property
from . import property_type
+from . import property_patrol_duty
+from . import property_patrol_plan
+from . import property_patrol_position
+from . import property_patrol_standard
+from . import property_route_management
from . import yuthon_resource_mgmt_config
from . import yuthon_draw_result
from . import yuthon_expert_database
diff --git a/yuthon_property/models/property_patrol_duty.py b/yuthon_property/models/property_patrol_duty.py
new file mode 100644
index 000000000..907f5bd67
--- /dev/null
+++ b/yuthon_property/models/property_patrol_duty.py
@@ -0,0 +1,25 @@
+from odoo import models, fields, api
+
+
+class PropertyPatrolDuty(models.Model):
+ _name = 'property.patrol.duty'
+ _description = '巡更任务'
+
+ number = fields.Integer(string='序号')
+ task_number = fields.Char(string='任务编号')
+ task_category = fields.Char(string='任务类别')
+ route_name = fields.Char(string='路线名称')
+ people = fields.Char(string='责任人')
+ scheduled_time = fields.Datetime(string='计划巡检时间')
+ task_status = fields.Selection([('all_tasks', '全部任务'), ('not_started', '未开始'),
+ ('ing', '进行中'), ('ed', '已完成'),
+ ('overtime', '超时关闭'), ('void', '已作废')], string='任务状态')
+ timeout_cause = fields.Char(string='超时原因')
+ create_date = fields.Date(string="开工时间")
+ end_date = fields.Date(string="完工时间")
+ point_random = fields.Char(string='点位随机')
+ inspection_completion = fields.Char(string='巡检完成率')
+ inspection_schedule = fields.Char(string='巡检进度')
+ controls = fields.Char(string='操作')
+
+
diff --git a/yuthon_property/models/property_patrol_plan.py b/yuthon_property/models/property_patrol_plan.py
new file mode 100644
index 000000000..23ea99f4d
--- /dev/null
+++ b/yuthon_property/models/property_patrol_plan.py
@@ -0,0 +1,18 @@
+from odoo import models, fields, api
+
+
+class PropertyPatrolPlan(models.Model):
+ _name = 'property.patrol.plan'
+ _description = '巡更计划'
+
+ plan_name = fields.Char(string='计划名称')
+ plan_category = fields.Char(string='计划类型')
+ people = fields.Char(string='巡检责任人')
+ time = fields.Integer(string='巡检周期')
+ start_date = fields.Date(string="生效日")
+ end_date = fields.Date(string="失效日")
+ generation_number = fields.Integer(string='任务生成数')
+ completed_number = fields.Integer(string='任务完成数')
+ founder = fields.Char(string='创建人/时间')
+ controls = fields.Char(string='操作')
+
diff --git a/yuthon_property/models/property_patrol_position.py b/yuthon_property/models/property_patrol_position.py
new file mode 100644
index 000000000..2f93e51ea
--- /dev/null
+++ b/yuthon_property/models/property_patrol_position.py
@@ -0,0 +1,19 @@
+from odoo import models, fields, api
+
+
+class PropertyPatrolPosition(models.Model):
+ _name = 'property.patrol.position'
+ _description = '巡更点位'
+
+ number = fields.Integer(string='序号')
+ point_number = fields.Char(string='点位编号')
+ point_name = fields.Char(string='点位名称')
+ external_coding = fields.Char(string='外部编码')
+ position = fields.Char(string='具体位置')
+ adapt_work = fields.Char(string='适应岗位')
+ founder = fields.Char(string='创建人/时间')
+ clock_in = fields.Boolean(string='扫码签到')
+ picture = fields.Boolean(string='强制拍照')
+ outside = fields.Char(string='外部二维码')
+ code_management = fields.Char(string='二维码管理')
+ controls = fields.Char(string='操作')
diff --git a/yuthon_property/models/property_patrol_standard.py b/yuthon_property/models/property_patrol_standard.py
new file mode 100644
index 000000000..1e8dd4d61
--- /dev/null
+++ b/yuthon_property/models/property_patrol_standard.py
@@ -0,0 +1,18 @@
+from odoo import models, fields, api
+
+
+class PropertyPatrolStandard(models.Model):
+ _name = 'property.patrol.standard'
+ _description = '巡更标准'
+
+ number = fields.Integer(string='序号')
+ task_number = fields.Char(string='任务编号')
+ question_type = fields.Char(string='题类型')
+ check_item = fields.Selection([('sweep_floor', '扫地拖地'), ('gate', '看大门'), ('Back door', '看后门')], string='检查顶')
+ title = fields.Selection([('cleaning', '保洁卫生'), ('gate', '看大门'), ('back_door', '看后门')], string='标题')
+ check_details = fields.Selection([('gate', '看大门'), ('back_door', '看后门')], string='检查明细')
+ result_option = fields.Selection([('ood', '好'), ('normal', '一般'), ('bad', '差')], string='检查明细')
+ people = fields.Char(string='创建人')
+ time = fields.Datetime(string='时间')
+ ed_time = fields.Datetime(string='最后修改')
+ controls = fields.Char(string='操作')
diff --git a/yuthon_property/models/property_route_management.py b/yuthon_property/models/property_route_management.py
new file mode 100644
index 000000000..5adf2d3f7
--- /dev/null
+++ b/yuthon_property/models/property_route_management.py
@@ -0,0 +1,13 @@
+from odoo import models, fields, api
+
+
+class PropertyRouteManagement(models.Model):
+ _name = 'property.route.management'
+ _description = '路线管理'
+
+ number = fields.Integer(string='序号')
+ patrol_types = fields.Char(string='安防巡更类型')
+ route_sequence = fields.Char(string='路线顺序')
+ patrol_number = fields.Integer(string='巡更点数量')
+ founder = fields.Char(string='创建人/时间')
+ controls = fields.Char(string='操作')
diff --git a/yuthon_property/security/ir.model.access.csv b/yuthon_property/security/ir.model.access.csv
index c56b8b589..f1d5b151c 100644
--- a/yuthon_property/security/ir.model.access.csv
+++ b/yuthon_property/security/ir.model.access.csv
@@ -1,7 +1,11 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_yuthon_property,yuthon_property,model_yuthon_property,base.group_user,1,1,1,1
access_property_type,property_type,model_property_type,base.group_user,1,1,1,1
-
+access_property_patrol_duty,property_patrol_duty,model_property_patrol_duty,base.group_user,1,1,1,1
+access_property_patrol_plan,property_patrol_plan,model_property_patrol_plan,base.group_user,1,1,1,1
+access_property_route_management,property_route_management,model_property_route_management,base.group_user,1,1,1,1
+access_property_patrol_position,property_patrol_position,model_property_patrol_position,base.group_user,1,1,1,1
+access_property_patrol_standard,property_patrol_standard,model_property_patrol_standard,base.group_user,1,1,1,1
access_yuthon_draw_result,yuthon.draw.result,model_yuthon_draw_result,base.group_user,1,1,1,1
access_yuthon_expert_database,yuthon.expert.database,model_yuthon_expert_database,base.group_user,1,1,1,1
access_yuthon_property_water,yuthon.property.water,model_yuthon_property_water,base.group_user,1,1,1,1
diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml
index 7128258e8..0dbf6cdbe 100644
--- a/yuthon_property/views/menuitem.xml
+++ b/yuthon_property/views/menuitem.xml
@@ -21,7 +21,7 @@
sequence="1"
name="待评估"
parent="yuthon_property_menu"
- action="yuthon_property_evaluation_action1"/>
+ action="property_assess_action"/>
+
+
+
+
+