From d1e279e9123b6404997829a6177d3122d48ee0a2 Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Fri, 16 Jul 2021 00:29:35 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=92=E6=A7=BD?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GlobalFooter/index.vue          | 4 ++--
 src/components/GlobalHeader/AvatarDropdown.vue | 2 +-
 src/components/tools/TwoStepCaptcha.vue        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/GlobalFooter/index.vue b/src/components/GlobalFooter/index.vue
index ffb94c6..d4b5a79 100644
--- a/src/components/GlobalFooter/index.vue
+++ b/src/components/GlobalFooter/index.vue
@@ -1,9 +1,9 @@
 <template>
   <global-footer class="footer custom-render">
-    <template v-slot:links>
+    <template #links>
       <a href="https://gitee.com/tcc/easy-restful-ui" target="_blank">Easy-RESTful-UI <small>v{{ version }}</small></a>
     </template>
-    <template v-slot:copyright>
+    <template #copyright>
       <a href="https://gitee.com/tcc/Easy-RESTful" target="_blank">Easy RESTful</a>
       <a-divider type="vertical"/>
       <a href="https://www.antdv.com/docs/vue/introduce-cn" target="_blank">Ant Design</a>
diff --git a/src/components/GlobalHeader/AvatarDropdown.vue b/src/components/GlobalHeader/AvatarDropdown.vue
index 51386a9..a0b2533 100644
--- a/src/components/GlobalHeader/AvatarDropdown.vue
+++ b/src/components/GlobalHeader/AvatarDropdown.vue
@@ -4,7 +4,7 @@
       <e-avatar :relative-path="false" size="small" :avatar="currentUser.avatar" :nickname="currentUser.nickname" class="antd-pro-global-header-index-avatar"/>
       <span class="ant-pro-global-header-nickname">{{ currentUser.nickname }}</span>
     </span>
-    <template v-slot:overlay>
+    <template #overlay>
       <a-menu class="ant-pro-drop-down menu" :selected-keys="[]">
         <a-menu-item v-if="menu" key="center" @click="handleToCenter">
           <a-icon type="user" />
diff --git a/src/components/tools/TwoStepCaptcha.vue b/src/components/tools/TwoStepCaptcha.vue
index 01302b4..5d4cd6c 100644
--- a/src/components/tools/TwoStepCaptcha.vue
+++ b/src/components/tools/TwoStepCaptcha.vue
@@ -7,7 +7,7 @@
     :maskClosable="false"
   >
     <div slot="title" :style="{ textAlign: 'center' }">两步验证</div>
-    <template slot="footer">
+    <template #footer>
       <div :style="{ textAlign: 'center' }">
         <a-button key="back" @click="handleCancel">返回</a-button>
         <a-button key="submit" type="primary" :loading="stepLoading" @click="handleStepOk">
-- 
Gitee


From 19e93713fb8fb8883e5c962aa2556aad966c8341 Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Fri, 16 Jul 2021 00:32:02 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8F=92=E6=A7=BD?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Easy/data-display/Avatar.vue   |   3 +-
 src/components/Easy/data-display/ProTable.vue |   8 +-
 src/components/Easy/data-entry/DatePicker.vue |   1 +
 src/components/Easy/data-entry/Upload.vue     |   3 +-
 .../Easy/data-entry/corn/CronModal.vue        |  12 +--
 src/components/Easy/general/BtnAddSub.vue     |   2 +-
 src/components/Easy/general/BtnEdit.vue       |   2 +-
 src/components/Easy/general/BtnInfo.vue       |   2 +-
 src/components/Easy/general/BtnRemove.vue     |   2 +-
 .../Easy/general/work-flow/BtnProgress.vue    |   4 +-
 .../Easy/general/work-flow/BtnRevoke.vue      |   2 +-
 .../Easy/general/work-flow/BtnStart.vue       |   2 +-
 .../activiti/history/taskInstance/All.vue     |  22 ++--
 .../activiti/history/taskInstance/My.vue      |  22 ++--
 .../history/taskInstance/Participate.vue      |  22 ++--
 src/views/activiti/model/List.vue             |  48 ++++-----
 src/views/activiti/process/List.vue           | 102 +++++++++---------
 src/views/activiti/task/List.vue              |  36 +++----
 src/views/activiti/task/ToDoList.vue          |   2 +-
 src/views/generator/BaseInfo.vue              |   6 +-
 src/views/generator/FieldSet.vue              |  58 +++++-----
 src/views/sample/general/List.vue             |  31 +++---
 src/views/sample/work-flow/Input.vue          |   2 +-
 src/views/sample/work-flow/List.vue           |   6 +-
 src/views/scheduler/job/Input.vue             |   2 +-
 src/views/scheduler/job/List.vue              |  48 ++++-----
 src/views/sys/config/Input.vue                |   2 +-
 src/views/sys/config/List.vue                 |  20 ++--
 src/views/sys/dept/View.vue                   |  16 +--
 src/views/sys/dept/type/View.vue              |  18 ++--
 src/views/sys/dict/Input.vue                  |   4 +-
 src/views/sys/dict/List.vue                   |  56 +++++-----
 src/views/sys/dict/type/List.vue              |  81 +++++++-------
 src/views/sys/exception/List.vue              |  16 ++-
 src/views/sys/import-excel-data/Input.vue     |  10 +-
 .../import-excel-template-details/Input.vue   |  36 +++----
 src/views/sys/import-excel-template/Input.vue |  14 +--
 src/views/sys/import-excel-template/List.vue  |  42 ++++----
 src/views/sys/log/List.vue                    |  24 ++---
 src/views/sys/message/Draft.vue               |  16 +--
 src/views/sys/message/Input.vue               |   2 +-
 src/views/sys/message/MessageList.vue         |   4 +-
 src/views/sys/message/Receive.vue             |  28 ++---
 src/views/sys/message/Sent.vue                |   8 +-
 src/views/sys/permissions/View.vue            |  12 +--
 src/views/sys/personal/center/View.less       |  33 +++---
 src/views/sys/personal/center/View.vue        |   4 +-
 .../sys/personal/settings/BaseSetting.vue     |   2 +-
 src/views/sys/role/View.vue                   |   8 +-
 src/views/sys/user/Input.vue                  |   4 +-
 src/views/sys/user/RetrievePassword.vue       |  10 +-
 src/views/sys/user/View.vue                   |  34 +++---
 52 files changed, 462 insertions(+), 492 deletions(-)

diff --git a/src/components/Easy/data-display/Avatar.vue b/src/components/Easy/data-display/Avatar.vue
index e9262ef..c652323 100644
--- a/src/components/Easy/data-display/Avatar.vue
+++ b/src/components/Easy/data-display/Avatar.vue
@@ -1,9 +1,10 @@
 <template>
   <a-avatar
+    shape="square"
     :size="size"
     v-if="avatar != null && avatar !== ''"
     :src="(relativePath ? VUE_APP_API_BASE_URL : '') + avatar"/>
-  <a-avatar :size="size" v-else>
+  <a-avatar shape="square" :size="size" v-else>
     {{ nickname && nickname.substr(0, 1) }}
   </a-avatar>
 </template>
diff --git a/src/components/Easy/data-display/ProTable.vue b/src/components/Easy/data-display/ProTable.vue
index ab0ec19..ed93b2d 100644
--- a/src/components/Easy/data-display/ProTable.vue
+++ b/src/components/Easy/data-display/ProTable.vue
@@ -35,13 +35,13 @@
               <slot name="button"></slot>
               <a-divider type="vertical"/>
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>刷新</span>
                 </template>
                 <a-button class="toolbar-item" icon="reload" @click="refresh()"/>
               </a-tooltip>
               <a-tooltip placement="top">
-                <template slot="title">
+                <template #title>
                   <span>密度</span>
                 </template>
                 <a-dropdown :trigger="['click']">
@@ -56,13 +56,13 @@
                 </a-dropdown>
               </a-tooltip>
               <a-tooltip placement="top" v-if="!isMobile">
-                <template slot="title">
+                <template #title>
                   <span>列设置（未实现）</span>
                 </template>
                 <a-button class="toolbar-item" icon="setting"/>
               </a-tooltip>
               <a-tooltip placement="top" v-if="!isMobile">
-                <template slot="title">
+                <template #title>
                   <span>全屏（未实现）</span>
                 </template>
                 <a-button class="toolbar-item" icon="fullscreen"/>
diff --git a/src/components/Easy/data-entry/DatePicker.vue b/src/components/Easy/data-entry/DatePicker.vue
index 1d6ada0..6579c94 100644
--- a/src/components/Easy/data-entry/DatePicker.vue
+++ b/src/components/Easy/data-entry/DatePicker.vue
@@ -78,6 +78,7 @@ export default {
     },
     handleChange () {
       this.$emit('input', this.currentValue.format(this.datePattern))
+      this.$emit('change')
     }
   }
 }
diff --git a/src/components/Easy/data-entry/Upload.vue b/src/components/Easy/data-entry/Upload.vue
index 9f54312..392ffee 100644
--- a/src/components/Easy/data-entry/Upload.vue
+++ b/src/components/Easy/data-entry/Upload.vue
@@ -2,7 +2,7 @@
   <a-upload
     name="file"
     :accept="accept"
-    :file-list="fileList"
+    :file-showUploadListlist="fileList"
     :disabled="disabled"
     :multiple="multiple"
     :action="`${VUE_APP_API_BASE_URL}/auth/file/upload`"
@@ -95,6 +95,7 @@ export default {
           this.$message.error(`${info.file.name || ''} 上传失败`)
         }
         this.$emit('input', this.initFileList(info.fileList))
+        this.$emit('change')
       }
     }
   }
diff --git a/src/components/Easy/data-entry/corn/CronModal.vue b/src/components/Easy/data-entry/corn/CronModal.vue
index dbc7742..315f1ac 100644
--- a/src/components/Easy/data-entry/corn/CronModal.vue
+++ b/src/components/Easy/data-entry/corn/CronModal.vue
@@ -10,7 +10,7 @@
     <div class="card-container">
       <a-tabs type="card">
         <a-tab-pane key="1" type="card">
-          <span slot="tab"><a-icon type="schedule" /> 秒</span>
+          <template #tab><a-icon type="schedule" /> 秒</template>
           <a-radio-group v-model="result.second.cronEvery">
             <a-row>
               <a-radio value="1">每一秒钟</a-radio>
@@ -40,7 +40,7 @@
           </a-radio-group>
         </a-tab-pane>
         <a-tab-pane key="2">
-          <span slot="tab"><a-icon type="schedule" />分</span>
+          <template #tab><a-icon type="schedule" />分</template>
           <div class="tabBody">
             <a-radio-group v-model="result.minute.cronEvery">
               <a-row>
@@ -72,7 +72,7 @@
           </div>
         </a-tab-pane>
         <a-tab-pane key="3">
-          <span slot="tab"><a-icon type="schedule" /> 时</span>
+          <template #tab><a-icon type="schedule" /> 时</template>
           <div class="tabBody">
             <a-radio-group v-model="result.hour.cronEvery">
               <a-row>
@@ -104,7 +104,7 @@
           </div>
         </a-tab-pane>
         <a-tab-pane key="4">
-          <span slot="tab"><a-icon type="schedule" />  天</span>
+          <template #tab><a-icon type="schedule" />  天</template>
           <div class="tabBody">
             <a-radio-group v-model="result.day.cronEvery">
               <a-row>
@@ -180,7 +180,7 @@
           </div>
         </a-tab-pane>
         <a-tab-pane key="5">
-          <span slot="tab"><a-icon type="schedule" /> 月</span>
+          <template #tab><a-icon type="schedule" /> 月</template>
           <div class="tabBody">
             <a-radio-group v-model="result.month.cronEvery">
               <a-row>
@@ -212,7 +212,7 @@
           </div>
         </a-tab-pane>
         <a-tab-pane key="6">
-          <span slot="tab"><a-icon type="schedule" /> 年</span>
+          <template #tab><a-icon type="schedule" /> 年</template>
           <div class="tabBody">
             <a-radio-group v-model="result.year.cronEvery">
               <a-row>
diff --git a/src/components/Easy/general/BtnAddSub.vue b/src/components/Easy/general/BtnAddSub.vue
index 935fe8c..cd59e39 100644
--- a/src/components/Easy/general/BtnAddSub.vue
+++ b/src/components/Easy/general/BtnAddSub.vue
@@ -1,7 +1,7 @@
 <template>
   <span v-if="permissions == null || permissions === '' || $permissions(permissions)">
     <a-tooltip placement="top">
-      <template slot="title">
+      <template #title>
         <span>{{ name }}</span>
       </template>
       <a-button type="primary" size="small" :icon="icon" @click="onClick"/>
diff --git a/src/components/Easy/general/BtnEdit.vue b/src/components/Easy/general/BtnEdit.vue
index 69efc7f..27c387a 100644
--- a/src/components/Easy/general/BtnEdit.vue
+++ b/src/components/Easy/general/BtnEdit.vue
@@ -1,7 +1,7 @@
 <template>
   <span v-if="permissions == null || permissions === '' || $permissions(permissions)">
     <a-tooltip placement="top">
