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

!8431 !8430 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…

Browse Source 
Merge pull request !8431 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-01-28 11:17:50 +00:00
committed by Gitee
parent d71bb7438d d6bfc1f0e7
commit fb3db2c3fb
5 changed files with 139 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_employee_approval/views/yuthon_employee_add_views.xml
+21 -15
View File
@@ -38,21 +38,25 @@
</h1>
</div>
<group string="审批信息">
<field name="is_back" invisible="1"/>
<field name="name" required="1"/>
<field name="work_end" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="users_id" options="{'no_create': True}"/>
<field name="contract_id" options="{'no_create': True}" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="reason"/>
<field name="documents_ids" widget="preview_many2many"/>
<group>
<field name="is_back" invisible="1"/>
<field name="name" required="1"/>
<field name="work_end" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="users_id" options="{'no_create': True}"/>
<field name="contract_id" options="{'no_create': True}" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="reason"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<group string="甲方信息">
<field name="party_id"/>
<field name="representatives"/>
<field name="economy_type"/>
<field name="address"/>
<group>
<field name="party_id"/>
<field name="representatives"/>
<field name="economy_type"/>
<field name="address"/>
</group>
</group>
<group col="2">
<group>
@@ -66,8 +70,10 @@
<group>
<field name="employee_id" options="{'no_create': True}"/>
<field name="contract_id" invisible="1"/>
<field name="is_annual_salary"/>
<field name="is_probation"/>
<label for="is_annual_salary" string="是否年薪"/>
<field name="is_annual_salary" nolabel="1"/>
<label for="is_probation" string="试用期"/>
<field name="is_probation" nolabel="1"/>
<field name="start_date" invisible="not is_probation"/>
<field name="end_date" invisible="not is_probation"/>
<field name="date_start"/>
yuthon_hr_employee_approval/views/yuthon_message_login_views.xml
+50 -47
View File
@@ -60,42 +60,43 @@
<field name="name" required="1"/>
</h1>
</div>
<group col="4" string="基本情况">
<group>
<field name="is_back" invisible="1"/>
<field name="staff_name" required="1"/>
<field name="id_card"/>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="sex"/>
<field name="old"/>
<field name="work_end" invisible="1"/>
<field name="date_birth"/>
<field name="is_relatives_work"/>
</group>
<group>
<field name="nation"/>
<field name="political"/>
<field name="party_time"/>
<field name="marital_status"/>
<field name="origin"/>
</group>
<group>
<field name="house_hold"/>
<field name="house_type"/>
<field name="home_address"/>
<field name="home_phone"/>
<field name="working_time"/>
</group>
<group>
<field name="current_address"/>
<field name="phone" required="1"/>
<field name="email"/>
<group string="基本情况">
<group col="2">
<group>
<field name="is_back" invisible="1"/>
<field name="staff_name" required="1"/>
<field name="id_card"/>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="sex"/>
<field name="old"/>
<field name="work_end" invisible="1"/>
<field name="date_birth"/>
<label for="is_relatives_work" string="本单位是否有亲属"/>
<field name="is_relatives_work" nolabel="1"/>
<field name="nation"/>
<field name="political"/>
<field name="party_time"/>
<field name="marital_status"/>
<field name="origin"/>
</group>
<group>
<field name="house_hold"/>
<field name="house_type"/>
<field name="home_address"/>
<field name="home_phone"/>
<field name="working_time"/>
<field name="current_address"/>
<field name="phone" required="1"/>
<field name="email"/>
</group>
</group>
</group>
<group>
<field name="login_document_id" widget="preview_many2one"/>
<field name="login_state" widget="radio"/>
<group>
<field name="login_document_id" widget="preview_many2one"/>
<field name="login_state" widget="radio"/>
</group>
</group>
<div class="oe_clear_row" style="margin: 35px 0">
</div>
@@ -226,20 +227,22 @@
</group>
</group>
<group>
<field name="is_expertise"/>
<field name="certificate_ids" invisible="not is_expertise">
<tree editable="bottom">
<field name="certificate_id" column_invisible="1"/>
<field name="professional_certificates_id" widget="preview_many2one"/>
<field name="professional_certificate_validity"/>
</tree>
</field>
<field name="is_bank_card"/>
<field name="bank_name" invisible="not is_bank_card"/>
<field name="bank_phone" invisible="not is_bank_card"/>
<field name="is_driving_license"/>
<field name="driving_license_id" invisible="not is_driving_license" widget="preview_many2one"/>
<field name="driving_license_validity" invisible="not is_driving_license"/>
<group>
<field name="is_expertise"/>
<field name="certificate_ids" invisible="not is_expertise">
<tree editable="bottom">
<field name="certificate_id" column_invisible="1"/>
<field name="professional_certificates_id" widget="preview_many2one"/>
<field name="professional_certificate_validity"/>
</tree>
</field>
<field name="is_bank_card"/>
<field name="bank_name" invisible="not is_bank_card"/>
<field name="bank_phone" invisible="not is_bank_card"/>
<field name="is_driving_license"/>
<field name="driving_license_id" invisible="not is_driving_license" widget="preview_many2one"/>
<field name="driving_license_validity" invisible="not is_driving_license"/>
</group>
</group>
<group>
<field name="attachment_ids">
yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+27 -17
View File
@@ -51,21 +51,25 @@
</h1>
</div>
<group string="审批信息">
<field name="is_back" invisible="1"/>
<field name="name" required="1"/>
<field name="work_end" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="users_id" options="{'no_create': True}"/>
<field name="department_id" invisible="1"/>
<field name="onboarding_status" invisible="1"/>
<field name="reason"/>
<field name="issues_result" invisible="is_issues == False"/>
<group>
<field name="is_back" invisible="1"/>
<field name="name" required="1"/>
<field name="work_end" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="users_id" options="{'no_create': True}"/>
<field name="department_id" invisible="1"/>
<field name="onboarding_status" invisible="1"/>
<field name="reason"/>
<field name="issues_result" invisible="is_issues == False"/>
</group>
</group>
<group string="甲方信息">
<field name="party_id" options="{'no_create': True}"/>
<field name="representatives"/>
<field name="economy_type"/>
<field name="address"/>
<group>
<field name="party_id" options="{'no_create': True}"/>
<field name="representatives"/>
<field name="economy_type"/>
<field name="address"/>
</group>
</group>
<group col="3" string="乙方信息">
<group>
@@ -76,8 +80,10 @@
<field name="duration_employment" class="me-2" style="max-width: 10rem !important;"/>至
<field name="duration_employment_end" class="ms-2" style="max-width: 10rem !important;"/>
</div>
<field name="is_annual_salary"/>
<field name="is_office"/>
<label for="is_annual_salary" string="是否年薪"/>
<field name="is_annual_salary" nolabel="1"/>
<label for="is_office" string="是否领用办公用品"/>
<field name="is_office" nolabel="1"/>
</group>
<group>
<field name="department_id1" domain = "[('company_id', '=', company_id)] if is_company else []" options="{'no_create': True}"/>
@@ -103,7 +109,9 @@
</group>
</group>
<group>
<field name="documents_ids" widget="preview_many2many"/>
<group>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<group col="2">
<group>
@@ -114,7 +122,9 @@
</group>
</group>
<group>
<field name="oter"/>
<group>
<field name="oter"/>
</group>
</group>
</sheet>
</form>
yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
+21 -14
View File
@@ -44,24 +44,31 @@
</h1>
</div>
<group>
<field name="issues_result" invisible="is_issues == False"/>
<group>
<field name="issues_result" invisible="is_issues == False"/>
</group>
</group>
<group string="审批详情">
<field name="is_back" invisible="1"/>
<field name="users_id"/>
<field name="department_id" invisible="1"/>
<field name="end_date"/>
<field name="work_end" invisible="1"/>
<field name="documents_id" widget="preview_many2one"/>
<group>
<field name="is_back" invisible="1"/>
<field name="users_id"/>
<field name="department_id" invisible="1"/>
<field name="end_date"/>
<field name="work_end" invisible="1"/>
<field name="documents_id" widget="preview_many2one"/>
</group>
</group>
<group string="考核详情">
<field name="documents_id1" widget="preview_many2one"/>
<field name="structure_type_id"/>
<field name="assessment_rating"/>
<field name="structure_type_id1"/>
<field name="is_adjust"/>
<field name="adjust_reason" invisible="is_adjust == False"/>
<field name="remake"/>
<group>
<field name="documents_id1" widget="preview_many2one"/>
<field name="structure_type_id"/>
<field name="assessment_rating"/>
<field name="structure_type_id1"/>
<label for="is_adjust" string="是否调整"/>
<field name="is_adjust" nolabel="1"/>
<field name="adjust_reason" invisible="is_adjust == False"/>
<field name="remake"/>
</group>
</group>
</sheet>
</form>
yuthon_property_approval/views/property_lease_renewal.xml
+20 -13
View File
@@ -39,12 +39,14 @@
</h1>
</div>
<group string="审批事项">
<field name="is_back" invisible="1"/>
<field name="name" required="1"/>
<field name="renewal_type" widget="radio"/>
<field name="company_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="work_end" invisible="1"/>
<group>
<field name="is_back" invisible="1"/>
<field name="name" required="1"/>
<field name="renewal_type" widget="radio"/>
<field name="company_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="work_end" invisible="1"/>
</group>
</group>
<group string="原租赁合同信息" col="3">
<group>
@@ -84,11 +86,14 @@
</group>
</group>
<group>
<field name="reason" invisible="renewal_type != 'lease'"/>
<field name="effective_date" invisible="renewal_type != 'lease'"/>
<field name="early_reason" invisible="renewal_type != 'early_checkout'"/>
<field name="deposit" invisible="renewal_type != 'early_checkout'"/>
<field name="is_full_refund" invisible="renewal_type != 'early_checkout'"/>
<group>
<field name="reason" invisible="renewal_type != 'lease'"/>
<field name="effective_date" invisible="renewal_type != 'lease'"/>
<field name="early_reason" invisible="renewal_type != 'early_checkout'"/>
<field name="deposit" invisible="renewal_type != 'early_checkout'"/>
<label for="is_full_refund" string="是否全额退押" invisible="renewal_type != 'early_checkout'"/>
<field name="is_full_refund" nolabel="1" invisible="renewal_type != 'early_checkout'"/>
</group>
</group>
<group col="4">
<group>
@@ -121,8 +126,10 @@
<group/>
</group>
<group>
<field name="early_explain" invisible="renewal_type != 'early_checkout'"/>
<field name="document_ids" widget="preview_many2many"/>
<group>
<field name="early_explain" invisible="renewal_type != 'early_checkout'"/>
<field name="document_ids" widget="preview_many2many"/>
</group>
</group>
<notebook>
<page string="应收明细" invisible="renewal_type != 'early_checkout'">