From 5cdf323d5c63d75c05a7f0a61c385c415db41e89 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 26 Mar 2025 17:14:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/accountCenter/consume.js              | 20 ++++++--
 .../account/accountManager/expired.vue        |  2 +-
 .../account/accountManager/index.vue          |  2 +-
 .../account/accountManager/logoff.vue         |  2 +-
 .../account/tradeRecords/index.vue            |  2 +-
 src/views/accountCenter/butie/butie/index.vue |  2 +-
 .../butie/butieRecordsTab/index.vue           |  8 +--
 .../butie/butieSummary/index.vue              |  2 +-
 .../consume/consumeSummary/index.vue          |  9 ++--
 .../consume/consumerWalletSummary/index.vue   | 11 ++--
 .../accountCenter/consume/deduct/index.vue    | 50 ++++++++++---------
 .../accountCenter/consume/trade/index.vue     |  2 +-
 src/views/base/area/index.vue                 |  4 +-
 src/views/base/canteen/index.vue              |  2 +-
 src/views/device/doubleScreen/index.vue       |  2 +-
 src/views/dish/dish/index.vue                 |  4 +-
 src/views/dish/material/index.vue             |  8 +--
 src/views/dish/menu/index.vue                 |  2 +-
 src/views/dish/nutritionInfo/index.vue        |  4 +-
 src/views/dish/type/index.vue                 |  2 +-
 src/views/login1.vue                          |  3 +-
 src/views/order/offlineManagement/index.vue   |  2 +-
 src/views/order/reserveManagement/index.vue   |  2 +-
 src/views/superstore/orderShenhe/index.vue    |  2 +-
 src/views/superstore/shopMaterial/index.vue   |  4 +-
 src/views/superstore/super/index.vue          |  2 +-
 src/views/superstore/superOrder/index.vue     |  2 +-
 src/views/superstore/superUitId/index.vue     |  2 +-
 28 files changed, 91 insertions(+), 68 deletions(-)

diff --git a/src/api/accountCenter/consume.js b/src/api/accountCenter/consume.js
index f89676bf..a142a927 100644
--- a/src/api/accountCenter/consume.js
+++ b/src/api/accountCenter/consume.js
@@ -61,8 +61,8 @@ export function consumeDeductSingleApi(data) {
     })
   } 
 
- // 补扣提交-批量
- export function consumeDeductBatchApi(data) {
+ // 补扣提交-批量预览
+ export function consumeBatchCheckApi(data) {
     return request({
       url: '/smart-canteen/api/v3/acc/batch/operate/repair/deduct/check',
       method: 'post',
@@ -71,7 +71,21 @@ export function consumeDeductSingleApi(data) {
       },
       data: data
     })
-  } 
+  }
+
+// 补扣提交-批量补扣
+ export function consumeDeductBatchApi(data) {
+  return request({
+    url: '/smart-canteen/api/v3/acc/consume/batch/repair/deduct',
+    method: 'post',
+    headers: {
+        "merchant-id":"378915229716713472",
+    },
+    data: data
+  })
+}
+
+  
 
 
   // 消费明细列表
diff --git a/src/views/accountCenter/account/accountManager/expired.vue b/src/views/accountCenter/account/accountManager/expired.vue
index 8a6354f1..5dc5ebbd 100644
--- a/src/views/accountCenter/account/accountManager/expired.vue
+++ b/src/views/accountCenter/account/accountManager/expired.vue
@@ -72,7 +72,7 @@
         <el-table-column label="序号" align="center" width="80" type="index">
             <template scope="scope">
                 <span v-if="!scope.row.custId">合计：</span>
-                <span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                <span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template> 
         </el-table-column> 
         <el-table-column label="操作时间" align="center" prop="uptime" :show-overflow-tooltip="true" width="160"/>
diff --git a/src/views/accountCenter/account/accountManager/index.vue b/src/views/accountCenter/account/accountManager/index.vue
index 2b0561c7..c1ac81c4 100644
--- a/src/views/accountCenter/account/accountManager/index.vue
+++ b/src/views/accountCenter/account/accountManager/index.vue
@@ -73,7 +73,7 @@
         <el-table-column label="序号" align="center" width="80" type="index">
             <template scope="scope">
                 <span v-if="!scope.row.custId">合计：</span>
