From f0b050141c922855fecf09f9a9f3c6823798aa8b Mon Sep 17 00:00:00 2001
From: myTest383 <address>
Date: Tue, 8 Oct 2024 15:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BA=93=E5=AD=98=E6=80=BB?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/login.vue                           |  2 ++
 .../totalStatus/totalInventory/totalInventory.vue   | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 8fefd41..afce4c0 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -224,6 +224,8 @@
           sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33', //  wms 资源sid
         },
         loginForm: {
+          // userName: '18033761989',
+          // password: 'Yxt123',
           userName: '',
           password: '',
           verifyCode: "",
diff --git a/src/views/storage/totalStatus/totalInventory/totalInventory.vue b/src/views/storage/totalStatus/totalInventory/totalInventory.vue
index f549037..b2f22ac 100644
--- a/src/views/storage/totalStatus/totalInventory/totalInventory.vue
+++ b/src/views/storage/totalStatus/totalInventory/totalInventory.vue
@@ -56,6 +56,10 @@
         <!--End查询列表部分-->
         <div class="listtop">
           <div class="tit">库存总量列表</div>
+          <div class="tit">库存总数量：{{map.totalUseCount}}</div>
+          <div class="tit">库存总金额：{{map.useCountMoney}}</div>
+          <div class="tit">在途总数量：{{map.totalInTransitSummary}}</div>
+          <div class="tit">在途总金额：{{map.inTransitSummaryMoney}}</div>
           <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
             :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
         </div>
@@ -87,8 +91,8 @@
             <el-table-column prop="barCode" label="条码" align="center" />
             <el-table-column prop="unit" label="单位" align="center" />
             <el-table-column label="库存数量" align="center">
-              <el-table-column prop="useCount" label="可用" align="center" />
               <el-table-column prop="count" label="实际" align="center" />
+              <el-table-column prop="useCount" label="可用" align="center" />
               <el-table-column prop="allocateCount" label="锁定" align="center" />
               <el-table-column prop="freezeCount" label="冻结" align="center" />
             </el-table-column>
@@ -112,10 +116,10 @@
             <el-table-column prop="batchNumber" label="生产批次号" width="120" align="center" />
           </el-table>
         </div>
-        <!--End 主页面主要部分-->
+        <!-- End 主页面主要部分 -->
         <!-- <div class="pages"> -->
         <!-- <div class="tit" /> -->
-        <!-- 翻页 -->
+        <!-- 翻页-->
         <!-- <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" -->
         <!-- :limit.sync="listQuery.size" class="pagination" @pagination="getList" /> -->
         <!-- </div> -->
@@ -267,6 +271,7 @@
         viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
         tableKey: 0,
         list: [],
+        map: {},
         sids: [], // 用于导出的时候保存已选择的SIDs
         listLoading: false,
         // 翻页
@@ -420,9 +425,11 @@
           this.listLoading = false
           if (response.success) {
             this.list = response.data.records
+            this.map = response.data.map
             this.listQuery.total = response.data.total
           } else {
             this.list = []
+            this.map = {}
             this.listQuery.total = 0
           }
         })