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

!10098 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang

Browse Source 
Merge pull request !10098 from 李鹏宇/dev_wang
This commit is contained in:
李鹏宇
2026-03-23 09:33:32 +00:00
committed by Gitee
parent 25ab51142e 1b3f55843e
commit 4ff5e816c4
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
header_search_panel/static/src/search/header_search/components/fields_filter/many2one_filter/many2one_filter.js
+6 -1
View File
@@ -11,6 +11,7 @@ export class Many2oneFilter extends Component {
setup() {
super.setup();
this.rpc = useService("rpc");
this.user = useService("user");
this.activeValues = this.env.searchModel.headerSearchInfo.FieldsFilter[this.props.id]?.activeValues || [];
}
@@ -68,7 +69,11 @@ export class Many2oneFilter extends Component {
}
getDomain() {
return new Domain(this.props.domain).toList({});
const evalContext = {
uid: this.user.context.uid,
allowed_company_ids: this.user.context.allowed_company_ids || [],
};
return new Domain(this.props.domain).toList(evalContext);
}
async update(value) {
yuthon_hr_attendance/views/yuthon_holiday_statement.xml
+3 -3
View File
@@ -46,15 +46,15 @@
<field name="model">hr.leave</field>
<field name="arch" type="xml">
<search string="请假情况">
<field name="company_id" invisible="1"/>
<field name="employee_id" domain="[('company_id', '=', company_id)]"/>
<field name="company_id" invisible="1" default="user.company_id"/>
<field name="employee_id" domain="[('company_id', 'in', allowed_company_ids)]"/>
<field name="caption"/>
<filter string="员工" name="group_by_employee_id" domain="[]" context="{'group_by': 'employee_id'}"/>
<filter name="now_month" string="当月" domain="[('date_from', '&gt;=', (context_today() + relativedelta(day=1)).strftime('%Y-%m-%d')),
('date_from', '&lt;', (context_today() + relativedelta(months=+1, day=1)).strftime('%Y-%m-%d'))]"/>
<header_search class="header-search-inline">
<field name="date_from"/>
<field name="employee_id" domain="[('company_id', '=', company_id)]"/>
<field name="employee_id" domain="[('company_id', 'in', allowed_company_ids)]"/>
</header_search>
<searchpanel>
<field name="department_id" string="部门" enable_counters="1" select="multi"/>