-                <span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                <span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template> 
         </el-table-column> 
         <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120" fixed="left"/>
diff --git a/src/views/accountCenter/account/accountManager/logoff.vue b/src/views/accountCenter/account/accountManager/logoff.vue
index 26856b56..461fbb60 100644
--- a/src/views/accountCenter/account/accountManager/logoff.vue
+++ b/src/views/accountCenter/account/accountManager/logoff.vue
@@ -72,7 +72,7 @@
         <el-table-column label="序号" align="center" width="80" type="index">
             <template scope="scope">
                 <span v-if="!scope.row.custId">合计：</span>
-                <span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                <span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template> 
         </el-table-column> 
         <el-table-column label="操作时间" align="center" prop="uptime" :show-overflow-tooltip="true" width="160"/>
diff --git a/src/views/accountCenter/account/tradeRecords/index.vue b/src/views/accountCenter/account/tradeRecords/index.vue
index 51d318dd..7fe8dc15 100644
--- a/src/views/accountCenter/account/tradeRecords/index.vue
+++ b/src/views/accountCenter/account/tradeRecords/index.vue
@@ -74,7 +74,7 @@
         <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/> -->
         <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
                 <template slot-scope="scope">
-                    <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
         </el-table-column>
         <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" />
diff --git a/src/views/accountCenter/butie/butie/index.vue b/src/views/accountCenter/butie/butie/index.vue
index b6a0fd30..a7c615d3 100644
--- a/src/views/accountCenter/butie/butie/index.vue
+++ b/src/views/accountCenter/butie/butie/index.vue
@@ -41,7 +41,7 @@
         <el-table-column label="序号" align="center" width="80" type="index">
             <template scope="scope">
                 <span v-if="!scope.row.custId">合计：</span>
-                <span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                <span v-else>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template> 
         </el-table-column> 
         <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120" fixed="left"/>
diff --git a/src/views/accountCenter/butie/butieRecordsTab/index.vue b/src/views/accountCenter/butie/butieRecordsTab/index.vue
index 091625af..446a0974 100644
--- a/src/views/accountCenter/butie/butieRecordsTab/index.vue
+++ b/src/views/accountCenter/butie/butieRecordsTab/index.vue
@@ -58,7 +58,7 @@
                     <el-table-column label="序号" align="center" width="100" type="index" >
                         <template scope="scope">
                             <span v-if="!scope.row.custId">合计：</span>
