diff --git a/src/api/base/canteen.js b/src/api/base/canteen.js
index 76a8ae05..22f09eeb 100644
--- a/src/api/base/canteen.js
+++ b/src/api/base/canteen.js
@@ -79,7 +79,19 @@ export function getCanteenLabelApi(data) {
       },
       data: data
     })
-} 
+}
+
+ // 通过角色查人员
+export function userListByRoleApi(data) {
+    return request({
+      url: '/system/user/listByPost',
+      method: 'post',
+      headers: {
+        "merchant-id":"378915229716713472",
+      },
+      data: data
+    })
+}
 // 人员职位职称查询
 export function queryAllCustJobApi(data) {
     return request({
diff --git a/src/api/base/stall.js b/src/api/base/stall.js
index c746d0a8..4ce5398d 100644
--- a/src/api/base/stall.js
+++ b/src/api/base/stall.js
@@ -123,7 +123,17 @@ export function getKindListApi(data) {
 } 
 
 
-
+ // 通过角色查人员
+export function userListByRoleApi(data) {
+    return request({
+      url: '/system/user/listByPost',
+      method: 'post',
+      headers: {
+        "merchant-id":"378915229716713472",
+      },
+      data: data
+    })
+}
 // 人员职位职称查询
 export function queryAllCustJobApi(data) {
     return request({
diff --git a/src/views/accountCenter/butie/butieSummary/index.vue b/src/views/accountCenter/butie/butieSummary/index.vue
index eaabad48..9a3f6b18 100644
--- a/src/views/accountCenter/butie/butieSummary/index.vue
+++ b/src/views/accountCenter/butie/butieSummary/index.vue
@@ -68,7 +68,7 @@
         <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>
         <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>
         <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>
-        <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='organization'"/> 
+        <el-table-column label="所属组织" align="center" prop="custOrgFullName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='organization'"/> 
         <el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='psn'"/> 
         <el-table-column label="补贴" align="center">
             <el-table-column label="笔数" align="center" prop="times" :show-overflow-tooltip="true" /> 
diff --git a/src/views/accountCenter/consume/consumeSummary/index.vue b/src/views/accountCenter/consume/consumeSummary/index.vue
index 004c3901..2be1b79b 100644
--- a/src/views/accountCenter/consume/consumeSummary/index.vue
+++ b/src/views/accountCenter/consume/consumeSummary/index.vue
@@ -180,7 +180,7 @@
           keyword:null, 
           psnTypeList:[],
           orgIdList:[],
-          orgLevel:2
+          orgLevel:1
         },
       };
     },
@@ -234,10 +234,10 @@
                 keyword:null, 
                 psnTypeList:[],
                 orgIdList:[],
-                orgLevel:2
+                orgLevel:1
             }
             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");
@@ -257,10 +257,11 @@
                 keyword:null, 
                 psnTypeList:[],
                 orgIdList:[],
-                orgLevel:2
+                orgLevel:1
             }
             if(this.activeName=='organization'){ 
                 let arr = this.lookForAllId(this.deptOptions)
+                console.log(arr)
                 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 ff60b7b2..715cfa98 100644
--- a/src/views/accountCenter/consume/consumerWalletSummary/index.vue
+++ b/src/views/accountCenter/consume/consumerWalletSummary/index.vue
@@ -196,6 +196,15 @@
                 })
                 .filter((node) => node.status !== '1')
         },
+        lookForAllId(data = [], arr = []) {
+            for (let item of data) {
+                if(!item.children){
+                    arr.push(item.id)
+                }
+                if (item.children && item.children.length) this.lookForAllId(item.children, arr)
+            }
+            return arr
+        },
         handleTabClick(tab, event) { 
             console.log(tab.name,tab.label)
             // if(this.activeName=='cust'){
@@ -217,6 +226,10 @@
                 orgIdList:[],
                 orgLevel:1
             }
+            if(this.activeName=='organization'){ 
+                let arr = this.lookForAllId(this.deptOptions)
+                this.$set(this.queryParams,'orgIdList',arr)
+            }
             this.resetForm("queryForm");
             this.handleQuery()
         },
@@ -236,6 +249,10 @@
                 orgIdList:[],
                 orgLevel:1
             }