-      <template slot="title">
+      <template #title>
         <span>{{ name }}</span>
       </template>
       <a-button type="primary" size="small" :icon="icon" @click="onClick"/>
diff --git a/src/components/Easy/general/BtnInfo.vue b/src/components/Easy/general/BtnInfo.vue
index 09543ec..c8ed860 100644
--- a/src/components/Easy/general/BtnInfo.vue
+++ b/src/components/Easy/general/BtnInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <span v-if="permissions == null || permissions === '' || $permissions(permissions)">
     <a-tooltip placement="top">
-      <template slot="title">
+      <template #title>
         <span>{{ name }}</span>
       </template>
       <a-button type="primary" size="small" :icon="icon" @click="onClick"/>
diff --git a/src/components/Easy/general/BtnRemove.vue b/src/components/Easy/general/BtnRemove.vue
index d71de6a..2d39ff8 100644
--- a/src/components/Easy/general/BtnRemove.vue
+++ b/src/components/Easy/general/BtnRemove.vue
@@ -5,7 +5,7 @@
       @confirm="() => remove()"
     >
       <a-tooltip placement="top">
-        <template slot="title">
+        <template #title>
           <span>{{ name }}</span>
         </template>
         <a-button type="danger" size="small" :loading="loading" :icon="icon"/>
diff --git a/src/components/Easy/general/work-flow/BtnProgress.vue b/src/components/Easy/general/work-flow/BtnProgress.vue
index bdad84d..db8c8c5 100644
--- a/src/components/Easy/general/work-flow/BtnProgress.vue
+++ b/src/components/Easy/general/work-flow/BtnProgress.vue
@@ -1,7 +1,7 @@
 <template>
   <span>
     <a-tooltip placement="top">
-      <template slot="title">
+      <template #title>
         <span>{{ name }}</span>
       </template>
       <a-button :loading="loading" size="small" :icon="icon" @click="progress"/>
@@ -9,7 +9,7 @@
     <a-divider v-if="divider" type="vertical"/>
     <!--  审核进度  -->
     <a-modal :width="800" v-model="progressModalVisible" title="审核进度">
-      <template slot="footer">
+      <template #footer>
         <a-button @click="() => {this.progressModalVisible = false}">关闭</a-button>
       </template>
       <img
diff --git a/src/components/Easy/general/work-flow/BtnRevoke.vue b/src/components/Easy/general/work-flow/BtnRevoke.vue
index c76dc20..eacedb7 100644
--- a/src/components/Easy/general/work-flow/BtnRevoke.vue
+++ b/src/components/Easy/general/work-flow/BtnRevoke.vue
@@ -1,7 +1,7 @@
 <template>
   <span>
     <a-tooltip placement="top">
-      <template slot="title">
+      <template #title>
         <span>{{ name }}</span>
       </template>
       <a-button type="danger" :loading="loading" size="small" :icon="icon" @click="revoke"/>
diff --git a/src/components/Easy/general/work-flow/BtnStart.vue b/src/components/Easy/general/work-flow/BtnStart.vue
index 297dccf..f0fbda7 100644
--- a/src/components/Easy/general/work-flow/BtnStart.vue
+++ b/src/components/Easy/general/work-flow/BtnStart.vue
@@ -1,7 +1,7 @@
 <template>
   <span>
     <a-tooltip placement="top">
-      <template slot="title">
+      <template #title>
         <span>{{ name }}</span>
       </template>
       <a-button type="primary" :loading="loading" size="small" :icon="icon" @click="start"/>
diff --git a/src/views/activiti/history/taskInstance/All.vue b/src/views/activiti/history/taskInstance/All.vue
index d058013..6195964 100644
--- a/src/views/activiti/history/taskInstance/All.vue
+++ b/src/views/activiti/history/taskInstance/All.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <e-pro-table title="流程跟踪" :no-advanced="true">
-      <template slot="query">
+      <template #query>
         <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
           <a-form-model-item label="ID">
             <a-input v-model="queryParam.processInstanceId"/>
@@ -14,7 +14,7 @@
         </a-col>
       </template>
 
-      <template slot="table">
+      <template #table>
         <s-table
           ref="eTable"
           row-key="processInstanceId"
@@ -22,23 +22,21 @@
           :data="loadData"
           showPagination="auto"
         >
-          <span slot="taskStatus" slot-scope="text, record">
+          <template #taskStatus="text, record">
             <e-dict-tag
               v-if="record.deleteReason != null && record.deleteReason !== ''"
               type="taskStatus"
               :code="TASK_STATUS.RESCINDED"/>
             <e-dict-tag v-else-if="record.endTime == null" type="taskStatus" :code="TASK_STATUS.IN_PROCESS"/>
             <e-dict-tag v-else type="taskStatus" :code="TASK_STATUS.COMPLETED"/>
-          </span>
-          <span slot="processSuspensionState" slot-scope="text">
+          </template>
+          <template #processSuspensionState="text">
             <e-dict-tag type="suspensionState" :code="text"/>
-          </span>
-          <span slot="action" slot-scope="text, record">
-            <template>
-              <e-btn-work-flow-progress :divider="record.deleteReason == null || record.endTime == null" :execution-id="record.executionId" :process-instance-id="record.processInstanceId"/>
-              <e-btn-work-flow-revoke v-if="record.deleteReason == null || record.endTime == null" :reason="true" :divider="false" :process-instance-id="record.processInstanceId"/>
-            </template>
-          </span>
+          </template>
+          <template #action="text, record">
+            <e-btn-work-flow-progress :divider="record.deleteReason == null || record.endTime == null" :execution-id="record.executionId" :process-instance-id="record.processInstanceId"/>
+            <e-btn-work-flow-revoke v-if="record.deleteReason == null || record.endTime == null" :reason="true" :divider="false" :process-instance-id="record.processInstanceId"/>
+          </template>
         </s-table>
       </template>
     </e-pro-table>
diff --git a/src/views/activiti/history/taskInstance/My.vue b/src/views/activiti/history/taskInstance/My.vue
index 0e1038d..587df85 100644
--- a/src/views/activiti/history/taskInstance/My.vue
+++ b/src/views/activiti/history/taskInstance/My.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <e-pro-table title="我发起的" :no-advanced="true">
-      <template slot="query">
+      <template #query>
         <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
           <a-form-model-item label="ID">
             <a-input v-model="queryParam.processInstanceId"/>
@@ -14,7 +14,7 @@
         </a-col>
       </template>
 
-      <template slot="table">
+      <template #table>
         <s-table
           ref="eTable"
           row-key="processInstanceId"
@@ -22,23 +22,21 @@
           :data="loadData"
           showPagination="auto"
         >
-          <span slot="taskStatus" slot-scope="text, record">
+          <template #taskStatus="text, record">
             <e-dict-tag
               v-if="record.deleteReason != null && record.deleteReason !== ''"
               type="taskStatus"
               :code="TASK_STATUS.RESCINDED"/>
             <e-dict-tag v-else-if="record.endTime == null" type="taskStatus" :code="TASK_STATUS.IN_PROCESS"/>
             <e-dict-tag v-else type="taskStatus" :code="TASK_STATUS.COMPLETED"/>
-          </span>
-          <span slot="processSuspensionState" slot-scope="text">
+          </template>
+          <template #processSuspensionState="text">
             <e-dict-tag type="suspensionState" :code="text"/>
-          </span>
-          <span slot="action" slot-scope="text, record">
-            <template>
-              <e-btn-work-flow-progress :divider="record.deleteReason == null || record.endTime == null" :execution-id="record.executionId" :process-instance-id="record.processInstanceId"/>
-              <e-btn-work-flow-revoke v-if="record.deleteReason == null || record.endTime == null" :reason="true" :divider="false" :process-instance-id="record.processInstanceId"/>
-            </template>
-          </span>
+          </template>
+          <template #action="text, record">
+            <e-btn-work-flow-progress :divider="record.deleteReason == null || record.endTime == null" :execution-id="record.executionId" :process-instance-id="record.processInstanceId"/>
+            <e-btn-work-flow-revoke v-if="record.deleteReason == null || record.endTime == null" :reason="true" :divider="false" :process-instance-id="record.processInstanceId"/>
+          </template>
         </s-table>
       </template>
     </e-pro-table>
diff --git a/src/views/activiti/history/taskInstance/Participate.vue b/src/views/activiti/history/taskInstance/Participate.vue
index 3d470e1..148971f 100644
--- a/src/views/activiti/history/taskInstance/Participate.vue
+++ b/src/views/activiti/history/taskInstance/Participate.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <e-pro-table title="我办理的" :no-advanced="true">
-      <template slot="query">
+      <template #query>
         <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
           <a-form-model-item label="ID">
             <a-input v-model="queryParam.processInstanceId"/>
@@ -14,7 +14,7 @@
         </a-col>
       </template>
 
-      <template slot="table">
+      <template #table>
         <s-table
           ref="eTable"
           row-key="processInstanceId"
@@ -22,23 +22,21 @@
           :data="loadData"
           showPagination="auto"
         >
-          <span slot="taskStatus" slot-scope="text, record">
+          <template #taskStatus="text, record">
             <e-dict-tag
               v-if="record.deleteReason != null && record.deleteReason !== ''"
               type="taskStatus"
               :code="TASK_STATUS.RESCINDED"/>
             <e-dict-tag v-else-if="record.endTime == null" type="taskStatus" :code="TASK_STATUS.IN_PROCESS"/>
             <e-dict-tag v-else type="taskStatus" :code="TASK_STATUS.COMPLETED"/>
-          </span>
-          <span slot="processSuspensionState" slot-scope="text">
+          </template>
+          <template #processSuspensionState="text">
             <e-dict-tag type="suspensionState" :code="text"/>
-          </span>
-          <span slot="action" slot-scope="text, record">
-            <template>
-              <e-btn-work-flow-progress :divider="record.deleteReason == null || record.endTime == null" :execution-id="record.executionId" :process-instance-id="record.processInstanceId"/>
-              <e-btn-work-flow-revoke v-if="$role(ROLE_CODE.SYS_ADMIN) && record.deleteReason == null || record.endTime == null" :reason="true" :divider="false" :process-instance-id="record.processInstanceId"/>
-            </template>
-          </span>
+          </template>
+          <template #action="text, record">
+            <e-btn-work-flow-progress :divider="record.deleteReason == null || record.endTime == null" :execution-id="record.executionId" :process-instance-id="record.processInstanceId"/>
+            <e-btn-work-flow-revoke v-if="$role(ROLE_CODE.SYS_ADMIN) && record.deleteReason == null || record.endTime == null" :reason="true" :divider="false" :process-instance-id="record.processInstanceId"/>
+          </template>
         </s-table>
       </template>
     </e-pro-table>
diff --git a/src/views/activiti/model/List.vue b/src/views/activiti/model/List.vue
index bb89a5d..d94a1aa 100644
--- a/src/views/activiti/model/List.vue
+++ b/src/views/activiti/model/List.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <e-pro-table title="流程模型" :no-advanced="true">
-      <template slot="query">
+      <template #query>
         <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
           <a-form-model-item label="名称">
             <a-input v-model="queryParam.name"/>
@@ -14,12 +14,12 @@
         </a-col>
       </template>
 
-      <template slot="button">
+      <template #button>
         <a-button v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.MODEL_SAVE)" type="primary" icon="plus" @click="handleAdd">新增</a-button>
         <e-btn-remove-batch :permissions="ACTIVITI_PERMISSIONS_CODE.MODEL_REMOVE" :loading.sync="removeBathLoading" :ids="selectedRowKeys" :click-callback="remove"/>
       </template>
 
-      <template slot="table">
+      <template #table>
         <s-table
           ref="eTable"
           :columns="columns"
@@ -28,29 +28,27 @@
           :rowSelection="rowSelection"
           showPagination="auto"
         >
-          <span slot="version" slot-scope="text">
+          <template #version="text">
             <a-tag color="blue">v.{{ text }}</a-tag>