-                            <span v-else>{{ (queryParams1.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                            <span v-else>{{ (queryParams1.pageNum - 1) * queryParams1.pageSize + scope.$index+1 }}</span>
                         </template> 
                     </el-table-column>
                     <el-table-column label="补贴时间" align="center" prop="tradeTime" :show-overflow-tooltip="true"  width="160"/>
@@ -152,7 +152,7 @@
                     <el-table-column label="序号" align="center" width="100" type="index" >
                         <template scope="scope">
                             <span v-if="!scope.row.custId">合计：</span>
-                            <span v-else>{{ (queryParams2.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                            <span v-else>{{ (queryParams2.pageNum - 1) * queryParams2.pageSize + scope.$index+1 }}</span>
                         </template> 
                     </el-table-column>
                     <el-table-column label="补贴清空时间" align="center" prop="tradeTime" :show-overflow-tooltip="true"  width="160"/>
@@ -218,7 +218,7 @@
                     <el-table-column label="序号" align="center" width="100" type="index" >
                         <template scope="scope">
                             <span v-if="!scope.row.custId">合计：</span>
-                            <span v-else>{{ (queryParams3.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                            <span v-else>{{ (queryParams3.pageNum - 1) * queryParams3.pageSize + scope.$index+1 }}</span>
                         </template> 
                     </el-table-column>
                     <el-table-column label="撤销时间" align="center" prop="tradeTime" :show-overflow-tooltip="true"  width="160"/>
@@ -327,7 +327,7 @@
                     <el-table-column label="序号" align="center" width="100" type="index" >
                         <template scope="scope">
                             <span v-if="!scope.row.custId">合计：</span>
-                            <span v-else>{{ (queryParams4.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                            <span v-else>{{ (queryParams4.pageNum - 1) * queryParams4.pageSize + scope.$index+1 }}</span>
                         </template> 
                     </el-table-column> 
                     <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
diff --git a/src/views/accountCenter/butie/butieSummary/index.vue b/src/views/accountCenter/butie/butieSummary/index.vue
index f8b469b8..eaabad48 100644
--- a/src/views/accountCenter/butie/butieSummary/index.vue
+++ b/src/views/accountCenter/butie/butieSummary/index.vue
@@ -62,7 +62,7 @@
         <el-table-column label="序号" align="center" width="100" type="index">
             <template scope="scope">
                 <span v-if="!scope.row.custNum&&!scope.row.psnTypeName&&!scope.row.orgFullName">合计：</span>
-                <span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                <span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
             </template> 
         </el-table-column>  
         <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>
diff --git a/src/views/accountCenter/consume/consumeSummary/index.vue b/src/views/accountCenter/consume/consumeSummary/index.vue
index 0fa03049..004c3901 100644
--- a/src/views/accountCenter/consume/consumeSummary/index.vue
+++ b/src/views/accountCenter/consume/consumeSummary/index.vue
@@ -68,7 +68,7 @@
         <el-table-column label="序号" align="center" width="100" type="index">
             <template scope="scope">
                 <span v-if="!scope.row.custNum&&!scope.row.psnTypeName&&!scope.row.orgFullName">合计：</span>
-                <span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                <span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
             </template> 
         </el-table-column> 
         <el-table-column label="统计日期" align="center" prop="statisticDate" :show-overflow-tooltip="true" v-if="queryParams.sumType==2"/>
@@ -236,7 +236,10 @@
                 orgIdList:[],
                 orgLevel:2
             }
-            
+            if(this.activeName=='organization'){ 
+                let arr = this.lookForAllId(this.deptOptions) 
+                this.$set(this.queryParams,'orgIdList',arr)
+            }
             this.resetForm("queryForm");
             this.handleQuery()
         },
@@ -257,7 +260,7 @@
                 orgLevel:2
             }
             if(this.activeName=='organization'){ 
-                let arr = this.lookForAllId(this.deptOptions) 
+                let arr = this.lookForAllId(this.deptOptions)
                 this.$set(this.queryParams,'orgIdList',arr)
             }
             this.resetForm("queryForm");
diff --git a/src/views/accountCenter/consume/consumerWalletSummary/index.vue b/src/views/accountCenter/consume/consumerWalletSummary/index.vue
index d36629a9..ff60b7b2 100644
--- a/src/views/accountCenter/consume/consumerWalletSummary/index.vue
+++ b/src/views/accountCenter/consume/consumerWalletSummary/index.vue
@@ -68,7 +68,7 @@
         <el-table-column label="序号" align="center" width="100" type="index">
             <template scope="scope">
                 <span v-if="!scope.row.custNum&&!scope.row.psnTypeName&&!scope.row.orgFullName">合计：</span>
-                <span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                <span v-else>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
             </template> 
         </el-table-column> 
         <el-table-column label="统计日期" align="center" prop="statisticDate" :show-overflow-tooltip="true" v-if="queryParams.sumType==2"/>
@@ -170,7 +170,8 @@
           sumType:'1',  
           keyword:null, 
           psnTypeList:[],
-          orgIdList:[]
+          orgIdList:[],
+          orgLevel:1
         },
       };
     },
@@ -213,7 +214,8 @@
                 sumType:'1',  
                 keyword:null, 
                 psnTypeList:[],
-                orgIdList:[]
+                orgIdList:[],
+                orgLevel:1
             }
             this.resetForm("queryForm");
             this.handleQuery()
@@ -231,7 +233,8 @@
                 sumType:'1',  
                 keyword:null, 
                 psnTypeList:[],
-                orgIdList:[]
+                orgIdList:[],
+                orgLevel:1
             }
             this.resetForm("queryForm");
             this.handleQuery();
diff --git a/src/views/accountCenter/consume/deduct/index.vue b/src/views/accountCenter/consume/deduct/index.vue
index 6aa382d2..ca760ef8 100644
--- a/src/views/accountCenter/consume/deduct/index.vue
+++ b/src/views/accountCenter/consume/deduct/index.vue
@@ -34,7 +34,7 @@
       <el-table v-loading="loading" :data="tableListData" height="800">
         <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
             <template scope="scope"> 
-                <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
+                <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index+1 }}</span>
             </template> 
         </el-table-column> 
         <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" width="120" fixed="left"/>
@@ -390,8 +390,9 @@
           <el-button @click="openBatch=false">取 消</el-button>
         </div>
       </el-dialog>
+
       <el-dialog title="批量校验预览" :visible.sync="openResult" width="800px" append-to-body>
-        <div>总人数： {{resultData.totalCount }}||-- ， 补扣人数：{{resultData.sucCount }}||-- ， 补扣总额：{{resultData.sucTotalAmount }}||-- ， 无效人数：{{resultData.errCount }}||--</div>
+        <div>总人数： {{resultData.totalCount || '--' }} ， 补扣人数：{{resultData.sucCount || '--' }}， 补扣总额：{{resultData.sucTotalAmount || '--' }}， 无效人数：{{resultData.errCount || '--'}}</div>
         <el-table :data="resultData.errVOList" height="300">
             <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
             <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
@@ -404,21 +405,10 @@
                 </template> 
             </el-table-column>
             <el-table-column label="失败原因" align="center" prop="errMsg" :show-overflow-tooltip="true"/>
-        </el-table>
-        <!-- <el-table :data="resultData.sucVOList" height="300" v-if="resultData.sucVOList.length>0">
-            <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
-            <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
-            <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
-            <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" />
-            <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true"/>
-            <el-table-column label="金额" align="center" prop="amount" :show-overflow-tooltip="true">
-                <template slot-scope="scope">
-                    <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
-                </template> 
-            </el-table-column> 
-        </el-table> -->
+        </el-table> 
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="openResult=false">确 定</el-button>
+          <el-button type="primary" @click="openResult=false" v-if="resultData.sucVOList&&resultData.sucVOList.length==0">确 定</el-button>
+          <el-button type="primary" @click="confirmBatchDeduct" v-else>继 续</el-button> 
           <el-button @click="openResult=false">取 消</el-button>
         </div>
       </el-dialog> 
@@ -428,7 +418,7 @@
   <script>
   import { deptTreeSelect } from '@/api/system/user'
   import { accInfoPageApi } from "@/api/accountCenter/manager";
-  import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi,getPayDeviceListApi,consumeDeductSingleApi,consumeDeductBatchApi } from "@/api/accountCenter/consume";
+  import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi,getPayDeviceListApi,consumeDeductSingleApi,consumeBatchCheckApi,consumeDeductBatchApi } from "@/api/accountCenter/consume";
   
   
   export default {
@@ -707,7 +697,7 @@
                 custIdList:this.batchIds 
             }
             param.amount=Number(this.form.amount*100);
