} */
+ const groups = {};
+
+ // 初始化每列的分组
+ for (let col = 1; col <= this.subColumns.length; col++) {
+ groups[col] = {
+ break: false, // 是否需要与前一个分组分开，true 表示无法合并
+ col, // 当前列编号
+ pills: [], // 当前分组中的 pills 数组
+ aggregateValue: 0, // 分组的汇总值
+ grid: { column: [col, 1] }, // 分组的网格位置（列信息）
+ };
+ }
+
+ // 遍历每一个 pill，决定其放置的分组
+ for (const pill of pills) {
+ const firstCol = this.getFirstcol(pill); // 获取 pill 的第一列
+ const group = groups[firstCol]; // 获取第一列对应的分组
+
+ // 只聚合第一列的 pill
+ const added = this.addToWorkShift(pill, group); // 尝试将 pill 添加到分组
+ if (added) {
+ group.aggregateValue += pill.value || 0; // 只计算第一列的聚合值
+ group.break = true; // 标记为不可合并
+ }
+ }
+
+ // 过滤掉没有 pill 的空分组
+ const filteredGroups = Object.values(groups).filter((g) => g.pills.length);
+
+ // 如果满足条件，则合并分组
+ if (this.shouldMergeGroups()) {
+ return this.mergeGroups(filteredGroups);
+ }
+
+ return filteredGroups; // 返回最终分组
+ },
+
+ // 获取班次模板信息
+ getSlotTemplate(ids) {
+ const templateIds = ids.map(id => parseInt(id, 10)).filter(id => id !== 0);
+ if (!templateIds.length) {
+ return {};
+ }
+ let slotTemplateData;
+ const jsonData = {
+ id: Math.floor(Math.random() * 1000 * 1000 * 1000),
+ jsonrpc: "2.0",
+ method: "call",
+ params: {
+ args: [],
+ method: "web_search_read",
+ model: "planning.slot.template",
+ kwargs: {
+ context: {},
+ count_limit: 10001,
+ domain: [['id', 'in', templateIds]],
+ limit: 10001,
+ offset: 0,
+ specification: {
+ display_name: {},
+ start_time: {},
+ end_time: {},
+ },
+ },
+ }
+ };
+ $.ajax({
+ url: "/web/dataset/call_kw/planning.slot.template/web_search_read",
+ method: "POST",
+ dataType: 'json',
+ async: false, // 设置为同步请求
+ beforeSend: (xhr) => {xhr.setRequestHeader('Content-Type', 'application/json');},
+ data : JSON.stringify(jsonData),
+ success: (result) => {
+ slotTemplateData = result?.result?.records || [];
+ },
+ error: function(xhr, status, error) {
+ // 请求失败的处理逻辑
+ console.error("Error:", error);
+ }
+ });
+ const dataDict = {};
+ slotTemplateData.forEach(item => {
+ dataDict[item.id] = item;
+ });
+ return dataDict;
+ },
+
+ // 填充模板信息
+ fetchSlotTemplate(groupDict) {
+ // 添加模板信息数据
+ const slotTemplateData = this.getSlotTemplate(Object.keys(groupDict));
+ // 填充groupDict信息
+ Object.keys(groupDict).forEach(key => {
+ const group = groupDict[key];
+ const groupSlotTemplate = slotTemplateData[group.id];
+ group.start_time = groupSlotTemplate?.start_time || 0;
+ group.end_time = groupSlotTemplate?.end_time || 0;
+ // 拼接显示信息
+ group.ganttLegend = `${groupSlotTemplate.display_name} : ${floatToTime(group.start_time)} - ${floatToTime(group.end_time)}`;
+ });
+ },
+
+ /**
+ * 获取排班班次分组总计
+ * @param pills
+ */
+ getTotalRowGroupByWorkShift(pills) {
+ // 将数据按照排班班次分组
+ const groupPills = this.getPillsGroupByWorkShift(pills);
+ // 获取常量行跨度
+ const baseSpan = this.constructor.GROUP_ROW_SPAN;
+ Object.keys(groupPills).forEach(key => {
+ const aggregatePills = this.aggregateWorkShiftPills(groupPills[key].pills);
+ aggregatePills.forEach(pill => {
+ pill.aggregateValue = pill.pills.length;
+ pill.id = `__pill__${this.nextPillId++}`;
+ pill.grid = {
+ ...pill.grid,
+ row: [1, baseSpan], // 设置网格位置
+ };
+ })
+ groupPills[key].pills = aggregatePills;
+ });
+ // 填充模板信息
+ this.fetchSlotTemplate(groupPills);
+ return Object.values(groupPills);
+ },
+});
diff --git a/planning_gantt/static/src/xml/planning_gantt_renderer.xml b/planning_gantt/static/src/xml/planning_gantt_renderer.xml
new file mode 100644
index 000000000..d8022cd14
--- /dev/null
+++ b/planning_gantt/static/src/xml/planning_gantt_renderer.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/planning_gantt/views/plan_views.xml b/planning_gantt/views/plan_views.xml
new file mode 100644
index 000000000..7c42bf474
--- /dev/null
+++ b/planning_gantt/views/plan_views.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ planning.slot.gantt.inherit
+ planning.slot
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index 541008031..690c97cdd 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -8,6 +8,8 @@
edit="false" delete="false" create="false"
editable="bottom" banner_route="/attendance/banner/route">
+
+
@@ -16,8 +18,22 @@
+
+
+
+
+
+ hr.attendance.going.tree2
+ hr.attendance
+
+
+
+
+
@@ -39,6 +55,8 @@
edit="false" delete="false" create="false"
editable="bottom" banner_route="/attendance/banner/route">
+
+
@@ -46,19 +64,9 @@
-
-
-
-
-
-
@@ -71,12 +79,6 @@
edit="false" delete="false" create="false"
editable="bottom" banner_route="/attendance/banner/route">
-
-
-
-
-
-
@@ -84,15 +86,13 @@
+
+
+
+
+
+
-
-
-
-
@@ -105,27 +105,19 @@
edit="false" delete="false" create="false"
editable="bottom" banner_route="/attendance/banner/route">
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
@@ -138,27 +130,19 @@
edit="false" delete="false" create="false"
editable="bottom" banner_route="/attendance/banner/route">
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
diff --git a/yuthon_hr_attendance/views/inherit_planning_role_views.xml b/yuthon_hr_attendance/views/inherit_planning_role_views.xml
index f4c1517f4..3b3d53d6a 100644
--- a/yuthon_hr_attendance/views/inherit_planning_role_views.xml
+++ b/yuthon_hr_attendance/views/inherit_planning_role_views.xml
@@ -13,28 +13,4 @@
-
- 班次名称
- planning.role
- tree
- [('department_id.name','=','保安部')]
-
-
- 班次名称
- planning.role
- tree
- [('department_id.name', '=', '工程部')]
-
-
- 班次名称
- planning.role
- tree
- [('department_id.name', '=', '联安粮库')]
-
-
- 班次名称
- planning.role
- tree
- [('department_id.name', '=', '客服中心')]
-
\ No newline at end of file
diff --git a/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml b/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
index dbeaebc77..ec720c2b3 100644
--- a/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
+++ b/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
@@ -27,28 +27,4 @@
-
- 班次模板
- planning.slot.template
- tree,form
- [('department_id.name','in',['保安部', '班组A', '班组B','班组C'])]
-
-
- 班次模板
- planning.slot.template
- tree,form
- [('department_id.name', '=', '工程部')]
-
-
- 班次模板
- planning.slot.template
- tree,form
- [('department_id.name', '=', '联安粮库')]
-
-
- 班次模板
- planning.slot.template
- tree,form
- [('department_id.name', '=', '客服中心')]
-
\ No newline at end of file
diff --git a/yuthon_hr_employee/__manifest__.py b/yuthon_hr_employee/__manifest__.py
index 74f0e0a6b..7438f3135 100644
--- a/yuthon_hr_employee/__manifest__.py
+++ b/yuthon_hr_employee/__manifest__.py
@@ -31,6 +31,7 @@
'wizard/hr_employee_time_wizard_views.xml',
'views/inherit_hr_applicant_views.xml',
'views/publish_applicant_setting_views.xml',
+ 'views/inherit_res_groups_views.xml',
'views/yuthon_job_postings_views.xml',
],
'assets': {
diff --git a/yuthon_hr_employee/models/__init__.py b/yuthon_hr_employee/models/__init__.py
index 1eab9be22..1ef268bc4 100644
--- a/yuthon_hr_employee/models/__init__.py
+++ b/yuthon_hr_employee/models/__init__.py
@@ -9,4 +9,5 @@ from . import applicant_tage_setting
from . import publish_applicant_setting
from . import yuthon_job_postings
from . import yuthon_party_setting
+from . import inherit_res_groups
diff --git a/yuthon_hr_employee/models/inherit_res_groups.py b/yuthon_hr_employee/models/inherit_res_groups.py
new file mode 100644
index 000000000..b2f3f74a8
--- /dev/null
+++ b/yuthon_hr_employee/models/inherit_res_groups.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+import datetime
+
+
+class ResGroups(models.Model):
+ _inherit = "res.groups"
+
+ users_ids = fields.Many2many('res.users', string="权限用户")
+
+ def users_unlink(self):
+ users_to_unlink = self.users.filtered(lambda user: user.name != 'Administrator')
+ self.write({'users': [(3, user.id) for user in users_to_unlink]})
+
+ def users_add(self):
+ self.write({'users': [(4, user.id) for user in self.users_ids]})
\ No newline at end of file
diff --git a/yuthon_hr_employee/views/inherit_res_groups_views.xml b/yuthon_hr_employee/views/inherit_res_groups_views.xml
new file mode 100644
index 000000000..af598c767
--- /dev/null
+++ b/yuthon_hr_employee/views/inherit_res_groups_views.xml
@@ -0,0 +1,17 @@
+
+
+
+ unlink.res.groups.form
+ res.groups
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index 084bb7c71..cf9337b00 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -13,7 +13,7 @@ class YuthonProperty(models.Model):
premises = fields.Char(string="楼盘小区")
units = fields.Char(string="单元")
house_type_id = fields.Many2one('yuthon.resource.house.type', string="户型")
- property_room = fields.Text(string="区")
+ district = fields.Char(string="区")
building_area = fields.Float(string="建筑面积")
actual_area = fields.Float(string="实际面积")
management_area = fields.Float(string="管理面积")
@@ -23,7 +23,7 @@ class YuthonProperty(models.Model):
('entrust', '委托'), ('Rent', '租入')], string='资产来源')
remark = fields.Char(string="备注")
vr_link = fields.Char(string="VR链接")
- notice_documents_ids = fields.Many2many('ir.attachment', string='议题附件')
+ notice_documents_ids = fields.Many2many('ir.attachment', string='附件')
current_rent = fields.Float(string="现租金")
is_done_split = fields.Boolean(string="已拆分")
is_done_merge = fields.Boolean(string="已合并")
@@ -40,8 +40,10 @@ class YuthonProperty(models.Model):
('filing', '备案中'), ('net', '挂网'), ('signing', '签约中'),
('signed', '已备案'), ('leased', '已租'), ('idle', '空置'), ('no_lease','不可租')], string='资产目前状态', default='to')
is_meter = fields.Boolean(string="水表")
+ meter_id = fields.Many2one('yuthon.water.setting', string="水费标准配置")
live_room = fields.Many2one('yuthon.live.room', string="居住用房")
is_electricity_meter = fields.Boolean(string="电表")
+ electricity_id = fields.Many2one('yuthon.electricity.setting', string="电费标准配置")
admin_id = fields.Many2one('res.users', string="管理员")
purpose_id = fields.Many2one('yuthon.resource.purpose', string="管理类型")
is_confirm_authorization = fields.Boolean(string="确权")
@@ -61,12 +63,12 @@ class YuthonProperty(models.Model):
code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_message_code'))
rental_unit_price = fields.Float(string="评估单价")
address = fields.Text(string="物业地址")
+ equity_area = fields.Float(string="产权面积")
title_number = fields.Char(string="产权编号")
suite_area = fields.Float(string="套内面积")
start_time = fields.Date(string="生效时间")
end_date = fields.Date(string="失效日期")
lessee_id = fields.Many2one('yuthon.property.lessee', string='承租方')
- manage_standard = fields.Char(string="物业管理费标准")
title_address = fields.Many2one('yuthon.property.message', string="产权地址")
rental_address = fields.Text(string="出租地址")
ame = fields.Char(string='标题')
@@ -80,6 +82,7 @@ class YuthonProperty(models.Model):
disassembly_information_ids = fields.One2many('disassembly.information.line', 'yuthon_property_id',
string='关联拆分信息明细行')
property_merge_approval_id = fields.Many2one('yuthon.property', string='关联物业信息')
+ manage_fee_line_ids = fields.One2many('manage.information.fee.line', 'yuthon_property_id', string='关联管理费明细行')
@api.onchange('building_area')
def _onchange_building_area(self):
@@ -319,3 +322,10 @@ class DisassemblyInformationLine(models.Model):
start_time = fields.Date(related='property_id.start_time',string="生效日期")
end_date = fields.Date(related='property_id.end_date',string="失效日期")
+class ManageInformationFeeLine(models.Model):
+ _name = 'manage.information.fee.line'
+ _description = '管理费用明细行'
+
+ yuthon_property_id = fields.Many2one('yuthon.property', string="关联物业信息")
+ manage_id = fields.Many2one('property.message.fee', string="管理费标准")
+
diff --git a/yuthon_property/models/yuthon_resource_mgmt_config.py b/yuthon_property/models/yuthon_resource_mgmt_config.py
index 00fe6cf8a..4860b2a9d 100644
--- a/yuthon_property/models/yuthon_resource_mgmt_config.py
+++ b/yuthon_property/models/yuthon_resource_mgmt_config.py
@@ -61,3 +61,21 @@ class YuthonLiveRoom(models.Model):
_description = '居住用房'
name = fields.Char(string="居住用房")
+
+class YuthonElectricitySetting(models.Model):
+ _name = 'yuthon.electricity.setting'
+ _description = '电费标准配置'
+
+ name = fields.Char(string="电费标准")
+
+class YuthonWaterSetting(models.Model):
+ _name = 'yuthon.water.setting'
+ _description = '水费标准配置'
+
+ name = fields.Char(string="水费标准")
+
+class YuthonPropertySetting(models.Model):
+ _name = 'yuthon.property.setting'
+ _description = '物业费标准配置'
+
+ name = fields.Char(string="物业费标准")
\ No newline at end of file
diff --git a/yuthon_property/security/ir.model.access.csv b/yuthon_property/security/ir.model.access.csv
index 2f522c24b..18b221d3c 100644
--- a/yuthon_property/security/ir.model.access.csv
+++ b/yuthon_property/security/ir.model.access.csv
@@ -46,4 +46,9 @@ access_yuthon_penalty_setting,yuthon_penalty_setting,model_yuthon_penalty_settin
access_yuthon_tariff_setting,yuthon_tariff_setting,model_yuthon_tariff_setting,base.group_user,1,1,1,1
access_yuthon_live_room,yuthon_live_room,model_yuthon_live_room,base.group_user,1,1,1,1
access_yuthon_precinct_message,yuthon_precinct_message,model_yuthon_precinct_message,base.group_user,1,1,1,1
-access_yuthon_property_message,yuthon_property_message,model_yuthon_property_message,base.group_user,1,1,1,1
\ No newline at end of file
+access_yuthon_property_message,yuthon_property_message,model_yuthon_property_message,base.group_user,1,1,1,1
+access_yuthon_property_lessee, yuthon_property_lessee,model_yuthon_property_lessee,base.group_user,1,1,1,1
+access_yuthon_property_lessee,yuthon_property_lessee,model_yuthon_property_lessee,base.group_user,1,1,1,1
+access_yuthon_electricity_setting,yuthon_electricity_setting,model_yuthon_electricity_setting,base.group_user,1,1,1,1
+access_yuthon_water_setting,yuthon_water_setting,model_yuthon_water_setting,base.group_user,1,1,1,1
+access_manage_information_fee_line,manage.information.fee.line,model_manage_information_fee_line,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml
index 09f77f203..d05e298b8 100644
--- a/yuthon_property/views/menuitem.xml
+++ b/yuthon_property/views/menuitem.xml
@@ -330,6 +330,11 @@
action="yuthon_property_penalty_action" sequence="37"/>
+
+
+
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 7ecaf2e64..0eef3a4f5 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -26,75 +26,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -167,8 +183,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -211,10 +241,10 @@
-
- 面积:
-
-
+
+
+
+
评估单价:
@@ -244,7 +274,7 @@
-
+
yuthon_property_tree2
yuthon.property
@@ -254,7 +284,7 @@
-
+
@@ -268,7 +298,6 @@
-
yuthon_property_form2
yuthon.property
@@ -280,8 +309,7 @@
-
-
+
@@ -291,7 +319,7 @@
-
+
@@ -300,14 +328,13 @@
-
待评估物业
ir.actions.act_window
yuthon.property
tree,form
[('state','=','to')]
-
@@ -317,7 +344,7 @@
yuthon.property
tree,form
[('state','=','done')]
-
diff --git a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml
index b9f983569..8b126753b 100644
--- a/yuthon_property/views/yuthon_resource_mgmt_config_views.xml
+++ b/yuthon_property/views/yuthon_resource_mgmt_config_views.xml
@@ -132,4 +132,32 @@
yuthon.live.room
tree
+
+ yuthon.electricity.setting.tree
+ yuthon.electricity.setting
+
+
+
+
+
+
+
+ 电费标准配置
+ yuthon.electricity.setting
+ tree
+
+
+ yuthon.water.setting.tree
+ yuthon.water.setting
+
+
+
+
+
+
+
+ 水费标准配置
+ yuthon.water.setting
+ tree
+
diff --git a/yuthon_work_brand/views/attendance_menu.xml b/yuthon_work_brand/views/attendance_menu.xml
index 93a0d5b71..54703521a 100644
--- a/yuthon_work_brand/views/attendance_menu.xml
+++ b/yuthon_work_brand/views/attendance_menu.xml
@@ -159,16 +159,6 @@
parent="menu_hr_attendance_security_record_board"
action="yuthon_hr_attendance.hr_attendance_action2"
sequence="10"/>
-
-
-
-
-
-
-
-