+            if(this.activeName=='organization'){ 
+                let arr = this.lookForAllId(this.deptOptions)
+                this.$set(this.queryParams,'orgIdList',arr)
+            }
             this.resetForm("queryForm");
             this.handleQuery();
         },
diff --git a/src/views/accountCenter/consume/trade/index.vue b/src/views/accountCenter/consume/trade/index.vue
index 8b48484f..8c3f6c26 100644
--- a/src/views/accountCenter/consume/trade/index.vue
+++ b/src/views/accountCenter/consume/trade/index.vue
@@ -64,12 +64,12 @@
         <!-- minAmount maxAmount -->
         <el-form-item label="消费金额">
             <el-input v-model="queryParams.minAmount"  placeholder="最小金额" clearable style="width: 40%;" 
-                @input="(v)=>(queryParams.minAmount=Number(v.replace(/[^\d.]/g,'')))">
+                @input="(v)=>(queryParams.minAmount=v.replace(/[^\d.]/g,''))">
                 <template slot="append">元</template>
             </el-input>
             <span>至</span>
             <el-input v-model="queryParams.maxAmount"  placeholder="最大金额" clearable style="width: 40%;" 
-                @input="(v)=>(queryParams.maxAmount=Number(v.replace(/[^\d.]/g,'')))">
+                @input="(v)=>(queryParams.maxAmount=v.replace(/[^\d.]/g,''))">
                 <template slot="append">元</template>
             </el-input>
         </el-form-item> 
@@ -290,6 +290,12 @@
                 "beginTime":this.formatDate(this.dateRange[0]),
                 "endTime":this.formatDate(this.dateRange[1])
             }
+            if(param.minAmount&&param.minAmount!=""){
+              param.minAmount = Number(param.minAmount*100)
+            }
+            if(param.maxAmount&&param.maxAmount!=""){
+              param.maxAmount = Number(param.maxAmount*100)
+            }
             accountFlowPageApi(param).then(response => {
                 this.tableListData = response.resultPage.records;
                 this.total = Number(response.resultPage.total);
diff --git a/src/views/base/area/index.vue b/src/views/base/area/index.vue
index 614eceec..1ae2a25e 100644
--- a/src/views/base/area/index.vue
+++ b/src/views/base/area/index.vue
@@ -43,7 +43,7 @@
                   <el-button
                     type="text"
                     size="mini"
-                    icon="el-icon-plus"
+                    icon="el-icon-plus" v-if="data.sortNo<3"
                     @click.stop="() => appendTreeNode(data)"
                   >
                   </el-button>
diff --git a/src/views/base/canteen/index.vue b/src/views/base/canteen/index.vue
index 6855ba51..2c551cca 100644
--- a/src/views/base/canteen/index.vue
+++ b/src/views/base/canteen/index.vue
@@ -226,8 +226,15 @@
               </el-row>
               <el-row>
                 <el-col :span="12">
-                  <el-form-item label="负责人" prop="custName"> 
-                    <el-select v-model="baseForm.custName" placeholder="请选择负责人" style="width: 100%;" @focus="openChosenCharger"></el-select> 
+                  <el-form-item label="负责人" prop="custId"> 
+                    <!-- <el-select v-model="baseForm.custName" placeholder="请选择负责人" style="width: 100%;" @focus="openChosenCharger"></el-select>  -->
+                    <el-select v-model="baseForm.custId" placeholder="请选择负责人" style="width: 100%;" clearable @change="chosenUser">
+                        <el-option v-for="item in userOptions"
+                            :key="item.userId" 
+                            :label="item.nickName"
+                            :value="item.userId" 
+                        ></el-option>
+                    </el-select> 
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -422,7 +429,7 @@
   <script>
   import { systemAreaTreeApi } from "@/api/base/area";
   import { getPageCanteenApi, getCanteenNumApi, addCanteenApi, getCanteenInfoModifyApi, updateCanteenApi, removeCanteenApi } from "@/api/base/canteen";
-  import { getCanteenLabelApi, queryAllCustJobApi, queryCustJobPageApi, getMealtimeListApi,changeIfReserveApi,changeBusinessStateApi } from "@/api/base/canteen";
+  import { getCanteenLabelApi, queryAllCustJobApi, queryCustJobPageApi, getMealtimeListApi,changeIfReserveApi,changeBusinessStateApi,userListByRoleApi } from "@/api/base/canteen";
   import { imgUpLoadTwo } from '@/api/system/upload'
   export default {
     name: "",
@@ -497,6 +504,7 @@
           ]
         },
         labelOptions:[],//食堂标签下拉
+        userOptions:[],//负责人下拉
         //选择负责人弹窗
         openJob: false,
         jobOptions:[],//职位标签下拉
@@ -563,7 +571,7 @@
       this.getList();
       this.getCanteenLabel()
       this.queryAllCustJob()
-      
+      this.mgruserListByRole()
     },
     computed: {
         //图片上传1张后，隐藏上传框
@@ -623,10 +631,7 @@
           changeIfReserveApi(param).then((response) => {
              this.getList()
           }); 
-        },
-
-
-
+        }, 
 
         handleTabClick(tab, event) {
           console.log(tab, event);
@@ -808,6 +813,26 @@
           //   this.labelOptions = response.records; 
           // });
         },