-          </span>
-          <span slot="action" slot-scope="text, record">
-            <template>
-              <e-btn-edit :permissions="ACTIVITI_PERMISSIONS_CODE.MODEL_SAVE" :to="`/iframe?path=/activiti-editor/modeler.html?modelId=${record.id}`" :tab-name="record.name"/>
-              <a-tooltip placement="top" v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.MODEL_DEPLOYMENT)">
-                <template slot="title">
-                  <span>部署</span>
-                </template>
-                <a-button type="primary" size="small" icon="check" @click="deploymentProcess(record.id)"/>
-              </a-tooltip>
-              <a-divider type="vertical" v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.MODEL_DEPLOYMENT)"/>
-              <a-tooltip placement="top" v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.MODEL_SELECT)">
-                <template slot="title">
-                  <span>导出</span>
-                </template>
-                <a-button size="small" icon="download" @click="exportModel(record.id)"/>
-              </a-tooltip>
-              <a-divider type="vertical" v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.MODEL_SELECT)"/>
-              <e-btn-remove :permissions="ACTIVITI_PERMISSIONS_CODE.MODEL_REMOVE" :id="record.id" :divider="false" :click-callback="remove"/>
-            </template>
-          </span>
+          </template>
+          <template #action="text, record">
+            <e-btn-edit :permissions="ACTIVITI_PERMISSIONS_CODE.MODEL_SAVE" :to="`/iframe?path=/activiti-editor/modeler.html?modelId=${record.id}`" :tab-name="record.name"/>
+            <a-tooltip placement="top" v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.MODEL_DEPLOYMENT)">
+              <template #title>
+                <span>部署</span>
+              </template>
+              <a-button type="primary" size="small" icon="check" @click="deploymentProcess(record.id)"/>
+            </a-tooltip>
+            <a-divider type="vertical" v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.MODEL_DEPLOYMENT)"/>
+            <a-tooltip placement="top" v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.MODEL_SELECT)">
+              <template #title>
+                <span>导出</span>
+              </template>
+              <a-button size="small" icon="download" @click="exportModel(record.id)"/>
+            </a-tooltip>
+            <a-divider type="vertical" v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.MODEL_SELECT)"/>
+            <e-btn-remove :permissions="ACTIVITI_PERMISSIONS_CODE.MODEL_REMOVE" :id="record.id" :divider="false" :click-callback="remove"/>
+          </template>
         </s-table>
       </template>
     </e-pro-table>
diff --git a/src/views/activiti/process/List.vue b/src/views/activiti/process/List.vue
index be11faa..3422338 100644
--- a/src/views/activiti/process/List.vue
+++ b/src/views/activiti/process/List.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <e-pro-table title="流程管理" :no-advanced="true">
-      <template slot="query">
+      <template #query>
         <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
           <a-form-model-item label="ID">
             <a-input v-model="queryParam.processDefinitionId"/>
@@ -20,11 +20,11 @@
 
       </template>
 
-      <template slot="button">
+      <template #button>
         <e-btn-remove-batch :permissions="ACTIVITI_PERMISSIONS_CODE.PROCESS_REMOVE" :loading.sync="removeBathLoading" :ids="selectedRowKeys" :click-callback="remove"/>
       </template>
 
-      <template slot="table">
+      <template #table>
         <s-table
           ref="eTable"
           row-key="deploymentId"
@@ -34,58 +34,56 @@
           :rowSelection="rowSelection"
           showPagination="auto"
         >
-          <span slot="version" slot-scope="text">
+          <template #version="text">
             <a-tag color="blue">v.{{ text }}</a-tag>
-          </span>
-          <span slot="suspensionState" slot-scope="text">
+          </template>
+          <template #suspensionState="text">
             <e-dict-tag type="suspensionState" :code="text"/>
-          </span>
-          <span slot="action" slot-scope="text, record">
-            <template>
-              <e-btn-remove :id="record.deploymentId" :click-callback="remove"/>
-              <template v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.PROCESS_SUSPEND) && SUSPENSION_STATUS.ACTIVATION === record.suspensionState">
-                <a-popconfirm
-                  title="挂起流程将同时挂起流程相关的任务"
-                  @confirm="() => suspend(record.processDefinitionId)"
-                >
-                  <a-tooltip placement="top">
-                    <template slot="title">
-                      <span>挂起</span>
-                    </template>
-                    <a-button size="small" icon="pause-circle"/>
-                  </a-tooltip>
-                </a-popconfirm>
-                <a-divider type="vertical" />
-              </template>
-              <template v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.PROCESS_ACTIVATION) && SUSPENSION_STATUS.SUSPENSION === record.suspensionState">
-                <a-popconfirm
-                  title="激活流程将同时激活流程相关的任务"
-                  @confirm="() => activation(record.processDefinitionId)"
-                >
-                  <a-tooltip placement="top">
-                    <template slot="title">
-                      <span>激活</span>
-                    </template>
-                    <a-button type="primary" size="small" icon="check"/>
-                  </a-tooltip>
-                </a-popconfirm>
-                <a-divider type="vertical" />
-              </template>
-              <a-tooltip placement="top">
-                <template slot="title">
-                  <span>查看流程图</span>
-                </template>
-                <a-button size="small" icon="deployment-unit" @click="showModelModal(record.deploymentId, record.dgrmResourceName)"/>
-              </a-tooltip>
+          </template>
+          <template #action="text, record">
+            <e-btn-remove :id="record.deploymentId" :click-callback="remove"/>
+            <template v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.PROCESS_SUSPEND) && SUSPENSION_STATUS.ACTIVATION === record.suspensionState">
+              <a-popconfirm
+                title="挂起流程将同时挂起流程相关的任务"
+                @confirm="() => suspend(record.processDefinitionId)"
+              >
+                <a-tooltip placement="top">
+                  <template #title>
+                    <span>挂起</span>
+                  </template>
+                  <a-button size="small" icon="pause-circle"/>
+                </a-tooltip>
+              </a-popconfirm>
+              <a-divider type="vertical" />
+            </template>
+            <template v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.PROCESS_ACTIVATION) && SUSPENSION_STATUS.SUSPENSION === record.suspensionState">
+              <a-popconfirm
+                title="激活流程将同时激活流程相关的任务"
+                @confirm="() => activation(record.processDefinitionId)"
+              >
+                <a-tooltip placement="top">
+                  <template #title>
+                    <span>激活</span>
+                  </template>
+                  <a-button type="primary" size="small" icon="check"/>
+                </a-tooltip>
+              </a-popconfirm>
               <a-divider type="vertical" />
-              <a-tooltip placement="top" v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.MODEL_SAVE)">
-                <template slot="title">
-                  <span>转为模型</span>
-                </template>
-                <a-button type="primary" size="small" icon="swap" @click="handleAdd(record.processDefinitionId)"/>
-              </a-tooltip>
             </template>
-          </span>
+            <a-tooltip placement="top">
+              <template #title>
+                <span>查看流程图</span>
+              </template>
+              <a-button size="small" icon="deployment-unit" @click="showModelModal(record.deploymentId, record.dgrmResourceName)"/>
+            </a-tooltip>
+            <a-divider type="vertical" />
+            <a-tooltip placement="top" v-if="$permissions(ACTIVITI_PERMISSIONS_CODE.MODEL_SAVE)">
+              <template #title>
+                <span>转为模型</span>
+              </template>
+              <a-button type="primary" size="small" icon="swap" @click="handleAdd(record.processDefinitionId)"/>
+            </a-tooltip>
+          </template>
         </s-table>
       </template>
     </e-pro-table>
@@ -109,7 +107,7 @@
     </a-modal>
 
     <a-modal :width="800" v-model="modalVisible" title="流程图">
-      <template slot="footer">
+      <template #footer>
         <a-button @click="() => {this.modalVisible = false}">关闭</a-button>
       </template>
       <img class="flow-chart" :src="`${VUE_APP_API_BASE_URL}/activiti/process/${deploymentId}/${resourceName}/image/stream`">
diff --git a/src/views/activiti/task/List.vue b/src/views/activiti/task/List.vue
index 9c2d277..486237e 100644
--- a/src/views/activiti/task/List.vue
+++ b/src/views/activiti/task/List.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <e-pro-table :title="title" :no-advanced="true">
-      <template slot="query">
+      <template #query>
         <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
           <a-form-model-item label="ID">
             <a-input v-model="queryParam.processInstanceId"/>
@@ -14,7 +14,7 @@
         </a-col>
       </template>
 
-      <template slot="table">
+      <template #table>
         <s-table
           ref="eTable"
           row-key="processInstanceId"
@@ -22,23 +22,21 @@
           :data="loadData"
           showPagination="auto"
         >
-          <span slot="action" slot-scope="text, record">
-            <template>
-              <e-btn-work-flow-progress :execution-id="record.executionId" :process-instance-id="record.processInstanceId"/>
-              <a-tooltip v-if="'waitingClaim' === status" placement="top">
-                <template slot="title">
-                  <span>签收</span>
-                </template>
-                <a-button type="primary" size="small" icon="check" @click="claimTask(record.id)"/>
-              </a-tooltip>
-              <a-tooltip v-else placement="top">
-                <template slot="title">
-                  <span>办理</span>
-                </template>
-                <a-button type="primary" size="small" icon="form" @click="handleTask(record)"/>
-              </a-tooltip>
-            </template>
-          </span>
+          <template #action="text, record">
+            <e-btn-work-flow-progress :execution-id="record.executionId" :process-instance-id="record.processInstanceId"/>
+            <a-tooltip v-if="'waitingClaim' === status" placement="top">
+              <template #title>
+                <span>签收</span>
+              </template>
+              <a-button type="primary" size="small" icon="check" @click="claimTask(record.id)"/>
+            </a-tooltip>
+            <a-tooltip v-else placement="top">
+              <template #title>
+                <span>办理</span>
+              </template>
+              <a-button type="primary" size="small" icon="form" @click="handleTask(record)"/>
+            </a-tooltip>
+          </template>
         </s-table>
       </template>
     </e-pro-table>
diff --git a/src/views/activiti/task/ToDoList.vue b/src/views/activiti/task/ToDoList.vue
index 554d263..210b1ee 100644
--- a/src/views/activiti/task/ToDoList.vue
+++ b/src/views/activiti/task/ToDoList.vue
@@ -9,7 +9,7 @@
             <a-tag color="blue">{{ item.name }}</a-tag>
             {{ item.businessTitle }}
           </a>
-          <template slot="avatar">
+          <template #avatar>
             <e-avatar :avatar="item.avatar" :nickname="item.applyUser" />
           </template>
         </a-list-item-meta>
