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

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

Browse Source 
Merge pull request !8427 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-01-28 10:11:02 +00:00
committed by Gitee
parent b6daf0ac47 b695104416
commit b0bad13ed4
17 changed files with 220 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
+59 -49
View File
@@ -61,38 +61,44 @@
</group>
</group>
<group>
<field name="documents_ids" widget="preview_many2many"/>
<group>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<group string="换班1" invisible="work_end">
<label for="resource_id"/>
<div>
<field name="resource_id" class="oe_inline"/>
<field name="shift_date" class="oe_inline"/>
<field name="shift_id" class="oe_inline" invisible="shift_rest" readonly="1"/>
<field name="shift_rest" class="oe_inline" invisible="shift_id or shift_date == False"/>
</div>
<label for="transferees_id"/>
<div>
<field name="transferees_id" class="oe_inline"/>
<field name="return_date" class="oe_inline"/>
<field name="return_id" class="oe_inline" invisible="return_rest" readonly="1"/>
<field name="return_rest" class="oe_inline" invisible="return_id or return_date == False" />
</div>
<group string="换班1" invisible="work_end">
<group>
<label for="resource_id"/>
<div>
<field name="resource_id" class="oe_inline"/>
<field name="shift_date" class="oe_inline"/>
<field name="shift_id" class="oe_inline" invisible="shift_rest" readonly="1"/>
<field name="shift_rest" class="oe_inline" invisible="shift_id or shift_date == False"/>
</div>
<label for="transferees_id"/>
<div>
<field name="transferees_id" class="oe_inline"/>
<field name="return_date" class="oe_inline"/>
<field name="return_id" class="oe_inline" invisible="return_rest" readonly="1"/>
<field name="return_rest" class="oe_inline" invisible="return_id or return_date == False" />
</div>
</group>
</group>
<!--显示原始数据-->
<group string="换班1" invisible="not work_end">
<label for="resource_id"/>
<div>
<field name="resource_id" class="oe_inline"/>
<field name="shift_date" class="oe_inline"/>
<field name="old_shift" class="oe_inline"/>
</div>
<label for="transferees_id"/>
<div>
<field name="transferees_id" class="oe_inline"/>
<field name="return_date" class="oe_inline"/>
<field name="old_return" class="oe_inline"/>
</div>
<group string="换班1" invisible="not work_end">
<group>
<label for="resource_id"/>
<div>
<field name="resource_id" class="oe_inline"/>
<field name="shift_date" class="oe_inline"/>
<field name="old_shift" class="oe_inline"/>
</div>
<label for="transferees_id"/>
<div>
<field name="transferees_id" class="oe_inline"/>
<field name="return_date" class="oe_inline"/>
<field name="old_return" class="oe_inline"/>
</div>
</group>
</group>
<!-- <group invisible="alternate_shifts == 'transferees'">-->
<!-- <label for="resource_id"/>-->
@@ -105,19 +111,20 @@
<!-- </div>-->
<!-- </group>-->
<group string="换班2" invisible="work_end">
<label for="resource_id"/>
<div>
<field name="resource_id" class="oe_inline"/>
<field name="shift_two_date" class="oe_inline"/>
<field name="shift_two_id" class="oe_inline" readonly="1" invisible="shift_two_rest"
context="{'tree_view_ref': 'yuthon_hr_attendance.view_yuthon_shift_context',
'search_view_ref': 'yuthon_hr_attendance.search_yuthon_shift_context',
'order': 'start_datetime desc',
'search_default_group_by_month': True,}" options="{'no_create': True, 'no_edit':True}"
/>
<field name="shift_two_rest" class="oe_inline" invisible="shift_two_id or shift_two_date == False"/>
</div>
<label for="transferees_id"/>
<group>
<label for="resource_id"/>
<div>
<field name="resource_id" class="oe_inline"/>
<field name="shift_two_date" class="oe_inline"/>
<field name="shift_two_id" class="oe_inline" readonly="1" invisible="shift_two_rest"
context="{'tree_view_ref': 'yuthon_hr_attendance.view_yuthon_shift_context',
'search_view_ref': 'yuthon_hr_attendance.search_yuthon_shift_context',
'order': 'start_datetime desc',
'search_default_group_by_month': True,}" options="{'no_create': True, 'no_edit':True}"
/>
<field name="shift_two_rest" class="oe_inline" invisible="shift_two_id or shift_two_date == False"/>
</div>
<label for="transferees_id"/>
<div>
<field name="transferees_id" class="oe_inline"/>
<field name="return_two_date" class="oe_inline"/>
@@ -129,21 +136,24 @@
/>
<field name="return_two_rest" class="oe_inline" invisible="return_two_id or return_two_date == False"/>
</div>
</group>
</group>
<!--与上述同理-->
<group string="换班2" invisible="not work_end">
<label for="resource_id"/>
<div>
<field name="resource_id" class="oe_inline"/>
<field name="shift_two_date" class="oe_inline"/>
<field name="old_two_shift" class="oe_inline"/>
</div>
<label for="transferees_id"/>
<group>
<label for="resource_id"/>
<div>
<field name="resource_id" class="oe_inline"/>
<field name="shift_two_date" class="oe_inline"/>
<field name="old_two_shift" class="oe_inline"/>
</div>
<label for="transferees_id"/>
<div>
<field name="transferees_id" class="oe_inline"/>
<field name="return_two_date" class="oe_inline"/>
<field name="old_two_return" class="oe_inline"/>
</div>
</group>
</group>
</sheet>
</form>
yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml
+10 -8
View File
@@ -46,14 +46,16 @@
</h1>
</div>
<group string="审批事项">
<field name="is_back" invisible="1"/>
<field name="name" required="1"/>
<field name="work_end" invisible="1"/>
<field name="users_id" readonly="1"/>
<field name="reason"/>
<field name="issues_result" invisible="is_issues == False"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="department_id"/>
<group>
<field name="is_back" invisible="1"/>
<field name="name" required="1"/>
<field name="work_end" invisible="1"/>
<field name="users_id" readonly="1"/>
<field name="reason"/>
<field name="issues_result" invisible="is_issues == False"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="department_id"/>
</group>
</group>
<notebook>
<page string="岗位">
yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
+17 -15
View File
@@ -45,21 +45,23 @@
</h1>
</div>
<group string="审批事项">
<field name="is_back" invisible="1"/>
<field name="name" required="1"/>
<field name="work_end" invisible="1"/>
<field name="users_id"/>
<field name="reason_issuance"/>
<field name="company_id" invisible="1"/>
<field name="issues_result" invisible="is_issues == False"/>
<field name="service_type_id"/>
<field name="is_turnover" invisible="1"/>
<field name="employee_id" domain="[('user_state', '=', 'leave')] if is_turnover else [('user_state', '=', 'in')]"/>
<field name="job_id"/>
<field name="department_id"/>
<field name="onboarding_time"/>
<field name="separation_date" invisible="not is_turnover"/>
<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="users_id"/>
<field name="reason_issuance"/>
<field name="company_id" invisible="1"/>
<field name="issues_result" invisible="is_issues == False"/>
<field name="service_type_id"/>
<field name="is_turnover" invisible="1"/>
<field name="employee_id" domain="[('user_state', '=', 'leave')] if is_turnover else [('user_state', '=', 'in')]"/>
<field name="job_id"/>
<field name="department_id"/>
<field name="onboarding_time"/>
<field name="separation_date" invisible="not is_turnover"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
</sheet>
</form>
yuthon_lessee_service/views/property_report_repair.xml
+16 -10
View File
@@ -39,20 +39,26 @@
</div>
<group col="3">
<group>
<field name="name"/>
<field name="fault"/>
<field name="work_end" invisible="1"/>
<field name="is_fee"/>
<group>
<field name="name"/>
<field name="fault"/>
<field name="work_end" invisible="1"/>
<field name="is_fee"/>
</group>
</group>
<group>
<field name="repairer"/>
<field name="dispatch"/>
<field name="labor_costs"/>
<group>
<field name="repairer"/>
<field name="dispatch"/>
<field name="labor_costs"/>
</group>
</group>
<group>
<field name="repairer_address"/>
<field name="situation"/>
<field name="property_documents_ids" widget="many2many_tags"/>
<group>
<field name="repairer_address"/>
<field name="situation"/>
<field name="property_documents_ids" widget="many2many_tags"/>
</group>
</group>
</group>
<notebook>
yuthon_maintain/views/property_report_repair.xml
+11 -9
View File
@@ -44,15 +44,17 @@
</h1>
</div>
<group string="审批详情">
<field name="name"/>
<field name="users_id"/>
<field name="types_repairs"/>
<field name="company_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="processing_order_id" invisible="not processing_order_id"/>
<field name="remake"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="create_time"/>
<group>
<field name="name"/>
<field name="users_id"/>
<field name="types_repairs"/>
<field name="company_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="processing_order_id" invisible="not processing_order_id"/>
<field name="remake"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="create_time"/>
</group>
</group>
<group string="报修信息" col="2">
<group>
yuthon_official/views/yuthon_official_party_views.xml
-6
View File
@@ -47,12 +47,6 @@
<field name="name_title" readonly="1"/>
</h1>
</div>
<div class="oe_title">
<label for="name"/>
<h1>
<field name="name" required="1"/>
</h1>
</div>
<div class="oe_title">
<label for="name"/>
<h1>
yuthon_official/views/yuthon_sub_enterprises_view.xml
+11 -9
View File
@@ -49,15 +49,17 @@
</h1>
</div>
<group string="审批信息">
<field name="name"/>
<field name="users_id"/>
<field name="is_send" invisible="1"/>
<field name="is_back" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="come_file_id"/>
<field name="official_partner_id"/>
<field name="reason_application"/>
<field name="document_ids" widget="preview_many2many"/>
<group>
<field name="name"/>
<field name="users_id"/>
<field name="is_send" invisible="1"/>
<field name="is_back" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="come_file_id"/>
<field name="official_partner_id"/>
<field name="reason_application"/>
<field name="document_ids" widget="preview_many2many"/>
</group>
</group>
</sheet>
</form>
yuthon_property_approval/views/property_bills_payable_views.xml
+10 -8
View File
@@ -39,14 +39,16 @@
</h1>
</div>
<group string="审批事项">
<field name="is_back" invisible="1"/>
<field name="name"/>
<field name="users_id"/>
<field name="work_end" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="remarks"/>
<field name="document_ids" widget="preview_many2many"/>
<group>
<field name="is_back" invisible="1"/>
<field name="name"/>
<field name="users_id"/>
<field name="work_end" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="remarks"/>
<field name="document_ids" widget="preview_many2many"/>
</group>
</group>
<group string="详情">
<group>
yuthon_property_approval/views/property_eligibility.xml
+11 -9
View File
@@ -42,15 +42,17 @@
</h1>
</div>
<group string="审批事项">
<field name="is_back" invisible="1"/>
<field name="users_id"/>
<field name="department_id" invisible="1"/>
<field name="sincerity_gold"/>
<field name="work_end" invisible="1"/>
<field name="name" required="1"/>
<field name="reason"/>
<field name="issues_result" invisible="is_issues == False"/>
<field name="documents_ids" widget="preview_many2many"/>
<group>
<field name="is_back" invisible="1"/>
<field name="users_id"/>
<field name="department_id" invisible="1"/>
<field name="sincerity_gold"/>
<field name="work_end" invisible="1"/>
<field name="name" required="1"/>
<field name="reason"/>
<field name="issues_result" invisible="is_issues == False"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<notebook>
<page string="承租方列表">
yuthon_property_approval/views/property_merge_approval_views.xml
+10 -8
View File
@@ -49,14 +49,16 @@
</h1>
</div>
<group string="审批事项">
<field name="is_back" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="name"/>
<field name="reason"/>
<field name="issues_result" invisible="is_issues == False"/>
<field name="documents_ids" widget="preview_many2many"/>
<group>
<field name="is_back" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="name"/>
<field name="reason"/>
<field name="issues_result" invisible="is_issues == False"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<notebook>
<page string="被合并信息">
yuthon_property_approval/views/property_split_approval_views.xml
+8 -6
View File
@@ -49,12 +49,14 @@
</h1>
</div>
<group string="审批事项">
<field name="is_back" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="reason"/>
<field name="is_issues" invisible="is_issues == False"/>
<field name="documents_ids" widget="preview_many2many"/>
<group>
<field name="is_back" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="reason"/>
<field name="is_issues" invisible="is_issues == False"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<group col="2" string="物业信息">
<group>
yuthon_report/static/src/components/yuthon_report/att_report.xml
+7
View File
@@ -3,6 +3,13 @@
<templates id="template" xml:space="preserve">
<t t-name="att_report.ReceivableReport">
<div class="container-fluid d-flex flex-column h-100 mt-2 pb-3">
<!-- 报表标题 居中 -->
<div class="row mb-2">
<div class="col-12 text-center">
<h5 t-esc="props.action.name"/>
</div>
</div>
<!-- 筛选卡片 -->
<div class="card mb-2">
<div class="card-body">
yuthon_report/static/src/components/yuthon_report/receivable_message.xml
+7
View File
@@ -2,6 +2,13 @@
<templates id="template" xml:space="preserve">
<t t-name="yuthon_report.ReceiptLedgerReport">
<div class="container-fluid d-flex flex-column h-100 mt-2 pb-3">
<!-- 报表标题 居中 -->
<div class="row mb-2">
<div class="col-12 text-center">
<h5 t-esc="props.action.name"/>
</div>
</div>
<div class="card mb-2">
<div class="card-body">
<div class="row mb-2" t-ref="search_area">
yuthon_report/static/src/components/yuthon_report/receivable_report.xml
+7
View File
@@ -3,6 +3,13 @@
<templates id="template" xml:space="preserve">
<t t-name="youthon_report.ReceivableReport">
<div class="container-fluid d-flex flex-column h-100 mt-2 pb-3">
<!-- 报表标题 居中 -->
<div class="row mb-2">
<div class="col-12 text-center">
<h5 t-esc="props.action.name"/>
</div>
</div>
<!-- 筛选卡片 -->
<div class="card mb-2">
<div class="card-body py-2">
yuthon_report/static/src/components/yuthon_report/yuthon_contract_report.xml
+7
View File
@@ -2,6 +2,13 @@
<templates id="template" xml:space="preserve">
<t t-name="yuthon_report.ContractInfoReport">
<div class="container-fluid d-flex flex-column h-100 mt-2 pb-3">
<!-- 报表标题 居中 -->
<div class="row mb-2">
<div class="col-12 text-center">
<h5 t-esc="props.action.name"/>
</div>
</div>
<div class="card mb-2">
<div class="card-body">
<div class="row mb-2" t-ref="search_area">
yuthon_report/static/src/components/yuthon_report/yuthon_report.xml
+7
View File
@@ -3,6 +3,13 @@
<templates id="template" xml:space="preserve">
<t t-name="youthon_report.YouthonReport">
<div class="container-fluid d-flex flex-column h-100 mt-2 pb-3 ">
<!-- 报表标题 居中 -->
<div class="row mb-2">
<div class="col-12 text-center">
<h5 t-esc="props.action.name"/>
</div>
</div>
<div class="card mb-2">
<div class="row g-4">
yuthon_trade/views/yuthon_task_approval_views.xml
+22 -14
View File
@@ -38,23 +38,28 @@
</h1>
</div>
<group string="审批事项">
<field name="is_back" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="users_id"/>
<field name="company_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="start_time"/>
<field name="document_ids" widget="preview_many2many"/>
<group>
<field name="is_back" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="users_id"/>
<field name="company_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="start_time"/>
<field name="document_ids" widget="preview_many2many"/>
</group>
</group>
<group string="详细">
<field name="employee_ids" widget="many2many_tags" domain="[('company_id', '=' , company_id)]"/>
<field name="task_id"/>
<field name="concentration" invisible="1"/>
<field name="stack_position_ids" widget="many2many_tags"/>
<group>
<field name="employee_ids" widget="many2many_tags" domain="[('company_id', '=' , company_id)]"/>
<field name="task_id"/>
<field name="concentration" invisible="1"/>
<field name="stack_position_ids" widget="many2many_tags"/>
</group>
</group>
<group>
<label for="task_start_time"/>
<group>
<label for="task_start_time"/>
<div class="d-inline-flex w-100">
<field name="task_start_time" string="作业时间：" class="me-2"
style="max-width: 10rem !important;"/>至
@@ -63,15 +68,18 @@
<field name="duration" string=" " class="ms-2"
style="max-width: 3rem !important;"/>小时
</div>
</group>
</group>
<group invisible="not concentration">
<label for="concentration"/>
<group>
<label for="concentration"/>
<div class="d-inline-flex w-100">
<field name="concentration" class="me-2" style="max-width: 3rem !important;"/>
<field name="symbol" class="ms-2" style="max-width: 1rem !important;"/>警戒值
<field name="warning_value" class="ms-2" readonly="1"
style="max-width: 3rem !important;"/>
</div>
</group>
</group>
</sheet>
</form>