diff --git a/src/components/jeecg/modal/ProcessDelivery.vue b/src/components/jeecg/modal/ProcessDelivery.vue
index 96ed8c5..271a32a 100644
--- a/src/components/jeecg/modal/ProcessDelivery.vue
+++ b/src/components/jeecg/modal/ProcessDelivery.vue
@@ -17,7 +17,8 @@
           <a-row :gutter="24">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="物资类型">
-                <a-input placeholder="请输入物资类型" v-model="queryParam.materialType"></a-input>
+                <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
+                                   placeholder="请选择物资类型"  />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
diff --git a/src/components/jeecg/modal/ProcessPlan.vue b/src/components/jeecg/modal/ProcessPlan.vue
index 5369a10..066aff5 100644
--- a/src/components/jeecg/modal/ProcessPlan.vue
+++ b/src/components/jeecg/modal/ProcessPlan.vue
@@ -17,14 +17,15 @@
           <a-row :gutter="24">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="物资类型">
-                <a-input placeholder="请输入物资类型" v-model="queryParam.materialType"></a-input>
+                <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
+                                   placeholder="请选择物资类型"  />
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <!--<a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="需求时间">
                 <j-date placeholder="请选择需求时间" v-model="queryParam.needTime"></j-date>
               </a-form-item>
-            </a-col>
+            </a-col>-->
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
diff --git a/src/components/layouts/UserLayout.vue b/src/components/layouts/UserLayout.vue
index 307f467..a513893 100644
--- a/src/components/layouts/UserLayout.vue
+++ b/src/components/layouts/UserLayout.vue
@@ -5,7 +5,7 @@
         <div class="header">
           <a href="/">
             <!--<img src="~@/assets/logo.svg" class="logo" alt="logo">-->