-            param.ordDateTime=this.form.ordDateTime+"00:00:00";
+            param.ordDateTime=this.form.ordDateTime+" 00:00:00";
             param.shopstallId=this.form.stallId;
             this.devicesOptions.forEach(item=>{
                 if(item.deviceId == this.form.deviceId){
@@ -717,17 +707,29 @@
                     param.mchType = item.deviceType
                 }
             }) 
-            consumeDeductBatchApi(param).then(response => { 
-                this.openBatch = false;
-                this.getList();
+            consumeBatchCheckApi(param).then(response => { 
+                this.openBatch = false; 
                 this.resultData = response.data
                 this.openResult=true
             });
           }else{
             this.$modal.msgError("请先勾选账户！");
-          }
-
-        }, 
+          } 
+        },
+        confirmBatchDeduct(){
+          let param = { 
+                ...this.resultData,
+                custIdList:this.batchIds 
+          } 
+          consumeDeductBatchApi(param).then(response => {
+              // this.$modal.msgSuccess("操作正在进行中，稍后可前往批量操作记录查看结果！");
+              if(response.code==200){
+                this.$modal.msgSuccess("操作成功！");
+                this.getList();
+                this.openResult=false
+              }
+          });
+        }
         
     }
   };
diff --git a/src/views/accountCenter/consume/trade/index.vue b/src/views/accountCenter/consume/trade/index.vue
index 1d5119fb..8b48484f 100644
--- a/src/views/accountCenter/consume/trade/index.vue
+++ b/src/views/accountCenter/consume/trade/index.vue
@@ -98,7 +98,7 @@
       <el-table v-loading="loading" :data="tableListData" height="800" ref="multipleTable" :row-key="(row)=>{return row.orderId}"> 
         <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
                 <template slot-scope="scope">
