diff --git a/src/api/foodManage/supplierManage.js b/src/api/foodManage/supplierManage.js
index 8ed835da..bfb7a0a4 100644
--- a/src/api/foodManage/supplierManage.js
+++ b/src/api/foodManage/supplierManage.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询用户列表-全量查询
 export function listUserAll(query) {
   return request({
-    url: '/system/user/list_all',
+    url: '/system/user/query/listAll',
     method: 'get',
     params: query
   })
diff --git a/src/views/canteen/dish/dish/index.vue b/src/views/canteen/dish/dish/index.vue
index 0ee5ce27..3cab22f9 100644
--- a/src/views/canteen/dish/dish/index.vue
+++ b/src/views/canteen/dish/dish/index.vue
@@ -21,7 +21,7 @@
           </div>
   
           <div class="head-container">
-            <el-tree style="height: 700px; overflow: scroll"
+            <el-tree style="height: 650px; overflow: scroll"
               :data="treeOptions" :props="defaultProps"
               :show-checkbox="true" :default-expand-all="true"
               :expand-on-click-node="false" :filter-node-method="filterNode"
@@ -165,7 +165,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
   
-          <el-table v-loading="loading" :data="tableList" ref="multipleTable" height="620px" border :row-key="(row)=>{return row.dishesId}" @selection-change="handleSelectionChange">
+          <el-table v-loading="loading" :data="tableList" ref="multipleTable" height="600px" border :row-key="(row)=>{return row.dishesId}" @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">
diff --git a/src/views/canteen/dish/material/components/MaterialDialog.vue b/src/views/canteen/dish/material/components/MaterialDialog.vue
index e0bcb9cd..2bb6df6b 100644
--- a/src/views/canteen/dish/material/components/MaterialDialog.vue
+++ b/src/views/canteen/dish/material/components/MaterialDialog.vue
@@ -346,8 +346,7 @@ export default {
   created() {
     this.getAreaTreeData();//获取区域树
     this.getTypeTreeData();//获取原料类别树
-    this.getDrpUnitList();//获取单位类型下拉
-    this.getNutritionTypeList()//获取营养信息类别树
+    this.getDrpUnitList();//获取单位类型下拉 
   },
   methods: {
     //区域树
@@ -522,6 +521,7 @@ export default {
       this.$set(this.form,"materialName",row.materialName)
       this.$set(this.form,"salesMode",row.salesMode+'')
       this.getDrpUnitList()
+      this.getNutritionTypeList()//获取营养信息类别树
       this.$set(this.form,"unitId",row.unitId)
       this.$set(this.form,"salePrice",Number((row.salePrice/100).toFixed(2)))
       this.$set(this.form,"unitPrice",Number((row.unitPrice/100).toFixed(2)))
diff --git a/src/views/canteen/dish/material/index.vue b/src/views/canteen/dish/material/index.vue
index c51c7707..12c27932 100644
--- a/src/views/canteen/dish/material/index.vue
+++ b/src/views/canteen/dish/material/index.vue
@@ -19,7 +19,7 @@
 
         <div class="head-container">
           <el-tree
-            style="height: 700px; overflow: scroll"
+            style="height: 650px; overflow: scroll"
             :data="treeOptions"
             :props="defaultProps"
             :show-checkbox="true"
@@ -179,8 +179,7 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="tableList" ref="multipleTable" height="550" border :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
-
+        <el-table v-loading="loading" :data="tableList" ref="multipleTable" height="542" 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">
@@ -714,7 +713,7 @@ export default {
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
   width: 60px !important;
-  margin-bottom: 10px;
+  // margin-bottom: 10px;
 }
 
 ::v-deep .btn-items .el-button + .el-button {
diff --git a/src/views/canteen/dish/nutritionInfo/index.vue b/src/views/canteen/dish/nutritionInfo/index.vue
index 4e794803..61d657b3 100644
--- a/src/views/canteen/dish/nutritionInfo/index.vue
+++ b/src/views/canteen/dish/nutritionInfo/index.vue
@@ -20,9 +20,9 @@
         </div>
 
         <div class="head-container">
-          <el-tree style="height: 700px;overflow: scroll;"
+          <el-tree style="height: 650px;overflow: scroll;"
             :data="cascaderOptions" :props="defaultProps"
-            :show-checkbox="true" :default-expand-all="true"
+            :show-checkbox="true" :default-expand-all="false"
             :expand-on-click-node="false" :filter-node-method="filterNode"
             ref="nutritionTypeTree" node-key="id" highlight-current @node-click="handleNodeClick" @check-change="handleCheckChange"
           >
@@ -93,7 +93,7 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="menuNutritionList" height="650"> 
+        <el-table v-loading="loading" :data="menuNutritionList" border height="542"> 
           <el-table-column label="序号" align="center" width="80" type="index">
                 <template slot-scope="scope">
                     <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
@@ -1238,7 +1238,7 @@ export default {
 
 ::v-deep.el-table .fixed-width .el-button--mini {
   width: 60px !important;
-  margin-bottom: 10px;
+  // margin-bottom: 10px;
 }
 
 ::v-deep .btn-items .el-button + .el-button {
diff --git a/src/views/foodManage/pickManage/materialPicking/index.vue b/src/views/foodManage/pickManage/materialPicking/index.vue
index c5f97265..59a10a9c 100644
--- a/src/views/foodManage/pickManage/materialPicking/index.vue
+++ b/src/views/foodManage/pickManage/materialPicking/index.vue
@@ -88,8 +88,8 @@
             <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="单据编号" align="center" prop="fetchMaterialCode" :show-overflow-tooltip="true" />
-        <el-table-column label="采购领料标题" align="center" prop="title" :show-overflow-tooltip="true" /> 
+        <el-table-column label="单据编号" align="center" prop="fetchMaterialCode" :show-overflow-tooltip="true" width="180"/>
+        <el-table-column label="采购领料标题" align="center" prop="title" :show-overflow-tooltip="true" width="120"/> 
         <el-table-column label="领料单状态" align="center" prop="commitStatus" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
                 <span v-if="scope.row.commitStatus==1">待提交</span>
@@ -113,13 +113,13 @@
             </template>  
         </el-table-column> -->
         <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/> 
+        <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="140"/> 
         <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" width="120"/>   
         <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="100"/>  
         <el-table-column label="货品数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="100"/>
         <el-table-column label="已领取数量" align="center" prop="outNum" :show-overflow-tooltip="true" width="100"/>
         <el-table-column label="领料人" align="center" prop="fetchUser" :show-overflow-tooltip="true" width="100"/> 
-        <el-table-column label="领料日期" align="center" prop="fetchMaterialTime" :show-overflow-tooltip="true" width="150"/>
+        <el-table-column label="领料日期" align="center" prop="fetchMaterialTime" :show-overflow-tooltip="true"/>
         <!-- <el-table-column label="审批人" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="审批完成时间" align="center" prop="" :show-overflow-tooltip="true" width="120"/> --> 
         <!-- <el-table-column label="制表人" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
diff --git a/src/views/foodManage/purchaseManage/contractList/index.vue b/src/views/foodManage/purchaseManage/contractList/index.vue
index 5f6e16e3..1f7fb46d 100644
--- a/src/views/foodManage/purchaseManage/contractList/index.vue
+++ b/src/views/foodManage/purchaseManage/contractList/index.vue
@@ -67,10 +67,10 @@
             <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" width="180"/>
         <el-table-column label="合同标题" align="center" prop="contractTitle" :show-overflow-tooltip="true" width="120" />
         <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="签订日期" align="center" prop="contractSigningTime" :show-overflow-tooltip="true"/>
+       
         <el-table-column label="合同状态" align="center" prop="contractStatus" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
                 <span v-if="scope.row.contractStatus==1">待生效</span>
@@ -90,8 +90,9 @@
                <span>{{ (scope.row.contractAmount/100).toFixed(4) }}</span>
             </template>  
         </el-table-column>
-        <el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="配送食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="签订日期" align="center" prop="contractSigningTime" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" width="140"/>
+        <el-table-column label="配送食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="140"/>
         <el-table-column label="合同周期" align="center" prop="" :show-overflow-tooltip="true">
              <template slot-scope="scope">
                <span>{{ scope.row.contractStartTime }} - {{ scope.row.contractEndTime }}</span>
@@ -99,7 +100,7 @@
         </el-table-column>
         <!-- <el-table-column label="审批人" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="审批完成时间" align="center" prop="" :show-overflow-tooltip="true" width="120"/> -->
-        <el-table-column label="负责人" align="center" prop="contractPerson" :show-overflow-tooltip="true" width="120"/>
+        <!-- <el-table-column label="负责人" align="center" prop="contractPerson" :show-overflow-tooltip="true" width="120"/> -->
         <!-- <el-table-column label="制表人" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="制表时间" align="center" prop="" :show-overflow-tooltip="true" width="120"/> -->
         <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
diff --git a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
index 1e22743e..48cc1ea4 100644
--- a/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
+++ b/src/views/foodManage/purchaseManage/goodsInquiry/index.vue
@@ -75,7 +75,7 @@
             <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="询价单号" align="center" prop="inquiryCode" :show-overflow-tooltip="true" />
+        <el-table-column label="询价单号" align="center" prop="inquiryCode" :show-overflow-tooltip="true" width="180"/>
         <el-table-column label="询价标题" align="center" prop="title" :show-overflow-tooltip="true" />
         <el-table-column label="报价开始时间" align="center" prop="startTime" :show-overflow-tooltip="true" />
         <el-table-column label="报价结束时间" align="center" prop="endTime" :show-overflow-tooltip="true" />
@@ -94,7 +94,7 @@
                 <span v-if="scope.row.status!=1">已提交</span>
             </template>
         </el-table-column> -->
-        <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
+        <el-table-column label="所属区域" align="center" prop="area" :show-overflow-tooltip="true"/>
         <el-table-column label="邀请供应商（家）" align="center" prop="inquirySupplierNum" :show-overflow-tooltip="true" />
         <el-table-column label="已报价供应商（家）" align="center" prop="supplierNum" :show-overflow-tooltip="true" />
         <el-table-column label="中选状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
diff --git a/src/views/foodManage/purchaseReport/procurePlanReport/index.vue b/src/views/foodManage/purchaseReport/procurePlanReport/index.vue
index ec00da79..2edab2d7 100644
--- a/src/views/foodManage/purchaseReport/procurePlanReport/index.vue
+++ b/src/views/foodManage/purchaseReport/procurePlanReport/index.vue
@@ -37,7 +37,7 @@
             <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
         </el-table-column> 
-        <el-table-column label="采购计划单号" align="center" prop="planCode" :show-overflow-tooltip="true" /> 
+        <el-table-column label="采购计划单号" align="center" prop="planCode" :show-overflow-tooltip="true" width="200"/> 
         <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />  
         <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" /> 
         <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />  
diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
index 5070e92b..276ed7e9 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
@@ -48,7 +48,7 @@
                     {{ baseInfo.inquiryNotes }}
                 </el-descriptions-item>
                 <el-descriptions-item label="所属区域" prop="areaId">
-                    {{ baseInfo.areaName }}
+                    {{ baseInfo.area }}
                     <!-- <el-cascader v-model="baseInfo.areaId"
                         :options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
                         :props="{
diff --git a/src/views/foodManage/supplierManage/supplierList/index.vue b/src/views/foodManage/supplierManage/supplierList/index.vue
index 198eca73..71c2c25f 100644
--- a/src/views/foodManage/supplierManage/supplierList/index.vue
+++ b/src/views/foodManage/supplierManage/supplierList/index.vue
@@ -72,16 +72,17 @@
                 <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="供应商编号" align="center" prop="supplierCode" :show-overflow-tooltip="true" width="120"/>
-            <el-table-column label="供应商名称" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120"/>
+            <el-table-column label="供应商编号" align="center" prop="supplierCode" :show-overflow-tooltip="true" width="150"/>
+            <el-table-column label="供应商名称" align="center" prop="supplierName" :show-overflow-tooltip="true"/>
             <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
             <el-table-column label="供应商评分" align="center" prop="supplierScore" :show-overflow-tooltip="true" width="120"/>
             <el-table-column label="主要联系人" align="center" prop="linkman" :show-overflow-tooltip="true" width="120"/>
-            <el-table-column label="联系人手机号" align="center" prop="linkmanPhone" :show-overflow-tooltip="true" width="150"/>
-            <el-table-column label="营业执照编号" align="center" prop="" :show-overflow-tooltip="true" width="150"/>
-            <el-table-column label="食品经营许可证编号" align="center" prop="" :show-overflow-tooltip="true" width="180"/>
-            <el-table-column label="供应类别" align="center" prop="categoryModelStr" :show-overflow-tooltip="true" width="150"/>
-            <el-table-column label="地址" align="center" prop="address" :show-overflow-tooltip="true" width="120"/>
+            <el-table-column label="联系人手机号" align="center" prop="linkmanPhone" :show-overflow-tooltip="true" width="120"/>
+            <el-table-column label="绑定供应商用户" align="center" prop="supplierUserName" :show-overflow-tooltip="true" width="140"/>
+            <!-- <el-table-column label="营业执照编号" align="center" prop="" :show-overflow-tooltip="true" width="150"/>
+            <el-table-column label="食品经营许可证编号" align="center" prop="" :show-overflow-tooltip="true" width="180"/> -->
+            <el-table-column label="供应类别" align="center" prop="categoryModelStr" :show-overflow-tooltip="true"/>
+            <el-table-column label="地址" align="center" prop="address" :show-overflow-tooltip="true"/>
             <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true" width="120">
                 <template slot-scope="scope">
                     <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="2"
@@ -140,6 +141,7 @@
                                 <el-form-item label="绑定供应商用户" prop="supplierUserId">
                                     <el-select v-model="form.supplierUserId"  placeholder="请选择绑定供应商用户" style="width: 100%;" clearable>
                                         <el-option v-for="item in supplierUserList"
+                                            :disabled="item.bingStatus"
                                             :key="item.userId"
                                             :label="item.userName"
                                             :value="item.userId"
@@ -232,7 +234,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="主要联系人手机号" prop="linkmanPhone">
-                                    <el-input  v-model="form.linkmanPhone" placeholder="请输入主要联系人手机号" maxlength="30" clearable/>
+                                    <el-input  v-model="form.linkmanPhone" placeholder="请输入主要联系人手机号" maxlength="11" clearable/>
                                 </el-form-item> 
                             </el-col>
                             <el-col :span="12">
@@ -678,7 +680,12 @@ export default {
                     { required: true, message: "主要联系人不能为空", trigger: "blur" }
                 ],  
                 linkmanPhone: [
-                    { required: true, message: "主要联系人手机号不能为空", trigger: "blur" }
+                    { required: true, message: "主要联系人手机号不能为空", trigger: "blur" },
+                    {
+                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                        message: '请输入正确的手机号码',
+                        trigger: 'blur',
+                    }
                 ],  
                 areaId: [
                     { required: true, message: "所属区域不能为空", trigger: "change" }
@@ -696,13 +703,6 @@ export default {
                         trigger: 'blur',
                     }
                 ],
-                linkmanPhone: [
-                    {
-                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-                        message: '请输入正确的手机号码',
-                        trigger: 'blur',
-                    }
-                ],
                 standbyPhone: [
                     {
                         pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
diff --git a/src/views/kitchen/staffManage/intoRecords/index.vue b/src/views/kitchen/staffManage/intoRecords/index.vue
index ab9c1ba4..ac3a47cf 100644
--- a/src/views/kitchen/staffManage/intoRecords/index.vue
+++ b/src/views/kitchen/staffManage/intoRecords/index.vue
@@ -151,7 +151,7 @@ export default {
         };
     },
     created() {
-        this.getDeptTree()
+        // this.getDeptTree()
         this.getList()
         this.getTreeData()
         this.getKitchenSubPlaceList()
diff --git a/src/views/kitchen/staffManage/staff/index.vue b/src/views/kitchen/staffManage/staff/index.vue
index 98a09fde..c1953fe0 100644
--- a/src/views/kitchen/staffManage/staff/index.vue
+++ b/src/views/kitchen/staffManage/staff/index.vue
@@ -144,7 +144,7 @@
                         <el-form-item label="员工名称:" prop="staffName">
                             <el-input v-model="form.staffName"
                                 placeholder="请输入员工名称"
-                                maxlength="30"
+                                maxlength="20"
                             />
                         </el-form-item>
                     </el-col>
@@ -703,12 +703,6 @@ export default {
                 this.$set(this.form,'canteenId',null)
             });
         },
-        // 食堂选项
-        getCanteenList(){
-            getCanteenByAreaApi({"areaId":this.form.areaId}).then((response) => {
-                this.canteenOptions = response.rows 
-            })
-        },
         // 门禁设备选项
         getKitchenDeviceSelect(){
             getKitchenDeviceSelectApi({deviceType:3}).then((response) => {
@@ -768,6 +762,12 @@ export default {
             this.reset(); 
             getStaffInfoApi(row.staffId).then(response => {
                 this.form = response.data;
+                getCanteenByAreaApi({"areaId":this.form.areaId}).then((response) => {
+                    this.canteenOptions = response.rows;
+                    setTimeout(()=>{
+                        this.$set(this.form,"canteenId",row.canteenId)
+                    },500) 
+                })
                 if(response.data.healthCertFrontImg){
                   this.fileList0=[{url:response.data.faceUrl}]
                   this.checkUrlList0=[response.data.faceUrl]