+        //商户类用户
+        mgruserListByRole(){
+          let param = {
+            "roleKey": "ROLE_MERCHANT"
+          }
+          userListByRoleApi(param).then(response => {
+            this.userOptions = response.rows
+          });
+        },
+        //选中
+        chosenUser(e){
+          let obj = {}
+          this.userOptions.forEach(item=>{
+            if(item.userId == e){
+              obj=item
+            }
+          })
+          this.$set(this.baseForm,"custName",obj.userName)
+          this.$set(this.baseForm,"contactTel",obj.phonenumber)
+        },
         //选择负责人
         openChosenCharger(){ 
           this.queryCustJobPage()
diff --git a/src/views/base/stall/index.vue b/src/views/base/stall/index.vue
index afaf68c1..0ff6b614 100644
--- a/src/views/base/stall/index.vue
+++ b/src/views/base/stall/index.vue
@@ -207,8 +207,15 @@
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="负责人" prop="custName"> 
-                  <el-select v-model="baseForm.custName" placeholder="请选择负责人" style="width: 100%;" @focus="openChosenCharger"></el-select> 
+                <el-form-item label="负责人" prop="custId"> 
+                  <!-- <el-select v-model="baseForm.custName" placeholder="请选择负责人" style="width: 100%;" @focus="openChosenCharger"></el-select>  -->
+                  <el-select v-model="baseForm.custId" placeholder="请选择负责人" style="width: 100%;" clearable @change="chosenUser">
+                        <el-option v-for="item in userOptions"
+                            :key="item.userId" 
+                            :label="item.nickName"
+                            :value="item.userId" 
+                        ></el-option>
+                    </el-select> 
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -251,7 +258,7 @@
               </el-col> 
             </el-row>
             <el-row> 
-              <!-- <el-col :span="12">
+              <el-col :span="12">
                 <el-form-item label="档口品类" prop="kindNameList"> 
                   <el-select v-model="baseForm.kindNameList" multiple placeholder="请选择档口品类" style="width: 100%;">
                         <el-option
@@ -267,19 +274,19 @@
                       ></el-option>
                   </el-select> 
                 </el-form-item>
-              </el-col>  -->
+              </el-col> 
               <el-col :span="12">
                 <el-form-item label="线上流水号前缀" prop="onLineMealCodePrefix"> 
                   <el-input v-model="baseForm.onLineMealCodePrefix" placeholder="请输入线上流水号前缀" maxlength="20" clearable/>
                 </el-form-item>
-              </el-col>
+              </el-col> 
+            </el-row>
+            <el-row>
               <el-col :span="12">
                 <el-form-item label="线下流水号前缀" prop="offLineMealCodePrefix"> 
                   <el-input v-model="baseForm.offLineMealCodePrefix" placeholder="请输入线下流水号前缀" maxlength="20" clearable/>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="12">
                 <el-form-item label="是否启用叫号" prop="ifUseCallNum">
                   <el-switch
@@ -290,7 +297,10 @@
                     :inactive-value="2">
                   </el-switch>
                 </el-form-item>
-              </el-col>
+              </el-col> 
+            </el-row>
+            
+            <el-row> 
               <el-col :span="12">
                 <el-form-item label="是否开启预订餐" prop="ifReserve">
                   <el-switch
@@ -302,9 +312,6 @@
                   </el-switch>
                 </el-form-item>
               </el-col>
-            </el-row>
-            
-            <el-row> 
               <el-col :span="12">
                 <el-form-item label="是否开启报餐" prop="ifBook">
                   <el-switch
@@ -315,7 +322,9 @@
                     :inactive-value="2">
                   </el-switch>
                 </el-form-item>
-              </el-col>
+              </el-col> 
+            </el-row>
+            <el-row>
               <el-col :span="12">
                 <el-form-item label="档口图片">
                   <el-upload
@@ -337,8 +346,6 @@
                     </el-upload>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <!-- <el-col :span="12">
                 <el-form-item label="是否开启收款码" prop="ifEnablePayCode">
                   <el-switch
@@ -423,7 +430,7 @@
 <script>
 import { systemAreaTreeApi } from "@/api/base/area";
 import { getCanteenByAreaApi, getPageStallApi, getStallNumApi, addStallApi, getStallInfoModifyApi, updateStallApi, removeStallApi } from "@/api/base/stall";
-import { getLabelListApi, getKindListApi, queryAllCustJobApi, queryCustJobPageApi, getMealtimeListApi,changeIfReserveApi,changeBusinessStateApi } from "@/api/base/stall";
+import { getLabelListApi, getKindListApi, queryAllCustJobApi, queryCustJobPageApi, getMealtimeListApi,changeIfReserveApi,changeBusinessStateApi,userListByRoleApi } from "@/api/base/stall";
 import { imgUpLoadTwo } from '@/api/system/upload'
 // import C from "highlight.js/lib/languages/1c";
 export default {
@@ -466,6 +473,7 @@ export default {
         areaArr: []
       },
       canteenOptions:[],//查询-食堂下拉选
+      userOptions:[],//负责人下拉
       activeName:"baseSetting",
       areaId:"",
       stallId:"",//档口数据-编辑
@@ -545,7 +553,7 @@ export default {
     this.getLabel()
     this.getKind()
     this.queryAllCustJob()
-    
+    this.mgruserListByRole()
   },
   computed: {
       //图片上传1张后，隐藏上传框
@@ -837,6 +845,26 @@ export default {
         //   this.kindOptions = response.records; 
         // });
       },
+      //商户类用户
+      mgruserListByRole(){
+        let param = {
+          "roleKey": "ROLE_MERCHANT"
+        }
+        userListByRoleApi(param).then(response => {
+          this.userOptions = response.rows
+        });
+      },
+      //选中
+      chosenUser(e){
+        let obj = {}
+        this.userOptions.forEach(item=>{
+          if(item.userId == e){
+            obj=item
+          }
+        })
+        this.$set(this.baseForm,"custName",obj.userName)
+        this.$set(this.baseForm,"contactTel",obj.phonenumber)
+      },
       //选择负责人
       openChosenCharger(){ 
         this.queryCustJobPage()
diff --git a/src/views/dish/dish/index.vue b/src/views/dish/dish/index.vue
index 23025602..b33c2735 100644
--- a/src/views/dish/dish/index.vue
+++ b/src/views/dish/dish/index.vue
@@ -283,8 +283,8 @@
                 <el-col :span="12">
                   <el-form-item label="菜品/套餐" prop="mealType">
                     <el-select v-model="baseForm.mealType" style="width: 100%;" >
-                      <el-option label="菜品" value="1"></el-option>
-                      <el-option label="套餐" value="2"></el-option>
+                      <el-option label="菜品" :value="1"></el-option>
+                      <el-option label="套餐" :value="2"></el-option>
                     </el-select>  
                   </el-form-item>
                 </el-col>
@@ -339,13 +339,12 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="计价方式" prop="salesMode">
                     <el-select v-model="baseForm.salesMode" style="width: 100%;" >
-                      <el-option label="按份" value="1" />
-                      <el-option label="称重" value="2" />
+                      <el-option label="按份" :value="1" />
+                      <el-option label="称重" :value="2" />
                     </el-select>  
                   </el-form-item>
                 </el-col>
@@ -678,7 +677,7 @@
           stallId:null,
           dishesNum:"",
           dishesName:"",
-          salesMode:"1",
+          salesMode:1,
           sizeType:"1", 
           price:"",
           materialCost:0,
@@ -928,14 +927,14 @@
 
       resetDishDialog(){
         this.baseForm = {
-          mealType:"1",//类型（菜品/套餐）
+          mealType:1,//类型（菜品/套餐）
           publicDishes: 2,
           areaId:null, 
           canteenId:null, 
           stallId:null,
           dishesNum:"",
           dishesName:"",
-          salesMode:"1",
+          salesMode:1,
           sizeType:"1", 
           price:"",
           materialCost:0,
@@ -978,9 +977,9 @@
           getStallByCanteenApi({canteenIdList:[this.baseForm.canteenId]}).then((response) => {
             this.stallOptions2=response||[] 
           });
-          this.$set(this.baseForm,"salesMode",response.salesMode+'')
+          this.$set(this.baseForm,"salesMode",response.salesMode)
           this.$set(this.baseForm,"sizeType",response.sizeType+'')
-          this.$set(this.baseForm,"mealType",response.mealType+'')
+          this.$set(this.baseForm,"mealType",response.mealType)
           this.$set(this.baseForm,"price",Number(response.price)/100)
           this.$set(this.baseForm,"materialCost",Number(response.materialCost)/100)
           if(this.baseForm.imageUrl){
@@ -997,24 +996,28 @@
       },
   
       /** 处理对话框提交 */
-      handleDialogSubmit() { 
-        this.baseForm.imageUrl = this.checkUrlList[0];
-        this.baseForm.arr = this.checkUrlList;
-        this.baseForm.price = Number(this.baseForm.price)*100;
-        this.baseForm.prmaterialCostice = Number(this.baseForm.materialCost)*100;
-        if (this.title === "新增") {
-          addMenuDishesApi(param).then(response => {
-            this.$modal.msgSuccess("新增成功");
-            this.openDish = false;
-            this.getList();
-          });
-        } else {
-          editMenuDishesApi(this.baseForm).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.openDish = false;
-            this.getList();
-          });
-        }
+      handleDialogSubmit() {
+        this.$refs.baseForm.validate(valid => {
+          if (valid) {
+            this.baseForm.imageUrl = this.checkUrlList[0];
+            this.baseForm.arr = this.checkUrlList;
+            this.baseForm.price = Number(this.baseForm.price)*100;
+            this.baseForm.materialCost = Number(this.baseForm.materialCost)*100;
+            if (this.title === "新增") {
+              addMenuDishesApi(this.baseForm).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.openDish = false;
+                this.getList();
+              });
+            } else {
+              editMenuDishesApi(this.baseForm).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.openDish = false;
+                this.getList();
+              });
+            }
+          }
+        })
       }, 
       /** 删除按钮操作 */
       handleDelete(row) {
@@ -1045,8 +1048,7 @@
         // });
       },
       // 图片上传
-      imgUpLoad(param, name, index) {
-          // console.log(param,'image')
+      imgUpLoad(param, name, index) { 
           param.type = 'dishes'
           imgUpLoadTwo(param).then((res) => {
               if (res.code == 200) {
diff --git a/src/views/dish/material/index.vue b/src/views/dish/material/index.vue
index a07996db..9589fcb4 100644
--- a/src/views/dish/material/index.vue
+++ b/src/views/dish/material/index.vue
@@ -41,7 +41,7 @@
                   <el-button
                     type="text"
                     size="mini"
-                    icon="el-icon-plus"
+                    icon="el-icon-plus" v-if="data.sortNo<3"
                     @click.stop="() => appendTreeNode(data)"
                   >
                   </el-button>
diff --git a/src/views/dish/nutritionInfo/index.vue b/src/views/dish/nutritionInfo/index.vue
index 1790931e..37dc0fc8 100644
--- a/src/views/dish/nutritionInfo/index.vue
+++ b/src/views/dish/nutritionInfo/index.vue
@@ -91,7 +91,7 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="营养信息类别" prop="nutritionCategory" required>
+            <el-form-item label="营养信息类别" prop="nutritionCategory">
               <el-cascader
                 v-model="form.nutritionCategory"
                 :options="cascaderOptions"
@@ -103,7 +103,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="营养信息名称" prop="nutritionName" required>
+            <el-form-item label="营养信息名称" prop="nutritionName">
               <el-input
                 v-model="form.nutritionName"
                 placeholder="请输入营养信息名称"
@@ -115,7 +115,7 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="食材编码" prop="nutritionCode" required>
+            <el-form-item label="食材编码" prop="nutritionCode">
               <el-input
                 v-model="form.nutritionCode"
                 placeholder="请输入食材编码"
@@ -686,7 +686,7 @@ export default {
         this.form = response.data;
         // 如果后端返回的是分开的大类小类，需要组合成数组
         if (response.data.bigType && response.data.littleType) {
-          this.form.nutritionCategory = [response.data.bigType, response.data.littleType];
+          this.$set(this.form,"nutritionCategory",[response.data.bigType,'#'+response.data.littleType]) 
         }
         this.open = true;
         this.title = "修改营养信息";
diff --git a/src/views/order/reserveManagement/index.vue b/src/views/order/reserveManagement/index.vue
index 186b4aaa..6732a585 100644
--- a/src/views/order/reserveManagement/index.vue
+++ b/src/views/order/reserveManagement/index.vue
@@ -827,7 +827,7 @@ export default {
               this.$refs["rowData"].validate(valid => {
                   if (valid) {
                       let param = {
-                          refundAmount:Number(this.rowData.refundMoney),
+                          refundAmount:Number(this.rowData.refundMoney*100),
                           orderId:this.rowData.orderId
                       }
                       refundOrderPartApi(param).then(response => {
diff --git a/src/views/superstore/shopMaterial/index.vue b/src/views/superstore/shopMaterial/index.vue
index 4370d53f..2d694659 100644
--- a/src/views/superstore/shopMaterial/index.vue
+++ b/src/views/superstore/shopMaterial/index.vue
@@ -41,7 +41,7 @@
                   <el-button
                     type="text"
                     size="mini"
-                    icon="el-icon-plus"
+                    icon="el-icon-plus" v-if="data.sortNo<3"
                     @click.stop="() => appendTreeNode(data)"
                   >
                   </el-button>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index b9e6f67b..c43c33d0 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -77,7 +77,7 @@
         <el-table
             v-if="refreshTable"
             v-loading="loading"
-            :data="deptList"
+            :data="deptList" height="650" 
             row-key="deptId"
             :default-expand-all="isExpandAll"
             :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index c410b84c..765dfad3 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -90,7 +90,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" height="650">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编码" align="center" prop="dictCode" />
       <el-table-column label="字典标签" align="center" prop="dictLabel">
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 83171424..9b851faf 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -107,7 +107,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange" height="650">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编号" align="center" prop="dictId" />
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 666885e9..f9af3333 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -52,7 +52,7 @@
       v-if="refreshTable"
       v-loading="loading"
       :data="menuList"
-      row-key="menuId"
+      row-key="menuId" height="650" 
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 19e25a00..d45067e8 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -69,7 +69,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange" height="650" >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="noticeId" width="100" />
       <el-table-column
diff --git a/src/views/system/operlog/index.vue b/src/views/system/operlog/index.vue
index b29ca0d0..17954a45 100644
--- a/src/views/system/operlog/index.vue
+++ b/src/views/system/operlog/index.vue
@@ -111,7 +111,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table ref="tables" v-loading="loading" height="650" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="日志编号" align="center" prop="operId" />
       <el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 444bf634..9a6b7a14 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -79,7 +79,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange" height="650">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="岗位编号" align="center" prop="postId" />
       <el-table-column label="岗位编码" align="center" prop="postCode" />
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 147aa33e..17a461c1 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -59,7 +59,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" height="650" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
       <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 3083e50a..196ba868 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -101,7 +101,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange" :selectable="checkSelectable" :row-class-name="getRowClassName">
+    <el-table v-loading="loading"  height="650" :data="roleList" @selection-change="handleSelectionChange" :selectable="checkSelectable" :row-class-name="getRowClassName">
       <el-table-column type="selection" min-width="55" align="center"/>
       <el-table-column label="角色编号" prop="roleId" min-width="120" align="center"/>
       <el-table-column label="角色名称" align="center" prop="roleName" :show-overflow-tooltip="true" min-width="150"/>