-                    <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
         </el-table-column>
         <el-table-column label="账户交易号" align="center" prop="flowId" :show-overflow-tooltip="true" width="120"/>
diff --git a/src/views/base/area/index.vue b/src/views/base/area/index.vue
index 9509e030..614eceec 100644
--- a/src/views/base/area/index.vue
+++ b/src/views/base/area/index.vue
@@ -104,10 +104,10 @@
             </el-form-item>
           </el-form> 
   
-          <el-table v-loading="loading" :data="typeList" border>
+          <el-table v-loading="loading" :data="typeList" border height="600">
             <el-table-column label="序号" align="center" width="80" type="index">
                   <template slot-scope="scope">
-                      <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                      <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                   </template>
             </el-table-column>
             <el-table-column label="区域编号" align="center" key="areaNum" prop="areaNum" show-overflow-tooltip/>
diff --git a/src/views/base/canteen/index.vue b/src/views/base/canteen/index.vue
index f8ab42bd..6855ba51 100644
--- a/src/views/base/canteen/index.vue
+++ b/src/views/base/canteen/index.vue
@@ -207,7 +207,7 @@
                           v-for="dict in dict.type.stall_tag"
                           :key="dict.value"
                           :label="dict.label"
-                          :value="dict.value"
+                          :value="dict.label"
                         />
                         <!-- <el-option v-for="item in labelOptions"
                             :key="item.labelName"
diff --git a/src/views/device/doubleScreen/index.vue b/src/views/device/doubleScreen/index.vue
index 3c907087..2376e6f4 100644
--- a/src/views/device/doubleScreen/index.vue
+++ b/src/views/device/doubleScreen/index.vue
@@ -383,7 +383,7 @@
         <el-table :data="logTableData" height="500"> 
             <el-table-column label="序号" align="center" width="80" type="index">
                   <template slot-scope="scope">
