From 460a9fa058f3404f9ba0ae697ab1a3561c7495e6 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Tue, 31 Dec 2024 17:43:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/property_lease_contract.py         |  6 ++-
 .../views/property_lease_contract.xml         | 53 +++++++++++--------
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py
index 53f7491bf..e8b610075 100644
--- a/yuthon_property_approval/models/property_lease_contract.py
+++ b/yuthon_property_approval/models/property_lease_contract.py
@@ -75,8 +75,12 @@ class PropertyLeaseContract(models.Model):
 
     breach_time = fields.Date(string="违约计算时点")
     percentage_liquidated_damages = fields.Many2one('yuthon.penalty.setting', string="违约金比例")
-    date_of_payment = fields.Date(string="每月支付日期")
+    date_payment_moth = fields.Integer(string="每月支付日期")
+    date_payment_day = fields.Integer(string="每日支付日期")
+    first_pay = fields.Date(string="首次付款日")
     unit_price = fields.Float(string="单价")
+    is_deposit = fields.Boolean(string="押金")
+    is_performance_bonds = fields.Boolean(string="履约保证金")
     deposit = fields.Float(string="押金")
     performance_bonds = fields.Float(string="履约保证金")
     performance_bonds_write = fields.Char(string="履约保证金大写")
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index afbaab67f..79bc120a7 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -115,43 +115,35 @@
                             </tree>
                         </field>
                     </group>
-                    <group col="3" string="收费详细">
+                    <group col="2" string="租凭期限">
                         <group>
                             <label for="lease_term_year"/>
                             <div class="d-inline-flex w-100">
                                 <field name="lease_term_year"/>
                                 年
-<!--                                    <field name="lease_term_year_uom" />-->
                                 <field name="lease_term_month"/>
                                 月
-<!--                                    <field name="lease_term_month_uom" />-->
                             </div>
                             <field name="term_start_time" required="1"/>
                             <field name="term_end_time" required="1"/>
-                            <field name="total_area" />
                             <field name="cycle_dict"/>
                             <field name="cycle_mode"/>
-                            <field name="is_water" invisible="1"/>
-                            <field name="is_electricity" invisible="1"/>
-                            <field name="is_mange" invisible="1"/>
-                            <field name="performance_bonds_write"/>
-                            <field name="deposit"/>
-                            <field name="first_year_rent"/>
                         </group>
                         <group>
+                            <label for="date_payment_moth"/>
+                            <div class="d-inline-flex w-100">
+                                <field name="date_payment_moth"/>
+                                月
+                                <field name="date_payment_day"/>
+                                日
+                            </div>
+                            <field name="first_pay"/>
+                            <field name="total_area" />
                             <field name="expected_reminders"/>
-                            <field name="increment_method"/>
-                            <field name="increment_percentage" invisible="increment_method != 'percentage'"/>
-                            <field name="increment_price" invisible="increment_method != 'increment_price'"/>
-                            <field name="increment_amount" invisible="increment_method != 'increment_amount'"/>
-                            <field name="breach_time"/>
-                            <field name="percentage_liquidated_damages"/>
-                            <field name="date_of_payment"/>
                             <field name="contract_type"/>
-                            <field name="rent"/>
-                             <field name="rent_company"/>
-                            <field name="rent_account"/>
                         </group>
+                    </group>
+                    <group col="2" string="收费详细">
                         <group>
                             <label for="rent_free_period_year"/>
                             <div class="d-inline-flex w-100">
@@ -162,13 +154,30 @@
                             </div>
                             <field name="first_years_begin"/>
                             <field name="increments_every_few_years"/>
-                            <field name="admin_id"/>
+                            <field name="admin_id" invisible="1"/>
                             <field name="unit_price"/>
                             <field name="tax"/>
-                            <field name="performance_bonds"/>
+                            <field name="is_water" invisible="1"/>
+                            <field name="is_electricity" invisible="1"/>
+                            <field name="is_mange" invisible="1"/>
+                            <field name="performance_bonds_write" invisible="1"/>
+                            <field name="is_deposit"/>
+                            <field name="deposit" invisible="not is_deposit" string=" "/>
+                            <field name="is_performance_bonds"/>
+                            <field name="performance_bonds" invisible="not is_performance_bonds" string=" "/>
+                            <field name="first_year_rent"/>
+                            <field name="rent"/>
+                        </group>
+                        <group>
                             <field name="total_contract_receivables"/>
                             <field name="tax_rate"/>
                             <field name="not_tax_amount"/>
+                            <field name="increment_method"/>
+                            <field name="increment_percentage" invisible="increment_method != 'percentage'"/>
+                            <field name="increment_price" invisible="increment_method != 'increment_price'"/>
+                            <field name="increment_amount" invisible="increment_method != 'increment_amount'"/>
+                            <field name="breach_time"/>
+                            <field name="percentage_liquidated_damages"/>
                         </group>
                     </group>
                     <notebook>