!10307 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang

Merge pull request !10307 from 李鹏宇/dev_wang

yuthon_property_approval/models/property_open_rent.py

@@ -18,6 +18,8 @@ class PropertyOpenRent(models.Model):
     property_documents_ids = fields.Many2many('documents.document', string="物业公开招租文件")
     rental_area = fields.Float(string="出租面积")
     upset = fields.Float(string="底价")
+    document_ids = fields.Many2many('ir.attachment', string="附件")
+    handling_opinions = fields.Text(string="经办意见")
 
     # 物业
     property_name = fields.Char(string="物业信息")

yuthon_property_approval/views/property_open_rent_views.xml

@@ -36,13 +36,18 @@
                     </div>
                     <group>
                         <group>
+                            <field name="name"/>
                             <field name="code" invisible="1"/>
                             <field name="work_end" invisible="1"/>
-                            <field name="rental_area"/>
-                            <field name="upset"/>
+                            <field name="rental_area" invisible="1"/>
+                            <field name="upset" invisible="1"/>
                             <field name="property_name" readonly="1"/>
+                            <field name="handling_opinions"/>
                         </group>
                     </group>
+                    <group>
+                        <field name="document_ids"/>
+                    </group>
                     <notebook>
                         <page string="物业列表">
                             <button name="choose_property_button" string="添加物业" type="object" class="btn-primary"/>