-                      <span>{{(dialogQueryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                      <span>{{(dialogQueryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                   </template>
             </el-table-column>
             <el-table-column label="发生时间" align="center" prop="messageTime" :show-overflow-tooltip="true"/>
diff --git a/src/views/dish/dish/index.vue b/src/views/dish/dish/index.vue
index d2017578..23025602 100644
--- a/src/views/dish/dish/index.vue
+++ b/src/views/dish/dish/index.vue
@@ -165,7 +165,7 @@
             <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
             <el-table-column label="序号" align="center" width="80" type="index">
               <template slot-scope="scope">
-                <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
               </template>
             </el-table-column>
             <el-table-column label="菜品/套餐图片" align="center" key="imageUrl" prop="imageUrl" :show-overflow-tooltip="true"  width="120">
@@ -778,7 +778,7 @@
         this.form={}
         this.resetForm("form");
         this.form = {
-          ...data,
+          ...data
         };
         this.openType = true;
         this.title = "修改";
diff --git a/src/views/dish/material/index.vue b/src/views/dish/material/index.vue
index da128fdd..a07996db 100644
--- a/src/views/dish/material/index.vue
+++ b/src/views/dish/material/index.vue
@@ -185,12 +185,12 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="tableList" ref="multipleTable" border :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="tableList" ref="multipleTable" height="550" border :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
 
           <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
           <el-table-column label="序号" align="center" width="80" type="index">
             <template slot-scope="scope">
-              <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+              <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
           <el-table-column label="原料编码" align="center" key="materialCode" prop="materialCode" :show-overflow-tooltip="true"  width="100"/>
@@ -211,7 +211,7 @@
                 <span>{{ (scope.row.unitPrice/100).toFixed(2)||"" }}</span>
             </template>   
           </el-table-column>
-          <el-table-column label="最近进价(元)" align="center" key="leastIntoPrice" prop="leastIntoPrice" :show-overflow-tooltip="true" width="150">
+          <!-- <el-table-column label="最近进价(元)" align="center" key="leastIntoPrice" prop="leastIntoPrice" :show-overflow-tooltip="true" width="150">
             <template slot-scope="scope">
                 <span v-if="scope.row.leastIntoPrice">{{ (scope.row.leastIntoPrice/100).toFixed(2) ||""}}</span>
                 <span v-else></span>
@@ -223,7 +223,7 @@
                 <span v-if="scope.row.monthlyAvgPrice">{{ (scope.row.monthlyAvgPrice/100).toFixed(2) ||""}}</span>
                 <span v-else></span>
             </template>   
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="营养信息名称" align="center" key="nutritionName" prop="nutritionName" :show-overflow-tooltip="true" width="150"/>
           <el-table-column label="条码" align="center" key="barCode" prop="barCode" :show-overflow-tooltip="true" width="150"/>
           <el-table-column label="操作" align="center" width="180" fixed="right">
diff --git a/src/views/dish/menu/index.vue b/src/views/dish/menu/index.vue
index 2bc97fd0..0851d475 100644
--- a/src/views/dish/menu/index.vue
+++ b/src/views/dish/menu/index.vue
@@ -76,7 +76,7 @@
         <el-table v-loading="loading" :data="tableListData" height="800">
             <el-table-column label="序号" align="center" width="80" type="index">
                 <template slot-scope="scope">
-                    <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
             </el-table-column>
             <el-table-column label="区域名称" align="center" prop="areaName" />
diff --git a/src/views/dish/nutritionInfo/index.vue b/src/views/dish/nutritionInfo/index.vue
index 3f19f65b..1790931e 100644
--- a/src/views/dish/nutritionInfo/index.vue
+++ b/src/views/dish/nutritionInfo/index.vue
@@ -47,10 +47,10 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="menuNutritionList" > 
+    <el-table v-loading="loading" :data="menuNutritionList" height="650"> 
       <el-table-column label="序号" align="center" width="80" type="index">
             <template slot-scope="scope">
-                <span>{{(queryParams.current - 1) * 10 + scope.$index + 1}}</span>
+                <span>{{(queryParams.current - 1) * queryParams.size + scope.$index + 1}}</span>
             </template>
       </el-table-column>
       <el-table-column label="食材编码" align="center" prop="nutritionCode" />
diff --git a/src/views/dish/type/index.vue b/src/views/dish/type/index.vue
index a0639f2d..4a3136af 100644
--- a/src/views/dish/type/index.vue
+++ b/src/views/dish/type/index.vue
@@ -40,7 +40,7 @@
         <el-table v-loading="loading" :data="tableListData" height="800">
             <el-table-column label="序号" align="center" width="80" type="index">
                   <template slot-scope="scope">
-                      <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                      <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                   </template>
             </el-table-column>
             <el-table-column label="名称" align="center" prop="cookName" v-if="activeName=='menudishescook'"/> 
diff --git a/src/views/login1.vue b/src/views/login1.vue
index e1448ee7..c3e5fa31 100644
--- a/src/views/login1.vue
+++ b/src/views/login1.vue
@@ -258,7 +258,8 @@ export default {
           this.loginForm.loginMethod = this.loginMethod
           this.$store.dispatch('Login', this.loginForm)
             .then(res => {
-              console.log(res)
+              this.loading = false
+              // console.log(res)
               if (res.code===200){
                 if (res.isLogin){
                   this.$modal.confirm('账号已在其他地方登录是否继续登录！！！！').then(function() {
diff --git a/src/views/order/offlineManagement/index.vue b/src/views/order/offlineManagement/index.vue
index c608e3d2..aa17b64e 100644
--- a/src/views/order/offlineManagement/index.vue
+++ b/src/views/order/offlineManagement/index.vue
@@ -172,7 +172,7 @@
         <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
         <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
                 <template slot-scope="scope">
-                    <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
         </el-table-column>
         <el-table-column label="就餐日期" align="center" prop="orderDate" :show-overflow-tooltip="true" width="100"/>
diff --git a/src/views/order/reserveManagement/index.vue b/src/views/order/reserveManagement/index.vue
index 0e32804d..186b4aaa 100644
--- a/src/views/order/reserveManagement/index.vue
+++ b/src/views/order/reserveManagement/index.vue
@@ -175,7 +175,7 @@
       <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
       <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
               <template slot-scope="scope">
-                  <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                  <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
               </template>
       </el-table-column>
       <el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true" width="100">
diff --git a/src/views/superstore/orderShenhe/index.vue b/src/views/superstore/orderShenhe/index.vue
index d732884f..560db6fe 100644
--- a/src/views/superstore/orderShenhe/index.vue
+++ b/src/views/superstore/orderShenhe/index.vue
@@ -55,7 +55,7 @@
         <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
         <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
                 <template slot-scope="scope">
-                    <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
         </el-table-column> 
         <el-table-column label="退款状态" align="center" prop="checkState" :show-overflow-tooltip="true" width="100">
diff --git a/src/views/superstore/shopMaterial/index.vue b/src/views/superstore/shopMaterial/index.vue
index 8034c47d..4370d53f 100644
--- a/src/views/superstore/shopMaterial/index.vue
+++ b/src/views/superstore/shopMaterial/index.vue
@@ -185,12 +185,12 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="tableList" ref="multipleTable" border :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="tableList" height="650" ref="multipleTable" border :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
 
           <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
           <el-table-column label="序号" align="center" width="80" type="index">
             <template slot-scope="scope">
-              <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+              <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
           <el-table-column label="商品编码" align="center" key="materialCode" prop="materialCode" :show-overflow-tooltip="true" />
diff --git a/src/views/superstore/super/index.vue b/src/views/superstore/super/index.vue
index b302062d..27f94b3f 100644
--- a/src/views/superstore/super/index.vue
+++ b/src/views/superstore/super/index.vue
@@ -39,7 +39,7 @@
       <el-table v-loading="loading" :data="tableListData" height="800">
         <el-table-column label="序号" align="center" width="100" type="index" fixed="left">
                 <template slot-scope="scope">
-                    <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
         </el-table-column>
         <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/> 
diff --git a/src/views/superstore/superOrder/index.vue b/src/views/superstore/superOrder/index.vue
index c68c1406..24202fd8 100644
--- a/src/views/superstore/superOrder/index.vue
+++ b/src/views/superstore/superOrder/index.vue
@@ -119,7 +119,7 @@
         <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
         <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
                 <template slot-scope="scope">
-                    <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
         </el-table-column>
         <el-table-column label="订单日期" align="center" prop="orderDate" :show-overflow-tooltip="true" width="100"/>
diff --git a/src/views/superstore/superUitId/index.vue b/src/views/superstore/superUitId/index.vue
index 064e9b8a..2205370c 100644
--- a/src/views/superstore/superUitId/index.vue
+++ b/src/views/superstore/superUitId/index.vue
@@ -43,7 +43,7 @@
       <el-table v-loading="loading" :data="tableListData" height="800">
         <el-table-column label="序号" align="center" width="80" type="index">
             <template slot-scope="scope">
-                <span>{{(queryParams.pageNum - 1) * 10 + scope.$index + 1}}</span>
+                <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
         </el-table-column>
         <el-table-column label="所属区域" align="center" key="areaName" prop="areaName" :show-overflow-tooltip="true" />