From 69742cf392d4fed8c2f21418d25f69f0792b3b8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 5 Nov 2021 00:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8=EF=BC=8C?=
=?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=8B=E6=9C=BA=E7=AB=AF=E4=B8=8D=E8=83=BD?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jshERP-web/src/views/report/AccountReport.vue | 27 +++++++++----------
.../src/views/report/CustomerAccount.vue | 2 +-
.../src/views/report/InOutStockReport.vue | 10 +++----
jshERP-web/src/views/report/MaterialStock.vue | 17 +++++-------
jshERP-web/src/views/report/VendorAccount.vue | 2 +-
5 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/jshERP-web/src/views/report/AccountReport.vue b/jshERP-web/src/views/report/AccountReport.vue
index c8e57652..3fa89f1c 100644
--- a/jshERP-web/src/views/report/AccountReport.vue
+++ b/jshERP-web/src/views/report/AccountReport.vue
@@ -9,29 +9,24 @@
-
+
-
+
-
-
+
+
查询
打印
导出
-
-
- {{allMonthAmount}}
-
-
-
-
- {{allCurrentAmount}}
+
+
+ 本月发生总额：{{allMonthAmount}}，当前总余额：{{allCurrentAmount}}
@@ -102,8 +97,10 @@
},
// 查询条件
queryParam: {
- name:'',
- serialNo:''
+ search: {
+ name:'',
+ serialNo:''
+ }
},
ipagination:{
pageSize: 11,
@@ -147,7 +144,7 @@
return param;
},
getAccountStatistics() {
- getAction(this.url.getStatistics, this.queryParam).then((res)=>{
+ getAction(this.url.getStatistics, this.queryParam.search).then((res)=>{
if(res && res.code === 200) {
if(res.data){
this.allMonthAmount = res.data.allMonthAmount
diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue
index 814eca98..bee0c7f1 100644
--- a/jshERP-web/src/views/report/CustomerAccount.vue
+++ b/jshERP-web/src/views/report/CustomerAccount.vue
@@ -30,7 +30,7 @@
-
+
查询
打印
导出
diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue
index e7519803..33154614 100644
--- a/jshERP-web/src/views/report/InOutStockReport.vue
+++ b/jshERP-web/src/views/report/InOutStockReport.vue
@@ -31,16 +31,16 @@
-
-
+
+
查询
打印
导出
-
-
- {{totalCountMoneyStr}}
+
+
+ 本月合计金额：{{totalCountMoneyStr}}
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index ea5e1f34..1f478ca5 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -40,21 +40,16 @@
-
-
+
+
查询
打印
导出
-
-
-
-
- {{currentStock}}
-
+
-
-
- {{currentStockPrice}}
+
+
+ 当前总库存：{{currentStock}}，当前总库存金额：{{currentStockPrice}}
diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue
index 06f0be97..b143961d 100644
--- a/jshERP-web/src/views/report/VendorAccount.vue
+++ b/jshERP-web/src/views/report/VendorAccount.vue
@@ -30,7 +30,7 @@
-
+
查询
打印
导出