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

添加功能

Browse Source
This commit is contained in:
李鹏宇
2025-09-28 16:28:52 +08:00
parent 24714801df
commit 13c11ebb65
4 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/views/soong_workflow_record.xml
+7 -7
View File
@@ -67,21 +67,21 @@
<button name="admin_end" type="object" string="管理员强制结束" class="oe_highlight" groups="soong_workflow.group_soong_workflow_manager"/>
<button name="delete_record" type="object" string="删除" class="oe_highlight" groups="soong_workflow.group_soong_workflow_manager"/>
</header>
<field name="workflow_id" string="审批类型"/>
<field name="code"/>
<field name="name"/>
<field name="workflow_id" string="审批类型"/>
<field name="approve_state" string="审批状态" widget="badge" decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
<field name="create_uid"/>
<field name="node_id" string="当前节点"/>
<field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width"/>
<field name="soong_state"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="approvals_group_id" optional="hide"/>
<field name="department_id" optional="hide"/>
<field name="node_id" string="当前节点"/>
<field name="approve_state" string="审批状态" widget="badge" decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
<field name="users_ids" string="用户" widget="many2many_tags" optional="hide"/>
<field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width"/>
<field name="create_uid"/>
<field name="write_date2"/>
<field name="company_id" optional="hide"/>
<field name="text" optional="hide"/>
<field name="soong_state"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="reclaim_state" column_invisible="1"/>
<field name="member_of_department" optional="hide"/>
<field name="is_manager" column_invisible="1"/>
yuthon_property_approval/report/lease_contract_templates.xml
+8
View File
@@ -83,6 +83,14 @@
</td>
</tr>
</table>
<table width="100%" style="table-layout:fixed;">
<tr>
<td width="15%"><strong>合约开始时间：</strong></td>
<td width="35%"><span t-field="o.term_start_time"/></td>
<td width="15%"><strong>合约结束时间：</strong></td>
<td width="35%"><span t-field="o.term_end_time"/></td>
</tr>
</table>
<!-- 审批明细 -->
<t t-if="o.log_ids">
yuthon_property_approval/views/property_lease_contract.xml
+5 -5
View File
@@ -92,7 +92,7 @@
</group>
</group>
<notebook>
<page string="物业列表" invisible="state not in ['分管领导', '总经理']">
<page string="物业列表" invisible="(state in ['分管领导', '总经理']) and (not work_end)">
<button name="choose_property_button" string="添加物业" type="object"
class="btn-primary"/>
<field name="lease_ids" string=" ">
@@ -249,7 +249,7 @@
<field name="ele_price"/>
</group>
<notebook>
<page string="租金明细" invisible="state not in ['分管领导', '总经理']">
<page string="租金明细" invisible="(state in ['分管领导', '总经理']) and (not work_end)">
<field name="breakdown_ids" string=" ">
<tree editable="bottom">
<field name="breakdown_id" column_invisible="1"/>
@@ -262,7 +262,7 @@
</tree>
</field>
</page>
<page string="其他费用" invisible="state not in ['分管领导', '总经理']">
<page string="其他费用" invisible="(state in ['分管领导', '总经理']) and (not work_end)">
<field name="other_ids" string=" ">
<tree editable="bottom">
<field name="other_id" column_invisible="1"/>
@@ -298,7 +298,7 @@
</tree>
</field>
</page>
<page string="银行流水" invisible="state not in ['分管领导', '总经理']">
<page string="银行流水" invisible="(state in ['分管领导', '总经理']) and (not work_end)">
<field name="bank_statements_ids" string=" ">
<tree editable="bottom">
<field name="start_time"/>
@@ -330,7 +330,7 @@
</group>
</group>
<notebook>
<page string="附件" invisible="state not in ['分管领导', '总经理']">
<page string="附件">
<group col="2">
<group>
<field name="asset_valuation_ids" widget="preview_many2many"/>
yuthon_property_approval/wizard/choose_property_wizard.py
-9
View File
@@ -37,15 +37,6 @@ class ChoosePropertyWizard(models.Model):
"address_id": record.id,
}))
if record.is_message_fee:
rec.is_mange = True
standard_id = record.message_standard_id
fee_list.append([0, 0, {
'fees_id': standard_id.id,
'proportional': standard_id.amount}])
else:
rec.is_mange = False
manage_id = record.manage_information_ids[-1] if record.manage_information_ids else False
admin_id = False
company_id = False