From eab8f0d61caecc027888b4d928a60f8a0ec229b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Mon, 15 Jun 2026 19:56:23 +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_bank_statements.py           | 16 ++++++++++------
 .../views/property_bank_statements_views.xml     | 10 +++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/yuthon_property/models/property_bank_statements.py b/yuthon_property/models/property_bank_statements.py
index 212381a87..e16b757fc 100644
--- a/yuthon_property/models/property_bank_statements.py
+++ b/yuthon_property/models/property_bank_statements.py
@@ -227,17 +227,17 @@ class ReceivableModifyLine(models.Model):
     # company_id = fields.Many2one('res.company', related='bank_id.company_id', string='公司', store=True)
 
 
-    original_amount = fields.Float(related='bank_id.original_amount', string='交易金额', store=False)
-    payout_date = fields.Date(related='receivable_id.payout_date', string='收款日期')
-    no_amount = fields.Float(related='bank_id.no_amount', string='未对', store=False)
+    original_amount = fields.Float(related='bank_id.original_amount', string='流水金额', store=False)
+    payout_date = fields.Date(related='receivable_id.payout_date', string='最终收款日期')
+    no_amount = fields.Float(compute="_compute_no_amount", string='未对')
     bank_state = fields.Selection(related='bank_id.bank_state', string='状态', store=False)
     receivable_id = fields.Many2one('property.accounts.receivable', string='合同编号')
     contract_id = fields.Many2one('property.lease.contract', string='关联租赁合同', compute='_compute_contract_id')
     management_type_id = fields.Many2one('yuthon.management.type', related='receivable_id.management_type_id', string='应收类型', store=True)
-    due_date = fields.Date(related='receivable_id.due_date', string='应收开始', store=False)
-    due_date_end = fields.Date(related='receivable_id.due_date_end', string='应收结束', store=False)
+    due_date = fields.Date(related='receivable_id.due_date', string='应收开始', store=True)
+    due_date_end = fields.Date(related='receivable_id.due_date_end', string='应收结束', store=True)
     property_name = fields.Text(string='物业名称', compute='_compute_property_name', store=False, search='_search_property_name')
-    delivered1 = fields.Float(related='receivable_id.delivered1', string='金额', store=False)
+    delivered1 = fields.Float(related='receivable_id.original_amount', string='当期金额', store=False)
     remake = fields.Text(related='receivable_id.remark', string='备注', store=False)
     # lessee_id = fields.Many2one(
     #     "property.tenant.information",
@@ -286,6 +286,10 @@ class ReceivableModifyLine(models.Model):
                 rec.company_id = getattr(rec.receivable_id, 'company_id', False)
                 rec.precinct_id = getattr(rec.receivable_id, 'precinct_id', False)
 
+    @api.depends('delivered1', 'amount')
+    def _compute_no_amount(self):
+        for rec in self:
+            rec.no_amount = rec.delivered1 - rec.amount
 
     @api.depends('receivable_id')
     def _compute_property_name(self):
diff --git a/yuthon_property/views/property_bank_statements_views.xml b/yuthon_property/views/property_bank_statements_views.xml
index 695e628cd..20f3ec8b0 100644
--- a/yuthon_property/views/property_bank_statements_views.xml
+++ b/yuthon_property/views/property_bank_statements_views.xml
@@ -122,18 +122,18 @@
         <field name="arch" type="xml">
             <tree string="应收流水中间表" editable="top" default_order="due_date desc">
                 <field name="bank_id"/>
-                <field name="no_amount"/>
                 <field name="bank_state"/>
+                <field name="original_amount"/>
                 <field name="reconciliation_date"/>
                 <field name="not_collected"/>
-                <field name="amount"/>
-                <field name="original_amount"/>
                 <field name="delivered1"/>
+                <field name="amount"/>
+                <field name="no_amount"/>
+                <field name="due_date"/>
+                <field name="due_date_end"/>
                 <field name="receivable_id"/>
                 <field name="lessee_id"/>
                 <field name="property_name"/>
-                <field name="due_date"/>
-                <field name="due_date_end"/>
                 <field name="management_type_id"/>
                 <field name="is_penalty"/>
                 <field name="has_date"/>