pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ljm 修改备份

Browse Source
This commit is contained in:
李鹏宇
2025-01-02 18:30:12 +08:00
parent 74465f4891
commit 8c74f60336
7 changed files with 89 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_holiday/models/inherit_hr_leave_allocation.py
+5 -5
View File
@@ -65,11 +65,11 @@ class HrLeaveAllocation(models.Model):
plan_level = allocation.accrual_plan_id.level_ids.sorted(key=lambda x: x.added_value, reverse=True)
for emp_int, emp_list in emp_dict.items():
for level in plan_level:
# level_month = 0
# if level.added_value_type == 'day':
level_month = level.added_value // 30
# if level.added_value_type == 'hour':
# level_month = level.added_value // (30 * 24)
level_month = 0
if level.added_value_type == 'day':
level_month = level.added_value // 30
if level.added_value_type == 'hour':
level_month = level.added_value // (30 * 7)
if emp_int != 0 and emp_int >= level_month:
info_list = [{**item, 'number_of_days': level.maximum_leave} for item in allocation._prepare_holiday_values(emp_list)]
allocation_vals.extend(info_list)
yuthon_hr_attendance/models/resource_calendar_leaves.py
+2 -2
View File
@@ -102,9 +102,9 @@ class ResourceCalendar(models.Model):
holiday_list.append((0, 0, holiday_values))
leave_list.append((0, 0, leave_values))
self.calendar_holiday_ids.unlink()
self.global_leave_ids.unlink()
self.holiday_data_lines = holiday_list
self.write({'calendar_holiday_ids': holiday_list})
self.write({'global_leave_ids': leave_list})
self.write({'calendar_holiday_ids': holiday_list, 'global_leave_ids': leave_list})
class ResourceCalendarHolidaye(models.Model):
yuthon_property/__manifest__.py
+5
View File
@@ -49,6 +49,11 @@
'wizard/yuthon_property_wizard_views.xml',
'views/menuitem.xml',
],
# 'assets': {
# 'web.assets_backend': [
# 'yuthon_property/static/src/scss/approval.scss',
# ],
# },
'demo': [],
'depends': ['mail', 'documents'],
'installable': True,
yuthon_property/static/scss/approval.scss
+49
View File
@@ -0,0 +1,49 @@
.o_kanban_row {
@media (min-width: 768px) {
display: block;
.o_kanban_group {
display: flex; /* 使用 flex 布局 */
flex-flow: row wrap; /* 横向排列，并支持换行 */
min-width: 100%; /* 确保组宽度占满行 */
.o_kanban_header {
min-width: 100%; /* 确保标题宽度占满行 */
width: 100%;
.o_kanban_header_title {
.o_column_title {
font-weight: bold; /* 确保标题加粗 */
}
}
}
.o_kanban_record {
display: inline-block; /* 横向排列 */
min-width: 332px; /* 设置最小宽度 */
width: 332px; /* 固定宽度 */
margin: 4px 8px; /* 设置间距 */
}
.o_kanban_load_more {
display: inline-block; /* 与记录一致 */
min-width: 332px;
width: 332px;
margin: 4px 8px;
}
}
/* 收拢时的样式调整 */
.o_column_folded {
.o_kanban_header {
.o_kanban_header_title {
.o_column_title {
transform: none; /* 禁用变形 */
top: 10px;
left: 20px; /* 调整位置 */
}
}
}
}
}
}
yuthon_property/views/yuthon_property_views.xml
+2 -5
View File
@@ -214,12 +214,12 @@
<filter name="group_statu" string="物业状态" context="{'group_by': 'state'}"/>
<filter name="purpose_id" string="管理类型" context="{'group_by': 'purpose_id'}"/>
<filter name="admin_id" string="管理员" context="{'group_by': 'admin_id'}"/>
<!-- <filter name="referred_id" string="地段" context="{'group_by': 'referred_id'}"/>-->
</group>
<searchpanel>
<field name="company_id" enable_counters="1"/>
<field name="tenure_type" enable_counters="1"/>
<field name="precinct_id" string="所属片区" enable_counters="1"/>
<field name="referred_id" enable_counters="1"/>
</searchpanel>
</search>
</field>
@@ -244,10 +244,6 @@
<strong class="o_kanban_record_title">
<field name="name"/>
</strong>
<!-- <div>-->
<!-- <span>面积:</span>-->
<!-- <field name="equity_area"/>-->
<!-- </div>-->
<div>
<span>评估单价:</span>
<field name="rental_unit_price"/>
@@ -282,6 +278,7 @@
<field name="name">物业</field>
<field name="res_model">yuthon.property</field>
<field name="view_mode">kanban,tree,form</field>
<!-- <field name="context">{'search_default_referred_id': 1}</field>-->
<field name="search_view_id" ref="yuthon_property_search"/>
</record>
<!--待评估-->
yuthon_property_approval/views/property_lease_contract.xml
+24 -18
View File
@@ -165,25 +165,28 @@
<field name="rent_free_period_days"/>
日
</div>
<field name="first_years_begin"/>
<field name="increments_every_few_years"/>
<field name="increment_method"/>
<field name="increment_percentage" invisible="increment_method != 'percentage'"/>
<field name="increment_price" invisible="increment_method != 'increment_price'"/>
<field name="increment_amount" invisible="increment_method != 'increment_amount'"/>
<field name="admin_id" invisible="1"/>
<field name="is_water" invisible="1"/>
<field name="is_electricity" invisible="1"/>
<field name="is_mange" invisible="1"/>
<field name="performance_bonds_write" invisible="1"/>
<field name="deposit_type" widget="radio"/>
<field name="deposit" invisible="deposit_type != 'deposit'" string=" "/>
<field name="performance_bonds" invisible="deposit_type != 'performance' " string=" "/>
<field name="first_year_rent"/>
<field name="total_contract_receivables"/>
</group>
<field name="first_years_begin"/>
<field name="increments_every_few_years"/>
<field name="increment_method"/>
<field name="increment_percentage" invisible="increment_method != 'percentage'"/>
<field name="increment_price" invisible="increment_method != 'increment_price'"/>
<field name="increment_amount" invisible="increment_method != 'increment_amount'"/>
<field name="admin_id" invisible="1"/>
<field name="is_water" invisible="1"/>
<field name="is_electricity" invisible="1"/>
<field name="is_mange" invisible="1"/>
<field name="performance_bonds_write" invisible="1"/>
<field name="deposit_type" widget="radio"/>
<field name="deposit" invisible="deposit_type != 'deposit'" string=" "/>
<field name="performance_bonds" invisible="deposit_type != 'performance' " string=" "/>
<field name="first_year_rent"/>
<field name="total_contract_receivables"/>
</group>
<group>
<field name="rent"/>
<field name="rent" string="月租金" invisible="cycle_dict != 'monthly'"/>
<field name="rent" string="季租金" invisible="cycle_dict != 'quarter'"/>
<field name="rent" string="半年租金" invisible="cycle_dict != 'half'"/>
<field name="rent" string="年租金" invisible="cycle_dict != 'year'"/>
<field name="tax_rate"/>
<field name="unit_price"/>
<field name="tax"/>
@@ -239,6 +242,9 @@
<field name="lessee_id"/>
<field name="contract_code"/>
<field name="name"/>
<searchpanel>
<field name="company_id"/>
</searchpanel>
</search>
</field>
</record>
yuthon_will_task/models/yuthon_will_task.py
+2 -2
View File
@@ -28,7 +28,7 @@ class YuthonWillTask(models.Model):
user_role_ids = fields.Many2many('soong.user.role', string='角色')
task_time_ids = fields.Many2many('yuthon.task.time', string='提醒')
yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'), ('thlc', '天河粮储')], string='所属公司')
start_time = fields.Datetime(string='开始时间', default=fields.Date.today())
start_time = fields.Datetime(string='开始时间', default=fields.Datetime.now)
end_time = fields.Datetime(string='结束时间', default=lambda self: datetime.combine(datetime.now().date(), time(11, 0, 0)))
state = fields.Selection([('will', '待办'), ('done', '已办'), ('cancel', '取消')], default='will', string='状态', store=True)
@@ -46,7 +46,7 @@ class YuthonWillTask(models.Model):
task.user_role_ids = roles
def will_task_time(self):
for i in self.search([('state', '!=', 'cancel')]):
for i in self.search([('state', '=', 'will')]):
if datetime.now() + timedelta(hours=8) > self.start_time:
i.write({'state', 'done'})
for task in self.search([('state', '=', 'will')]):