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

!4812 添加功能

Browse Source 
Merge pull request !4812 from dev_zhou
This commit is contained in:
李鹏宇
2025-08-29 03:09:59 +00:00
committed by Gitee
parent fcb14b782b 218f4e1c80
commit d8fdfd8b42
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/templates/soong_workflow_templates.xml
+5 -5
View File
@@ -6,10 +6,10 @@
<field name="log_ids" style="width:100%; margin-top: 10px;">
<tree editable="bottom">
<field name="sequence" string="" widget="handle" groups="soong_workflow.group_soong_workflow_manager"/>
<field name="name" string="" readonly="0"/>
<field name="done_by" string=""/>
<field name="name" string="申请人" readonly="0"/>
<field name="done_by" string="节点"/>
<field name="comment" string=""/>
<field name="lase_click_date" string=""/>
<field name="comment" string=""/>
<field name="approval_state" string=""/>
<field name="node_btn_name" string="" groups="soong_workflow.group_soong_workflow_manager"/>
<field name="document_ids" string="" widget="preview_many2many"/>
@@ -20,8 +20,8 @@
<field name="log_ids" style="width:100%; margin-top: 10px;" domain="[('node_btn_name', '!=', '1')]">
<tree editable="bottom">
<field name="sequence" string="" widget="handle" groups="soong_workflow.group_soong_workflow_manager"/>
<field name="name" string="" readonly="0"/>
<field name="done_by" string=""/>
<field name="name" string="申请人" readonly="0"/>
<field name="done_by" string="节点"/>
<field name="lase_click_date" string=""/>
<field name="comment" string=""/>
<field name="approval_state" string=""/>
yuthon_property/views/yuthon_property_views.xml
+1 -1
View File
@@ -232,7 +232,7 @@
</tree>
</field>
</page>
<page string="合并信息" invisible="not is_done_merge">
<page string="被合并信息" invisible="not is_done_merge">
<field name="property_merge_approval_id"/>
</page>
<page string="水表列表" invisible="is_meter == False">
yuthon_property_approval/models/property_merge_approval.py
+4 -1
View File
@@ -55,11 +55,14 @@ class PropertyMergeApproval(models.Model):
def put_merge_message(self):
property_list = []
merge_asset_type_id = self.property_merge_approval_line_ids[0].property_id.asset_type_id
merge_property_floor_id = self.property_merge_approval_line_ids[0].property_id.property_floor_id
property_id = self.env['yuthon.property'].create({
'name': self.property_name,
'building_area': self.merge_building_area,
'property_floor_id': merge_property_floor_id.id,
'rent_area': self.merge_rent_area,
'asset_type_id': self.merge_asset_type_id.id,
'asset_type_id': merge_asset_type_id.id ,
'is_done_split':True,
})
for record in self.property_merge_approval_line_ids:
yuthon_property_approval/views/property_approval_views.xml
+1 -3
View File
@@ -56,10 +56,8 @@
<field name="issues_result" invisible="is_issues == False"/>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="property_documents_ids" widget="preview_many2many"/>
</group>
<group>
<field name="tip_description" type="html"/>
<field name="property_documents_ids" widget="preview_many2many"/>
</group>
<notebook>
<page string="审批信息">
yuthon_property_approval/views/property_merge_approval_views.xml
+4 -4
View File
@@ -57,7 +57,7 @@
<field name="documents_ids" widget="preview_many2many"/>
</group>
<notebook>
<page string="合并信息">
<page string="被合并信息">
<gourp/>
<group>
<field name="property_merge_approval_line_ids" string=" ">
@@ -72,12 +72,12 @@
</tree>
</field>
</group>
<group col="2" string="物业信息">
<group col="2" string="合并信息">
<group>
<field name="property_name"/>
<field name="merge_units"/>
<field name="merge_property_floor_id"/>
<field name="merge_asset_type_id"/>
<field name="merge_property_floor_id" invisible="1"/>
<field name="merge_asset_type_id" invisible="1"/>
</group>
<group>
<field name="merge_building_area"/>