From fc2125ae2ca79dcbb9f156a92e66784d0af3a4a1 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sun, 7 Apr 2024 00:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=87=BA=E5=85=A5=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=92=8C=E6=B1=87=E6=80=BB=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=80=BB=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/report/AllocationDetail.vue     | 37 +++++++++++++--
 jshERP-web/src/views/report/InDetail.vue      | 37 +++++++++++++--
 .../src/views/report/InMaterialCount.vue      | 47 +++++++++++++++----
 jshERP-web/src/views/report/OutDetail.vue     | 37 +++++++++++++--
 .../src/views/report/OutMaterialCount.vue     | 47 +++++++++++++++----
 5 files changed, 170 insertions(+), 35 deletions(-)

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 @@
         <div class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入单据编号" v-model="queryParam.number"></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.materialParam"></a-input>
@@ -44,7 +39,17 @@
                   </a>
                 </span>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item>
+                  <span>总数量：{{operNumberTotalStr}}，总金额：{{allPriceTotalStr}}</span>
+                </a-form-item>
+              </a-col>
               <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="调出仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select
@@ -180,6 +185,8 @@
         supList: [],
         depotList: [],
         orgaTree: [],
+        operNumberTotalStr: '0',
+        allPriceTotalStr: '0',
         tabKey: "1",
         // 表头
         columns: [
@@ -231,6 +238,26 @@
         this.queryParam.beginTime=dateString[0];
         this.queryParam.endTime=dateString[1];
       },
+      loadData(arg) {
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        let params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          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 @@
         <div class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入单据编号" v-model="queryParam.number"></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.materialParam"></a-input>
@@ -40,7 +35,17 @@
                   </a>
                 </span>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item>
+                  <span>总数量：{{operNumberTotalStr}}，总金额：{{allPriceTotalStr}}</span>
+                </a-form-item>
+              </a-col>
               <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="选择往来单位" v-model="queryParam.organId"
@@ -182,6 +187,8 @@
         depotList: [],
         userList: [],
         orgaTree: [],
+        operNumberTotalStr: '0',
+        allPriceTotalStr: '0',
         tabKey: "1",
         // 表头
         columns: [
@@ -236,6 +243,26 @@
         this.queryParam.beginTime=dateString[0];
         this.queryParam.endTime=dateString[1];
       },
+      loadData(arg) {
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        let params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          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 @@
         <div class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select placeholder="选择往来单位" v-model="queryParam.organId"
-                    :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
-                    <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
-                      {{ item.supplier }}
-                    </a-select-option>
-                  </a-select>
-                </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.materialParam"></a-input>
@@ -45,7 +35,22 @@
                   </a>
                 </span>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item>
+                  <span>入库总数量：{{numSumTotalStr}}，入库总金额：{{priceSumTotalStr}}</span>
+                </a-form-item>
+              </a-col>
               <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择往来单位" v-model="queryParam.organId"
+                              :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
+                      <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
+                        {{ item.supplier }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select
@@ -151,6 +156,8 @@
         organList: [],
         depotList: [],
         orgaTree: [],
+        numSumTotalStr: '0',
+        priceSumTotalStr: '0',
         tabKey: "1",
         // 表头
         columns: [
@@ -194,6 +201,26 @@
         this.queryParam.beginTime=dateString[0];
         this.queryParam.endTime=dateString[1];
       },
+      loadData(arg) {
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        let params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          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 @@
         <div class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入单据编号" v-model="queryParam.number"></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.materialParam"></a-input>
@@ -40,7 +35,17 @@
                   </a>
                 </span>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item>
+                  <span>总数量：{{operNumberTotalStr}}，总金额：{{allPriceTotalStr}}</span>
+                </a-form-item>
+              </a-col>
               <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="选择往来单位" v-model="queryParam.organId"
@@ -182,6 +187,8 @@
         depotList: [],
         userList: [],
         orgaTree: [],
+        operNumberTotalStr: '0',
+        allPriceTotalStr: '0',
         tabKey: "1",
         // 表头
         columns: [
@@ -236,6 +243,26 @@
         this.queryParam.beginTime=dateString[0];
         this.queryParam.endTime=dateString[1];
       },
+      loadData(arg) {
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        let params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          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 @@
         <div class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select placeholder="选择往来单位" v-model="queryParam.organId"
-                    :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
-                    <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
-                      {{ item.supplier }}
-                    </a-select-option>
-                  </a-select>
-                </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.materialParam"></a-input>
@@ -45,7 +35,22 @@
                   </a>
                 </span>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item>
+                  <span>出库总数量：{{numSumTotalStr}}，出库总金额：{{priceSumTotalStr}}</span>
+                </a-form-item>
+              </a-col>
               <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择往来单位" v-model="queryParam.organId"
+                              :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
+                      <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
+                        {{ item.supplier }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select
@@ -151,6 +156,8 @@
         organList: [],
         depotList: [],
         orgaTree: [],
+        numSumTotalStr: '0',
+        priceSumTotalStr: '0',
         tabKey: "1",
         // 表头
         columns: [
@@ -194,6 +201,26 @@
         this.queryParam.beginTime=dateString[0];
         this.queryParam.endTime=dateString[1];
       },
+      loadData(arg) {
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        let params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          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)=>{