-            <span class="title" style="color: #fff">昊易信息</span>
+            <span class="title" style="color: #fff">昊易信息管理平台</span>
           </a>
         </div>
         <div class="desc">
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index 0df14a9..42a2858 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -275,12 +275,12 @@ export const JeecgListMixin = {
       if (fileName ==="废旧物资库表"){
         param.materialName = "废旧物资库表"
       }
-      // if (fileName ==="电缆模板"){
-      //   param.materialName = "电缆模板"
-      // }
-      // if (fileName ==="废旧物资库表导入模板"){
-      //   param.materialName = "废旧物资库表导入模板"
-      // }
+      if (fileName ==="电缆模板"){
+        param.materialName = "电缆模板"
+      }
+      if (fileName ==="废旧物资库表导入模板"){
+        param.materialName = "废旧物资库表导入模板"
+      }
       if (fileName ==="用户信息导入模板"){
         param.realname = "用户信息导入模板"
       }
@@ -314,6 +314,7 @@ export const JeecgListMixin = {
         console.log(info.file, info.fileList);
       }
       console.log(info.file, info.fileList);
+      console.log("info.file.response", info.file.response);
       if (info.file.status === 'done') {
         if (info.file.response.success) {
           // this.$message.success(`${info.file.name} 文件上传成功`);
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 72e311f..773373e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,6 +1,19 @@
 import Vue from 'vue'
 import { login, logout, phoneLogin, thirdLogin } from "@/api/login"
-import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA,TENANT_ID,CACHE_INCLUDED_ROUTES,PARENT_ID,USER_INFORMATION,PUWWC_Id } from "@/store/mutation-types"
+import {
+  ACCESS_TOKEN,
+  USER_NAME,
+  USER_INFO,
+  USER_AUTH,
+  SYS_BUTTON_AUTH,
+  UI_CACHE_DB_DICT_DATA,
+  TENANT_ID,
+  CACHE_INCLUDED_ROUTES,
+  PARENT_ID,
+  USER_INFORMATION,
+  PUWWC_Id,
+  ASIDE_MEAN
+} from '@/store/mutation-types'
 import { welcome } from "@/utils/util"
 import { queryPermissionsByUser } from '@/api/api'
 import { getAction } from '@/api/manage'
@@ -131,6 +144,7 @@ const user = {
            sessionStorage.setItem(PARENT_ID,parentId);
            sessionStorage.setItem(PUWWC_Id,puwwcId);
            sessionStorage.setItem(USER_INFORMATION,JSON.stringify(userInformation));
+          sessionStorage.setItem('ASIDE_MEAN',JSON.stringify(menuData));
           if (menuData && menuData.length > 0) {
             //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
             menuData.forEach((item, index) => {
diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js
index 59b21ee..7a05321 100644
--- a/src/store/mutation-types.js
+++ b/src/store/mutation-types.js
@@ -22,6 +22,7 @@ export const UI_CACHE_DB_DICT_DATA = 'UI_CACHE_DB_DICT_DATA'
 export const INDEX_MAIN_PAGE_PATH = '/dashboard/analysis'
 export const TENANT_ID = 'TENANT_ID'
 export const ONL_AUTH_FIELDS = 'ONL_AUTH_FIELDS'
+export const ASIDE_MEAN = 'ASIDE_MEAN'
 //路由缓存问题，关闭了tab页时再打开就不刷新 #842
 export const CACHE_INCLUDED_ROUTES = 'CACHE_INCLUDED_ROUTES'
 
diff --git a/src/views/activiti/form/ProcessMaterialsDelivery.vue b/src/views/activiti/form/ProcessMaterialsDelivery.vue
index de77f6f..8d1032a 100644
--- a/src/views/activiti/form/ProcessMaterialsDelivery.vue
+++ b/src/views/activiti/form/ProcessMaterialsDelivery.vue
@@ -1,7 +1,7 @@
 <template>
-  <a-card :bordered="false" style="text-align: center">
+  <a-card :bordered="false">
 
-    <a-tabs>
+    <a-tabs  style="text-align: center">
       <a-tab-pane tab="流程正文" key="1" forceRender>
         <process-materials-delivery-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
       </a-tab-pane>
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 9e61098..e525673 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -94,11 +94,12 @@
     <div class="div_process">
       <a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
         <a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
+        <!--<a-button  style="margin-left: 8px" type="primary" :disabled="disabled||btndisabled" @click="applySubmit">提交申请</a-button>-->
         <a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
       </a-form-item>
       <a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
-        <a-button type="primary" @click="passTask">通过</a-button>
-        <a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
+        <a-button type="primary"  @click="passTask">通过</a-button>
+        <a-button style="margin-left: 8px"  @click="backTask">驳回</a-button>
       </a-form-item>
     </div>
   </a-spin>
@@ -376,7 +377,7 @@
           }
           return true
         }
-        return this.disabled = false
+        return this.disabled
       },
       showFlowSubmitButton() {
         if (this.formBpm === true) {
@@ -389,7 +390,7 @@
     },
     created() {
       //如果是流程中表单，则需要加载流程表单data
-      this.showFlowData()
+      //this.showFlowData()
       if (!this.isNew) {
         this.init()
       }
@@ -486,9 +487,10 @@
           }
 
         }
+
         // 根据请发数量计算
         if(record.row.pleaseSendNumber !== '' && record.row.pleaseSendNumber !== undefined && isMA ){
-          // console.log("执行了根据请发数量计算")
+          // console.log("执行了",record.row)
           let res = record.row;
           let materialName = {}
           this.bigIdMerchandiseNewsList.forEach(item => {
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 31e99bc..eef3a00 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -475,6 +475,7 @@
     created() {
       //如果是流程中表单，则需要加载流程表单data
       //this.showFlowData()
+      console.log(this.disabled,this.task,this.btndisabled,"-------------------")
       if (!this.isNew){
         this.init();
       }
diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index 4cccf7a..5fd387d 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -100,9 +100,9 @@
                 <a href="javascript:void(0);" @click="backTask(r)" style="color: orange">驳回</a>
                 <a-divider type="vertical" />-->
                 <a href="javascript:void(0);" @click="delegateTask(r)" style="color: #00A0E9">委托他人代办</a>
-                <a-divider type="vertical" />
+                <!--<a-divider type="vertical" />-->
               </span>
-              <a href="javascript:void(0);" @click="history(r)" style="color: #217dbb">历史</a>
+              <!--<a href="javascript:void(0);" @click="history(r)" style="color: #217dbb">历史</a>-->
             </template>
           </a-table-column>
         </a-table>
diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index a8895e8..64ab3ba 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -1,8 +1,8 @@
 <template>
   <div style="height: 100%">
-    <div style="height: 50%;display: flex;justify-content: stretch;" >
+    <div style="height: 40%;display: flex;justify-content: stretch;" >
       <a-row type="flex" :gutter="16" style="height: 100%;width: 100%">
-        <a-col :md="8" :sm="24" style="height: 98%;">
+        <a-col :md="8" :sm="24" style="height: 100%;">
           <!--待办任务-->
           <a-card title="待办" style="height: 100%;overflow: hidden;">
             <a-table
@@ -18,7 +18,7 @@
             </a-table>
           </a-card>
         </a-col>
-        <a-col :md="8" :sm="24" style="height: 98%;">
+        <a-col :md="8" :sm="24" style="height: 100%;">
           <!--站内消息-->
           <a-card ref="cardH" title="站内消息" style="height: 100%;overflow: hidden;">
             <a-table style="height: 100%;"
@@ -33,7 +33,7 @@
             </a-table>
           </a-card>
         </a-col>
-        <a-col :md="8" :sm="24" style="height: 98%;">
+        <a-col :md="8" :sm="24" style="height: 100%;">
           <!--登录日志-->
           <a-card title="登录日志" style="height: 100%;overflow: hidden">
             <a-table  style="height: 100%;"
@@ -51,39 +51,25 @@
       </a-row>
     </div>
     <!--全部应用-->
-    <div class="bottom-div" style="height: 50%;margin-top: 1%;width: 98.5%;" >
-      <a-card title="全部应用" style="height: 100%">
-        <a-row type="flex" :gutter="16" style="height: 100%;">
-          <a-col class="bottomClick" span="4" @click='informationManagement'>
-            <a-icon class="bottomClick" type="table" style="font-size: 25px;" /> 基础信息管理
-          </a-col>
-          <a-col class="bottomClick" span="4" @click='processManage'>
-            <a-icon type="cluster" style="font-size: 25px;" /> 流程管理
-          </a-col>
-          <a-col class="bottomClick" span="4" @click='materialManage'>
-            <a-icon type="setting" style="font-size: 25px;" /> 物资管理
-          </a-col>
-          <a-col class="bottomClick" span="4" @click='statisticalAnalysis'>
-            <a-icon type="line-chart" style="font-size: 25px;" /> 统计分析
-          </a-col>
-          <a-col class="bottomClick" span="4" @click='dictionaryLibrary'>
-            <a-icon type="read" style="font-size: 25px;" /> 标准字典库
-          </a-col>
-          <a-col class="bottomClick" span="4" @click='isystemManage'>
-            <a-icon type="setting" style="font-size: 25px;" /> 系统管理
-          </a-col>
-        </a-row>
+    <div class="bottom-div" style="height: 60%;margin-top: 1%;width: 98.5%;" >
+      <a-card class="bottom-card" title="全部应用" style="height: 100%;" :headStyle="{padding:'24'}" :bodyStyle="{padding:'10'}">
+        <ul class="apply-use" style="list-style-type: none;padding: 0px">
+          <li class="ant-col-md-3" v-for="(item,index) in userChildren" @click="goRouteView(item.path)">
+            {{ item.meta.title }}
+          </li>
+        </ul>
       </a-card>
     </div>
 
   </div>
 </template>
-
 <script>
 
 import { getAction } from '@api/manage'
 import { JVXETypes } from '@/components/jeecg/JVxeTable/index'
+import store from '@/store'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import userMenu from '@comp/tools/UserMenu'
 
 
 
@@ -162,17 +148,46 @@ export default {
       msgContent: [],
       //加载状态
       loading:true,
-
-
+      //全部用户菜单
+      userMean:[],
+      //用户子菜单
+      userChildren:[],
+      routerGo:""
     }
   },
   created() {
     this.todoList();
     this.loginList();
     this.systemMessage();
+    this.getChildrenMenu();
   },
 
   methods: {
+    goRouteView(item){
+      this.$router.push(item)
+    },
+    //循环获取所有的子菜单项
+    getChildrenMenu() {
+      let userMean = JSON.parse(sessionStorage.getItem('ASIDE_MEAN'))
+      console.log("userMean")
+      console.log(userMean)
+      let children = []
+      for (let i in userMean){
+        if (userMean[i].hidden !== true){
+          children.push(userMean[i].children)
+        }
+      }
+      let childrenMean = []
+      for (let i in children){
+        let childrenArray = children[i]
+        for (let j in childrenArray){
+          childrenMean.push(childrenArray[j])
+        }
+      }
+      this.userChildren = childrenMean
+      console.log("this.userChildren")
+      console.log(this.userChildren)
+    },
     //待办任务的行点击事件(前往待办)
     rowClick: function(record, index) {
       return {
@@ -247,36 +262,6 @@ export default {
       })
     },
 
-    // 跳转地址
-    informationManagement(){
-      this.$router.push('/supplier/regulate')
-    },
-    processManage(){
-      this.$router.push('/activiti/applyHome')
-    },
-    materialManage(){
-      this.$router.push('/modules/suppliesstronger')
-    },
-    statisticalAnalysis(){
-      this.$router.push('/statistic_analysis/costStatistic')
-    },
-    dictionaryLibrary(){
-      this.$router.push('/dictionaries/data')
-    },
-    isystemManage(){
-      this.$router.push('/isystem/user')
-    },
-    portalInformation(){
-      this.$router.push('')
-    },
-    statisticalTreatment(){
-      this.$router.push('/report/ArchivesStatisticst')
-    },
-    // 对待办任务进行查询查看是否有待办数据
-    searchDoneData(){
-      // 待添加
-    },
-
 
   }
 }
@@ -285,14 +270,23 @@ export default {
 <style scoped>
 @import url("http://at.alicdn.com/t/c/font_3733417_ws9m9bvag1h.css");
 
-/deep/.ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
-  height: 100%;
+/deep/.bottom-div > ant-card-body {
+  padding: 10px 24px;
 }
 
-/deep/.ant-table-scroll {
+.apply-use li {
+  cursor: pointer;
+  margin: 0 4% 2% 3%;
+}
+.apply-use li:hover{
+  color: #18aeff;
+}
+
+/deep/.ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
   height: 100%;
 }
 
+
 /deep/.ant-table {
   height: 100%;
 }
@@ -356,7 +350,6 @@ export default {
 }
 
 /deep/.ant-card-body{
-  padding: 5% 3% 5% 3%;
   height: 80%;
 }
 
diff --git a/src/views/description/ProcessDescriptionList.vue b/src/views/description/ProcessDescriptionList.vue
index ce68fd5..7bd289d 100644
--- a/src/views/description/ProcessDescriptionList.vue
+++ b/src/views/description/ProcessDescriptionList.vue
@@ -44,6 +44,7 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('品名分类')">导出</a-button>
+      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/品名分类导入模板_1667997006232_1668004136429.xlsx')">品名分类导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
diff --git a/src/views/materialstorage/ProcessMaterialStorageList.vue b/src/views/materialstorage/ProcessMaterialStorageList.vue
index d3bc0dc..db98e01 100644
--- a/src/views/materialstorage/ProcessMaterialStorageList.vue
+++ b/src/views/materialstorage/ProcessMaterialStorageList.vue
@@ -50,6 +50,7 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('物资储存地址表')">导出</a-button>
+      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/物资储存位置导入模板_1667998262940.xlsx')">物资储存地址导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
diff --git a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
index 54e5ad5..81aedf6 100644
--- a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
+++ b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
@@ -80,6 +80,7 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('物资清单表')">导出</a-button>
+      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/物资清单导入模板_1668004559282.xlsx')">物资清单表导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
diff --git a/src/views/modules/oss/OSSFileList.vue b/src/views/modules/oss/OSSFileList.vue
index 0266717..52b9ad7 100644
--- a/src/views/modules/oss/OSSFileList.vue
+++ b/src/views/modules/oss/OSSFileList.vue
@@ -65,12 +65,12 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-          style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a-->
+<!--          style="font-weight: 600">{{-->
+<!--        selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
           ref="table"
diff --git a/src/views/supplier/ProcessSupplierList.vue b/src/views/supplier/ProcessSupplierList.vue
index 27a5dce..a7c526b 100644
--- a/src/views/supplier/ProcessSupplierList.vue
+++ b/src/views/supplier/ProcessSupplierList.vue
@@ -51,6 +51,7 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('供应商信息')">导出</a-button>
+      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/供应商名称及编码_1668003417087.xlsx')">供应商导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index 8fc1ae5..73da89d 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -35,9 +35,9 @@
     <div class="table-operator">
 <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       <a-button type="primary" icon="download" @click="handleExportXls('物资总库')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
diff --git a/src/views/system/DepartUserList.vue b/src/views/system/DepartUserList.vue
index 833f3e3..a1bb88b 100644
--- a/src/views/system/DepartUserList.vue
+++ b/src/views/system/DepartUserList.vue
@@ -1,50 +1,52 @@
 <template>
-  <a-row :gutter="10">
-    <a-col :md="8" :sm="24">
-      <a-card :bordered="false">
-        <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
-          <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
-          <!-- 树-->
+  <a-card :bordered="false">
+    <a-row :gutter="10">
+      <a-col :md="8" :sm="24">
+        <a-card :bordered="false">
+          <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
+            <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
+            <!-- 树-->
 
-          <template v-if="userIdentity === '2' && departTree.length>0">
+            <template v-if="userIdentity === '2' && departTree.length>0">
 
-            <!--组织机构-->
-            <a-tree
-              showLine
-              :selectedKeys="selectedKeys"
-              :checkStrictly="true"
-              @select="onSelect"
-              :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-              :treeData="departTree"
-              :autoExpandParent="autoExpandParent"
-              :expandedKeys="iExpandedKeys"
-              @expand="onExpand"
-            />
+              <!--组织机构-->
+              <a-tree
+                showLine
+                :selectedKeys="selectedKeys"
+                :checkStrictly="true"
+                @select="onSelect"
+                :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+                :treeData="departTree"
+                :autoExpandParent="autoExpandParent"
+                :expandedKeys="iExpandedKeys"
+                @expand="onExpand"
+              />
 
-          </template>
-          <div style="margin-top: 24px;" v-else-if="userIdentity === '2' && departTree.length==0">
-            <h3><span>您的部门下暂无有效部门信息</span></h3>
+            </template>
+            <div style="margin-top: 24px;" v-else-if="userIdentity === '2' && departTree.length==0">
+              <h3><span>您的部门下暂无有效部门信息</span></h3>
+            </div>
+            <div style="margin-top: 24px;" v-else><h3>普通员工暂此权限</h3></div>
           </div>
-          <div style="margin-top: 24px;" v-else><h3>普通员工暂此权限</h3></div>
-        </div>
-      </a-card>
-    </a-col>
-    <a-col :md="16" :sm="24">
-      <a-card :bordered="false">
-        <a-tabs defaultActiveKey="2" @change="callback">
-          <a-tab-pane tab="基本信息" key="1" forceRender>
-            <Dept-Base-Info ref="DeptBaseInfo"></Dept-Base-Info>
-          </a-tab-pane>
-<!--          <a-tab-pane tab="用户信息" key="2">-->
-<!--            <Dept-User-Info ref="DeptUserInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"></Dept-User-Info>-->
-<!--          </a-tab-pane>-->
-<!--          <a-tab-pane tab="部门角色" key="3" forceRender>-->
-<!--            <dept-role-info ref="DeptRoleInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"/>-->
-<!--          </a-tab-pane>-->
-        </a-tabs>
-      </a-card>
-    </a-col>
-  </a-row>
+        </a-card>
+      </a-col>
+      <a-col :md="16" :sm="24">
+        <a-card :bordered="false">
+          <a-tabs defaultActiveKey="2" @change="callback">
+            <a-tab-pane tab="基本信息" key="1" forceRender>
+              <Dept-Base-Info ref="DeptBaseInfo"></Dept-Base-Info>
+            </a-tab-pane>
+            <!--          <a-tab-pane tab="用户信息" key="2">-->
+            <!--            <Dept-User-Info ref="DeptUserInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"></Dept-User-Info>-->
+            <!--          </a-tab-pane>-->
+            <!--          <a-tab-pane tab="部门角色" key="3" forceRender>-->
+            <!--            <dept-role-info ref="DeptRoleInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"/>-->
+            <!--          </a-tab-pane>-->
+          </a-tabs>
+        </a-card>
+      </a-col>
+    </a-row>
+  </a-card>
 </template>
 <script>
   import DeptBaseInfo from './modules/DeptBaseInfo'
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index e35a64c..b7bb180 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -56,6 +56,7 @@
             :dataSource="dataSource"
             :pagination="ipagination"
             :loading="loading"
+            :scroll="{y:460}"
             :rowSelection="{selectedRowKeys: selectedRowKeys1, onChange: onSelectChange1, type:'radio'}"
             @change="handleTableChange">
           <span slot="action" slot-scope="text, record">
diff --git a/src/views/system/SysPositionList.vue b/src/views/system/SysPositionList.vue
index 8e63597..cafad7a 100644
--- a/src/views/system/SysPositionList.vue
+++ b/src/views/system/SysPositionList.vue
@@ -78,14 +78,15 @@
         @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑&nbsp;&nbsp;&nbsp;</a>
+          <a @click="handleEdit(record)">编辑</a>
           <!--          <a-divider type="vertical"/>-->
           <!--          <a-dropdown>-->
           <!--            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>-->
           <!--            <a-menu slot="overlay">-->
           <!--              <a-menu-item>-->
+           <a-divider type="vertical"/>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a> 删除</a>
+                  <a>删除</a>
                 </a-popconfirm>
           <!--              </a-menu-item>-->
           <!--            </a-menu>-->
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 22aea1f..6410d2d 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -93,7 +93,7 @@
     <div class="table-operator" style="border-top: 5px">
       <a-button @click="handleAdd" type="primary" icon="plus">添加用户</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('用户信息导入模板')">导入模板</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('用户信息导入模板')">用户信息导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -123,10 +123,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
@@ -138,7 +138,6 @@
         :pagination="ipagination"
         :loading="loading"
         :scroll="{ y: 450 }"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange"
       >
 
diff --git a/src/views/system/modules/AddressListRight.vue b/src/views/system/modules/AddressListRight.vue
index b9c7c24..9853dca 100644
--- a/src/views/system/modules/AddressListRight.vue
+++ b/src/views/system/modules/AddressListRight.vue
@@ -36,7 +36,7 @@
       :columns="columns"
       :dataSource="dataSource"
       :loading="loading"
-      :scroll="{x: false, y: 460 }"
+      :scroll="{y: 460 }"
       @change="handleTableChange">
     </a-table>
 
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 6662df4..cd5e66e 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -100,13 +100,13 @@
 
        <!-- update--begin--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
                     <a-col :span="12" >
-        <a-form-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group
-            v-model="identity"
-            @change="identityChange">
-            <a-radio value="1">普通用户</a-radio>
-            <a-radio value="2">上级</a-radio>
-          </a-radio-group>
+        <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
+<!--          <a-radio-group-->
+<!--            v-model="identity"-->
+<!--            @change="identityChange">-->
+<!--            <a-radio value="1">普通用户</a-radio>-->
+<!--            <a-radio value="2">上级</a-radio>-->
+<!--          </a-radio-group>-->
           <a-upload
             listType="picture-card"
             class="avatar-uploader"
diff --git a/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
index 229c3ba..6cca999 100644
--- a/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
+++ b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
@@ -41,6 +41,7 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('单位、废旧库房编码')">导出</a-button>
+      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/废旧物资存储库房编码模板_1668004947302.xlsx')">废旧库房导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue
index f942eb0..f739cd3 100644
--- a/src/views/waste/ProcessWasteList.vue
+++ b/src/views/waste/ProcessWasteList.vue
@@ -50,7 +50,7 @@
       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('废旧物资库表')">导出</a-button>
-<!--      <a-button type="primary" icon="download" @click="handleExportXls('废旧物资库表导入模板')">导入模板</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('废旧物资库表导入模板')">废旧物资库导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
diff --git a/src/views/waste/ProcessWasteListCable.vue b/src/views/waste/ProcessWasteListCable.vue
index 21907e6..e485e1c 100644
--- a/src/views/waste/ProcessWasteListCable.vue
+++ b/src/views/waste/ProcessWasteListCable.vue
@@ -52,7 +52,7 @@
       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('电缆')">导出</a-button>
-<!--      <a-button type="primary" icon="download" @click="handleExportXls('电缆模板')">导入模板</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('电缆模板')">电缆导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -73,7 +73,7 @@
       <a-table
         ref="table"
         size="middle"
-        :scroll="{y:true}"
+        :scroll="{y:460}"
         bordered
         rowKey="id"
         :columns="columns"
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index 783cbcc..c7a98de 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -33,9 +33,9 @@
       <!-- 操作按钮区域 -->
       <div class="table-operator">
         <a-button type="primary" icon="download" @click="handleExportXls('账外物资库')">导出</a-button>
-        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-          <a-button type="primary" icon="import">导入</a-button>
-        </a-upload>
+<!--        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--          <a-button type="primary" icon="import">导入</a-button>-->
+<!--        </a-upload>-->
         <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
         <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
       </div>
@@ -200,6 +200,7 @@
     created() {
     this.getSuperFieldList();
     this.initDictConfig();
+    console.log()
     },
     computed: {
       importExcelUrl: function(){
@@ -208,6 +209,7 @@
     },
     methods: {
       handleDetail(record){
+        console.log("1111111111111111111111111111111111")
         console.log(record);
         this.$router.push({
           // name:'src-views-wastematerials-ProcessWasteMaterialsLists',
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
index ae96981..28e4826 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
@@ -336,8 +336,8 @@
         this.createProductTime = [],
         this.createInnerTime = [],
         this.queryParam = {
-          merchandiseNewsId : this.$route.query.merchandiseNewsId,
-          materialStorageId : this.$route.query.materialStorageId,
+          merchandiseNewsId: this.$route.query.merchandiseNewsId,
+          materialStorageId: this.$route.query.materialStorageId,
           del_flag: 0
         },
         getAction(this.url.list,this.queryParam).then((res)=>{
@@ -350,7 +350,6 @@
         });
       },
       loadData(){
-        console.log(this.queryParam);
         getAction(this.url.list,this.queryParam).then((res)=>{
           if(res.success){
             console.log("result ：")