diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue
index d00ed68c..250e5fa6 100644
--- a/jshERP-web/src/views/report/AllocationDetail.vue
+++ b/jshERP-web/src/views/report/AllocationDetail.vue
@@ -11,11 +11,6 @@
-
-
-
-
-
@@ -44,7 +39,17 @@
+
+
+ 总数量:{{operNumberTotalStr}},总金额:{{allPriceTotalStr}}
+
+
+
+
+
+
+
{
+ if (res.code===200) {
+ this.dataSource = res.data.rows;
+ this.ipagination.total = res.data.total;
+ this.operNumberTotalStr = res.data.operNumberTotal.toFixed(2)
+ this.allPriceTotalStr = res.data.allPriceTotal.toFixed(2)
+ this.tableAddTotalRow(this.columns, this.dataSource)
+ }
+ if(res.code===510){
+ this.$message.warning(res.data)
+ }
+ this.loading = false;
+ })
+ },
initSupplier() {
let that = this;
findBySelectSup({}).then((res)=>{
diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue
index bf4b5d6c..2a86c6dc 100644
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@@ -7,11 +7,6 @@
-
-
-
-
-
@@ -40,7 +35,17 @@
+
+
+ 总数量:{{operNumberTotalStr}},总金额:{{allPriceTotalStr}}
+
+
+
+
+
+
+
{
+ if (res.code===200) {
+ this.dataSource = res.data.rows;
+ this.ipagination.total = res.data.total;
+ this.operNumberTotalStr = res.data.operNumberTotal.toFixed(2)
+ this.allPriceTotalStr = res.data.allPriceTotal.toFixed(2)
+ this.tableAddTotalRow(this.columns, this.dataSource)
+ }
+ if(res.code===510){
+ this.$message.warning(res.data)
+ }
+ this.loading = false;
+ })
+ },
initSupplier() {
let that = this;
findBySelectOrgan({}).then((res)=>{
diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue
index df44c275..20402f63 100644
--- a/jshERP-web/src/views/report/InMaterialCount.vue
+++ b/jshERP-web/src/views/report/InMaterialCount.vue
@@ -7,16 +7,6 @@
-
-
-
-
- {{ item.supplier }}
-
-
-
-
@@ -45,7 +35,22 @@
+
+
+ 入库总数量:{{numSumTotalStr}},入库总金额:{{priceSumTotalStr}}
+
+
+
+
+
+
+ {{ item.supplier }}
+
+
+
+
{
+ if (res.code===200) {
+ this.dataSource = res.data.rows;
+ this.ipagination.total = res.data.total;
+ this.numSumTotalStr = res.data.numSumTotal.toFixed(2)
+ this.priceSumTotalStr = res.data.priceSumTotal.toFixed(2)
+ this.tableAddTotalRow(this.columns, this.dataSource)
+ }
+ if(res.code===510){
+ this.$message.warning(res.data)
+ }
+ this.loading = false;
+ })
+ },
initSupplier() {
let that = this;
findBySelectOrgan({}).then((res)=>{
diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue
index da330de6..d090250b 100644
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@@ -7,11 +7,6 @@
-
-
-
-
-
@@ -40,7 +35,17 @@
+
+
+ 总数量:{{operNumberTotalStr}},总金额:{{allPriceTotalStr}}
+
+
+
+
+
+
+
{
+ if (res.code===200) {
+ this.dataSource = res.data.rows;
+ this.ipagination.total = res.data.total;
+ this.operNumberTotalStr = res.data.operNumberTotal.toFixed(2)
+ this.allPriceTotalStr = res.data.allPriceTotal.toFixed(2)
+ this.tableAddTotalRow(this.columns, this.dataSource)
+ }
+ if(res.code===510){
+ this.$message.warning(res.data)
+ }
+ this.loading = false;
+ })
+ },
initSupplier() {
let that = this;
findBySelectOrgan({}).then((res)=>{
diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue
index 1dde5838..37e7be47 100644
--- a/jshERP-web/src/views/report/OutMaterialCount.vue
+++ b/jshERP-web/src/views/report/OutMaterialCount.vue
@@ -7,16 +7,6 @@
-
-
-
-
- {{ item.supplier }}
-
-
-
-
@@ -45,7 +35,22 @@
+
+
+ 出库总数量:{{numSumTotalStr}},出库总金额:{{priceSumTotalStr}}
+
+
+
+
+
+
+ {{ item.supplier }}
+
+
+
+
{
+ if (res.code===200) {
+ this.dataSource = res.data.rows;
+ this.ipagination.total = res.data.total;
+ this.numSumTotalStr = res.data.numSumTotal.toFixed(2)
+ this.priceSumTotalStr = res.data.priceSumTotal.toFixed(2)
+ this.tableAddTotalRow(this.columns, this.dataSource)
+ }
+ if(res.code===510){
+ this.$message.warning(res.data)
+ }
+ this.loading = false;
+ })
+ },
initSupplier() {
let that = this;
findBySelectOrgan({}).then((res)=>{