From 712c896c8766c0d35f8e0691557feb55ccf8ab6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 23 Oct 2023 00:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=B4=A6=E6=88=B7=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/report/AccountReport.vue | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue
index 2d6a8844..a753465c 100644
--- a/jshERP-web/src/views/report/AccountReport.vue
+++ b/jshERP-web/src/views/report/AccountReport.vue
@@ -9,12 +9,12 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入名称" v-model="queryParam.search.name"></a-input>
+                  <a-input placeholder="请输入名称" v-model="queryParam.name"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入编号" v-model="queryParam.search.serialNo"></a-input>
+                  <a-input placeholder="请输入编号" v-model="queryParam.serialNo"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="5" :sm="24">
@@ -98,10 +98,8 @@
         },
         // 查询条件
         queryParam: {
-          search: {
-            name:'',
-            serialNo:''
-          }
+          name:'',
+          serialNo:''
         },
         ipagination:{
           pageSize: 11,
@@ -128,7 +126,7 @@
           { title: '当前余额', dataIndex: 'currentAmount', sorter: (a, b) => a.currentAmount - b.currentAmount, width: 100}
         ],
         url: {
-          list: "/account/list",
+          list: "/account/listWithBalance",
           getStatistics: "/account/getStatistics"
         }
       }
@@ -145,7 +143,7 @@
         return param;
       },
       getAccountStatistics() {
-        getAction(this.url.getStatistics, this.queryParam.search).then((res)=>{
+        getAction(this.url.getStatistics, this.queryParam).then((res)=>{
           if(res && res.code === 200) {
             if(res.data){
               this.allMonthAmount = res.data.allMonthAmount