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

!7652 添加功能

Browse Source 
Merge pull request !7652 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2026-01-07 02:41:23 +00:00
committed by Gitee
parent 857162a0fa 9b12f71005
commit 70b90301aa
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
+3 -2
View File
@@ -89,9 +89,10 @@
<h2>当前流程是否收回，请确认</h2>
</div>
<group invisible="node_btn_name != '分发'">
<field name="employee_ids" widget="many2many_tags" string="董事长" domain="[('user_role_id.name', '=', '董事长')]" options="{'no_create': True}"/>
<field name="employee_ids" widget="many2many_tags" string="董事长" domain="[('user_role_id.name', '=', '董事长')]" options="{'no_create': True}" groups="yuthon_salary.group_jtbb_user"/>
<field name="dep_manager_employee_ids" widget="many2many_tags" string="承办" domain="[('user_role_id.name', '=', '部门经理')]" options="{'no_create': True}"/>
<field name="circulated_employee_ids" widget="many2many_tags" options="{'no_create': True}"/>
<field name="circulated_employee_ids" widget="many2many_tags" options="{'no_create': True}" domain = "[('company_id', '=', company_id)]"/>
<field name="supervising_employee_ids" widget="many2many_tags" invisible="not is_supervising" options="{'no_create': True}"/>
</group>
<footer>
yuthon_salary/wizard/salary_meal_wizard.py
+2 -2
View File
@@ -43,8 +43,8 @@ class SalaryMealWizard(models.TransientModel):
self.salary_meal_data(row)
def salary_meal_data(self, row):
select_year = row[0].value
select_time = row[1].value
select_year = str(row[0].value).replace("年", "").strip()
select_time = str(row[1].value).replace("月", "").strip()
employee_id = self.env['hr.employee'].search([('identification_id', '=', row[3].value)], limit=1)
card = row[3].value
number_breakfasts = row[4].value
yuthon_salary/wizard/salary_party_wizard.py
+3 -3
View File
@@ -21,11 +21,11 @@ class SalaryPartyWizard(models.TransientModel):
sh = book.sheet_by_index(0)
for rx in range(1, sh.nrows):
row = sh.row(rx)
self.salary_year_ttjt_data(row)
self.salary_party_data(row)
def salary_party_data(self, row):
select_year = row[0].value
select_time = row[1].value
select_year = str(row[0].value).replace("年", "").strip()
select_time = str(row[1].value).replace("月", "").strip()
employee_id = self.env['hr.employee'].search([('identification_id', '=', row[3].value)], limit=1)
card = row[3].value
fee = row[4].value