diff --git a/src/views/generator/BaseInfo.vue b/src/views/generator/BaseInfo.vue
index 7619ae4..9dd9762 100644
--- a/src/views/generator/BaseInfo.vue
+++ b/src/views/generator/BaseInfo.vue
@@ -224,7 +224,7 @@ export default {
       model: this.value,
       rules: {
         tableName: [
-          { required: true, message: '请选择表名', trigger: 'blur' }
+          { required: true, message: '请选择表名', trigger: 'change' }
         ],
         businessName: [
           { required: true, message: '请输入业务名称', trigger: 'blur' },
@@ -239,13 +239,13 @@ export default {
           { max: 50, message: '作者不能超过50个字符', trigger: 'blur' }
         ],
         generatorTemplate: [
-          { required: true, message: '请选择生成模板', trigger: 'blur' }
+          { required: true, message: '请选择生成模板', trigger: 'change' }
         ],
         menuName: [
           { max: 10, message: '菜单名称超过10个字符', trigger: 'blur' }
         ],
         genFile: [
-          { required: true, message: '请选择需要生成的文件', trigger: 'blur' }
+          { required: true, message: '请选择需要生成的文件', trigger: 'change' }
         ]
       }
     }
diff --git a/src/views/generator/FieldSet.vue b/src/views/generator/FieldSet.vue
index 0a02162..fcbdbce 100644
--- a/src/views/generator/FieldSet.vue
+++ b/src/views/generator/FieldSet.vue
@@ -6,10 +6,10 @@
       :data-source="data"
       :pagination="false"
       :scroll="{ x: tableScrollX, y: tableScrollY }">
-      <span slot="propertyName" slot-scope="text, record">
+      <template #propertyName="text, record">
         <a-icon v-if="record.columnKey" type="key"/>
         <a-popover placement="top">
-          <template slot="content">
+          <template #content>
             <span>列名：{{ record.columnName }}</span><br/>
             <span>类型：{{ record.columnType }}</span><br/>
             <span>属性：{{ record.propertyName }}</span><br/>
@@ -17,51 +17,51 @@
           </template>
           <span class="property-name">{{ text }}</span>
         </a-popover>
-      </span>
-      <span slot="showInList" slot-scope="text, record">
+      </template>
+      <template #showInList="text, record">
         <a-checkbox v-model="record.showInList"/>
-      </span>
-      <span slot="titleSlots" slot-scope="text, record">
+      </template>
+      <template #titleSlots="text, record">
         <a-input v-model="record.title"/>
-      </span>
-      <span slot="showInSearch" slot-scope="text, record">
+      </template>
+      <template #showInSearch="text, record">
         <a-checkbox v-model="record.showInSearch"/>
-      </span>
-      <span slot="matchingMode" slot-scope="text, record">
+      </template>
+      <template #matchingMode="text, record">
         <e-dict-select type="matchingMode" v-model="record.matchingMode"/>
-      </span>
+      </template>
 
-      <span slot="showInInput" slot-scope="text, record">
+      <template #showInInput="text, record">
         <a-checkbox v-model="record.showInInput"/>
-      </span>
-      <span slot="label" slot-scope="text, record">
+      </template>
+      <template #label="text, record">
         <a-input v-model="record.label"/>
-      </span>
-      <span slot="inputGrid" slot-scope="text, record">
+      </template>
+      <template #inputGrid="text, record">
         <e-dict-select type="grid" v-model="record.inputGrid"/>
-      </span>
-      <span slot="elementType" slot-scope="text, record">
+      </template>
+      <template #elementType="text, record">
         <e-dict-select type="elementType" v-model="record.elementType"/>
-      </span>
-      <span slot="dictType" slot-scope="text, record">
+      </template>
+      <template #dictType="text, record">
         <a-select show-search option-filter-prop="children" :allowClear="true" v-model="record.dictType" style="width: 100%">
           <a-select-option v-for="item in dictTypes" :key="item.type">
             {{ item.name }}（{{ item.type }}）
           </a-select-option>
         </a-select>
-      </span>
-      <span slot="required" slot-scope="text, record">
+      </template>
+      <template #required="text, record">
         <a-checkbox v-model="record.required"/>
-      </span>
-      <span slot="validate" slot-scope="text, record">
+      </template>
+      <template #validate="text, record">
         <a-input v-model="record.validate"/>
-      </span>
-      <span slot="exportData" slot-scope="text, record">
+      </template>
+      <template #exportData="text, record">
         <a-checkbox v-model="record.exportData"/>
-      </span>
-      <span slot="importData" slot-scope="text, record">
+      </template>
+      <template #importData="text, record">
         <a-checkbox v-model="record.importData"/>
-      </span>
+      </template>
     </a-table>
   </div>
 </template>
diff --git a/src/views/sample/general/List.vue b/src/views/sample/general/List.vue
index fe804d6..9572e33 100644
--- a/src/views/sample/general/List.vue
+++ b/src/views/sample/general/List.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 如无需展开查询，请移除:advanced.sync="advanced"并添加:no-advanced="true" -->
   <e-pro-table title="代码生成示例" :advanced.sync="advanced">
-    <template slot="query">
+    <template #query>
       <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
         <a-form-model-item label="姓名">
           <a-input v-model="queryParam.name"/>
@@ -37,14 +37,14 @@
       </template>
     </template>
 
-    <template slot="button">
+    <template #button>
       <e-btn-add permissions="sample:general:save" to="/sample/general/input"/>
       <e-btn-remove-batch permissions="sample:general:remove" :loading.sync="removeBathLoading" :ids="selectedRowKeys" :click-callback="remove"/>
       <e-btn-import import-code="sample:general"/>
       <a-button icon="download" @click="exportData">导出数据</a-button>
     </template>
 
-    <template slot="table">
+    <template #table>
       <s-table
         ref="eTable"
         :columns="columns"
@@ -53,18 +53,16 @@
         :rowSelection="rowSelection"
         showPagination="auto"
       >
-        <span slot="sex" slot-scope="text">
+        <template #sex="text">
           <e-dict-tag type="sex" :code="text"/>
-        </span>
-        <span slot="status" slot-scope="text">
+        </template>
+        <template #status="text">
           <e-dict-tag type="commonStatus" :code="text"/>
-        </span>
-        <span slot="action" slot-scope="text, record">
-          <template>
-            <e-btn-edit permissions="sample:general:save" :to="`/sample/general/input`" :tab-name="record.key" :id="record.id"/>
-            <e-btn-remove permissions="sample:general:remove" :id="record.id" :divider="false" :click-callback="remove"/>
-          </template>
-        </span>
+        </template>
+        <template #action="text, record">
+          <e-btn-edit permissions="sample:general:save" :to="`/sample/general/input`" :tab-name="record.key" :id="record.id"/>
+          <e-btn-remove permissions="sample:general:remove" :id="record.id" :divider="false" :click-callback="remove"/>
+        </template>
       </s-table>
     </template>
   </e-pro-table>
@@ -84,6 +82,12 @@ import EDictSelect from '@/components/Easy/data-entry/DictSelect'
 import EBtnImport from '@/components/Easy/general/BtnImport'
 
 const columns = [
+  {
+    title: '序号',
+    dataIndex: 'index',
+    width: 70,
+    sorter: false
+  },
   {
     title: '姓名',
     dataIndex: 'name',
@@ -168,6 +172,7 @@ export default {
       const requestParameters = Object.assign({}, parameter, this.queryParam)
       return select(requestParameters)
         .then(res => {
+          res.data.data.map((item, index) => (item.index = index + 1))
           return res.data
         })
     },
diff --git a/src/views/sample/work-flow/Input.vue b/src/views/sample/work-flow/Input.vue
index 61e9eb5..1a12412 100644
--- a/src/views/sample/work-flow/Input.vue
+++ b/src/views/sample/work-flow/Input.vue
@@ -60,7 +60,7 @@ export default {
       },
       rules: {
         leaveType: [
-          { required: true, message: '请选择类型', trigger: 'blur' }
+          { required: true, message: '请选择类型', trigger: 'change' }
         ],
         startDate: [
           { required: true, message: '请输入时间', trigger: 'blur' }
diff --git a/src/views/sample/work-flow/List.vue b/src/views/sample/work-flow/List.vue
index ea7d894..a63a3c4 100644
--- a/src/views/sample/work-flow/List.vue
+++ b/src/views/sample/work-flow/List.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <e-pro-table title="请假" :no-advanced="true">
-      <template slot="query">
+      <template #query>
         <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
           <a-form-model-item label="类型">
             <e-dict-select type="leaveType" v-model="queryParam.leaveType" @change="$refs.eTable.refresh(true)"/>
@@ -9,12 +9,12 @@
         </a-col>
       </template>
 
-      <template slot="button">
+      <template #button>
         <e-btn-add :permissions="SAMPLE_PERMISSIONS_CODE.SAMPLE_WORK_FLOW_SAVE" to="/sample/work-flow/input"/>
         <e-btn-remove-batch :permissions="SAMPLE_PERMISSIONS_CODE.SAMPLE_WORK_FLOW_REMOVE" :loading.sync="removeBathLoading" :ids="selectedRowKeys" :click-callback="remove"/>
       </template>
 
-      <template slot="table">
+      <template #table>
         <s-table
           ref="eTable"
           :columns="columns"
diff --git a/src/views/scheduler/job/Input.vue b/src/views/scheduler/job/Input.vue
index ffdba90..86d39db 100644
--- a/src/views/scheduler/job/Input.vue
+++ b/src/views/scheduler/job/Input.vue
@@ -105,7 +105,7 @@ export default {
           { max: 50, message: 'cron不能超过50个字符', trigger: 'blur' }
         ],
         status: [
-          { required: true, message: '请选择状态', trigger: 'blur' }
+          { required: true, message: '请选择状态', trigger: 'change' }
         ],
         bean: [
           { required: true, message: '请输入Bean', trigger: 'blur' },
diff --git a/src/views/scheduler/job/List.vue b/src/views/scheduler/job/List.vue
index 9d8b1d7..65d7c33 100644
--- a/src/views/scheduler/job/List.vue
+++ b/src/views/scheduler/job/List.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <e-pro-table title="定时任务" :no-advanced="true">
-      <template slot="query">
+      <template #query>
         <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
           <a-form-model-item label="名称">
             <a-input v-model="queryParam.name"/>
@@ -19,12 +19,12 @@
         </a-col>
       </template>
 
-      <template slot="button">
+      <template #button>
         <e-btn-add :permissions="SCHEDULER_PERMISSIONS_CODE.JOB_SAVE" to="/scheduler/job/input"/>
         <e-btn-remove-batch :permissions="SCHEDULER_PERMISSIONS_CODE.JOB_REMOVE" :loading.sync="removeBathLoading" :ids="selectedRowKeys" :click-callback="remove"/>
       </template>
 
-      <template slot="table">
+      <template #table>
         <s-table
           ref="eTable"
           :columns="columns"
@@ -33,7 +33,7 @@
           :rowSelection="rowSelection"
           showPagination="auto"
         >
-          <span slot="status" slot-scope="text, record, index">
+          <template #status="text, record, index">
             <a-switch
               size="small"
               :data-id="record.id"
@@ -41,33 +41,31 @@
               :loading="switchLoading[index]"
               :default-checked="text === SCHEDULER_STATUS_CONST.ENABLE"
               @change="statusChange"/>
-          </span>
+          </template>
 
-          <span slot="action" slot-scope="text, record">
-            <template>
-              <a-tooltip placement="top" v-if="$permissions(SCHEDULER_PERMISSIONS_CODE.JOB_SAVE)">
-                <template slot="title">
-                  <span>立即执行</span>
-                </template>
-                <a-button type="primary" size="small" icon="play-circle" @click="immediateExecution(record.id)"/>
-              </a-tooltip>
-              <a-divider type="vertical" v-if="$permissions(SCHEDULER_PERMISSIONS_CODE.JOB_SAVE)"/>
-              <e-btn-edit :permissions="SCHEDULER_PERMISSIONS_CODE.JOB_SAVE" :to="`/scheduler/job/input`" :tab-name="record.key" :id="record.id"/>
-              <e-btn-remove :permissions="SCHEDULER_PERMISSIONS_CODE.JOB_REMOVE" :id="record.id" :click-callback="remove"/>
-              <a-tooltip placement="top" v-if="$permissions(SCHEDULER_PERMISSIONS_CODE.JOB_LOG_SELECT)">
-                <template slot="title">
-                  <span>查看日志</span>
-                </template>
-                <a-button size="small" icon="profile" @click="showLog(record.id)"/>
-              </a-tooltip>
-            </template>
-          </span>
+          <template #action="text, record">
+            <a-tooltip placement="top" v-if="$permissions(SCHEDULER_PERMISSIONS_CODE.JOB_SAVE)">
+              <template #title>
+                <span>立即执行</span>
+              </template>
+              <a-button type="primary" size="small" icon="play-circle" @click="immediateExecution(record.id)"/>
+            </a-tooltip>
+            <a-divider type="vertical" v-if="$permissions(SCHEDULER_PERMISSIONS_CODE.JOB_SAVE)"/>
+            <e-btn-edit :permissions="SCHEDULER_PERMISSIONS_CODE.JOB_SAVE" :to="`/scheduler/job/input`" :tab-name="record.key" :id="record.id"/>
+            <e-btn-remove :permissions="SCHEDULER_PERMISSIONS_CODE.JOB_REMOVE" :id="record.id" :click-callback="remove"/>
+            <a-tooltip placement="top" v-if="$permissions(SCHEDULER_PERMISSIONS_CODE.JOB_LOG_SELECT)">
+              <template #title>
+                <span>查看日志</span>
+              </template>
+              <a-button size="small" icon="profile" @click="showLog(record.id)"/>
+            </a-tooltip>
+          </template>
         </s-table>
       </template>
     </e-pro-table>
 
     <a-modal v-model="logModalVisible" title="定时任务执行日志">
-      <template slot="footer">
+      <template #footer>
         <a-button @click="() => {this.logModalVisible = false}">关闭</a-button>
       </template>
       <scheduler-job-log-list :id="jobId"/>
diff --git a/src/views/sys/config/Input.vue b/src/views/sys/config/Input.vue
index a6f25f3..cb0105f 100644
--- a/src/views/sys/config/Input.vue
+++ b/src/views/sys/config/Input.vue
@@ -82,7 +82,7 @@ export default {
           { required: true, message: '请输入value', trigger: 'blur' }
         ],
         type: [
-          { required: true, message: '请选择类型', trigger: 'blur' }
+          { required: true, message: '请选择类型', trigger: 'change' }
         ],
         tips: [
           { max: 200, message: '备注不能超过200个字符', trigger: 'blur' }
diff --git a/src/views/sys/config/List.vue b/src/views/sys/config/List.vue
index fe2a7b2..d2679d2 100644
--- a/src/views/sys/config/List.vue
+++ b/src/views/sys/config/List.vue
@@ -1,6 +1,6 @@
 <template>
   <e-pro-table title="系统参数" :no-advanced="true">
-    <template slot="query">
+    <template #query>
       <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
         <a-form-model-item label="key">
           <a-input v-model="queryParam.sysKey"/>
@@ -18,13 +18,13 @@
       </a-col>
     </template>
 
-    <template slot="button">
+    <template #button>
       <e-btn-add :permissions="SYS_PERMISSIONS_CODE.SYS_CONFIG_SAVE" to="/sys/config/input"/>
       <a-button v-if="$permissions(SYS_PERMISSIONS_CODE.SYS_CONFIG_SAVE)" type="primary" icon="sync" @click="refreshCache">更新缓存数据</a-button>
       <e-btn-remove-batch :permissions="SYS_PERMISSIONS_CODE.SYS_CONFIG_REMOVE" :loading.sync="removeBathLoading" :ids="selectedRowKeys" :click-callback="remove"/>
     </template>
 
-    <template slot="table">
+    <template #table>
       <s-table
         ref="eTable"
         :columns="columns"
@@ -33,16 +33,14 @@
         :rowSelection="rowSelection"
         showPagination="auto"
       >
-        <span slot="type" slot-scope="text, record">
+        <template #type="text, record">
           <e-dict-tag type="dataType" :code="record.type"/>
-        </span>
+        </template>
 
-        <span slot="action" slot-scope="text, record">
-          <template>
-            <e-btn-edit :permissions="SYS_PERMISSIONS_CODE.SYS_CONFIG_SAVE" :to="`/sys/config/input`" :tab-name="record.key" :id="record.id"/>
-            <e-btn-remove :permissions="SYS_PERMISSIONS_CODE.SYS_CONFIG_REMOVE" :id="record.id" :divider="false" :click-callback="remove"/>
-          </template>
-        </span>
+        <template #action="text, record">
+          <e-btn-edit :permissions="SYS_PERMISSIONS_CODE.SYS_CONFIG_SAVE" :to="`/sys/config/input`" :tab-name="record.key" :id="record.id"/>
+          <e-btn-remove :permissions="SYS_PERMISSIONS_CODE.SYS_CONFIG_REMOVE" :id="record.id" :divider="false" :click-callback="remove"/>
+        </template>
       </s-table>
     </template>
   </e-pro-table>
diff --git a/src/views/sys/dept/View.vue b/src/views/sys/dept/View.vue
index 3e4b86d..cd8c23f 100644
--- a/src/views/sys/dept/View.vue
+++ b/src/views/sys/dept/View.vue
@@ -5,7 +5,7 @@
         <router-link v-if="$permissions(SYS_PERMISSIONS_CODE.SYS_DEPT_TYPE_SELECT)" slot="extra" to="/sys/dept/type">部门类型管理</router-link>
 
         <a-tooltip placement="top" :visible="searchTooltipVisible">
-          <template slot="title">
+          <template #title>
             <span>请输入部门名称后查询</span>
           </template>
           <a-input-search v-model="query" placeholder="输入部门名称搜索" @search="onSearch"/>
@@ -25,7 +25,9 @@
               @expand="onExpand"
               @rightClick="rightClick"
             >
-              <a-icon v-for="item in iconArrays" :key="item" :slot="item" :type="item"/>
+              <template v-for="item in iconArrays" v-slot:[item]>
+                <a-icon :type="item" :key="item"/>
+              </template>
             </tree>
 
             <a-menu slot="overlay" @click="onRightMenuClick">
@@ -147,7 +149,7 @@ import {
   selectDeptTypeOption,
   selectUpDeptOption
 } from '@/api/sys/dept'
-import { convertTree, getElementOffset, isBlank, isNotBlank } from '@/utils/util'
+import { convertTree, isBlank, isNotBlank } from '@/utils/util'
 import EDictRadio from '@/components/Easy/data-entry/DictRadio'
 import { removeSuccessTip, saveSuccessTip, successTip } from '@/utils/tips'
 import {
@@ -180,7 +182,6 @@ export default {
       noResults: false,
       searchTooltipVisible: false,
 
-      elementOffset: {},
       // 树相关
       treeData: [],
       expandedKeys: [],
@@ -211,10 +212,10 @@ export default {
       parentDeparts: [],
       rules: {
         typeCode: [
-          { required: true, message: '请选择部门类型', trigger: 'blur' }
+          { required: true, message: '请选择部门类型', trigger: 'change' }
         ],
         pId: [
-          { required: true, message: '请选择上级部门', trigger: 'blur' }
+          { required: true, message: '请选择上级部门', trigger: 'change' }
         ],
         name: [
           { required: true, message: '请输入部门名称', trigger: 'blur' },
@@ -227,7 +228,7 @@ export default {
           { max: 20, message: '部门简称字数不能超过20个字符', trigger: 'blur' }
         ],
         status: [
-          { required: true, message: '请选择部门状态', trigger: 'blur' }
+          { required: true, message: '请选择部门状态', trigger: 'change' }
         ],
         orderNo: [
           { required: true, message: '请输入排序值', trigger: 'blur' },
@@ -259,7 +260,6 @@ export default {
         // 默认展开根节点
         this.expandedKeys.push(baseId)
         this.iconArrays = generatorNodeIcon(this.treeData, this.iconArrays)
-        this.elementOffset = getElementOffset(document.getElementById('tree-card'))
       })
     },
     onExpand (expandedKeys) {
diff --git a/src/views/sys/dept/type/View.vue b/src/views/sys/dept/type/View.vue
index 55826af..b6ea937 100644
--- a/src/views/sys/dept/type/View.vue
+++ b/src/views/sys/dept/type/View.vue
@@ -3,7 +3,7 @@
     <a-col :xl="6" :md="8">
       <a-card title="部门类型管理" :bordered="false" id="tree-card">
         <a-tooltip placement="top" :visible="searchTooltipVisible">
-          <template slot="title">
+          <template #title>
             <span>请输入部门类型名称后查询</span>
           </template>
           <a-input-search v-model="query" placeholder="输入类型名称搜索" @search="onSearch"/>
@@ -25,10 +25,12 @@
               @expand="onExpand"
               @rightClick="rightClick"
             >
-              <a-icon v-for="item in iconArrays" :key="item" :slot="item" :type="item"/>
+              <template v-for="item in iconArrays" v-slot:[item]>
+                <a-icon :type="item" :key="item"/>
+              </template>
             </tree>
 
-            <a-menu slot="overlay" @click="onRightMenuClick">
+            <a-menu v-slot="overlay" @click="onRightMenuClick">
               <a-menu-item key="add" v-if="$permissions(SYS_PERMISSIONS_CODE.SYS_DEPT_TYPE_SAVE)"><a-icon type="plus"/> 新增下级</a-menu-item>
               <a-menu-item key="edit" v-if="$permissions(SYS_PERMISSIONS_CODE.SYS_DEPT_TYPE_SAVE)" :disabled="!rightMenuState.edit"><a-icon type="edit"/> 修改</a-menu-item>
               <a-menu-item key="remove" v-if="$permissions(SYS_PERMISSIONS_CODE.SYS_DEPT_TYPE_REMOVE)" :disabled="!rightMenuState.remove"><a-icon type="delete"/> 删除</a-menu-item>
@@ -82,7 +84,9 @@
                   checkable
                   @expand="onRoleExpand"
                 >
-                  <a-icon v-for="item in iconArrays" :key="item" :slot="item" :type="item"/>
+                  <template v-for="item in iconArrays" v-slot:[item]>
+                    <a-icon :type="item" :key="item"/>
+                  </template>
                 </tree>
               </div>
             </a-col>
@@ -126,7 +130,7 @@
 import IconSelector from '@/components/IconSelector'
 import { Tree } from 'ant-design-vue'
 import { selectByPId, get, save, add, remove, move, setStatus, selectByTitle } from '@/api/sys/dept-type'
-import { convertTree, getElementOffset, isNotBlank } from '@/utils/util'
+import { convertTree, isNotBlank } from '@/utils/util'
 import EDictRadio from '@/components/Easy/data-entry/DictRadio'
 import { removeSuccessTip, saveSuccessTip, successTip } from '@/utils/tips'
 import {
@@ -159,7 +163,6 @@ export default {
       noResults: false,
       searchTooltipVisible: false,
 
-      elementOffset: {},
       // 树相关
       treeData: [],
       expandedKeys: [],
@@ -202,7 +205,7 @@ export default {
           { max: 50, message: '类型名称字数不能超过50个字符', trigger: 'blur' }
         ],
         status: [
-          { required: true, message: '请选择状态', trigger: 'blur' }
+          { required: true, message: '请选择状态', trigger: 'change' }
         ],
         tips: [
           { max: 200, message: '备注字数不能超过200个字符', trigger: 'blur' }
@@ -233,7 +236,6 @@ export default {
         // 默认展开根节点
         this.expandedKeys.push(baseId)
         this.iconArrays = generatorNodeIcon(this.treeData, this.iconArrays)
-        this.elementOffset = getElementOffset(document.getElementById('tree-card'))
       })
     },
     loadRoleTree () {
diff --git a/src/views/sys/dict/Input.vue b/src/views/sys/dict/Input.vue
index da5473c..f1a70f2 100644
--- a/src/views/sys/dict/Input.vue
+++ b/src/views/sys/dict/Input.vue
@@ -136,7 +136,7 @@ export default {
       model: {},
       rules: {
         dictType: [
-          { required: true, message: '请选择字典类型', trigger: 'blur' }
+          { required: true, message: '请选择字典类型', trigger: 'change' }
         ],
         code: [
           { required: true, message: '请输入字典编码', trigger: 'blur' },
@@ -147,7 +147,7 @@ export default {
           { max: 80, message: '字典名称字数不能超过80个字符', trigger: 'blur' }
         ],
         status: [
-          { required: true, message: '请选择字典状态', trigger: 'blur' }
+          { required: true, message: '请选择字典状态', trigger: 'change' }
         ],
         orderNo: [
           { required: true, message: '请输入排序值', trigger: 'blur' },
diff --git a/src/views/sys/dict/List.vue b/src/views/sys/dict/List.vue
index 545e77b..17da727 100644
--- a/src/views/sys/dict/List.vue
+++ b/src/views/sys/dict/List.vue
@@ -1,6 +1,6 @@
 <template>
   <e-pro-table title="字典管理" :advanced.sync="advanced">
-    <template slot="query">
+    <template #query>
       <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
         <a-form-model-item label="字典类型">
           <a-select
@@ -34,7 +34,7 @@
       </template>
     </template>
 
-    <template slot="button">
+    <template #button>
       <e-btn-add
         :permissions="SYS_PERMISSIONS_CODE.SYS_DICT_SAVE"
         to="/sys/dict/input"
@@ -43,7 +43,7 @@
         <a-button icon="bars">字典类型管理</a-button>
       </router-link>
       <a-tooltip placement="top" v-if="$permissions(SYS_PERMISSIONS_CODE.SYS_DICT_SAVE)">
-        <template slot="title">
+        <template #title>
           <span>重新生成字典js文件</span>
         </template>
         <a-button icon="sync" @click="generateDictData">更新字典资源</a-button>
@@ -56,7 +56,7 @@
         :click-callback="remove"/>
     </template>
 
-    <template slot="table">
+    <template #table>
       <s-table
         ref="eTable"
         :columns="columns"
@@ -65,42 +65,40 @@
         :rowSelection="rowSelection"
         showPagination="auto"
       >
-        <span slot="name" slot-scope="text, record">
+        <template #name="text, record">
           <template v-if="record.css != null && record.css !== ''">
             <a-tag :color="record.css">{{ record.name }}</a-tag>
           </template>
           <template v-if="record.css == null || record.css === ''">
             {{ record.name }}
           </template>
-        </span>
-        <span slot="status" slot-scope="text, record">
+        </template>
+        <template #status="text, record">
           <e-dict-tag type="commonStatus" :code="record.status"/>
-        </span>
+        </template>
 
-        <span slot="dictType" slot-scope="text, record">
+        <template #dictType="text, record">
           {{ record.dictTypeName }}（{{ record.dictType }}）
-        </span>
-        <span slot="action" slot-scope="text, record">
-          <template>
-            <e-btn-add-sub
-              :permissions="SYS_PERMISSIONS_CODE.SYS_DICT_SAVE"
-              :to="`/sys/dict/input`"
-              :tab-name="`新增下级 - ${record.name}`"
-              :params="{ pId: record.id, dictType: record.dictType }"/>
+        </template>
+        <template #action="text, record">
+          <e-btn-add-sub
+            :permissions="SYS_PERMISSIONS_CODE.SYS_DICT_SAVE"
+            :to="`/sys/dict/input`"
+            :tab-name="`新增下级 - ${record.name}`"
+            :params="{ pId: record.id, dictType: record.dictType }"/>
 
-            <e-btn-edit
-              :permissions="SYS_PERMISSIONS_CODE.SYS_DICT_SAVE"
-              :to="`/sys/dict/input`"
-              :tab-name="record.name"
-              :id="record.id"/>
+          <e-btn-edit
+            :permissions="SYS_PERMISSIONS_CODE.SYS_DICT_SAVE"
+            :to="`/sys/dict/input`"
+            :tab-name="record.name"
+            :id="record.id"/>
 
-            <e-btn-remove
-              :permissions="SYS_PERMISSIONS_CODE.SYS_DICT_REMOVE"
-              :id="record.id"
-              :divider="false"
-              :click-callback="remove"/>
-          </template>
-        </span>
+          <e-btn-remove
+            :permissions="SYS_PERMISSIONS_CODE.SYS_DICT_REMOVE"
+            :id="record.id"
+            :divider="false"
+            :click-callback="remove"/>
+        </template>
       </s-table>
     </template>
   </e-pro-table>
diff --git a/src/views/sys/dict/type/List.vue b/src/views/sys/dict/type/List.vue
index f9fc109..47094b7 100644
--- a/src/views/sys/dict/type/List.vue
+++ b/src/views/sys/dict/type/List.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <e-pro-table title="字典类型" :advanced.sync="advanced">
-      <template slot="query">
+      <template #query>
         <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
           <a-form-model-item label="类型">
             <a-input v-model="queryParam.type"/>
@@ -21,12 +21,12 @@
         </template>
       </template>
 
-      <template slot="button">
+      <template #button>
         <a-button v-if="$permissions(SYS_PERMISSIONS_CODE.SYS_DICT_TYPE_SAVE)" type="primary" icon="plus" @click="handleAdd">新增</a-button>
         <e-btn-remove-batch :permissions="SYS_PERMISSIONS_CODE.SYS_DICT_TYPE_REMOVE" :loading.sync="removeBathLoading" :ids="selectedRowKeys" :click-callback="remove"/>
       </template>
 
-      <template slot="table">
+      <template #table>
         <s-table
           ref="eTable"
           :columns="columns"
@@ -37,8 +37,7 @@
         >
           <template
             v-for="col in ['type', 'name']"
-            :slot="col"
-            slot-scope="text, record"
+            v-slot:[col]="text, record"
           >
             <div :key="col">
               <a-input
@@ -52,7 +51,7 @@
             </div>
           </template>
 
-          <span slot="status" slot-scope="text, record">
+          <template #status="text, record">
             <e-dict-select
               v-if="record.editable"
               type="commonStatus"
@@ -61,45 +60,43 @@
             <template v-else>
               <e-dict-tag type="commonStatus" :code="record.status"/>
             </template>
-          </span>
+          </template>
 
-          <span slot="action" slot-scope="text, record">
-            <template>
-              <e-btn-remove :id="record.id" :divider="false" :click-callback="remove"/>
-              <template v-if="$permissions(SYS_PERMISSIONS_CODE.SYS_DICT_TYPE_SAVE)">
+          <template #action="text, record">
+            <e-btn-remove :id="record.id" :divider="false" :click-callback="remove"/>
+            <template v-if="$permissions(SYS_PERMISSIONS_CODE.SYS_DICT_TYPE_SAVE)">
+              <a-divider type="vertical"/>
+              <span v-if="record.editable">
+                <a-tooltip placement="top">
+                  <template #title>
+                    <span>保存</span>
+                  </template>
+                  <a-button type="primary" size="small" icon="save" @click="() => save(record.id)"/>
+                </a-tooltip>
                 <a-divider type="vertical"/>
-                <span v-if="record.editable">
-                  <a-tooltip placement="top">
-                    <template slot="title">
-                      <span>保存</span>
-                    </template>
-                    <a-button type="primary" size="small" icon="save" @click="() => save(record.id)"/>
-                  </a-tooltip>
-                  <a-divider type="vertical"/>
 
-                  <a-tooltip placement="top">
-                    <template slot="title">
-                      <span>取消编辑</span>
-                    </template>
-                    <a-button size="small" icon="rollback" @click="() => cancel(record.id)"/>
-                  </a-tooltip>
-                </span>
-                <span v-else>
-                  <a-tooltip placement="top">
-                    <template slot="title">
-                      <span>修改</span>
-                    </template>
-                    <a-button
-                      type="primary"
-                      size="small"
-                      icon="edit"
-                      :disabled="editingId !== ''"
-                      @click="() => edit(record.id)"/>
-                  </a-tooltip>
-                </span>
-              </template>
+                <a-tooltip placement="top">
+                  <template #title>
+                    <span>取消编辑</span>
+                  </template>
+                  <a-button size="small" icon="rollback" @click="() => cancel(record.id)"/>
+                </a-tooltip>
+              </span>
+              <span v-else>
+                <a-tooltip placement="top">
+                  <template #title>
+                    <span>修改</span>
+                  </template>
+                  <a-button
+                    type="primary"
+                    size="small"
+                    icon="edit"
+                    :disabled="editingId !== ''"
+                    @click="() => edit(record.id)"/>
+                </a-tooltip>
+              </span>
             </template>
-          </span>
+          </template>
         </s-table>
       </template>
     </e-pro-table>
@@ -217,7 +214,7 @@ export default {
           { max: 80, message: '字典类型名称字数不能超过80个字符', trigger: 'blur' }
         ],
         status: [
-          { required: true, message: '请选择字典类型状态', trigger: 'blur' }
+          { required: true, message: '请选择字典类型状态', trigger: 'change' }
         ]
       }
     }
diff --git a/src/views/sys/exception/List.vue b/src/views/sys/exception/List.vue
index d56f81f..8aa16e9 100644
--- a/src/views/sys/exception/List.vue
+++ b/src/views/sys/exception/List.vue
@@ -1,6 +1,6 @@
 <template>
   <e-pro-table title="异常日志" :advanced.sync="advanced">
-    <template slot="query">
+    <template #query>
       <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
         <a-form-model-item label="错误代码">
           <a-input v-model="queryParam.code"/>
@@ -25,11 +25,11 @@
       </template>
     </template>
 
-    <template slot="button">
+    <template #button>
       <e-btn-remove-batch :permissions="SYS_PERMISSIONS_CODE.SYS_EXCEPTION_REMOVE" :loading.sync="removeBathLoading" :ids="selectedRowKeys" :click-callback="remove"/>
     </template>
 
-    <template slot="table">
+    <template #table>
       <s-table
         ref="eTable"
         :columns="columns"
@@ -38,12 +38,10 @@
         :rowSelection="rowSelection"
         showPagination="auto"
       >
-        <span slot="action" slot-scope="text, record">
-          <template>
-            <e-btn-info :to="`/sys/exception/input`" :tab-name="record.message" :id="record.id"/>
-            <btn-remove :permissions="SYS_PERMISSIONS_CODE.SYS_EXCEPTION_REMOVE" :id="record.id" :divider="false" :click-callback="remove"/>
-          </template>
-        </span>
+        <template #action="text, record">
+          <e-btn-info :to="`/sys/exception/input`" :tab-name="record.message" :id="record.id"/>
+          <btn-remove :permissions="SYS_PERMISSIONS_CODE.SYS_EXCEPTION_REMOVE" :id="record.id" :divider="false" :click-callback="remove"/>
+        </template>
       </s-table>
     </template>
   </e-pro-table>
diff --git a/src/views/sys/import-excel-data/Input.vue b/src/views/sys/import-excel-data/Input.vue
index 18d0c6c..693bd8c 100644
--- a/src/views/sys/import-excel-data/Input.vue
+++ b/src/views/sys/import-excel-data/Input.vue
@@ -30,19 +30,19 @@
           showPagination="auto"
         >
 
-          <template v-for="item in dictionaries" :slot="item" slot-scope="text">
+          <template v-for="item in dictionaries" v-slot:[item]="text">
             <e-dict-tag :key="item" :type="item" :code="text"/>
           </template>
 
-          <span slot="verificationResults" slot-scope="text, record">
+          <template #verificationResults="text, record">
             <a-tag :color="record.verificationStatus === '1' ? 'cyan' : 'red'">
               {{ record.verificationStatus === '1' ? '验证通过' : text }}
             </a-tag>
-          </span>
-          <span slot="action" slot-scope="text, record">
+          </template>
+          <template #action="text, record">
             <e-btn-edit :to="`/sys/config/input`" :tab-name="record.field1" :id="record.id"/>
             <e-btn-remove :id="record.id" :divider="false" :click-callback="remove"/>
-          </span>
+          </template>
         </s-table>
       </div>
       <div v-if="current === 3">
diff --git a/src/views/sys/import-excel-template-details/Input.vue b/src/views/sys/import-excel-template-details/Input.vue
index ad22ada..d883e51 100644
--- a/src/views/sys/import-excel-template-details/Input.vue
+++ b/src/views/sys/import-excel-template-details/Input.vue
@@ -30,17 +30,17 @@
           :data-source="data"
           :pagination="false"
           :scroll="{ x: tableScrollX, y: tableScrollY }">
-          <span slot="needImport" slot-scope="text, record">
+          <template #needImport="text, record">
             <a-checkbox v-model="record.needImport"/>
-          </span>
-          <span slot="titleSlots" slot-scope="text, record">
+          </template>
+          <template #titleSlots="text, record">
             <a-input :disabled="!record.needImport" v-model="record.title"/>
-          </span>
+          </template>
 
-          <span slot="needReplace" slot-scope="text, record">
+          <template #needReplace="text, record">
             <a-checkbox :disabled="!record.needImport" v-model="record.needReplace"/>
-          </span>
-          <span slot="replaceTable" slot-scope="text, record">
+          </template>
+          <template #replaceTable="text, record">
             <a-select
               show-search
               :disabled="!record.needImport || !record.needReplace"
@@ -53,8 +53,8 @@
                 {{ item.value }} - {{ item.text }}
               </a-select-option>
             </a-select>
-          </span>
-          <span slot="replaceTableDictType" slot-scope="text, record">
+          </template>
+          <template #replaceTableDictType="text, record">
             <a-select
               show-search
               :disabled="!record.needImport || !record.needReplace || record.replaceTable !== 'sys_dict'"
@@ -66,26 +66,26 @@
                 {{ item.name }}（{{ item.type }}）
               </a-select-option>
             </a-select>
-          </span>
-          <span slot="replaceTableFieldName" slot-scope="text, record">
+          </template>
+          <template #replaceTableFieldName="text, record">
             <e-table-field
               :disabled="!record.needImport || !record.needReplace"
               :table="record.replaceTable"
               v-model="record.replaceTableFieldName"/>
-          </span>
-          <span slot="replaceTableFieldValue" slot-scope="text, record">
+          </template>
+          <template #replaceTableFieldValue="text, record">
             <e-table-field
               :disabled="!record.needImport || !record.needReplace"
               :table="record.replaceTable"
               v-model="record.replaceTableFieldValue"/>
-          </span>
+          </template>
 
-          <span slot="required" slot-scope="text, record">
+          <template #required="text, record">
             <a-checkbox :disabled="!record.needImport" v-model="record.required"/>
-          </span>
-          <span slot="only" slot-scope="text, record">
+          </template>
+          <template #only="text, record">
             <a-checkbox :disabled="!record.needImport" v-model="record.only"/>
-          </span>
+          </template>
         </a-table>
         <div class="input-btn-group" style="margin-top: 15px">
           <e-btn-save
diff --git a/src/views/sys/import-excel-template/Input.vue b/src/views/sys/import-excel-template/Input.vue
index 96fcd90..d5abe31 100644
--- a/src/views/sys/import-excel-template/Input.vue
+++ b/src/views/sys/import-excel-template/Input.vue
@@ -28,35 +28,35 @@
         </a-col>
         <a-col :lg="12" :sm="24">
           <a-form-model-item prop="importCode">
-            <span slot="label">
+            <template #label>
               模板代码
               <a-tooltip title="模板代码不可重复">
                 <a-icon type="question-circle-o"/>
               </a-tooltip>
-            </span>
+            </template>
             <a-input v-model="model.importCode"/>
           </a-form-model-item>
         </a-col>
         <a-col :lg="12" :sm="24">
           <a-form-model-item prop="permissionCode">
-            <span slot="label">
+            <template #label>
               权限标识
               <a-tooltip title="用于检查当前登录用户是否允许使用此模板">
                 <a-icon type="question-circle-o"/>
               </a-tooltip>
-            </span>
+            </template>
             <a-input v-model="model.permissionCode"/>
           </a-form-model-item>
         </a-col>
         <a-col :lg="12" :sm="24">
           <a-form-model-item prop="callback">
-            <span slot="label">
+            <template #label>
               回调Class
               <a-tooltip
                 title="用于导入前&后处理数据（需实现com.easy.restful.sys.service.ImportService），如不需要可忽略。示例（sampleImportDataServiceImpl）">
                 <a-icon type="question-circle-o"/>
               </a-tooltip>
-            </span>
+            </template>
             <a-input v-model="model.callback"/>
           </a-form-model-item>
         </a-col>
@@ -113,7 +113,7 @@ export default {
       model: {},
       rules: {
         importTable: [
-          { required: true, message: '请选择表名', trigger: 'blur' }
+          { required: true, message: '请选择表名', trigger: 'change' }
         ],
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' },
diff --git a/src/views/sys/import-excel-template/List.vue b/src/views/sys/import-excel-template/List.vue
index ce15f1b..0fd3514 100644
--- a/src/views/sys/import-excel-template/List.vue
+++ b/src/views/sys/import-excel-template/List.vue
@@ -1,6 +1,6 @@
 <template>
   <e-pro-table title="导入模板" :no-advanced="true">
-    <template slot="query">
+    <template #query>
       <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
         <a-form-model-item label="名称">
           <a-input v-model="queryParam.name"/>
@@ -26,12 +26,12 @@
       </a-col>
     </template>
 
-    <template slot="button">
+    <template #button>
       <e-btn-add :permissions="SYS_PERMISSIONS_CODE.SYS_IMPORT_EXCEL_TEMPLATE_SAVE" to="/sys/import-excel-template/input"/>
       <e-btn-remove-batch :permissions="SYS_PERMISSIONS_CODE.SYS_IMPORT_EXCEL_TEMPLATE_REMOVE" :loading.sync="removeBathLoading" :ids="selectedRowKeys" :click-callback="remove"/>
     </template>
 
-    <template slot="table">
+    <template #table>
       <s-table
         ref="eTable"
         :columns="columns"
@@ -40,25 +40,23 @@
         :rowSelection="rowSelection"
         showPagination="auto"
       >
-        <span slot="action" slot-scope="text, record">
-          <template>
-            <e-btn-edit :permissions="SYS_PERMISSIONS_CODE.SYS_IMPORT_EXCEL_TEMPLATE_SAVE" :to="`/sys/import-excel-template/input`" :tab-name="record.key" :id="record.id"/>
-            <a-tooltip placement="top">
-              <template slot="title">
-                <span>编辑导入规则</span>
-              </template>
-              <a-button size="small" icon="setting" @click="editImportExcelTemplateDetails(record.id, record.name)"/>
-            </a-tooltip>
-            <a-divider type="vertical"/>
-            <e-btn-remove :permissions="SYS_PERMISSIONS_CODE.SYS_IMPORT_EXCEL_TEMPLATE_REMOVE" :id="record.id" :click-callback="remove"/>
-            <a-tooltip placement="top">
-              <template slot="title">
-                <span>下载模板</span>
-              </template>
-              <a-button size="small" icon="download" @click="downloadTemplate(record.importCode)"/>
-            </a-tooltip>
-          </template>
-        </span>
+        <template #action="text, record">
+          <e-btn-edit :permissions="SYS_PERMISSIONS_CODE.SYS_IMPORT_EXCEL_TEMPLATE_SAVE" :to="`/sys/import-excel-template/input`" :tab-name="record.key" :id="record.id"/>
+          <a-tooltip placement="top">
+            <template #title>
+              <span>编辑导入规则</span>
+            </template>
+            <a-button size="small" icon="setting" @click="editImportExcelTemplateDetails(record.id, record.name)"/>
+          </a-tooltip>
+          <a-divider type="vertical"/>
+          <e-btn-remove :permissions="SYS_PERMISSIONS_CODE.SYS_IMPORT_EXCEL_TEMPLATE_REMOVE" :id="record.id" :click-callback="remove"/>
+          <a-tooltip placement="top">
+            <template #title>
+              <span>下载模板</span>
+            </template>
+            <a-button size="small" icon="download" @click="downloadTemplate(record.importCode)"/>
+          </a-tooltip>
+        </template>
       </s-table>
     </template>
   </e-pro-table>
diff --git a/src/views/sys/log/List.vue b/src/views/sys/log/List.vue
index 02079b8..d44eb2e 100644
--- a/src/views/sys/log/List.vue
+++ b/src/views/sys/log/List.vue
@@ -1,6 +1,6 @@
 <template>
   <e-pro-table title="访问日志" :advanced.sync="advanced">
-    <template slot="query">
+    <template #query>
       <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
         <a-form-model-item label="模块">
           <a-input v-model="queryParam.modular"/>
@@ -30,7 +30,7 @@
       </template>
     </template>
 
-    <template slot="table">
+    <template #table>
       <s-table
         ref="eTable"
         :columns="columns"
@@ -38,18 +38,16 @@
         :alert="true"
         showPagination="auto"
       >
-        <span slot="class" slot-scope="text, record">
+        <template #class="text, record">
           {{ record.clazz }}.{{ record.methodName }}()
-        </span>
-        <span slot="action" slot-scope="text, record">
-          <template>
-            <e-btn-info
-              :to="`/sys/log/input`"
-              :tab-name="record.method || record.modular"
-              :id="record.id"
-              :divider="false"/>
-          </template>
-        </span>
+        </template>
+        <template #action="text, record">
+          <e-btn-info
+            :to="`/sys/log/input`"
+            :tab-name="record.method || record.modular"
+            :id="record.id"
+            :divider="false"/>
+        </template>
       </s-table>
     </template>
   </e-pro-table>
diff --git a/src/views/sys/message/Draft.vue b/src/views/sys/message/Draft.vue
index 02748bd..6d8965f 100644
--- a/src/views/sys/message/Draft.vue
+++ b/src/views/sys/message/Draft.vue
@@ -14,30 +14,30 @@
       :alert="true"
       showPagination="auto"
     >
-      <span slot="m-title" slot-scope="text, record">
+      <template #m-title="text, record">
         <a-tag v-if="MESSAGE_CONST.IMPORTANT_YES === record.important" color="red">重要</a-tag>
         <a-button type="link" @click="edit(record.id)">{{ text }}</a-button>
-      </span>
-      <span slot="type" slot-scope="text">
+      </template>
+      <template #type="text">
         <e-dict-tag type="messageType" :code="text"/>
-      </span>
-      <span slot="action" slot-scope="text, record">
+      </template>
+      <template #action="text, record">
         <a-tooltip placement="top">
-          <template slot="title">
+          <template #title>
             <span>编辑</span>
           </template>
           <a-button type="primary" size="small" icon="edit" @click="edit(record.id)"/>
         </a-tooltip>
         <a-divider type="vertical"/>
         <a-tooltip placement="top">
-          <template slot="title">
+          <template #title>
             <span>发送</span>
           </template>
           <a-button type="primary" size="small" icon="check-circle" @click="send(record.id)"/>
         </a-tooltip>
         <a-divider type="vertical"/>
         <e-btn-remove :id="record.id" :click-callback="remove" :divider="false"/>
-      </span>
+      </template>
     </s-table>
   </div>
 </template>
diff --git a/src/views/sys/message/Input.vue b/src/views/sys/message/Input.vue
index fafb4ea..125a45c 100644
--- a/src/views/sys/message/Input.vue
+++ b/src/views/sys/message/Input.vue
@@ -84,7 +84,7 @@ export default {
       showBtn: true,
       rules: {
         receivers: [
-          { required: true, message: '请选择收信人', trigger: 'blur' }
+          { required: true, message: '请选择收信人', trigger: 'change' }
         ],
         title: [
           { required: true, message: '请输入主题', trigger: 'blur' },
diff --git a/src/views/sys/message/MessageList.vue b/src/views/sys/message/MessageList.vue
index 5833e19..6600b8d 100644
--- a/src/views/sys/message/MessageList.vue
+++ b/src/views/sys/message/MessageList.vue
@@ -10,7 +10,7 @@
             :class="item.readDate == null ? 'unread' : ''"
             type="link"
             @click="info(item.id, item.messageId)">{{ item.title }}</a>
-          <template slot="avatar">
+          <template #avatar>
             <e-avatar :avatar="item.avatar" :nickname="item.nickname"/>
           </template>
         </a-list-item-meta>
@@ -19,7 +19,7 @@
 
     <a-modal v-model="messageModalVisible" title="消息详情">
       <info :id="id" :message-id="messageId"/>
-      <template slot="footer">
+      <template #footer>
         <a-button key="back" @click="close">
           关闭
         </a-button>
diff --git a/src/views/sys/message/Receive.vue b/src/views/sys/message/Receive.vue
index 9ea99a9..39a35f2 100644
--- a/src/views/sys/message/Receive.vue
+++ b/src/views/sys/message/Receive.vue
@@ -15,28 +15,28 @@
       :alert="true"
       showPagination="auto"
     >
-      <span slot="m-title" slot-scope="text, record">
+      <template #star="text, record">
+        <a-icon v-if="MESSAGE_CONST.STAR_NO === text" type="star" @click="setStar(record.id, true)"/>
+        <a-icon v-if="MESSAGE_CONST.STAR_YES === text" type="star" theme="filled" @click="setStar(record.id, false)"/>
+      </template>
+      <template #m-title="text, record">
         <a-tag v-if="MESSAGE_CONST.IMPORTANT_YES === record.important" color="red">重要</a-tag>
         <a-button
           :class="record.readDate == null ? 'unread' : ''"
           type="link"
           @click="info(record.id, record.messageId)">{{ text }}</a-button>
-      </span>
-      <span slot="star" slot-scope="text, record">
-        <a-icon v-if="MESSAGE_CONST.STAR_NO === text" type="star" @click="setStar(record.id, true)"/>
-        <a-icon v-if="MESSAGE_CONST.STAR_YES === text" type="star" theme="filled" @click="setStar(record.id, false)"/>
-      </span>
-      <span slot="type" slot-scope="text">
+      </template>
+      <template #type="text">
         <e-dict-tag type="messageType" :code="text"/>
-      </span>
-      <span slot="createUser" slot-scope="text, record">
+      </template>
+      <template #createUser="text, record">
         <e-avatar :avatar="record.avatar" :nickname="record.nickname"/>
         {{ record.nickname }}
-      </span>
-      <span slot="action" slot-scope="text, record">
+      </template>
+      <template #action="text, record">
         <template v-if="status !== MESSAGE_CONST.RECEIVE_STATUS_DELETED">
           <a-tooltip placement="top">
-            <template slot="title">
+            <template #title>
               <span>查看</span>
             </template>
             <a-button type="primary" size="small" icon="search" @click="info(record.id, record.messageId)"/>
@@ -46,7 +46,7 @@
         </template>
         <template v-if="status === MESSAGE_CONST.RECEIVE_STATUS_DELETED">
           <a-tooltip placement="top">
-            <template slot="title">
+            <template #title>
               <span>还原</span>
             </template>
             <a-button type="primary" size="small" icon="reload" @click="reductionByIds(record.id)"/>
@@ -54,7 +54,7 @@
           <a-divider type="vertical"/>
           <e-btn-remove :click-callback="remove" :id="record.id" :divider="false"/>
         </template>
-      </span>
+      </template>
     </s-table>
   </div>
 </template>
diff --git a/src/views/sys/message/Sent.vue b/src/views/sys/message/Sent.vue
index 4907019..fa285e6 100644
--- a/src/views/sys/message/Sent.vue
+++ b/src/views/sys/message/Sent.vue
@@ -14,13 +14,13 @@
       :alert="true"
       showPagination="auto"
     >
-      <span slot="m-title" slot-scope="text, record">
+      <template #m-title="text, record">
         <a-tag v-if="MESSAGE_CONST.IMPORTANT_YES === record.important" color="red">重要</a-tag>
         <a-button type="link" @click="info(record.id)">{{ text }}</a-button>
-      </span>
-      <span slot="type" slot-scope="text">
+      </template>
+      <template #type="text">
         <e-dict-tag type="messageType" :code="text"/>
-      </span>
+      </template>
     </s-table>
   </div>
 </template>
diff --git a/src/views/sys/permissions/View.vue b/src/views/sys/permissions/View.vue
index 4a608da..62242f8 100644
--- a/src/views/sys/permissions/View.vue
+++ b/src/views/sys/permissions/View.vue
@@ -3,7 +3,7 @@
     <a-col :xl="6" :md="8">
       <a-card title="菜单管理" :bordered="false" id="tree-card">
         <a-tooltip placement="top" :visible="searchTooltipVisible">
-          <template slot="title">
+          <template #title>
             <span>请输入菜单名称后查询</span>
           </template>
           <a-input-search v-model="query" placeholder="输入菜单名称搜索" @search="onSearch"/>
@@ -146,7 +146,7 @@
 import IconSelector from '@/components/IconSelector'
 import { Tree } from 'ant-design-vue'
 import { selectByPId, get, save, add, remove, move, setStatus, copyNodes, selectByTitle } from '@/api/sys/permissions'
-import { convertTree, getElementOffset, isNotBlank } from '@/utils/util'
+import { convertTree, isNotBlank } from '@/utils/util'
 import EDictRadio from '@/components/Easy/data-entry/DictRadio'
 import {
   convertTreeData, dropNode,
@@ -185,7 +185,6 @@ export default {
       iconModalVisible: false,
       currentSelectedIcon: null,
 
-      elementOffset: {},
       // 树相关
       treeData: [],
       expandedKeys: [],
@@ -213,7 +212,7 @@ export default {
       model: {},
       rules: {
         type: [
-          { required: true, message: '请选择菜单类型', trigger: 'blur' }
+          { required: true, message: '请选择菜单类型', trigger: 'change' }
         ],
         name: [
           { required: true, message: '请输入菜单名称', trigger: 'blur' },
@@ -229,10 +228,10 @@ export default {
           { max: 200, message: '页面地址不能超过200个字符', trigger: 'blur' }
         ],
         status: [
-          { required: true, message: '请选择菜单状态', trigger: 'blur' }
+          { required: true, message: '请选择菜单状态', trigger: 'change' }
         ],
         hide: [
-          { required: true, message: '请选择是否显示', trigger: 'blur' }
+          { required: true, message: '请选择是否显示', trigger: 'change' }
         ],
         icon: [
           { max: 32, message: '图标不能超过32个字符', trigger: 'blur' }
@@ -262,7 +261,6 @@ export default {
         // 默认展开根节点
         this.expandedKeys.push(baseId)
         this.iconArrays = generatorNodeIcon(this.treeData, this.iconArrays)
-        this.elementOffset = getElementOffset(document.getElementById('tree-card'))
       })
     },
     onExpand (expandedKeys) {
diff --git a/src/views/sys/personal/center/View.less b/src/views/sys/personal/center/View.less
index 992d924..366449c 100644
--- a/src/views/sys/personal/center/View.less
+++ b/src/views/sys/personal/center/View.less
@@ -7,22 +7,6 @@
   word-break: break-all;
 }
 
-.ant-avatar {
-  width: 72px;
-  height: 72px;
-  line-height: 72px;
-  font-size: 24px;
-  border-radius: 50%;
-  overflow: hidden;
-  color: @primary-color;
-  background-color: color(~`colorPalette('@{primary-color}', 1) `);
-
-  img {
-    height: 100%;
-    width: 100%;
-  }
-}
-
 // mixins for clearfix
 // ------------------------
 .clearfix() {
@@ -42,6 +26,22 @@
 
 .ant-page-header {
   margin-bottom: 16px;
+
+  .ant-avatar {
+    width: 72px;
+    height: 72px;
+    line-height: 72px;
+    font-size: 24px;
+    overflow: hidden;
+    color: @primary-color;
+    background-color: color(~`colorPalette('@{primary-color}', 1) `);
+
+    img {
+      height: 100%;
+      width: 100%;
+    }
+  }
+
 }
 
 .page-header-content {
@@ -54,7 +54,6 @@
       display: block;
       width: 72px;
       height: 72px;
-      border-radius: 72px;
     }
   }
 
diff --git a/src/views/sys/personal/center/View.vue b/src/views/sys/personal/center/View.vue
index 760837d..121827d 100644
--- a/src/views/sys/personal/center/View.vue
+++ b/src/views/sys/personal/center/View.vue
@@ -27,8 +27,8 @@
                         {{ user.age }} 岁
                       </a-tag>
 
-                      {{ user.dept && user.dept.name }} |
-                      <span :key="item" v-for="item in user.roleNames">{{ item }}</span>
+                      <a-icon type="environment" /> {{ user.dept && user.dept.name }}
+                      <a-icon type="user" /> <span :key="item" v-for="item in user.roleNames">{{ item }}</span>
                     </div>
                   </div>
                 </div>
diff --git a/src/views/sys/personal/settings/BaseSetting.vue b/src/views/sys/personal/settings/BaseSetting.vue
index 79baac0..2024293 100644
--- a/src/views/sys/personal/settings/BaseSetting.vue
+++ b/src/views/sys/personal/settings/BaseSetting.vue
@@ -82,7 +82,7 @@ export default {
           { max: 20, message: '昵称字数不能超过20个字符', trigger: 'blur' }
         ],
         sex: [
-          { required: true, message: '请选择性别', trigger: 'blur' }
+          { required: true, message: '请选择性别', trigger: 'change' }
         ],
         phone: [
           { pattern: new RegExp(/^[1]([3-9])[0-9]{9}$/), message: '请输入正确的手机号码', trigger: 'blur' }
diff --git a/src/views/sys/role/View.vue b/src/views/sys/role/View.vue
index dd835a5..dfe3d44 100644
--- a/src/views/sys/role/View.vue
+++ b/src/views/sys/role/View.vue
@@ -3,7 +3,7 @@
     <a-col :xl="6" :md="8">
       <a-card title="角色管理" :bordered="false" id="tree-card">
         <a-tooltip placement="top" :visible="searchTooltipVisible">
-          <template slot="title">
+          <template #title>
             <span>请输入角色名称后查询</span>
           </template>
           <a-input-search v-model="query" placeholder="输入角色名称搜索" @search="onSearch"/>
@@ -133,7 +133,7 @@
 <script>
 import { Tree } from 'ant-design-vue'
 import { selectByPId, get, save, add, remove, move, setStatus, selectByTitle } from '@/api/sys/role'
-import { convertTree, getElementOffset, isNotBlank } from '@/utils/util'
+import { convertTree, isNotBlank } from '@/utils/util'
 import EDictRadio from '@/components/Easy/data-entry/DictRadio'
 import { removeSuccessTip, saveSuccessTip, successTip } from '@/utils/tips'
 import {
@@ -166,7 +166,6 @@ export default {
       noResults: false,
       searchTooltipVisible: false,
 
-      elementOffset: {},
       // 树相关
       treeData: [],
       expandedKeys: [],
@@ -205,7 +204,7 @@ export default {
           { max: 10, message: '角色名称字数不能超过10个字符', trigger: 'blur' }
         ],
         status: [
-          { required: true, message: '请选择角色状态', trigger: 'blur' }
+          { required: true, message: '请选择角色状态', trigger: 'change' }
         ],
         code: [
           { max: 50, message: '角色标识字数不能超过50个字符', trigger: 'blur' }
@@ -235,7 +234,6 @@ export default {
         // 默认展开根节点
         this.expandedKeys.push(baseId)
         this.iconArrays = generatorNodeIcon(this.treeData, this.iconArrays)
-        this.elementOffset = getElementOffset(document.getElementById('tree-card'))
       })
     },
     loadMenuTree () {
diff --git a/src/views/sys/user/Input.vue b/src/views/sys/user/Input.vue
index 712dd70..7016c3c 100644
--- a/src/views/sys/user/Input.vue
+++ b/src/views/sys/user/Input.vue
@@ -115,10 +115,10 @@ export default {
           { max: 20, message: '昵称字数不能超过20个字符', trigger: 'blur' }
         ],
         roleIds: [
-          { required: true, message: '请选择角色', trigger: 'blur' }
+          { required: true, message: '请选择角色', trigger: 'change' }
         ],
         sex: [
-          { required: true, message: '请选择性别', trigger: 'blur' }
+          { required: true, message: '请选择性别', trigger: 'change' }
         ],
         phone: [
           { pattern: new RegExp(/^[1]([3-9])[0-9]{9}$/), message: '请输入正确的手机号码', trigger: 'blur' }
diff --git a/src/views/sys/user/RetrievePassword.vue b/src/views/sys/user/RetrievePassword.vue
index ba78171..f3f5270 100644
--- a/src/views/sys/user/RetrievePassword.vue
+++ b/src/views/sys/user/RetrievePassword.vue
@@ -6,13 +6,13 @@
     :handleCollapse="()=>{}"
     contentWidth="Fixed"
   >
-    <template v-slot:menuHeaderRender>
+    <template #menuHeaderRender>
       <div>
         <logo-svg/>
         <h1>{{ title }}</h1>
       </div>
     </template>
-    <template v-slot:rightContentRender>
+    <template #rightContentRender>
       <div class="ant-pro-global-header-index-right">
         <router-link to="/user/login">
           <a-button type="link" icon="login" ghost>登录</a-button>
@@ -31,7 +31,7 @@
                 <a-icon type="mail"/>
               </div>
               <a-list-item-meta description="你需要用密保邮箱进行邮箱验证">
-                <a slot="title" href="https://www.antdv.com/">通过密保邮箱找回</a>
+                <template #title>通过密保邮箱找回</template>
               </a-list-item-meta>
             </a-list-item>
             <a-list-item @click="choseFindType(findTypeConst.PHONE)">
@@ -39,7 +39,7 @@
                 <a-icon type="mobile"/>
               </div>
               <a-list-item-meta description="你需要用密保手机进行短信验证">
-                <a slot="title" href="https://www.antdv.com/">通过密保手机找回</a>
+                <template #title>通过密保手机找回</template>
               </a-list-item-meta>
             </a-list-item>
           </a-list>
@@ -118,7 +118,7 @@
         </a-button>
       </div>
     </a-card>
-    <template v-slot:footerRender>
+    <template #footerRender>
       <pro-global-footer/>
     </template>
   </pro-layout>
diff --git a/src/views/sys/user/View.vue b/src/views/sys/user/View.vue
index 2afda6c..6be00dc 100644
--- a/src/views/sys/user/View.vue
+++ b/src/views/sys/user/View.vue
@@ -3,7 +3,7 @@
     <a-col :xl="6" :md="8">
       <a-card title="部门" :bordered="false" id="tree-card">
         <a-tooltip placement="top" :visible="searchTooltipVisible">
-          <template slot="title">
+          <template #title>
             <span>请输入部门名称后查询</span>
           </template>
           <a-input-search v-model="query" placeholder="输入部门名称搜索" @search="onSearch"/>
@@ -32,7 +32,7 @@
     </a-col>
     <a-col :xl="18" :md="16">
       <e-pro-table title="用户" :advanced.sync="advanced">
-        <template slot="query">
+        <template #query>
           <a-col :xxl="6" :xl="8" :lg="12" :sm="24">
             <a-form-model-item label="用户名">
               <a-input v-model="queryParam.username"/>
@@ -52,12 +52,12 @@
           </template>
         </template>
 
-        <template slot="button">
+        <template #button>
           <e-btn-add :permissions="SYS_PERMISSIONS_CODE.SYS_USER_SAVE" to="/sys/user/input" :params="{deptId: queryParam.deptId}"/>
           <e-btn-remove-batch :permissions="SYS_PERMISSIONS_CODE.SYS_USER_REMOVE" :loading.sync="removeBathLoading" :ids="selectedRowKeys" :click-callback="remove"/>
         </template>
 
-        <template slot="table">
+        <template #table>
           <s-table
             ref="eTable"
             :columns="columns"
@@ -66,15 +66,7 @@
             :rowSelection="rowSelection"
             showPagination="auto"
           >
-            <span slot="name" slot-scope="text, record">
-              <template v-if="record.css != null && record.css !== ''">
-                <a-tag :color="record.css">{{ record.name }}</a-tag>
-              </template>
-              <template v-if="record.css == null || record.css === ''">
-                {{ record.name }}
-              </template>
-            </span>
-            <span slot="status" slot-scope="text, record, index">
+            <template #status="text, record, index">
               <a-switch
                 size="small"
                 :data-id="record.id"
@@ -82,14 +74,14 @@
                 :loading="switchLoading[index]"
                 :default-checked="text === USER_STATUS_CONST.ENABLE"
                 @change="statusChange"/>
-            </span>
-            <span slot="sex" slot-scope="text">
+            </template>
+            <template #sex="text, record">
               <e-dict-tag type="sex" :code="text"/>
-            </span>
-            <span slot="avatar" slot-scope="text, record">
+            </template>
+            <template #avatar="text, record">
               <e-avatar :avatar="text" :nickname="record.nickname"/>
-            </span>
-            <span slot="action" slot-scope="text, record">
+            </template>
+            <template #action="text, record">
               <e-btn-edit :permissions="SYS_PERMISSIONS_CODE.SYS_USER_SAVE" :to="`/sys/user/input`" :tab-name="record.nickname" :id="record.id"/>
               <e-btn-remove :permissions="SYS_PERMISSIONS_CODE.SYS_USER_REMOVE" :id="record.id" :click-callback="remove"/>
               <a-popconfirm
@@ -98,13 +90,13 @@
                 @confirm="() => resetPassword(record.id)"
               >
                 <a-tooltip placement="top">
-                  <template slot="title">
+                  <template #title>
                     <span>重置密码</span>
                   </template>
                   <a-button type="danger" size="small" icon="undo"/>
                 </a-tooltip>
               </a-popconfirm>
-            </span>
+            </template>
           </s-table>
         </template>
       </e-pro-table>
-- 
Gitee


From b1a3a68d4b744a1bd9a0ebc45e11eeaebf5f2fef Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Fri, 16 Jul 2021 00:32:16 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E5=88=AB?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/util.js b/src/utils/util.js
index efaf0bc..d1bec10 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -2,7 +2,7 @@ import * as moment from 'moment'
 import { DATE_PATTERN } from '@/utils/const/datePattern'
 
 /**
- * 根据时间获取xx号欢迎
+ * 根据时间获取xx好欢迎
  *
  * @return {string}
  */
-- 
Gitee


From 3b4c4c9a41124c821cfd8f0a05c55f2e36850b45 Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Fri, 16 Jul 2021 00:32:55 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 0f9895e..b8636fc 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -43,7 +43,7 @@ const user = {
       return new Promise((resolve, reject) => {
         login(userInfo).then(response => {
           const token = response.data
-          storage.set(ACCESS_TOKEN, token, 7 * 24 * 60 * 60 * 1000)
+          storage.set(ACCESS_TOKEN, token)
           commit('SET_TOKEN', token)
           resolve()
         }).catch(error => {
-- 
Gitee


From 15e2eb8e85eeaeca54633d22fac77931ca2a53fe Mon Sep 17 00:00:00 2001
From: tengchong <26172583@qq.com>
Date: Fri, 16 Jul 2021 00:33:15 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8a16f3b..f18bd2a 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@ant-design-vue/pro-layout": "^1.0.7",
     "@antv/data-set": "^0.10.2",
-    "ant-design-vue": "^1.6.2",
+    "ant-design-vue": "^1.7.5",
     "axios": "^0.19.0",
     "core-js": "^3.1.2",
     "echarts": "^5.0.0",
-- 
Gitee