diff --git a/package-lock.json b/package-lock.json
index 364a1d8..c7de788 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "@ant-design/icons-vue": "^6.0.1",
         "@antv/g2": "^4.1.20",
-        "@hwork/ant-design-vue": "^4.1.24",
+        "@hwork/ant-design-vue": "4.1.24",
         "@hwork/icon": "^1.0.0",
         "@tinymce/tinymce-vue": "^4.0.4",
         "axios": "^0.21.1",
@@ -915,9 +915,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@hwork/ant-design-vue": {
-      "version": "4.1.25",
-      "resolved": "http://x-repo.haier.net/repository/npm-public/@hwork/ant-design-vue/-/ant-design-vue-4.1.25.tgz",
-      "integrity": "sha512-fgpwWpxVuAlCtpYspVVKS2JLily7Mq90Q9aQj8dr5gIlz56DHW8Tq2j+dIFN2wS5jcRugP5hbC7Wo9LNf23ElA==",
+      "version": "4.1.24",
+      "resolved": "http://x-repo.haier.net/repository/npm-public/@hwork/ant-design-vue/-/ant-design-vue-4.1.24.tgz",
+      "integrity": "sha512-A2jil/lqCdcsDY49XR0GMKRX5MQcnqDsjCEkOAbKBK1V96dLi7M4PJ6Xx8BrREQtmGjpfSy3/hRMhsjyk904iQ==",
       "license": "MIT",
       "dependencies": {
         "@ant-design/icons-vue": "^7.0.0",
diff --git a/package.json b/package.json
index a091b69..eea8591 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@ant-design/icons-vue": "^6.0.1",
     "@antv/g2": "^4.1.20",
-    "@hwork/ant-design-vue": "^4.1.24",
+    "@hwork/ant-design-vue": "4.1.24",
     "@hwork/icon": "^1.0.0",
     "@tinymce/tinymce-vue": "^4.0.4",
     "axios": "^0.21.1",
diff --git a/src/assets/css/layout.less b/src/assets/css/layout.less
index 57f831f..681ecb7 100644
--- a/src/assets/css/layout.less
+++ b/src/assets/css/layout.less
@@ -423,6 +423,9 @@ html {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
   line-height: 30px;
 }
+.ant-list-layout {
+  height: 100% !important;
+}
 .ant-list-layout-content {
   height: 100%;
   display: flex;
diff --git a/src/layout/module/content/index.vue b/src/layout/module/content/index.vue
index 5bd61b9..214b518 100644
--- a/src/layout/module/content/index.vue
+++ b/src/layout/module/content/index.vue
@@ -40,4 +40,4 @@ export default {
   background-color: transparent;
   height: 100%;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/view/announce/index.vue b/src/view/announce/index.vue
index 71eeea3..a179e7c 100644
--- a/src/view/announce/index.vue
+++ b/src/view/announce/index.vue
@@ -1,43 +1,23 @@
 <template>
-    <page-layout>
-      <a-row :gutter="[10, 10]">
-        <!-- 查询表单 -->
-        <a-col :span="24">
-          <a-card>
-            <pro-query
-              :searchParam="searchParam"
-              @on-search ="search"
-            ></pro-query>
-          </a-card>
-        </a-col>
-        <!-- 岗位列表 -->
-        <a-col :span="24">
-          <a-card>
-            <pro-table
-              ref="tableRef"
-              :fetch="fetch"
-              :columns="columns"
-              :toolbar="toolbar"
-              :operate="operate"
-              :param="state.param"
-              :pagination="pagination"
-              :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
-            >
-            </pro-table>
-          </a-card>
-        </a-col>
-      </a-row>
-      <save :visible="state.visibleSave" @close="closeSave"></save>
-      <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-      <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
-    </page-layout>
+  <a-list-layout ref="pageRef">
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
+    <save :visible="state.visibleSave" @close="closeSave"></save>
+    <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
+    <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
+  </a-list-layout>
 </template>
 
 <script>
 import save from './modal/save.vue';
 import edit from './modal/edit.vue';
 import info from './modal/info.vue';
-import { message , Modal} from '@hwork/ant-design-vue';
+import { message, Modal as modal } from '@hwork/ant-design-vue';
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { page, remove, removeBatch } from "@/api/module/announce";
 import { reactive, createVNode, ref } from 'vue';
@@ -56,7 +36,7 @@ export default {
     const tableRef = ref();
 
     /// 开关
-    const converFormat = [{label:"已发布",value:true},{label:"未发布",value:false}];
+    const converFormat = [{ label: "已发布", value: true }, { label: "未发布", value: false }];
 
     /// 列配置
     const columns = [
@@ -91,19 +71,19 @@ export default {
 
     /// 批量删除
     const removeBatchMethod = (ids) => {
-       Modal.confirm({
+      modal.confirm({
         title: '您是否确定要删除选择公告?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
         cancelText: '取消',
         onOk() {
           message.loading({ content: "提交中...", key: removeBatchKey });
-          removeBatch({"ids":ids}).then((response) => {
-            if(response.success){
-              message.success({content: "删除成功", key: removeBatchKey, duration: 1})
+          removeBatch({ "ids": ids }).then((response) => {
+            if (response.success) {
+              message.success({ content: "删除成功", key: removeBatchKey, duration: 1 })
               tableRef.value.reload()
-            }else{
-              message.error({content: "删除失败", key: removeBatchKey, duration: 1})
+            } else {
+              message.error({ content: "删除失败", key: removeBatchKey, duration: 1 })
             }
           })
         }
@@ -112,15 +92,15 @@ export default {
 
     /// 工具栏
     const toolbar = [
-      { label: "新增", event: function () { state.visibleSave = true }},
-      { label: "删除", event: function () { removeBatchMethod(state.selectedRowKeys) }},
+      { label: "新增", event: function () { state.visibleSave = true } },
+      { label: "删除", event: function () { removeBatchMethod(state.selectedRowKeys) } },
     ];
 
     /// 行操作
     const operate = [
-      { label: "查看", event: function (record) { state.visibleInfo = true, state.recordInfo = record }},
-      { label: "修改", event: function (record) { state.visibleEdit = true, state.recordEdit = record }},
-      { label: "删除",isDel: true, delEvent: function (record) { removeMethod(record) },cancelEvent:(record)=>{}},
+      { label: "查看", event: function (record) { state.visibleInfo = true, state.recordInfo = record } },
+      { label: "修改", event: function (record) { state.visibleEdit = true, state.recordEdit = record } },
+      { label: "删除", isDel: true, delEvent: function (record) { removeMethod(record) }, cancelEvent: (record) => { } },
     ];
 
     /// 分页参数
@@ -139,26 +119,26 @@ export default {
       recordEdit: {},
       recordInfo: {},
     })
-    
+
     const searchParam = [
-        { key: "title", type: "input", label: "公告标题"},
+      { key: "title", type: "input", label: "公告标题" },
     ]
 
-    const search = function(value) {
+    const search = function (value) {
       state.param = value
     }
 
-    const closeSave = function(){
+    const closeSave = function () {
       tableRef.value.reload()
       state.visibleSave = false
     }
 
-    const closeEdit = function(){
+    const closeEdit = function () {
       tableRef.value.reload()
       state.visibleEdit = false
     }
 
-    const closeInfo = function(){
+    const closeInfo = function () {
       state.visibleInfo = false
     }
 
@@ -167,23 +147,23 @@ export default {
     };
 
     return {
-      state, 
-      fetch, 
-      toolbar, 
-      columns, 
-      operate, 
-      pagination, 
+      state,
+      fetch,
+      toolbar,
+      columns,
+      operate,
+      pagination,
 
       search,
       searchParam,
-    
+
       closeSave,
       closeEdit,
       closeInfo,
-      
+
       onSelectChange,
       tableRef
     };
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/view/config/index.vue b/src/view/config/index.vue
index 237f334..ce64fd7 100644
--- a/src/view/config/index.vue
+++ b/src/view/config/index.vue
@@ -151,7 +151,7 @@
 
       /// 删除配置
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此配置?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -185,7 +185,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择配置?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/dataSource/index.vue b/src/view/dataSource/index.vue
index 36b218d..d4f8b11 100644
--- a/src/view/dataSource/index.vue
+++ b/src/view/dataSource/index.vue
@@ -1,43 +1,24 @@
 <template>
-    <page-layout>
-      <a-row :gutter="[10, 10]">
-        <!-- 查询表单 -->
-        <a-col :span="24">
-          <a-card>
-            <pro-query
-              :searchParam="searchParam"
-              @on-search ="search"
-            ></pro-query>
-          </a-card>
-        </a-col>
-        <!-- 多库列表 -->
-        <a-col :span="24">
-          <a-card>
-            <pro-table
-              ref="tableRef"
-              :fetch="fetch"
-              :columns="columns"
-              :toolbar="toolbar"
-              :operate="operate"
-              :param="state.param"
-              :pagination="pagination"
-              :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
-            >
-            </pro-table>
-          </a-card>
-        </a-col>
-      </a-row>
-      <!-- 新增页面 -->
-      <save :visible="state.visibleSave" @close="closeSave"></save>
-      <!-- 修改页面 -->
-      <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-    </page-layout>
+  <a-list-layout ref="pageRef">
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
+    <!-- 多库列表 -->
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
+    <!-- 新增页面 -->
+    <save :visible="state.visibleSave" @close="closeSave"></save>
+    <!-- 修改页面 -->
+    <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
+  </a-list-layout>
 </template>
 
 <script>
 import save from './modal/save.vue';
 import edit from './modal/edit.vue';
-import { message , Modal} from '@hwork/ant-design-vue';
+import { message, Modal as modal } from '@hwork/ant-design-vue';
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { page, remove, removeBatch } from "@/api/module/dataSource";
 import { reactive, createVNode, ref } from 'vue';
@@ -58,10 +39,10 @@ export default {
     const columns = [
       { dataIndex: "name", key: "name", title: "名称" },
       { dataIndex: "username", key: "username", title: "账户" },
-      { dataIndex: "password", key: "password", title: "密码"},
-      { dataIndex: "url", key: "url", title: "链接"},
-      { dataIndex: "driver", key: "driver", title: "驱动"},
-      { dataIndex: "remark", key: "remark", title: "备注"},
+      { dataIndex: "password", key: "password", title: "密码" },
+      { dataIndex: "url", key: "url", title: "链接" },
+      { dataIndex: "driver", key: "driver", title: "驱动" },
+      { dataIndex: "remark", key: "remark", title: "备注" },
       { dataIndex: "createTime", key: "createTime", title: "创建日期" },
     ];
 
@@ -74,22 +55,22 @@ export default {
       };
     };
 
-     /// 删除配置
+    /// 删除配置
     const removeMethod = (record) => {
-      Modal.confirm({
+      modal.confirm({
         title: '您是否确定要删除此配置?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
         cancelText: '取消',
         onOk() {
           message.loading({ content: "提交中...", key: removeKey });
-          remove({"id":record.id}).then((response) => {
-            if(response.success){
-              message.success({content: "删除成功", key: removeKey, duration: 1}).then(()=>{
+          remove({ "id": record.id }).then((response) => {
+            if (response.success) {
+              message.success({ content: "删除成功", key: removeKey, duration: 1 }).then(() => {
                 tableRef.value.reload()
               })
-            }else{
-              message.error({content: "删除失败", key: removeKey, duration: 1})
+            } else {
+              message.error({ content: "删除失败", key: removeKey, duration: 1 })
             }
           })
         }
@@ -97,20 +78,20 @@ export default {
     }
 
     const removeBatchMethod = (ids) => {
-       Modal.confirm({
+      modal.confirm({
         title: '您是否确定要删除选择配置?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
         cancelText: '取消',
         onOk() {
           message.loading({ content: "提交中...", key: removeBatchKey });
-          removeBatch({"ids":ids}).then((response) => {
-            if(response.success){
-              message.success({content: "删除成功", key: removeBatchKey, duration: 1}).then(()=>{
+          removeBatch({ "ids": ids }).then((response) => {
+            if (response.success) {
+              message.success({ content: "删除成功", key: removeBatchKey, duration: 1 }).then(() => {
                 tableRef.value.reload()
               })
-            }else{
-              message.error({content: "删除失败", key: removeBatchKey, duration: 1})
+            } else {
+              message.error({ content: "删除失败", key: removeBatchKey, duration: 1 })
             }
           })
         }
@@ -119,15 +100,15 @@ export default {
 
     /// 工具栏
     const toolbar = [
-      { label: "新增", event: function () { state.visibleSave = true }},
-      { label: "删除", event: function () { removeBatchMethod(state.selectedRowKeys) }},
+      { label: "新增", event: function () { state.visibleSave = true } },
+      { label: "删除", event: function () { removeBatchMethod(state.selectedRowKeys) } },
     ];
 
     /// 行操作
     const operate = [
-      { label: "查看", event: function (record) { alert("查看详情:" + JSON.stringify(record))}},
-      { label: "修改", event: function (record) { state.recordEdit = record, state.visibleEdit = true }},
-      { label: "删除", event: function (record) { removeMethod(record) }},
+      { label: "查看", event: function (record) { alert("查看详情:" + JSON.stringify(record)) } },
+      { label: "修改", event: function (record) { state.recordEdit = record, state.visibleEdit = true } },
+      { label: "删除", event: function (record) { removeMethod(record) } },
     ];
 
     /// 分页参数
@@ -147,12 +128,12 @@ export default {
 
     /// 查询参数
     const searchParam = [
-        { key: "name", type: "input", label: "名称"},
-        { key: "code", type: "input", label: "描述"},
+      { key: "name", type: "input", label: "名称" },
+      { key: "code", type: "input", label: "描述" },
     ]
 
     /// 查询操作
-    const search = function(value) {
+    const search = function (value) {
       state.param = value
       tableRef.value.reload
     }
@@ -161,12 +142,12 @@ export default {
       state.selectedRowKeys = selectedRowKeys;
     };
 
-    const closeSave = function(){
+    const closeSave = function () {
       state.visibleSave = false
       tableRef.value.reload
     }
 
-    const closeEdit = function(){
+    const closeEdit = function () {
       state.visibleEdit = false
       tableRef.value.reload
     }
@@ -184,9 +165,9 @@ export default {
 
       closeSave,
       closeEdit,
-    
+
       tableRef
     };
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/view/dept/index.vue b/src/view/dept/index.vue
index 196b065..0962e10 100644
--- a/src/view/dept/index.vue
+++ b/src/view/dept/index.vue
@@ -1,45 +1,25 @@
 <template>
-    <page-layout>
-      <a-row :gutter="[10, 10]">
-        <!-- 顶部区域 -->
-        <a-col :span="24">
-          <a-card>
-            <!-- 查询参数 -->
-            <pro-query
-              :searchParam="searchParam"
-              @on-search ="search"
-            ></pro-query>
-          </a-card>
-        </a-col>
-        <!-- 中心区域 -->
-        <a-col :span="24">
-          <a-card>
-            <!-- 列表 -->
-            <pro-table
-               ref="tableRef"
-              :fetch="fetch"
-              :columns="columns"
-              :toolbar="toolbar"
-              :operate="operate"
-              :param="state.param"
-              :pagination="pagination"
-              :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
-            >
-            </pro-table>
-          </a-card>
-        </a-col>
-      </a-row>
-      <save :visible="state.visibleSave" @close="closeSave"></save>
-      <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-      <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
-    </page-layout>
+  <a-list-layout ref="pageRef">
+    <template #search>
+      <!-- 查询参数 -->
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
+    <!-- 中心区域 -->
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
+    <save :visible="state.visibleSave" @close="closeSave"></save>
+    <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
+    <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
+  </a-list-layout>
 </template>
 
 <script>
 import save from './modal/save.vue';
 import edit from './modal/edit.vue';
 import info from './modal/info.vue';
-import { message , Modal} from '@hwork/ant-design-vue';
+import { message, Modal as modal } from '@hwork/ant-design-vue';
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { tree, remove, removeBatch } from "@/api/module/dept";
 import { reactive, createVNode, ref } from 'vue';
@@ -56,15 +36,17 @@ export default {
 
     const tableRef = ref()
 
-    const switchFormat = { yes: true, no: false, event: function(value,record){
-      record.enable = !record.enable;
-      return value;
-    }}
+    const switchFormat = {
+      yes: true, no: false, event: function (value, record) {
+        record.enable = !record.enable;
+        return value;
+      }
+    }
 
     const columns = [
       { dataIndex: "name", key: "name", title: "部门" },
       { dataIndex: "address", key: "address", title: "地址" },
-      { dataIndex: "enable", key: "enable", title: "状态", switch: switchFormat},
+      { dataIndex: "enable", key: "enable", title: "状态", switch: switchFormat },
       { dataIndex: "sort", key: "sort", title: "排序" },
       { dataIndex: "remark", key: "remark", title: "仓库编号" },
     ];
@@ -77,22 +59,22 @@ export default {
       };
     };
 
-        /// 删除配置
+    /// 删除配置
     const removeMethod = (record) => {
-      Modal.confirm({
+      modal.confirm({
         title: '您是否确定要删除此配置?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
         cancelText: '取消',
         onOk() {
           message.loading({ content: "提交中...", key: removeKey });
-          remove({"id":record.id}).then((response) => {
-            if(response.success){
-              message.success({content: "删除成功", key: removeKey, duration: 1}).then(()=>{
+          remove({ "id": record.id }).then((response) => {
+            if (response.success) {
+              message.success({ content: "删除成功", key: removeKey, duration: 1 }).then(() => {
                 tableRef.value.reload()
               })
-            }else{
-              message.error({content: "删除失败", key: removeKey, duration: 1})
+            } else {
+              message.error({ content: "删除失败", key: removeKey, duration: 1 })
             }
           })
         }
@@ -101,18 +83,18 @@ export default {
 
     /// 工具栏
     const toolbar = [
-      { label: "新增", event: function () { state.visibleSave = true }},
+      { label: "新增", event: function () { state.visibleSave = true } },
     ];
 
     /// 行操作
     const operate = [
-      { label: "查看", event: function (record) { state.visibleInfo = true, state.recordInfo = record }},
-      { label: "修改", event: function (record) { state.visibleEdit = true, state.recordEdit = record }},
-      { label: "删除", event: function (record) { removeMethod(record) }},
+      { label: "查看", event: function (record) { state.visibleInfo = true, state.recordInfo = record } },
+      { label: "修改", event: function (record) { state.visibleEdit = true, state.recordEdit = record } },
+      { label: "删除", event: function (record) { removeMethod(record) } },
     ];
 
     const pagination = false;
-    
+
     const state = reactive({
       selectedRowKeys: [],
       param: {},
@@ -124,11 +106,11 @@ export default {
     })
 
     const searchParam = [
-        { key: "name", type: "input", label: "名称"},
-        { key: "code", type: "input", label: "描述"},
+      { key: "name", type: "input", label: "名称" },
+      { key: "code", type: "input", label: "描述" },
     ]
 
-    const search = function(value) {
+    const search = function (value) {
       state.param = value
       tableRef.value.reload()
     }
@@ -137,17 +119,17 @@ export default {
       state.selectedRowKeys = selectedRowKeys;
     };
 
-    const closeSave = function() {
+    const closeSave = function () {
       state.visibleSave = false
       tableRef.value.reload()
     }
 
-    const closeEdit = function() {
+    const closeEdit = function () {
       state.visibleEdit = false
       tableRef.value.reload()
     }
 
-    const closeInfo = function() {
+    const closeInfo = function () {
       state.visibleInfo = false
     }
 
@@ -170,4 +152,4 @@ export default {
     };
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/view/dict/index.vue b/src/view/dict/index.vue
index 6ad0387..4ddaac1 100644
--- a/src/view/dict/index.vue
+++ b/src/view/dict/index.vue
@@ -107,7 +107,7 @@
 
       /// 删除角色
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此字典?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -142,7 +142,7 @@
 
       /// 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择字典?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/dict/modal/data.vue b/src/view/dict/modal/data.vue
index ccced2a..4dc4496 100644
--- a/src/view/dict/modal/data.vue
+++ b/src/view/dict/modal/data.vue
@@ -109,7 +109,7 @@
 
       /// 删除角色
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此字典?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -144,7 +144,7 @@
 
       /// 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择字典?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/inbox/index.vue b/src/view/inbox/index.vue
index c230fe5..4ab9534 100644
--- a/src/view/inbox/index.vue
+++ b/src/view/inbox/index.vue
@@ -1,26 +1,19 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- 岗位列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
     <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -165,7 +158,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择私信?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/job/index.vue b/src/view/job/index.vue
index f9962eb..93c08f3 100644
--- a/src/view/job/index.vue
+++ b/src/view/job/index.vue
@@ -1,26 +1,19 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- 岗位列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
     <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -151,7 +144,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择任务?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/jobLog/index.vue b/src/view/jobLog/index.vue
index b4ec50c..12b957c 100644
--- a/src/view/jobLog/index.vue
+++ b/src/view/jobLog/index.vue
@@ -1,19 +1,14 @@
 <template>
-    <page-layout>
-      <a-row :gutter="[10, 10]">
-        <!-- 顶部区域 -->
-        <a-col :span="24">
-          <a-card>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
             <!-- 查询参数 -->
             <pro-query
               :searchParam="searchParam"
               @on-search ="search"
             ></pro-query>
-          </a-card>
-        </a-col>
-        <!-- 中心区域 -->
-        <a-col :span="24">
-          <a-card>
+          </template>
             <!-- 列表 -->
             <pro-table
               :fetch="fetch"
@@ -26,11 +21,8 @@
             >
               <!-- 继承至 a-table 的默认插槽 -->
             </pro-table>
-          </a-card>
-        </a-col>
-      </a-row>
       <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
-    </page-layout>
+    </a-list-layout>
 </template>
 
 <script>
@@ -50,7 +42,7 @@ export default {
     /// 列配置
     const columns = [
       { dataIndex: "jobName", key: "jobName", title: "任务" },
-      { dataIndex: "beanName", key: "beanName", title: "目标" },     
+      { dataIndex: "beanName", key: "beanName", title: "目标" },
       { dataIndex: "time", key: "time", title: "耗时"},
       { dataIndex: "createTime", key: "createTime", title: "运行时间" },
       { dataIndex: "state", key: "state", title: "状态", conver: converFormat },
@@ -104,7 +96,7 @@ export default {
       state.param.title = value.title
       state.param.state = value.state
     }
-    
+
     const onSelectChange = selectedRowKeys => {
       state.selectedRowKeys = selectedRowKeys;
     };
@@ -123,10 +115,10 @@ export default {
 
       search,
       searchParam,
-      
+
       closeInfo,
       onSelectChange,
     };
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/view/log/auth.vue b/src/view/log/auth.vue
index b5388a9..9114b9e 100644
--- a/src/view/log/auth.vue
+++ b/src/view/log/auth.vue
@@ -1,19 +1,14 @@
 <template>
-    <page-layout>
-      <a-row :gutter="[10, 10]">
-        <!-- 顶部区域 -->
-        <a-col :span="24">
-          <a-card>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
             <!-- 查询参数 -->
             <pro-query
               :searchParam="searchParam"
               @on-search ="search"
             ></pro-query>
-          </a-card>
-        </a-col>
-        <!-- 中心区域 -->
-        <a-col :span="24">
-          <a-card>
+    </template>
             <!-- 列表 -->
             <pro-table
               :fetch="fetch"
@@ -26,14 +21,11 @@
             >
               <!-- 继承至 a-table 的默认插槽 -->
             </pro-table>
-          </a-card>
-        </a-col>
-      </a-row>
-    </page-layout>
+    </a-list-layout>
 </template>
 
 <script>
-import { message , Modal} from '@hwork/ant-design-vue';
+import { message , Modal as modal} from '@hwork/ant-design-vue';
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { page, clean } from "@/api/module/log";
 import { reactive, createVNode } from 'vue';
@@ -79,7 +71,7 @@ export default {
 
     /// 删除配置
     const cleanMethod = (record) => {
-      Modal.confirm({
+      modal.confirm({
         title: '您是否确定要清空日志?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
diff --git a/src/view/log/oper.vue b/src/view/log/oper.vue
index 519addd..9b58f33 100644
--- a/src/view/log/oper.vue
+++ b/src/view/log/oper.vue
@@ -1,40 +1,20 @@
 <template>
-    <page-layout>
-      <a-row :gutter="[10, 10]">
-        <!-- 顶部区域 -->
-        <a-col :span="24">
-          <a-card>
-            <!-- 查询参数 -->
-            <pro-query
-              :searchParam="searchParam"
-              @on-search ="search"
-            ></pro-query>
-          </a-card>
-        </a-col>
-        <!-- 中心区域 -->
-        <a-col :span="24">
-          <a-card>
-            <!-- 列表 -->
-            <pro-table
-              ref="tableRef"
-              :fetch="fetch"
-              :columns="columns"
-              :operate="operater"
-              :toolbar="toolbar"
-              :param="state.param"
-              :pagination="pagination"
-              :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
-            >
-              <!-- 继承至 a-table 的默认插槽 -->
-            </pro-table>
-          </a-card>
-        </a-col>
-      </a-row>
-    </page-layout>
+  <a-list-layout ref="pageRef">
+    <template #search>
+      <!-- 查询参数 -->
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
+    <!-- 列表 -->
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :operate="operater" :toolbar="toolbar"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+      <!-- 继承至 a-table 的默认插槽 -->
+    </pro-table>
+  </a-list-layout>
 </template>
 
 <script>
-import { message , Modal} from '@hwork/ant-design-vue';
+import { message, Modal as modal } from '@hwork/ant-design-vue';
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { page, clean, exportExcel } from "@/api/module/log";
 import { reactive, createVNode, ref } from 'vue';
@@ -47,29 +27,29 @@ export default {
     const tableRef = ref()
 
     /// 文本
-    const converFormat = [{label:"成功", value:true},{label:"失败", value:false}];
+    const converFormat = [{ label: "成功", value: true }, { label: "失败", value: false }];
 
     /// 列配置
     const columns = [
-      { dataIndex: "title", key: "title", title: "标题" ,width:120,showSearch: true},
-      { dataIndex: "describe", key: "describe", title: "描述" ,width:120,showSearch: true},
-      { dataIndex: "action", key: "action", title: "动作",width:100},
-      { dataIndex: "type", key: "type", title: "方式",width:120},
-      { dataIndex: "browser", key: "browser", title: "浏览器" ,width:120,ellipsis: true},
-      { dataIndex: "system", key: "system", title: "系统" ,width:120,ellipsis: true},
-      { dataIndex: "address", key: "address", title: "操作地" ,width:120,showSearch: true,ellipsis: true},
-      { dataIndex: "operator", key: "operator", title: "操作人" ,width:100},
-      { dataIndex: "createBy", key: "createBy", title: "创建人" ,width:120,ellipsis: true,showSearch: true},
-      { dataIndex: "createUsername", key: "createUsername", title: "创建人" ,width:120,ellipsis: true,showSearch: true},
-      { dataIndex: "createNickname", key: "createNickname", title: "创建人昵称" ,width:120,ellipsis: true},
-      { dataIndex: "createTime", key: "createTime", title: "操作时间" ,width:180,ellipsis: true},
-      { dataIndex: "state", key: "state", title: "状态", conver: converFormat ,width:120,ellipsis: true},
-      { dataIndex: "params", key: "params", title: "参数",showSearch: true ,width:300,ellipsis: true},
-      { dataIndex: "result", key: "result", title: "返回结果", showSearch: true ,width:300,ellipsis: true},
+      { dataIndex: "title", key: "title", title: "标题", width: 120, showSearch: true },
+      { dataIndex: "describe", key: "describe", title: "描述", width: 120, showSearch: true },
+      { dataIndex: "action", key: "action", title: "动作", width: 100 },
+      { dataIndex: "type", key: "type", title: "方式", width: 120 },
+      { dataIndex: "browser", key: "browser", title: "浏览器", width: 120, ellipsis: true },
+      { dataIndex: "system", key: "system", title: "系统", width: 120, ellipsis: true },
+      { dataIndex: "address", key: "address", title: "操作地", width: 120, showSearch: true, ellipsis: true },
+      { dataIndex: "operator", key: "operator", title: "操作人", width: 100 },
+      { dataIndex: "createBy", key: "createBy", title: "创建人", width: 120, ellipsis: true, showSearch: true },
+      { dataIndex: "createUsername", key: "createUsername", title: "创建人", width: 120, ellipsis: true, showSearch: true },
+      { dataIndex: "createNickname", key: "createNickname", title: "创建人昵称", width: 120, ellipsis: true },
+      { dataIndex: "createTime", key: "createTime", title: "操作时间", width: 180, ellipsis: true },
+      { dataIndex: "state", key: "state", title: "状态", conver: converFormat, width: 120, ellipsis: true },
+      { dataIndex: "params", key: "params", title: "参数", showSearch: true, width: 300, ellipsis: true },
+      { dataIndex: "result", key: "result", title: "返回结果", showSearch: true, width: 300, ellipsis: true },
     ];
 
     const operater = [
-      { label: "查看", event: function (record) { alert("查看详情:" + JSON.stringify(record))}},
+      { label: "查看", event: function (record) { alert("查看详情:" + JSON.stringify(record)) } },
     ];
 
     /// 数据来源 [模拟]
@@ -81,21 +61,21 @@ export default {
       };
     };
 
-        /// 删除配置
+    /// 删除配置
     const cleanMethod = (record) => {
-      Modal.confirm({
+      modal.confirm({
         title: '您是否确定要清空日志?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
         cancelText: '取消',
         onOk() {
           message.loading({ content: "提交中...", key: cleanKey });
-          clean({"isAuth":false}).then((response) => {
-            if(response.success){
-              message.success({content: "清空成功", key: cleanKey, duration: 1})
+          clean({ "isAuth": false }).then((response) => {
+            if (response.success) {
+              message.success({ content: "清空成功", key: cleanKey, duration: 1 })
               tableRef.value.reload()
-            }else{
-              message.error({content: "清空失败", key: cleanKey, duration: 1})
+            } else {
+              message.error({ content: "清空失败", key: cleanKey, duration: 1 })
             }
           })
         }
@@ -104,8 +84,8 @@ export default {
 
     /// 工具栏
     const toolbar = [
-      { label: "备份", event: function () { exportExcel(); }},
-      { label: "清空", event: function () { cleanMethod(); }},
+      { label: "备份", event: function () { exportExcel(); } },
+      { label: "清空", event: function () { cleanMethod(); } },
     ];
 
     /// 分页参数
@@ -122,18 +102,19 @@ export default {
 
     /// 查询参数
     const searchParam = [
-        { key: "title", type: "input", label: "标题"},
-        { key: "state", type: "select", label: "状态", value: "",
-          options: [
-            { text: "全部", value: ""},
-            { text: "成功", value: true},
-            { text: "失败", value: false}
-          ]
-        }
+      { key: "title", type: "input", label: "标题" },
+      {
+        key: "state", type: "select", label: "状态", value: "",
+        options: [
+          { text: "全部", value: "" },
+          { text: "成功", value: true },
+          { text: "失败", value: false }
+        ]
+      }
     ]
 
     /// 查询操作
-    const search = function(value) {
+    const search = function (value) {
       state.param.title = value.title
       state.param.state = value.state
     }
diff --git a/src/view/post/index.vue b/src/view/post/index.vue
index 998f2f6..56ea700 100644
--- a/src/view/post/index.vue
+++ b/src/view/post/index.vue
@@ -1,43 +1,23 @@
 <template>
-    <page-layout>
-      <a-row :gutter="[10, 10]">
-        <!-- 查询表单 -->
-        <a-col :span="24">
-          <a-card>
-            <pro-query
-              :searchParam="searchParam"
-              @on-search ="search"
-            ></pro-query>
-          </a-card>
-        </a-col>
-        <!-- 岗位列表 -->
-        <a-col :span="24">
-          <a-card>
-            <pro-table
-              ref="tableRef"
-              :fetch="fetch"
-              :columns="columns"
-              :toolbar="toolbar"
-              :operate="operate"
-              :param="state.param"
-              :pagination="pagination"
-              :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
-            >
-            </pro-table>
-          </a-card>
-        </a-col>
-      </a-row>
-      <save :visible="state.visibleSave" @close="closeSave"></save>
-      <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-      <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
-    </page-layout>
+  <a-list-layout ref="pageRef">
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
+    <save :visible="state.visibleSave" @close="closeSave"></save>
+    <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
+    <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
+  </a-list-layout>
 </template>
 
 <script>
 import save from './modal/save.vue';
 import edit from './modal/edit.vue';
 import info from './modal/info.vue';
-import { message , Modal} from '@hwork/ant-design-vue';
+import { message, Modal as modal } from '@hwork/ant-design-vue';
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { page, remove, removeBatch } from "@/api/module/post";
 import { reactive, createVNode, ref } from 'vue';
@@ -63,7 +43,7 @@ export default {
       { dataIndex: "name", key: "name", title: "名称" },
       { dataIndex: "code", key: "code", title: "标识" },
       { dataIndex: "remark", key: "remark", title: "备注" },
-      { dataIndex: "enable", key: "enable", title: "状态", switch: switchFormat},
+      { dataIndex: "enable", key: "enable", title: "状态", switch: switchFormat },
       { dataIndex: "sort", key: "sort", title: "排序" },
     ];
 
@@ -78,20 +58,20 @@ export default {
 
     /// 删除配置
     const removeMethod = (record) => {
-      Modal.confirm({
+      modal.confirm({
         title: '您是否确定要删除此配置?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
         cancelText: '取消',
         onOk() {
           message.loading({ content: "提交中...", key: removeKey });
-          remove({"id":record.id}).then((response) => {
-            if(response.success){
-              message.success({content: "删除成功", key: removeKey, duration: 1}).then(()=>{
+          remove({ "id": record.id }).then((response) => {
+            if (response.success) {
+              message.success({ content: "删除成功", key: removeKey, duration: 1 }).then(() => {
                 tableRef.value.reload()
               })
-            }else{
-              message.error({content: "删除失败", key: removeKey, duration: 1})
+            } else {
+              message.error({ content: "删除失败", key: removeKey, duration: 1 })
             }
           })
         }
@@ -99,20 +79,20 @@ export default {
     }
 
     const removeBatchMethod = (ids) => {
-       Modal.confirm({
+      modal.confirm({
         title: '您是否确定要删除选择配置?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
         cancelText: '取消',
         onOk() {
           message.loading({ content: "提交中...", key: removeBatchKey });
-          removeBatch({"ids":ids}).then((response) => {
-            if(response.success){
-              message.success({content: "删除成功", key: removeBatchKey, duration: 1}).then(()=>{
+          removeBatch({ "ids": ids }).then((response) => {
+            if (response.success) {
+              message.success({ content: "删除成功", key: removeBatchKey, duration: 1 }).then(() => {
                 tableRef.value.reload()
               })
-            }else{
-              message.error({content: "删除失败", key: removeBatchKey, duration: 1})
+            } else {
+              message.error({ content: "删除失败", key: removeBatchKey, duration: 1 })
             }
           })
         }
@@ -121,15 +101,15 @@ export default {
 
     /// 工具栏
     const toolbar = [
-      { label: "新增", event: function () { state.visibleSave = true }},
-      { label: "删除", event: function () { removeBatchMethod(state.selectedRowKeys) }},
+      { label: "新增", event: function () { state.visibleSave = true } },
+      { label: "删除", event: function () { removeBatchMethod(state.selectedRowKeys) } },
     ];
 
     /// 行操作
     const operate = [
-      { label: "查看", event: function (record) { state.visibleInfo = true, state.recordInfo = record }},
-      { label: "修改", event: function (record) { state.visibleEdit = true, state.recordEdit = record }},
-      { label: "删除", event: function (record) { removeMethod(record) }},
+      { label: "查看", event: function (record) { state.visibleInfo = true, state.recordInfo = record } },
+      { label: "修改", event: function (record) { state.visibleEdit = true, state.recordEdit = record } },
+      { label: "删除", event: function (record) { removeMethod(record) } },
     ];
 
     /// 分页参数
@@ -148,28 +128,28 @@ export default {
       recordEdit: {},
       recordInfo: {},
     })
-    
+
     const searchParam = [
-        { key: "name", type: "input", label: "岗位名称"},
-        { key: "code", type: "input", label: "岗位编码"},
+      { key: "name", type: "input", label: "岗位名称" },
+      { key: "code", type: "input", label: "岗位编码" },
     ]
 
-    const search = function(value) {
+    const search = function (value) {
       state.param = value
       tableRef.value.reload()
     }
 
-    const closeSave = function(){
+    const closeSave = function () {
       state.visibleSave = false
       tableRef.value.reload()
     }
 
-    const closeEdit = function(){
+    const closeEdit = function () {
       state.visibleEdit = false
       tableRef.value.reload()
     }
 
-    const closeInfo = function(){
+    const closeInfo = function () {
       state.visibleInfo = false
     }
 
@@ -178,16 +158,16 @@ export default {
     };
 
     return {
-      state, 
-      fetch, 
+      state,
+      fetch,
       search,
       toolbar,
-      columns, 
-      operate, 
-      pagination, 
-      searchParam, 
+      columns,
+      operate,
+      pagination,
+      searchParam,
       onSelectChange,
-      
+
       closeSave,
       closeEdit,
       closeInfo,
@@ -196,4 +176,4 @@ export default {
     };
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/view/role/index.vue b/src/view/role/index.vue
index daec4c8..d3d315d 100644
--- a/src/view/role/index.vue
+++ b/src/view/role/index.vue
@@ -119,7 +119,7 @@
 
       /// 删除角色
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此角色?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -154,7 +154,7 @@
 
       /// 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择角色?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/tenant/index.vue b/src/view/tenant/index.vue
index d0e3597..fd8077d 100644
--- a/src/view/tenant/index.vue
+++ b/src/view/tenant/index.vue
@@ -1,40 +1,20 @@
 <template>
-    <page-layout>
-      <a-row :gutter="[10, 10]">
-        <!-- 顶部区域 -->
-        <a-col :span="24">
-          <a-card>
-            <!-- 查询参数 -->
-            <pro-query
-              :searchParam="searchParam"
-              @on-search ="search"
-            ></pro-query>
-          </a-card>
-        </a-col>
-        <!-- 中心区域 -->
-        <a-col :span="24">
-          <a-card>
-            <!-- 列表 -->
-            <pro-table
-               ref="tableRef"
-              :fetch="fetch"
-              :columns="columns"
-              :toolbar="toolbar"
-              :operate="operate"
-              :param="state.param"
-              :pagination="pagination"
-              :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
-            >
-              <!-- 继承至 a-table 的默认插槽 -->
-            </pro-table>
-          </a-card>
-        </a-col>
-      </a-row>
-      <save :visible="state.visibleSave" @close="closeSave"></save>
-      <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-      <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
-      <give :visible="state.visibleGive" @close="closeGive" :record="state.recordGive"></give>
-    </page-layout>
+  <a-list-layout ref="pageRef">
+    <template #search>
+      <!-- 查询参数 -->
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
+    <!-- 列表 -->
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+      <!-- 继承至 a-table 的默认插槽 -->
+    </pro-table>
+    <save :visible="state.visibleSave" @close="closeSave"></save>
+    <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
+    <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
+    <give :visible="state.visibleGive" @close="closeGive" :record="state.recordGive"></give>
+  </a-list-layout>
 </template>
 
 <script>
@@ -42,7 +22,7 @@ import save from './modal/save.vue';
 import edit from './modal/edit.vue';
 import info from './modal/info.vue';
 import give from './modal/give.vue';
-import { message , Modal} from '@hwork/ant-design-vue';
+import { message, Modal as modal } from '@hwork/ant-design-vue';
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { page, remove, removeBatch } from "@/api/module/tenant";
 import { reactive, createVNode, ref } from 'vue';
@@ -63,7 +43,7 @@ export default {
 
     const columns = [
       { dataIndex: "name", key: "name", title: "名称" },
-      { dataIndex: "describe", key: "describe", title: "描述"},
+      { dataIndex: "describe", key: "describe", title: "描述" },
       { dataIndex: "createTime", key: "createTime", title: "创建时间" },
     ];
 
@@ -91,20 +71,20 @@ export default {
     }
 
     const removeBatchMethod = (ids) => {
-       Modal.confirm({
+      modal.confirm({
         title: '您是否确定要删除选择租户?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
         cancelText: '取消',
         onOk() {
           message.loading({ content: "提交中...", key: removeBatchKey });
-          removeBatch({"ids":ids}).then((response) => {
-            if(response.success){
-              message.success({content: "删除成功", key: removeBatchKey, duration: 1}).then(()=>{
+          removeBatch({ "ids": ids }).then((response) => {
+            if (response.success) {
+              message.success({ content: "删除成功", key: removeBatchKey, duration: 1 }).then(() => {
                 tableRef.value.reload()
               })
-            }else{
-              message.error({content: "删除失败", key: removeBatchKey, duration: 1})
+            } else {
+              message.error({ content: "删除失败", key: removeBatchKey, duration: 1 })
             }
           })
         }
@@ -113,16 +93,16 @@ export default {
 
     /// 工具栏
     const toolbar = [
-      { label: "新增", event: function () { state.visibleSave = true }},
-      { label: "删除", event: function () { removeBatchMethod(state.selectedRowKeys) }},
+      { label: "新增", event: function () { state.visibleSave = true } },
+      { label: "删除", event: function () { removeBatchMethod(state.selectedRowKeys) } },
     ];
 
     /// 行操作
     const operate = [
-      { label: "查看", event: function (record) { state.visibleInfo = true, state.recordInfo = record }},
-      { label: "修改", event: function (record) { state.visibleEdit = true, state.recordEdit = record }},
-      { label: "分配", event: function (record) { state.visibleGive = true, state.recordGive = record }},
-      { label: "删除",isDel:true, delEvent: function (record) { removeMethod(record) }},
+      { label: "查看", event: function (record) { state.visibleInfo = true, state.recordInfo = record } },
+      { label: "修改", event: function (record) { state.visibleEdit = true, state.recordEdit = record } },
+      { label: "分配", event: function (record) { state.visibleGive = true, state.recordGive = record } },
+      { label: "删除", isDel: true, delEvent: function (record) { removeMethod(record) } },
     ];
 
     /// 分页参数
@@ -150,52 +130,52 @@ export default {
 
     /// 查询参数
     const searchParam = [
-      { key: "name", type: "input", label: "名称"},
-      { key: "key", type: "input", label: "Key"},
+      { key: "name", type: "input", label: "名称" },
+      { key: "key", type: "input", label: "Key" },
     ]
 
     /// 查询操作
-    const search = function(value) {
+    const search = function (value) {
       state.param = value
       tableRef.value.reload()
     }
 
-    const closeSave = function(){
+    const closeSave = function () {
       state.visibleSave = false;
       tableRef.value.reload()
     }
 
-    const closeEdit = function(){
+    const closeEdit = function () {
       state.visibleEdit = false;
       tableRef.value.reload()
     }
 
-    const closeInfo = function(){
+    const closeInfo = function () {
       state.visibleInfo = false;
     }
 
-    const closeGive = function(){
+    const closeGive = function () {
       state.visibleGive = false;
     }
 
     return {
-      state, 
-      fetch, 
+      state,
+      fetch,
       search,
       toolbar,
-      columns, 
-      operate, 
+      columns,
+      operate,
       pagination,
-      searchParam, 
+      searchParam,
       onSelectChange,
 
       closeSave,
       closeEdit,
       closeInfo,
       closeGive,
-    
+
       tableRef
     };
   },
 };
-</script>  
\ No newline at end of file
+</script>
diff --git a/src/view/user/index.vue b/src/view/user/index.vue
index cdd7d52..e4270ff 100644
--- a/src/view/user/index.vue
+++ b/src/view/user/index.vue
@@ -1,45 +1,25 @@
 <template>
-    <page-layout>
-      <!-- 列表页面 -->
-      <a-row :gutter="[10, 10]">
-        <!-- 查询条件 -->
-        <a-col :span="24">
-          <a-card>
-            <pro-query
-              :searchParam="searchParam"
-              @on-search ="search"
-            >
-              <template #test="{ data }">
-                <a-input v-model:value="data.test" type="text" />
-              </template>
-            </pro-query>
-          </a-card>
-        </a-col>
-        <!-- 用户列表 -->
-        <a-col :span="24">
-          <a-card>
-            <pro-table
-               ref="tableRef"
-              :fetch="fetch"
-              :columns="columns"
-              :toolbar="toolbar"
-              :operate="operate"
-              :param="state.param"
-              :pagination="pagination"
-              :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-            </pro-table>
-          </a-card>
-        </a-col>
-      </a-row>
-      <!-- 新增页面 -->
-      <save :visible="state.visibleSave" @close="closeSave" :record="state.record"></save>
-      <!-- 修改页面 -->
-      <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit" ></edit>
-      <!-- 分配页面 -->
-      <give :visible="state.visibleGive" @close="closeGive" :record="state.recordGive"></give>
-      <!-- 详情页面 -->
-      <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
-    </page-layout>
+  <a-list-layout ref="pageRef">
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search">
+        <template #test="{ data }">
+          <a-input v-model:value="data.test" type="text" />
+        </template>
+      </pro-query>
+    </template>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
+    <!-- 新增页面 -->
+    <save :visible="state.visibleSave" @close="closeSave" :record="state.record"></save>
+    <!-- 修改页面 -->
+    <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
+    <!-- 分配页面 -->
+    <give :visible="state.visibleGive" @close="closeGive" :record="state.recordGive"></give>
+    <!-- 详情页面 -->
+    <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
+  </a-list-layout>
 </template>
 
 <script>
@@ -47,7 +27,7 @@ import save from './modal/save.vue';
 import edit from './modal/edit.vue';
 import give from './modal/give.vue';
 import info from './modal/info.vue';
-import { message , Modal} from '@hwork/ant-design-vue';
+import { message, Modal as modal } from '@hwork/ant-design-vue';
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { page, remove, removeBatch, resetPassword } from "@/api/module/user";
 import { reactive, createVNode, ref } from 'vue';
@@ -76,31 +56,31 @@ export default {
     };
 
     const resetPasswordMethod = (record) => {
-      resetPassword({"id":record.id}).then((response) => {
-        if(response.success){
-          message.success({content: "重置成功", key: removeKey, duration: 1})
-        }else{
-          message.error({content: "重置失败", key: removeKey, duration: 1})
+      resetPassword({ "id": record.id }).then((response) => {
+        if (response.success) {
+          message.success({ content: "重置成功", key: removeKey, duration: 1 })
+        } else {
+          message.error({ content: "重置失败", key: removeKey, duration: 1 })
         }
       })
     }
 
     /// 删除用户
     const removeMethod = (record) => {
-      Modal.confirm({
+      modal.confirm({
         title: '您是否确定要删除此用户?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
         cancelText: '取消',
         onOk() {
           message.loading({ content: "提交中...", key: removeKey });
-          remove({"id":record.id}).then((response) => {
-            if(response.success){
-              message.success({content: "删除成功", key: removeKey, duration: 1}).then(() => 
+          remove({ "id": record.id }).then((response) => {
+            if (response.success) {
+              message.success({ content: "删除成功", key: removeKey, duration: 1 }).then(() =>
                 tableRef.value.reload()
               )
-            }else{
-              message.error({content: "删除失败", key: removeKey, duration: 1})
+            } else {
+              message.error({ content: "删除失败", key: removeKey, duration: 1 })
             }
           })
         }
@@ -109,20 +89,20 @@ export default {
 
     /// 批量删除
     const removeBatchMethod = (ids) => {
-       Modal.confirm({
+      modal.confirm({
         title: '您是否确定要删除选择用户?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
         cancelText: '取消',
         onOk() {
           message.loading({ content: "提交中...", key: removeBatchKey });
-          removeBatch({"ids":ids}).then((response) => {
-            if(response.success){
-              message.success({content: "删除成功", key: removeBatchKey, duration: 1}).then(() => 
+          removeBatch({ "ids": ids }).then((response) => {
+            if (response.success) {
+              message.success({ content: "删除成功", key: removeBatchKey, duration: 1 }).then(() =>
                 tableRef.value.reload()
               )
-            }else{
-              message.error({content: "删除失败", key: removeBatchKey, duration: 1})
+            } else {
+              message.error({ content: "删除失败", key: removeBatchKey, duration: 1 })
             }
           })
         }
@@ -131,27 +111,29 @@ export default {
 
     /// 工具栏
     const toolbar = [
-      { label: "新增", event: function () { state.visibleSave = true }},
-      { label: "删除", event: function () { removeBatchMethod(state.selectedRowKeys) }}
+      { label: "新增", event: function () { state.visibleSave = true } },
+      { label: "删除", event: function () { removeBatchMethod(state.selectedRowKeys) } }
     ];
 
     /// 行操作
     const operate = [
-      { label: "查看", event: function (record) { state.visibleInfo = true , state.recordInfo = record }},
-      { label: "修改", event: function (record) { state.visibleEdit = true , state.recordEdit = record }},
-      { label: "分配", event: function (record) { state.visibleGive = true , state.recordGive = record }},
-      { label: "删除", event: function (record) { removeMethod(record) }},
-      { label: '重置', event: function (record) { resetPasswordMethod(record) }}
+      { label: "查看", event: function (record) { state.visibleInfo = true, state.recordInfo = record } },
+      { label: "修改", event: function (record) { state.visibleEdit = true, state.recordEdit = record } },
+      { label: "分配", event: function (record) { state.visibleGive = true, state.recordGive = record } },
+      { label: "删除", event: function (record) { removeMethod(record) } },
+      { label: '重置', event: function (record) { resetPasswordMethod(record) } }
     ];
 
     /// 文本
-    const converFormat = [{label:"男", value:"0"},{label:"女", value:"1"}];
+    const converFormat = [{ label: "男", value: "0" }, { label: "女", value: "1" }];
 
     /// 开关
-    const switchFormat = { yes: true, no: false, event: function(value,record){
-      record.enable = !record.enable;
-      return value;
-    } };
+    const switchFormat = {
+      yes: true, no: false, event: function (value, record) {
+        record.enable = !record.enable;
+        return value;
+      }
+    };
 
     /// 头像
     const avatarFormat = { size: 36, shape: "square" };
@@ -162,18 +144,18 @@ export default {
       { dataIndex: "avatar", key: "avatar", title: "头像", avatar: avatarFormat },
       { dataIndex: "nickname", key: "nickname", title: "名称" },
       { dataIndex: "username", key: "username", title: "账号" },
-      { dataIndex: "gender", key: "gender", title: "性别", conver: converFormat},
-      { dataIndex: "enable", key: "enable", title: "状态", switch: switchFormat},
+      { dataIndex: "gender", key: "gender", title: "性别", conver: converFormat },
+      { dataIndex: "enable", key: "enable", title: "状态", switch: switchFormat },
       { dataIndex: "email", key: "email", title: "邮箱" },
       { dataIndex: "phone", key: "phone", title: "电话" },
       { dataIndex: "createTime", key: "createTime", title: "注册时间" }
     ];
 
     /// 分页参数
-    const pagination = { pageNum: 1, pageSize: 10}
+    const pagination = { pageNum: 1, pageSize: 10 }
 
     /// 外置参数
-    const state = reactive({ 
+    const state = reactive({
       selectedRowKeys: [],
       param: {},
       record: {},
@@ -188,9 +170,9 @@ export default {
 
     /// 查询参数
     const searchParam = [
-        { key: "name", type: "input", label: "名称"},
-        { key: "code", type: "input", label: "描述"},
-        { key: "test", type: "custom", label: "插槽", customRender: "test" } 
+      { key: "name", type: "input", label: "名称" },
+      { key: "code", type: "input", label: "描述" },
+      { key: "test", type: "custom", label: "插槽", customRender: "test" }
     ]
 
     /// 选择操作
@@ -199,31 +181,31 @@ export default {
     };
 
     /// 查询操作
-    const search = function(value) {
+    const search = function (value) {
       state.param = value;
       tableRef.value.reload();
     }
 
     /// 关闭新增
-    const closeSave = function(){
+    const closeSave = function () {
       state.visibleSave = false;
       tableRef.value.reload();
     }
 
     /// 关闭修改
-    const closeEdit = function(){
+    const closeEdit = function () {
       state.visibleEdit = false;
       tableRef.value.reload();
     }
 
     /// 关闭分配
-    const closeGive = function(){
+    const closeGive = function () {
       state.visibleGive = false;
       tableRef.value.reload();
     }
 
     /// 关闭详情
-    const closeInfo = function(){
+    const closeInfo = function () {
       state.visibleInfo = false;
     }
 
@@ -247,4 +229,4 @@ export default {
     };
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/view/wms/baseInfo/customer/index.vue b/src/view/wms/baseInfo/customer/index.vue
index b2a982b..b9b7d7a 100644
--- a/src/view/wms/baseInfo/customer/index.vue
+++ b/src/view/wms/baseInfo/customer/index.vue
@@ -1,26 +1,19 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- 客户信息列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
     <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -183,7 +176,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择客户信息?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/baseInfo/deliverType/index.vue b/src/view/wms/baseInfo/deliverType/index.vue
index 4f60dff..5ac6437 100644
--- a/src/view/wms/baseInfo/deliverType/index.vue
+++ b/src/view/wms/baseInfo/deliverType/index.vue
@@ -1,26 +1,19 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- 搬运类型列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
     <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -218,7 +211,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择任务?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/baseInfo/request/index.vue b/src/view/wms/baseInfo/request/index.vue
index f6ceb7c..3e759dd 100644
--- a/src/view/wms/baseInfo/request/index.vue
+++ b/src/view/wms/baseInfo/request/index.vue
@@ -1,237 +1,227 @@
 <template>
-  <div>
-    <page-layout>
-      <a-row :gutter="[0,2]">
-        <a-col :span="24">
-          <a-card>
-            <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-          </a-card>
-        </a-col>
-        <a-col :span="24">
-          <a-card>
-            <pro-table style="margin-top: 10px" rowKey="id" ref="tableRef" :fetch="fetch" :columns="columns"
-              :toolbar="toolbar" :operate="operate" :param="state.param" :pagination="pagination"
-              :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-            </pro-table>
-          </a-card>
-        </a-col>
-      </a-row>
-    </page-layout>
-  </div>
+  <a-list-layout ref="pageRef">
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
+    <pro-table style="margin-top: 10px" rowKey="id" ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar"
+      :operate="operate" :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
+  </a-list-layout>
 </template>
 <script>
-  import {
-    message,
-    notification,
-    modal
-  } from '@hwork/ant-design-vue';
-  import {
-    ExclamationCircleOutlined
-  } from '@ant-design/icons-vue';
-  import {
-    reActivate,
-    page,
-    remove,
-    cancel,
-    removeBatch
-  } from "@/api/wms/request";
-  import {
-    reactive,
-    createVNode,
-    ref,
-  } from 'vue';
-  const reActivateKey = "reActivate";
-  const removeKey = "remove";
-  const cancelKey = "cancel";
-  const removeBatchKey = "removeBatch";
+import {
+  message,
+  Modal as modal
+} from '@hwork/ant-design-vue';
+import {
+  ExclamationCircleOutlined
+} from '@ant-design/icons-vue';
+import {
+  reActivate,
+  page,
+  remove,
+  cancel,
+  removeBatch
+} from "@/api/wms/request";
+import {
+  reactive,
+  createVNode,
+  ref,
+} from 'vue';
+const reActivateKey = "reActivate";
+const removeKey = "remove";
+const cancelKey = "cancel";
+const removeBatchKey = "removeBatch";
 
-  export default {
-    components: {},
+export default {
+  name: 'WmsRequestIndex',
+  components: {},
 
-    setup() {
+  setup() {
 
-      const tableRef = ref()
+    const tableRef = ref()
 
-      const columns = [{
-          dataIndex: "requestCode",
-          key: "requestCode",
-          title: "请求编号",
-          width: 150,
-          showSearch: true,
-        },
-        {
-          dataIndex: "status",
-          key: "status",
-          title: "状态",
-          width: 100,
-          dictionary: {
-            type: 'tag',
-            code: 'TaskStatus'
-          },
-          showSearch: true
-        },
-        {
-          dataIndex: "paramType",
-          key: "paramType",
-          title: "请求类型",
-          width: 100,
-          showSearch: true,
-        },
-        {
-          dataIndex: "processClass",
-          key: "processClass",
-          title: "处理类",
-          width: 160,
-          showSearch: true,
-        },
-        {
-          dataIndex: "requestDate",
-          key: "requestDate",
-          title: "请求时间",
-          width: 180,
-        },
-        {
-          dataIndex: "respondDate",
-          key: "respondDate",
-          title: "响应时间",
-          width: 180,
-        },
-        {
-          dataIndex: "request",
-          key: "request",
-          title: "请求数据",
-          width: 900,
-          showSearch: true,
-        },
-        {
-          dataIndex: "response",
-          key: "response",
-          title: "响应信息",
-          width: 900,
-          showSearch: true,
-        },
-        {
-          dataIndex: "createBy",
-          key: "createBy",
-          title: "录入人",
-          width: 120,
-        },
-        {
-          dataIndex: "createTime",
-          key: "createTime",
-          title: "录入时间",
-          width: 200,
-        },
-        {
-          dataIndex: "updateBy",
-          key: "updateBy",
-          title: "修改人",
-          width: 120,
-        },
-        {
-          dataIndex: "updateTime",
-          key: "updateTime",
-          title: "修改时间",
-          width: 200,
-        },
-        {
-          dataIndex: "preRequestCode",
-          key: "preRequestCode",
-          title: "前置请求编号",
-          width: 120,
-        },
-        {
-          dataIndex: "priority",
-          key: "priority",
-          title: "优先级",
-          width: 120,
-          dictionary: {
-            type: 'tag',
-            code: 'priority'
-          }
-        },
-        {
-          dataIndex: "remark",
-          key: "remark",
-          title: "备注",
-          width: 300,
-        },
-      ];
-
-
-      /// 数据来源 [模拟]
-      const fetch = async (param) => {
-        var response = await page(param);
-        console.log("response", response)
-        return {
-          total: response.data.total,
-          data: response.data.record,
-        };
-      };
-
-      //重置配置
-      const reActivateMethod = (record) => {
-        Modal.confirm({
-          title: '您是否确认重置该请求?',
-          icon: createVNode(ExclamationCircleOutlined),
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            message.loading({
-              content: "重置中...",
-              key: reActivateKey
-            });
-            reActivate({
-              'id': record.id,
-              //"status": record.status,
-              // "processClass": record.processClass,
-              //data: record.data,
-            }).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: "重置成功",
-                  key: reActivateKey,
-                  duration: 1
-                })
-                tableRef.value.reload()
-              } else {
-                message.error({
-                  content: "重置失败:" +response.msg,
-                  key: reActivateKey,
-                  duration: 3
-                })
-              }
-            })
-          }
-        });
+    const columns = [{
+      dataIndex: "requestCode",
+      key: "requestCode",
+      title: "请求编号",
+      width: 150,
+      showSearch: true,
+    },
+    {
+      dataIndex: "status",
+      key: "status",
+      title: "状态",
+      width: 100,
+      dictionary: {
+        type: 'tag',
+        code: 'TaskStatus'
+      },
+      showSearch: true
+    },
+    {
+      dataIndex: "paramType",
+      key: "paramType",
+      title: "请求类型",
+      width: 100,
+      showSearch: true,
+    },
+    {
+      dataIndex: "processClass",
+      key: "processClass",
+      title: "处理类",
+      width: 160,
+      showSearch: true,
+    },
+    {
+      dataIndex: "requestDate",
+      key: "requestDate",
+      title: "请求时间",
+      width: 180,
+    },
+    {
+      dataIndex: "respondDate",
+      key: "respondDate",
+      title: "响应时间",
+      width: 180,
+    },
+    {
+      dataIndex: "request",
+      key: "request",
+      title: "请求数据",
+      width: 900,
+      showSearch: true,
+    },
+    {
+      dataIndex: "response",
+      key: "response",
+      title: "响应信息",
+      width: 900,
+      showSearch: true,
+    },
+    {
+      dataIndex: "createBy",
+      key: "createBy",
+      title: "录入人",
+      width: 120,
+    },
+    {
+      dataIndex: "createTime",
+      key: "createTime",
+      title: "录入时间",
+      width: 200,
+    },
+    {
+      dataIndex: "updateBy",
+      key: "updateBy",
+      title: "修改人",
+      width: 120,
+    },
+    {
+      dataIndex: "updateTime",
+      key: "updateTime",
+      title: "修改时间",
+      width: 200,
+    },
+    {
+      dataIndex: "preRequestCode",
+      key: "preRequestCode",
+      title: "前置请求编号",
+      width: 120,
+    },
+    {
+      dataIndex: "priority",
+      key: "priority",
+      title: "优先级",
+      width: 120,
+      dictionary: {
+        type: 'tag',
+        code: 'priority'
       }
+    },
+    {
+      dataIndex: "remark",
+      key: "remark",
+      title: "备注",
+      width: 300,
+    },
+    ];
 
-      //取消配置
-      const cancelMethod = (record) => {
-        const confirmMsg = Modal.confirm({
-          title: '您是否确认取消该请求?',
-          icon: createVNode(ExclamationCircleOutlined),
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            message.loading({
-              content: "取消中...",
-              key: cancelKey
-            });
-            cancel({
-              'id': record.id,
-              'status':record.status,
-            }).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: "取消成功",
-                  key: cancelKey,
-                  duration: 1
-                })
-                tableRef.value.reload()
-              } else {
+
+    /// 数据来源 [模拟]
+    const fetch = async (param) => {
+      var response = await page(param);
+      console.log("response", response)
+      return {
+        total: response.data.total,
+        data: response.data.record,
+      };
+    };
+
+    //重置配置
+    const reActivateMethod = (record) => {
+      modal.confirm({
+        title: '您是否确认重置该请求?',
+        icon: createVNode(ExclamationCircleOutlined),
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          message.loading({
+            content: "重置中...",
+            key: reActivateKey
+          });
+          reActivate({
+            'id': record.id,
+            //"status": record.status,
+            // "processClass": record.processClass,
+            //data: record.data,
+          }).then((response) => {
+            if (response.success) {
+              message.success({
+                content: "重置成功",
+                key: reActivateKey,
+                duration: 1
+              })
+              tableRef.value.reload()
+            } else {
+              message.error({
+                content: "重置失败:" + response.msg,
+                key: reActivateKey,
+                duration: 3
+              })
+            }
+          })
+        }
+      });
+    }
+
+    //取消配置
+    const cancelMethod = (record) => {
+      const confirmMsg = modal.confirm({
+        title: '您是否确认取消该请求?',
+        icon: createVNode(ExclamationCircleOutlined),
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          message.loading({
+            content: "取消中...",
+            key: cancelKey
+          });
+          cancel({
+            'id': record.id,
+            'status': record.status,
+          }).then((response) => {
+            if (response.success) {
+              message.success({
+                content: "取消成功",
+                key: cancelKey,
+                duration: 1
+              })
+              tableRef.value.reload()
+            } else {
               message.destroy()
-              notification.error({
+              message.error({
                 message: '请求取消失败',
                 description: response.msg
               })
@@ -242,175 +232,175 @@
         }
       });
     }
-      // 删除数据
-      const removeMethod = (record) => {
-        Modal.confirm({
-          title: '您是否确定要删除?',
-          icon: createVNode(ExclamationCircleOutlined),
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            message.loading({
-              content: "提交中...",
-              key: removeKey
-            });
-            remove({
-              "id": record.id,
-            }).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: "删除成功",
-                  key: removeKey,
-                  duration: 1
-                }).then(() => {
-                  tableRef.value.reload()
-                })
-              } else {
-                message.error({
-                  content: response.msg,
-                  key: removeKey,
-                  duration: 1
-                })
-              }
-            })
-          }
-        });
-      }
-
-      // 批量删除
-      const removeBatchMethod = (ids) => {
-        Modal.confirm({
-          title: '您是否确定要删除?',
-          icon: createVNode(ExclamationCircleOutlined),
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            message.loading({
-              content: "提交中...",
-              key: removeBatchKey
-            });
-            removeBatch({
-              "ids": ids
-            }).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: "删除成功",
-                  key: removeBatchKey,
-                  duration: 1
-                }).then(() => {
-                  tableRef.value.reload()
-                })
-              } else {
-                message.error({
-                  content: "删除失败",
-                  key: removeBatchKey,
-                  duration: 1
-                })
-              }
-            })
-          }
-        });
-      }
-
-      /// 工具栏
-      const toolbar = [{
-        label: "删除",
-        code: remove,
-        event: function() {
-          removeBatchMethod(state.selectedRowKeys)
-        },
-        type: 'danger'
-      }, ];
-
-      /// 行操作
-      const operate = [{
-          label: "删除",
-          code: 'wms:request:delete',
-          event: function(record) {
-            removeMethod(record)
-          }
-        },
-        {
-          label: "重置",
-          code: 'wms:request:reactivate',
-          isRes: true,
-          event: function(record) {
-            reActivateMethod(record)
-          }
-        },
-        {
-          label: "取消",
-          code: 'wms:request:cancel',
-          isRes: true,
-          event: function(record) {
-            cancelMethod(record)
-          }
-        },
-        {
-          label: "查看",
-          event: function(record) {
-            alert("查看详情:" + JSON.stringify(record))
-          }
-        },
-      ];
-
-      const pagination = {
-        pageNum: 1,
-        pageSize: 20,
-        showSizeChanger: true, // 显示可改变每页条数
-        pageSizeOptions: ["10", "20", "50", "100"], // 每页条数选项设置
-        showTotal: total => `共 ${total} 条记录`, // 显示总条数
-        showSizeChange: (current, pageSize) => (this.pageSize = pageSize) // 改变每页条数时更新显示
-      };
-
-      const state = reactive({
-        selectedRowKeys: [],
-        param: {},
-      });
-
-      const searchParam = [{
-          key: "request",
-          type: "input",
-          label: "请求消息"
-        },
-        {
-          key: "response",
-          type: "input",
-          label: "响应消息"
-        }, {
-          key: "requestCode",
-          type: "input",
-          label: "请求编号"
-        },
-        {
-          key: "preRequestCode",
-          type: "input",
-          label: "前置请求编号"
+    // 删除数据
+    const removeMethod = (record) => {
+      modal.confirm({
+        title: '您是否确定要删除?',
+        icon: createVNode(ExclamationCircleOutlined),
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          message.loading({
+            content: "提交中...",
+            key: removeKey
+          });
+          remove({
+            "id": record.id,
+          }).then((response) => {
+            if (response.success) {
+              message.success({
+                content: "删除成功",
+                key: removeKey,
+                duration: 1
+              }).then(() => {
+                tableRef.value.reload()
+              })
+            } else {
+              message.error({
+                content: response.msg,
+                key: removeKey,
+                duration: 1
+              })
+            }
+          })
         }
-      ]
-
-      const search = function(value) {
-        console.log("search", value)
-        state.param = value
-      }
-
-      const onSelectChange = selectedRowKeys => {
-        state.selectedRowKeys = selectedRowKeys;
-      };
-
-      return {
-        state,
-        fetch,
-        search,
-        toolbar,
-        columns,
-        operate,
-        pagination,
-        searchParam,
-        onSelectChange,
-        tableRef,
-      };
-
+      });
     }
+
+    // 批量删除
+    const removeBatchMethod = (ids) => {
+      modal.confirm({
+        title: '您是否确定要删除?',
+        icon: createVNode(ExclamationCircleOutlined),
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          message.loading({
+            content: "提交中...",
+            key: removeBatchKey
+          });
+          removeBatch({
+            "ids": ids
+          }).then((response) => {
+            if (response.success) {
+              message.success({
+                content: "删除成功",
+                key: removeBatchKey,
+                duration: 1
+              }).then(() => {
+                tableRef.value.reload()
+              })
+            } else {
+              message.error({
+                content: "删除失败",
+                key: removeBatchKey,
+                duration: 1
+              })
+            }
+          })
+        }
+      });
+    }
+
+    /// 工具栏
+    const toolbar = [{
+      label: "删除",
+      code: 'wms:request:delete',
+      event: function () {
+        removeBatchMethod(state.selectedRowKeys)
+      },
+      type: 'danger'
+    },];
+
+    /// 行操作
+    const operate = [{
+      label: "删除",
+      code: 'wms:request:delete',
+      event: function (record) {
+        removeMethod(record)
+      }
+    },
+    {
+      label: "重置",
+      code: 'wms:request:reactivate',
+      isRes: true,
+      event: function (record) {
+        reActivateMethod(record)
+      }
+    },
+    {
+      label: "取消",
+      code: 'wms:request:cancel',
+      isRes: true,
+      event: function (record) {
+        cancelMethod(record)
+      }
+    },
+    {
+      label: "查看",
+      event: function (record) {
+        alert("查看详情:" + JSON.stringify(record))
+      }
+    },
+    ];
+
+    const pagination = {
+      pageNum: 1,
+      pageSize: 20,
+      showSizeChanger: true, // 显示可改变每页条数
+      pageSizeOptions: ["10", "20", "50", "100"], // 每页条数选项设置
+      showTotal: total => `共 ${total} 条记录`, // 显示总条数
+      showSizeChange: (current, pageSize) => (this.pageSize = pageSize) // 改变每页条数时更新显示
+    };
+
+    const state = reactive({
+      selectedRowKeys: [],
+      param: {},
+    });
+
+    const searchParam = [{
+      key: "request",
+      type: "input",
+      label: "请求消息"
+    },
+    {
+      key: "response",
+      type: "input",
+      label: "响应消息"
+    }, {
+      key: "requestCode",
+      type: "input",
+      label: "请求编号"
+    },
+    {
+      key: "preRequestCode",
+      type: "input",
+      label: "前置请求编号"
+    }
+    ]
+
+    const search = function (value) {
+      console.log("search", value)
+      state.param = value
+    }
+
+    const onSelectChange = selectedRowKeys => {
+      state.selectedRowKeys = selectedRowKeys;
+    };
+
+    return {
+      state,
+      fetch,
+      search,
+      toolbar,
+      columns,
+      operate,
+      pagination,
+      searchParam,
+      onSelectChange,
+      tableRef,
+    };
+
   }
+}
 </script>
diff --git a/src/view/wms/baseInfo/skuCategory/index.vue b/src/view/wms/baseInfo/skuCategory/index.vue
index 713cd8c..9f94ada 100644
--- a/src/view/wms/baseInfo/skuCategory/index.vue
+++ b/src/view/wms/baseInfo/skuCategory/index.vue
@@ -1,324 +1,316 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
-      <!-- 岗位列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+  <a-list-layout ref="pageRef">
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
+    <!-- 岗位列表 -->
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
-  import save from './modal/save.vue';
-  import edit from './modal/edit.vue';
-  import {
-    message,
-    Modal as modal
-  } from '@hwork/ant-design-vue';
-  import {
-    ExclamationCircleOutlined
-  } from '@ant-design/icons-vue';
-  import {
-    page,
-    remove,
-    removeBatch
-  } from "@/api/wms/skuCategory";
-  import {
-    reactive,
-    createVNode,
-    ref
-  } from 'vue';
+import save from './modal/save.vue';
+import edit from './modal/edit.vue';
+import {
+  message,
+  Modal as modal
+} from '@hwork/ant-design-vue';
+import {
+  ExclamationCircleOutlined
+} from '@ant-design/icons-vue';
+import {
+  page,
+  remove,
+  removeBatch
+} from "@/api/wms/skuCategory";
+import {
+  reactive,
+  createVNode,
+  ref
+} from 'vue';
 
-  const removeKey = "remove";
-  const removeBatchKey = "removeBatch";
+const removeKey = "remove";
+const removeBatchKey = "removeBatch";
 
-  export default {
-    components: {
-      save,
-      edit,
+export default {
+  name: "SkuCategory",
+  components: {
+    save,
+    edit,
 
+  },
+  setup() {
+
+    const tableRef = ref();
+
+    /// 列配置
+    const columns = [{
+      dataIndex: "categoryCode",
+      key: "categoryCode",
+      title: "种类编号",
+      width: 140,
+      defaultSortOrder: 'ascend',
+      sorter: (a, b) => a.categoryCode - b.categoryCode,
+      showSearch: true
+    },
+    {
+      dataIndex: "categoryName",
+      key: "categoryName",
+      title: "种类名称",
+      width: 120,
+      showSearch: true
+    },
+    {
+      dataIndex: "categoryDesc",
+      key: "categoryDesc",
+      title: "种类描述",
+      width: 100,
+      showSearch: true
+    },
+    {
+      dataIndex: "treeLevel",
+      key: "treeLevel",
+      title: "层级",
+      width: 100,
+      showSearch: true
+    },
+    {
+      dataIndex: "treeCode",
+      key: "treeCode",
+      title: "编号",
+      width: 100,
+      showSearch: true
+    },
+    {
+      dataIndex: "isActive",
+      key: "isActive",
+      title: "是否有效",
+      width: 100,
+      dictionary: {
+        type: 'tag',
+        code: 'isActive'
+      },
     },
-    setup() {
 
-      const tableRef = ref();
-
-      /// 列配置
-      const columns = [{
-          dataIndex: "categoryCode",
-          key: "categoryCode",
-          title: "种类编号",
-          width: 140,
-          defaultSortOrder: 'ascend',
-          sorter: (a, b) => a.categoryCode - b.categoryCode,
-          showSearch: true
-        },
-        {
-          dataIndex: "categoryName",
-          key: "categoryName",
-          title: "种类名称",
-          width: 120,
-          showSearch: true
-        },
-        {
-          dataIndex: "categoryDesc",
-          key: "categoryDesc",
-          title: "种类描述",
-          width: 100,
-          showSearch: true
-        },
-        {
-          dataIndex: "treeLevel",
-          key: "treeLevel",
-          title: "层级",
-          width: 100,
-          showSearch: true
-        },
-        {
-          dataIndex: "treeCode",
-          key: "treeCode",
-          title: "编号",
-          width: 100,
-          showSearch: true
-        },
-        {
-          dataIndex: "isActive",
-          key: "isActive",
-          title: "是否有效",
-          width: 100,
-          dictionary: {
-            type: 'tag',
-            code: 'isActive'
-          },
-        },
-
-        {
-          dataIndex: "createBy",
-          key: "createBy",
-          title: "录入人",
-          width: 100,
-        },
-        {
-          dataIndex: "createTime",
-          key: "createTime",
-          title: "录入时间",
-          width: 200,
-        },
-        {
-          dataIndex: "updateBy",
-          key: "updateBy",
-          title: "更新人",
-          width: 100,
-        },
-        {
-          dataIndex: "updateTime",
-          key: "updateTime",
-          title: "更新时间",
-          width: 200,
-        },
-        {
-          dataIndex: "remark",
-          key: "remark",
-          title: "备注",
-          width: 100,
-        },
-      ];
-
-      /// 数据来源 [模拟]
-      const fetch = async (param) => {
-        var response = await page(param);
-        return {
-          total: response.data.total,
-          data: response.data.record,
-        };
-      };
-
-      /// 删除配置
-      const removeMethod = (record) => {
-        Modal.confirm({
-          title: '您是否确定要删除此数据?',
-          icon: createVNode(ExclamationCircleOutlined),
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            message.loading({
-              content: "提交中...",
-              key: removeKey
-            });
-            remove({
-              "id": record.id
-            }).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: "删除成功",
-                  key: removeKey,
-                  duration: 1
-                }).then(() => {
-                  tableRef.value.reload()
-                })
-              } else {
-                message.error({
-                  content: "删除失败",
-                  key: removeKey,
-                  duration: 1
-                })
-              }
-            })
-          }
-        });
-      }
-
-      const removeBatchMethod = (ids) => {
-        Modal.confirm({
-          title: '您是否确定要删除选择数据?',
-          icon: createVNode(ExclamationCircleOutlined),
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            message.loading({
-              content: "提交中...",
-              key: removeBatchKey
-            });
-            removeBatch({
-              "ids": ids
-            }).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: "删除成功",
-                  key: removeBatchKey,
-                  duration: 1
-                }).then(() => {
-                  tableRef.value.reload()
-                })
-              } else {
-                message.error({
-                  content: "删除失败",
-                  key: removeBatchKey,
-                  duration: 1
-                })
-              }
-            })
-          }
-        });
-      }
-
-      /// 工具栏
-      const toolbar = [{
-          label: "新增",
-          code: 'wms:skuCategory:add',
-          event: function() {
-            state.visibleSave = true
-          }
-        },
-        {
-          label: "删除",
-          code: 'wms:skuCategory:remove',
-          event: function() {
-            removeBatchMethod(state.selectedRowKeys)
-          },
-          type: 'danger'
-        },
-      ];
-
-      /// 行操作
-      const operate = [
-        // { label: "查看", event: function (record) { state.visibleInfo = true, state.recordInfo = record }},
-        {
-          label: "修改",
-          code: 'wms:skuCategory:edit',
-          event: function(record) {
-            state.visibleEdit = true, state.recordEdit = record
-          }
-        },
-        {
-          label: "删除",
-          code: 'wms:skuCategory:delete',
-          event: function(record) {
-            removeMethod(record)
-          }
-        },
-      ];
-
-      /// 分页参数
-      const pagination = {
-        pageNum: 1,
-        pageSize: 20,
-        showSizeChanger: true, // 显示可改变每页条数
-        pageSizeOptions: ["10", "20", "50", "100"], // 每页条数选项设置
-        showTotal: total => `共 ${total} 条记录`, // 显示总条数
-        showSizeChange: (current, pageSize) => (this.pageSize = pageSize) // 改变每页条数时更新显示
-      }
-
-      /// 外置参数 - 当参数改变时, 重新触发 fetch 函数
-      const state = reactive({
-        selectedRowKeys: [],
-        param: {},
-        visibleSave: false,
-        visibleEdit: false,
-        recordEdit: {},
-      })
-
-      const searchParam = [{
-          key: "categoryCode",
-          type: "input",
-          label: "种类编号"
-        },
-        {
-          key: "categoryName",
-          type: "input",
-          label: "种类名称"
-        },
-      ]
-
-      const search = function(value) {
-        state.param = value
-        tableRef.value.reload()
-      }
-
-      const closeSave = function() {
-        state.visibleSave = false
-        tableRef.value.reload()
-      }
-
-      const closeEdit = function() {
-        state.visibleEdit = false
-        tableRef.value.reload()
-      }
-
-
-      const onSelectChange = selectedRowKeys => {
-        state.selectedRowKeys = selectedRowKeys;
-      };
+    {
+      dataIndex: "createBy",
+      key: "createBy",
+      title: "录入人",
+      width: 100,
+    },
+    {
+      dataIndex: "createTime",
+      key: "createTime",
+      title: "录入时间",
+      width: 200,
+    },
+    {
+      dataIndex: "updateBy",
+      key: "updateBy",
+      title: "更新人",
+      width: 100,
+    },
+    {
+      dataIndex: "updateTime",
+      key: "updateTime",
+      title: "更新时间",
+      width: 200,
+    },
+    {
+      dataIndex: "remark",
+      key: "remark",
+      title: "备注",
+      width: 100,
+    },
+    ];
 
+    /// 数据来源 [模拟]
+    const fetch = async (param) => {
+      var response = await page(param);
       return {
-        state,
-        fetch,
-        search,
-        toolbar,
-        columns,
-        operate,
-        pagination,
-        searchParam,
-        onSelectChange,
-
-        closeSave,
-        closeEdit,
-
-        tableRef
+        total: response.data.total,
+        data: response.data.record,
       };
+    };
+
+    /// 删除配置
+    const removeMethod = (record) => {
+      modal.confirm({
+        title: '您是否确定要删除此数据?',
+        icon: createVNode(ExclamationCircleOutlined),
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          message.loading({
+            content: "提交中...",
+            key: removeKey
+          });
+          remove({
+            "id": record.id
+          }).then((response) => {
+            if (response.success) {
+              message.success({
+                content: "删除成功",
+                key: removeKey,
+                duration: 1
+              }).then(() => {
+                tableRef.value.reload()
+              })
+            } else {
+              message.error({
+                content: "删除失败",
+                key: removeKey,
+                duration: 1
+              })
+            }
+          })
+        }
+      });
+    }
+
+    const removeBatchMethod = (ids) => {
+      modal.confirm({
+        title: '您是否确定要删除选择数据?',
+        icon: createVNode(ExclamationCircleOutlined),
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          message.loading({
+            content: "提交中...",
+            key: removeBatchKey
+          });
+          removeBatch({
+            "ids": ids
+          }).then((response) => {
+            if (response.success) {
+              message.success({
+                content: "删除成功",
+                key: removeBatchKey,
+                duration: 1
+              }).then(() => {
+                tableRef.value.reload()
+              })
+            } else {
+              message.error({
+                content: "删除失败",
+                key: removeBatchKey,
+                duration: 1
+              })
+            }
+          })
+        }
+      });
+    }
+
+    /// 工具栏
+    const toolbar = [{
+      label: "新增",
+      code: 'wms:skuCategory:add',
+      event: function () {
+        state.visibleSave = true
+      }
     },
-  };
+    {
+      label: "删除",
+      code: 'wms:skuCategory:remove',
+      event: function () {
+        removeBatchMethod(state.selectedRowKeys)
+      },
+      type: 'danger'
+    },
+    ];
+
+    /// 行操作
+    const operate = [
+      // { label: "查看", event: function (record) { state.visibleInfo = true, state.recordInfo = record }},
+      {
+        label: "修改",
+        code: 'wms:skuCategory:edit',
+        event: function (record) {
+          state.visibleEdit = true, state.recordEdit = record
+        }
+      },
+      {
+        label: "删除",
+        code: 'wms:skuCategory:delete',
+        event: function (record) {
+          removeMethod(record)
+        }
+      },
+    ];
+
+    /// 分页参数
+    const pagination = {
+      pageNum: 1,
+      pageSize: 20,
+      showSizeChanger: true, // 显示可改变每页条数
+      pageSizeOptions: ["10", "20", "50", "100"], // 每页条数选项设置
+      showTotal: total => `共 ${total} 条记录`, // 显示总条数
+      showSizeChange: (current, pageSize) => (this.pageSize = pageSize) // 改变每页条数时更新显示
+    }
+
+    /// 外置参数 - 当参数改变时, 重新触发 fetch 函数
+    const state = reactive({
+      selectedRowKeys: [],
+      param: {},
+      visibleSave: false,
+      visibleEdit: false,
+      recordEdit: {},
+    })
+
+    const searchParam = [{
+      key: "categoryCode",
+      type: "input",
+      label: "种类编号"
+    },
+    {
+      key: "categoryName",
+      type: "input",
+      label: "种类名称"
+    },
+    ]
+
+    const search = function (value) {
+      state.param = value
+      tableRef.value.reload()
+    }
+
+    const closeSave = function () {
+      state.visibleSave = false
+      tableRef.value.reload()
+    }
+
+    const closeEdit = function () {
+      state.visibleEdit = false
+      tableRef.value.reload()
+    }
+
+
+    const onSelectChange = selectedRowKeys => {
+      state.selectedRowKeys = selectedRowKeys;
+    };
+
+    return {
+      state,
+      fetch,
+      search,
+      toolbar,
+      columns,
+      operate,
+      pagination,
+      searchParam,
+      onSelectChange,
+
+      closeSave,
+      closeEdit,
+
+      tableRef
+    };
+  },
+};
 </script>
diff --git a/src/view/wms/billsInfo/check/addCheckDetail/addCheckDetail.vue b/src/view/wms/billsInfo/check/addCheckDetail/addCheckDetail.vue
index 1af6888..583f16b 100644
--- a/src/view/wms/billsInfo/check/addCheckDetail/addCheckDetail.vue
+++ b/src/view/wms/billsInfo/check/addCheckDetail/addCheckDetail.vue
@@ -62,7 +62,7 @@
   import save from './model/save.vue';
   import {
     message,
-    Modal,
+    Modal as modal,
   } from '@hwork/ant-design-vue';
   import {
     CheckOutlined,
@@ -312,7 +312,7 @@
 
       //删除
       const removeMethod = (id) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此条数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -349,7 +349,7 @@
 
       //批量删除
       const removeactQtyMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/check/addCheckDetail/model/save.vue b/src/view/wms/billsInfo/check/addCheckDetail/model/save.vue
index 4585834..e9377e5 100644
--- a/src/view/wms/billsInfo/check/addCheckDetail/model/save.vue
+++ b/src/view/wms/billsInfo/check/addCheckDetail/model/save.vue
@@ -20,7 +20,7 @@
 <script>
   import {
     message,
-    Modal,
+    Modal as modal,
   } from '@hwork/ant-design-vue';
 
   import {
@@ -228,7 +228,7 @@
 
       //删除
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此条数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -263,7 +263,7 @@
 
       //批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/check/checkPlt/checkPlt.vue b/src/view/wms/billsInfo/check/checkPlt/checkPlt.vue
index 577d0ec..2296400 100644
--- a/src/view/wms/billsInfo/check/checkPlt/checkPlt.vue
+++ b/src/view/wms/billsInfo/check/checkPlt/checkPlt.vue
@@ -25,7 +25,7 @@
   import edit from './model/edit.vue';
   import {
     message,
-    Modal,
+    Modal as modal,
   } from '@hwork/ant-design-vue';
 
   import {
@@ -187,7 +187,7 @@
 
       //删除
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此条数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -222,7 +222,7 @@
 
       //批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/check/index.vue b/src/view/wms/billsInfo/check/index.vue
index f5f7dd8..28d7ce4 100644
--- a/src/view/wms/billsInfo/check/index.vue
+++ b/src/view/wms/billsInfo/check/index.vue
@@ -135,7 +135,7 @@
 
       // 删除数据
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -171,7 +171,7 @@
 
       // 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/check/modal/checkDetail.vue b/src/view/wms/billsInfo/check/modal/checkDetail.vue
index 1a8f74f..70d5033 100644
--- a/src/view/wms/billsInfo/check/modal/checkDetail.vue
+++ b/src/view/wms/billsInfo/check/modal/checkDetail.vue
@@ -188,7 +188,7 @@
 
       /// 删除角色
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -223,7 +223,7 @@
 
       /// 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/inBill/addInBillDetail/addInBillDetail.vue b/src/view/wms/billsInfo/inBill/addInBillDetail/addInBillDetail.vue
index 718d88c..c51d414 100644
--- a/src/view/wms/billsInfo/inBill/addInBillDetail/addInBillDetail.vue
+++ b/src/view/wms/billsInfo/inBill/addInBillDetail/addInBillDetail.vue
@@ -151,7 +151,7 @@
 
   import {
     message,
-    Modal,
+    Modal as modal,
   } from '@hwork/ant-design-vue';
   import {
     CheckOutlined,
@@ -768,7 +768,7 @@
       }
       //删除
       const removeMethod = (id) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此条数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -805,7 +805,7 @@
 
       //批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/inBill/addInBillDetail/model/save.vue b/src/view/wms/billsInfo/inBill/addInBillDetail/model/save.vue
index f4723e7..81d32d6 100644
--- a/src/view/wms/billsInfo/inBill/addInBillDetail/model/save.vue
+++ b/src/view/wms/billsInfo/inBill/addInBillDetail/model/save.vue
@@ -20,7 +20,7 @@
 <script>
   import {
     message,
-    Modal,
+    Modal as modal,
   } from '@hwork/ant-design-vue';
 
   import {
@@ -190,7 +190,7 @@
 
       //删除
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此条数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -225,7 +225,7 @@
 
       //批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/inBill/index.vue b/src/view/wms/billsInfo/inBill/index.vue
index 59a71b7..5ba6d05 100644
--- a/src/view/wms/billsInfo/inBill/index.vue
+++ b/src/view/wms/billsInfo/inBill/index.vue
@@ -193,7 +193,7 @@
 
       // 删除数据
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -229,7 +229,7 @@
 
       // 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/inBill/modal/inBillDetail.vue b/src/view/wms/billsInfo/inBill/modal/inBillDetail.vue
index dec31f1..35ae06a 100644
--- a/src/view/wms/billsInfo/inBill/modal/inBillDetail.vue
+++ b/src/view/wms/billsInfo/inBill/modal/inBillDetail.vue
@@ -307,7 +307,7 @@
 
       /// 删除角色
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -342,7 +342,7 @@
 
       /// 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/outBill/addOutBillDetail/addOutBillDetail.vue b/src/view/wms/billsInfo/outBill/addOutBillDetail/addOutBillDetail.vue
index 1670dee..c5bfd61 100644
--- a/src/view/wms/billsInfo/outBill/addOutBillDetail/addOutBillDetail.vue
+++ b/src/view/wms/billsInfo/outBill/addOutBillDetail/addOutBillDetail.vue
@@ -159,7 +159,7 @@
 
   import {
     message,
-    Modal,
+    Modal as modal,
   } from '@hwork/ant-design-vue';
   import {
     CheckOutlined,
@@ -777,7 +777,7 @@
       }
       //删除
       const removeMethod = (id) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此条数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -814,7 +814,7 @@
 
       //批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/outBill/addOutBillDetail/modal/save.vue b/src/view/wms/billsInfo/outBill/addOutBillDetail/modal/save.vue
index 2cb946f..553e075 100644
--- a/src/view/wms/billsInfo/outBill/addOutBillDetail/modal/save.vue
+++ b/src/view/wms/billsInfo/outBill/addOutBillDetail/modal/save.vue
@@ -20,7 +20,7 @@
 <script>
   import {
     message,
-    Modal,
+    Modal as modal,
   } from '@hwork/ant-design-vue';
 
   import {
@@ -188,7 +188,7 @@
 
       //删除
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此条数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -223,7 +223,7 @@
 
       //批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/outBill/index.vue b/src/view/wms/billsInfo/outBill/index.vue
index 742f8a0..826d96e 100644
--- a/src/view/wms/billsInfo/outBill/index.vue
+++ b/src/view/wms/billsInfo/outBill/index.vue
@@ -211,7 +211,7 @@
 
       // 删除数据
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -247,7 +247,7 @@
 
       // 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -290,7 +290,7 @@
           })
           return;
         }
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要分配选择的数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -330,7 +330,7 @@
           })
           return;
         }
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要确认选择的数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -370,7 +370,7 @@
           })
           return;
         }
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要执行选择的数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -410,7 +410,7 @@
           })
           return;
         }
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要取消分配选择的数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/outBill/modal/outBillDetail.vue b/src/view/wms/billsInfo/outBill/modal/outBillDetail.vue
index d25575f..3e08c05 100644
--- a/src/view/wms/billsInfo/outBill/modal/outBillDetail.vue
+++ b/src/view/wms/billsInfo/outBill/modal/outBillDetail.vue
@@ -290,7 +290,7 @@
 
       /// 删除角色
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -325,7 +325,7 @@
 
       /// 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -368,7 +368,7 @@
           })
           return;
         }
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确认分配?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/billsInfo/outBill/pick/pick.vue b/src/view/wms/billsInfo/outBill/pick/pick.vue
index 256139d..7f43015 100644
--- a/src/view/wms/billsInfo/outBill/pick/pick.vue
+++ b/src/view/wms/billsInfo/outBill/pick/pick.vue
@@ -25,7 +25,7 @@
   import edit from './model/edit.vue';
   import {
     message,
-    Modal,
+    Modal as modal,
   } from '@hwork/ant-design-vue';
 
   import {
@@ -223,7 +223,7 @@
 
       //删除
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此条数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -258,7 +258,7 @@
 
       //批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/realTimeMonitor/task/index.vue b/src/view/wms/realTimeMonitor/task/index.vue
index 4eb42b4..4ab3b42 100644
--- a/src/view/wms/realTimeMonitor/task/index.vue
+++ b/src/view/wms/realTimeMonitor/task/index.vue
@@ -47,6 +47,7 @@
   const taskCancelKey = "taskCancel";
 
   export default {
+    name: 'WmsRealTimeMonitorTaskIndex',
     components: {
       save,
       edit,
@@ -337,7 +338,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择任务?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -385,7 +386,7 @@
           })
           return;
         }
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定下发?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -432,7 +433,7 @@
           })
           return;
         }
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定完成?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -479,7 +480,7 @@
           })
           return;
         }
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定取消?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/realTimeMonitor/taskLog/index.vue b/src/view/wms/realTimeMonitor/taskLog/index.vue
index aa810fa..c8f2b4d 100644
--- a/src/view/wms/realTimeMonitor/taskLog/index.vue
+++ b/src/view/wms/realTimeMonitor/taskLog/index.vue
@@ -1,21 +1,16 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 任务备份列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-          <!-- 列表 -->
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+  <a-list-layout ref="pageRef">
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
+      <!-- 列表 -->
+      <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+        :param="state.param" :pagination="pagination"
+        :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+      </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-  </page-layout>
+  </a-list-layout>
 
 </template>
 
@@ -328,7 +323,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择任务?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/report/base/index.vue b/src/view/wms/report/base/index.vue
index 6bba146..fde3582 100644
--- a/src/view/wms/report/base/index.vue
+++ b/src/view/wms/report/base/index.vue
@@ -226,7 +226,7 @@
 
       // 删除数据
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -261,7 +261,7 @@
 
       // 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/report/compoents/table.vue b/src/view/wms/report/compoents/table.vue
index 0d8cdd9..c8fb611 100644
--- a/src/view/wms/report/compoents/table.vue
+++ b/src/view/wms/report/compoents/table.vue
@@ -261,7 +261,7 @@ export default defineComponent({
 
       // 删除数据
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -296,7 +296,7 @@ export default defineComponent({
 
       // 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/stockInfo/getTallyPallet/index.vue b/src/view/wms/stockInfo/getTallyPallet/index.vue
index 6e6e33a..8b512ac 100644
--- a/src/view/wms/stockInfo/getTallyPallet/index.vue
+++ b/src/view/wms/stockInfo/getTallyPallet/index.vue
@@ -242,7 +242,7 @@
 
       /// 删除数据
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -277,7 +277,7 @@
 
       /// 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -312,7 +312,7 @@
 
       ///创建理货
       const createTallyTaskMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要创建理货任务?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/stockInfo/inventoryView/index.vue b/src/view/wms/stockInfo/inventoryView/index.vue
index 32881b9..88f5805 100644
--- a/src/view/wms/stockInfo/inventoryView/index.vue
+++ b/src/view/wms/stockInfo/inventoryView/index.vue
@@ -271,7 +271,7 @@
 
       // 删除数据
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -306,7 +306,7 @@
 
       // 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/stockInfo/pallet/index.vue b/src/view/wms/stockInfo/pallet/index.vue
index 803787d..aae5308 100644
--- a/src/view/wms/stockInfo/pallet/index.vue
+++ b/src/view/wms/stockInfo/pallet/index.vue
@@ -167,7 +167,7 @@
 
       // 删除数据
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -202,7 +202,7 @@
 
       // 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/stockInfo/pallet/modal/palletDetail.vue b/src/view/wms/stockInfo/pallet/modal/palletDetail.vue
index 9b3ddad..8e1b1b2 100644
--- a/src/view/wms/stockInfo/pallet/modal/palletDetail.vue
+++ b/src/view/wms/stockInfo/pallet/modal/palletDetail.vue
@@ -258,7 +258,7 @@
 
       /// 删除数据
       const removeMethod = (record) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除此数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
@@ -293,7 +293,7 @@
 
       /// 批量删除
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/stockInfo/palletLog/index.vue b/src/view/wms/stockInfo/palletLog/index.vue
index dcf1ff2..82a3e7e 100644
--- a/src/view/wms/stockInfo/palletLog/index.vue
+++ b/src/view/wms/stockInfo/palletLog/index.vue
@@ -1,373 +1,362 @@
 <template>
-  <div>
-    <page-layout>
-      <a-row :gutter="[0,2]">
-        <!-- 查询表单 -->
-        <a-col :span="24">
-          <a-card>
-            <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-          </a-card>
-        </a-col>
-        <a-col :span="24" style="height: 100%;">
-          <a-card style="width: 100%;">
-            <!-- 托盘出入库记录列表 -->
-            <pro-table style="margin-top: 10px" rowKey="id" ref="tableRef" :fetch="fetch" :columns="columns"
-              :toolbar="toolbar" :operate="operate" :param="state.param" :pagination="pagination">
-            </pro-table>
-          </a-card>
-        </a-col>
-      </a-row>
-    </page-layout>
-  </div>
+  <a-list-layout ref="pageRef">
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
+    <!-- 托盘出入库记录列表 -->
+    <pro-table style="margin-top: 10px" rowKey="id" ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar"
+      :operate="operate" :param="state.param" :pagination="pagination">
+    </pro-table>
+  </a-list-layout>
 </template>
 <script>
-  import {
-    message,
-    Modal as modal
-  } from '@hwork/ant-design-vue';
-  import {
-    ExclamationCircleOutlined
-  } from '@ant-design/icons-vue';
-  import {
-    page,
-    remove,
-    removeBatch
-  } from "@/api/wms/palletLog";
-  import {
-    reactive,
-    createVNode,
-    ref,
-  } from 'vue';
-  const removeKey = "remove";
-  const removeBatchKey = "removeBatch";
+import {
+  message,
+  Modal as modal
+} from '@hwork/ant-design-vue';
+import {
+  ExclamationCircleOutlined
+} from '@ant-design/icons-vue';
+import {
+  page,
+  remove,
+  removeBatch
+} from "@/api/wms/palletLog";
+import {
+  reactive,
+  createVNode,
+  ref,
+} from 'vue';
+const removeKey = "remove";
+const removeBatchKey = "removeBatch";
 
-  export default {
-    components: {},
+export default {
+  components: {},
 
-    setup() {
+  setup() {
 
-      const tableRef = ref()
+    const tableRef = ref()
 
-      const columns = [{
-          dataIndex: "palletCode",
-          key: "palletCode",
-          title: "托盘号",
-          width: 100,
-          showSearch: true,
-        },
-        // {
-        //   dataIndex: "invoiceCode",
-        //   key: "invoiceCode",
-        //   title: "单据号",
-        //   width: 200,
-        //   showSearch: true,
-        // },
-        {
-          dataIndex: "taskCode",
-          key: "taskCode",
-          title: "任务号",
-          width: 90,
-          showSearch: true,
-        },
-        {
-          dataIndex: "directFlag",
-          key: "directFlag",
-          title: "方向标志",
-          width: 80,
-          dictionary: {
-            type: 'tag',
-            code: 'DirectFlag'
-          }
-        },
-        {
-          dataIndex: "skuType",
-          key: "skuType",
-          title: "物料类型",
-          width: 80,
-        },
-        {
-          dataIndex: "skuCode",
-          key: "skuCode",
-          title: "物料编号",
-          width: 120,
-          showSearch: true,
-        },
-        {
-          dataIndex: "skuName",
-          key: "skuName",
-          title: "物料描述",
-          width: 150,
-          showSearch: true,
-        },
+    const columns = [{
+      dataIndex: "palletCode",
+      key: "palletCode",
+      title: "托盘号",
+      width: 100,
+      showSearch: true,
+    },
+    // {
+    //   dataIndex: "invoiceCode",
+    //   key: "invoiceCode",
+    //   title: "单据号",
+    //   width: 200,
+    //   showSearch: true,
+    // },
+    {
+      dataIndex: "taskCode",
+      key: "taskCode",
+      title: "任务号",
+      width: 90,
+      showSearch: true,
+    },
+    {
+      dataIndex: "directFlag",
+      key: "directFlag",
+      title: "方向标志",
+      width: 80,
+      dictionary: {
+        type: 'tag',
+        code: 'DirectFlag'
+      }
+    },
+    {
+      dataIndex: "skuType",
+      key: "skuType",
+      title: "物料类型",
+      width: 80,
+    },
+    {
+      dataIndex: "skuCode",
+      key: "skuCode",
+      title: "物料编号",
+      width: 120,
+      showSearch: true,
+    },
+    {
+      dataIndex: "skuName",
+      key: "skuName",
+      title: "物料描述",
+      width: 150,
+      showSearch: true,
+    },
 
-        // {
-        //   dataIndex: "batch",
-        //   key: "batch",
-        //   title: "批次",
-        //   width: 100,
-        //   showSearch: true,
-        // },
-        // {
-        //   dataIndex: "serial",
-        //   key: "serial",
-        //   title: "序列号",
-        //   width: 120,
-        //   showSearch: true,
-        // },
-        // {
-        //   dataIndex: "master",
-        //   key: "master",
-        //   title: "货主",
-        //   width: 100,
-        //   showSearch: true,
-        // },
-        // {
-        //   dataIndex: "producer",
-        //   key: "producer",
-        //   title: "厂家",
-        //   width: 100,
-        //   showSearch: true,
-        // },
-        // {
-        //   dataIndex: "customer",
-        //   key: "customer",
-        //   title: "客户",
-        //   width: 100,
-        //   showSearch: true,
-        // },
-        // {
-        //   dataIndex: "produceDate",
-        //   key: "produceDate",
-        //   title: "生产日期",
-        //   width: 180,
-        // },
-        // {
-        //   dataIndex: "overdue",
-        //   key: "overdue",
-        //   title: "过期日期",
-        //   width: 180,
-        // },
-        {
-          dataIndex: "skuQty",
-          key: "skuQty",
-          title: "物料数量",
-          width: 100,
-          showSearch: true,
-        },
-        {
-          dataIndex: "baseUnit",
-          key: "baseUnit",
-          title: "物流单位",
-          width: 100,
-          showSearch: true,
-        },
-        // {
-        //   dataIndex: "convertQty",
-        //   key: "convertQty",
-        //   title: "换算数量",
-        //   width: 120,
-        //   showSearch: true,
-        // },
-        // {
-        //   dataIndex: "primaryUnit",
-        //   key: "primaryUnit",
-        //   title: "换算单位",
-        //   width: 120,
-        //   showSearch: true,
-        // },
-        // {
-        //   dataIndex: "spInv",
-        //   key: "spInv",
-        //   title: "特殊库存",
-        //   width: 100,
-        //   dictionary: {
-        //     type: 'tag',
-        //     code: 'spInv'
-        //   },
-        // },
-        // {
-        //   dataIndex: "invType",
-        //   key: "invType",
-        //   title: "库存类型",
-        //   width: 120,
-        // },
-        // {
-        //   dataIndex: "qualityStatus",
-        //   key: "qualityStatus",
-        //   title: "质量状态",
-        //   width: 100,
-        //   dictionary: {
-        //     type: 'tag',
-        //     code: 'qualityStatus'
-        //   },
-        // },
-        // {
-        //   dataIndex: "weight",
-        //   key: "weight",
-        //   title: "重量",
-        //   width: 100,
-        //   showSearch: true,
-        // },
-        // {
-        //   dataIndex: "weightUnit",
-        //   key: "weightUnit",
-        //   title: "重量单位",
-        //   width: 120,
-        //   showSearch: true,
-        // },
-        {
-          dataIndex: "sourceLoc",
-          key: "sourceLoc",
-          title: "源位置",
-          width: 120,
-          showSearch: true,
-        },
-        {
-          dataIndex: "targetLoc",
-          key: "targetLoc",
-          title: "目标位置",
-          width: 120,
-          showSearch: true,
-        },
-        // {
-        //   dataIndex: "finishDate",
-        //   key: "finishDate",
-        //   title: "完成时间",
-        //   width: 180,
-        // },
-        // {
-        //   dataIndex: "note",
-        //   key: "note",
-        //   title: "备注"
-        // },
-        // {
-        //   dataIndex: "createBy",
-        //   key: "createBy",
-        //   title: "录入人",
-        //   width: 120,
-        //   showSearch: true,
-        // },
-        {
-          dataIndex: "createTime",
-          key: "createTime",
-          title: "录入时间",
-          width: 200,
-        },
-        // {
-        //   dataIndex: "updateBy",
-        //   key: "updateBy",
-        //   title: "修改人",
-        //   width: 120,
-        // },
-        // {
-        //   dataIndex: "updateTime",
-        //   key: "updateTime",
-        //   title: "修改时间",
-        //   width: 200,
-        // },
-        {
-          dataIndex: "remark",
-          key: "remark",
-          title: "备注",
-          width: 300,
-        },
-      ];
+    // {
+    //   dataIndex: "batch",
+    //   key: "batch",
+    //   title: "批次",
+    //   width: 100,
+    //   showSearch: true,
+    // },
+    // {
+    //   dataIndex: "serial",
+    //   key: "serial",
+    //   title: "序列号",
+    //   width: 120,
+    //   showSearch: true,
+    // },
+    // {
+    //   dataIndex: "master",
+    //   key: "master",
+    //   title: "货主",
+    //   width: 100,
+    //   showSearch: true,
+    // },
+    // {
+    //   dataIndex: "producer",
+    //   key: "producer",
+    //   title: "厂家",
+    //   width: 100,
+    //   showSearch: true,
+    // },
+    // {
+    //   dataIndex: "customer",
+    //   key: "customer",
+    //   title: "客户",
+    //   width: 100,
+    //   showSearch: true,
+    // },
+    // {
+    //   dataIndex: "produceDate",
+    //   key: "produceDate",
+    //   title: "生产日期",
+    //   width: 180,
+    // },
+    // {
+    //   dataIndex: "overdue",
+    //   key: "overdue",
+    //   title: "过期日期",
+    //   width: 180,
+    // },
+    {
+      dataIndex: "skuQty",
+      key: "skuQty",
+      title: "物料数量",
+      width: 100,
+      showSearch: true,
+    },
+    {
+      dataIndex: "baseUnit",
+      key: "baseUnit",
+      title: "物流单位",
+      width: 100,
+      showSearch: true,
+    },
+    // {
+    //   dataIndex: "convertQty",
+    //   key: "convertQty",
+    //   title: "换算数量",
+    //   width: 120,
+    //   showSearch: true,
+    // },
+    // {
+    //   dataIndex: "primaryUnit",
+    //   key: "primaryUnit",
+    //   title: "换算单位",
+    //   width: 120,
+    //   showSearch: true,
+    // },
+    // {
+    //   dataIndex: "spInv",
+    //   key: "spInv",
+    //   title: "特殊库存",
+    //   width: 100,
+    //   dictionary: {
+    //     type: 'tag',
+    //     code: 'spInv'
+    //   },
+    // },
+    // {
+    //   dataIndex: "invType",
+    //   key: "invType",
+    //   title: "库存类型",
+    //   width: 120,
+    // },
+    // {
+    //   dataIndex: "qualityStatus",
+    //   key: "qualityStatus",
+    //   title: "质量状态",
+    //   width: 100,
+    //   dictionary: {
+    //     type: 'tag',
+    //     code: 'qualityStatus'
+    //   },
+    // },
+    // {
+    //   dataIndex: "weight",
+    //   key: "weight",
+    //   title: "重量",
+    //   width: 100,
+    //   showSearch: true,
+    // },
+    // {
+    //   dataIndex: "weightUnit",
+    //   key: "weightUnit",
+    //   title: "重量单位",
+    //   width: 120,
+    //   showSearch: true,
+    // },
+    {
+      dataIndex: "sourceLoc",
+      key: "sourceLoc",
+      title: "源位置",
+      width: 120,
+      showSearch: true,
+    },
+    {
+      dataIndex: "targetLoc",
+      key: "targetLoc",
+      title: "目标位置",
+      width: 120,
+      showSearch: true,
+    },
+    // {
+    //   dataIndex: "finishDate",
+    //   key: "finishDate",
+    //   title: "完成时间",
+    //   width: 180,
+    // },
+    // {
+    //   dataIndex: "note",
+    //   key: "note",
+    //   title: "备注"
+    // },
+    // {
+    //   dataIndex: "createBy",
+    //   key: "createBy",
+    //   title: "录入人",
+    //   width: 120,
+    //   showSearch: true,
+    // },
+    {
+      dataIndex: "createTime",
+      key: "createTime",
+      title: "录入时间",
+      width: 200,
+    },
+    // {
+    //   dataIndex: "updateBy",
+    //   key: "updateBy",
+    //   title: "修改人",
+    //   width: 120,
+    // },
+    // {
+    //   dataIndex: "updateTime",
+    //   key: "updateTime",
+    //   title: "修改时间",
+    //   width: 200,
+    // },
+    {
+      dataIndex: "remark",
+      key: "remark",
+      title: "备注",
+      width: 300,
+    },
+    ];
 
 
-      /// 数据来源 [模拟]
-      const fetch = async (param) => {
-        var response = await page(param);
-        console.log("response", response)
-        return {
-          total: response.data.total,
-          data: response.data.record,
-        };
+    /// 数据来源 [模拟]
+    const fetch = async (param) => {
+      var response = await page(param);
+      console.log("response", response)
+      return {
+        total: response.data.total,
+        data: response.data.record,
       };
+    };
 
-      // 删除数据
-      const removeMethod = (record) => {
-        Modal.confirm({
-          title: '您是否确定要删除?',
-          icon: createVNode(ExclamationCircleOutlined),
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            message.loading({
-              content: "提交中...",
-              key: removeKey
-            });
-            remove({
-              "id": record.id
-            }).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: "删除成功",
-                  key: removeKey,
-                  duration: 1
-                }).then(() => {
-                  tableRef.value.reload()
-                })
-              } else {
-                message.error({
-                  content: response.msg,
-                  key: removeKey,
-                  duration: 1
-                })
-              }
-            })
-          }
-        });
-      }
+    // 删除数据
+    const removeMethod = (record) => {
+      modal.confirm({
+        title: '您是否确定要删除?',
+        icon: createVNode(ExclamationCircleOutlined),
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          message.loading({
+            content: "提交中...",
+            key: removeKey
+          });
+          remove({
+            "id": record.id
+          }).then((response) => {
+            if (response.success) {
+              message.success({
+                content: "删除成功",
+                key: removeKey,
+                duration: 1
+              }).then(() => {
+                tableRef.value.reload()
+              })
+            } else {
+              message.error({
+                content: response.msg,
+                key: removeKey,
+                duration: 1
+              })
+            }
+          })
+        }
+      });
+    }
 
-      // 批量删除
-      const removeBatchMethod = (ids) => {
-        Modal.confirm({
-          title: '您是否确定要删除?',
-          icon: createVNode(ExclamationCircleOutlined),
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-            message.loading({
-              content: "提交中...",
-              key: removeBatchKey
-            });
-            removeBatch({
-              "ids": ids
-            }).then((response) => {
-              if (response.success) {
-                message.success({
-                  content: "删除成功",
-                  key: removeBatchKey,
-                  duration: 1
-                }).then(() => {
-                  tableRef.value.reload()
-                })
-              } else {
-                message.error({
-                  content: "删除失败",
-                  key: removeBatchKey,
-                  duration: 1
-                })
-              }
-            })
-          }
-        });
-      }
+    // 批量删除
+    const removeBatchMethod = (ids) => {
+      modal.confirm({
+        title: '您是否确定要删除?',
+        icon: createVNode(ExclamationCircleOutlined),
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          message.loading({
+            content: "提交中...",
+            key: removeBatchKey
+          });
+          removeBatch({
+            "ids": ids
+          }).then((response) => {
+            if (response.success) {
+              message.success({
+                content: "删除成功",
+                key: removeBatchKey,
+                duration: 1
+              }).then(() => {
+                tableRef.value.reload()
+              })
+            } else {
+              message.error({
+                content: "删除失败",
+                key: removeBatchKey,
+                duration: 1
+              })
+            }
+          })
+        }
+      });
+    }
 
-      /// 工具栏
-      const toolbar = [
-        {
+    /// 工具栏
+    const toolbar = [
+      {
         label: "删除",
         code: remove,
-        event: function() {
+        event: function () {
           removeBatchMethod(state.selectedRowKeys)
         },
         type: 'danger'
       },
-      ];
+    ];
 
-      /// 行操作
-      const operate = [
+    /// 行操作
+    const operate = [
       //   {
       //   label: "删除",
       //   code: "wms:palletLog:remove",
@@ -375,77 +364,77 @@
       //     removeMethod(record)
       //   }
       // },
-      ];
+    ];
 
-      const pagination = {
-        pageNum: 1,
-        pageSize: 20,
-        showSizeChanger: true, // 显示可改变每页条数
-        pageSizeOptions: ["10", "20", "50", "100"], // 每页条数选项设置
-        showTotal: total => `共 ${total} 条记录`, // 显示总条数
-        showSizeChange: (current, pageSize) => (this.pageSize = pageSize) // 改变每页条数时更新显示
-      };
+    const pagination = {
+      pageNum: 1,
+      pageSize: 20,
+      showSizeChanger: true, // 显示可改变每页条数
+      pageSizeOptions: ["10", "20", "50", "100"], // 每页条数选项设置
+      showTotal: total => `共 ${total} 条记录`, // 显示总条数
+      showSizeChange: (current, pageSize) => (this.pageSize = pageSize) // 改变每页条数时更新显示
+    };
 
-      const state = reactive({
-        selectedRowKeys: [],
-        param: {},
-      });
+    const state = reactive({
+      selectedRowKeys: [],
+      param: {},
+    });
 
-      //界面头部-查询框
-      const searchParam = [{
-        key: "skuType",
-        type: "select",
-        label: "物料类型",
-        options: [{
-          value: '包装箱',
-          text: '包装箱',
-        }, {
-          value: '观察窗',
-          text: '观察窗',
-        }, {
-          value: '台面',
-          text: '台面',
-        }, {
-          value: '手把',
-          text: '手把',
-        }, {
-          value: '前板',
-          text: '前板',
-        },{
-          value: '内衬',
-          text: '内衬',
-        }, {
-          value: 'KTP001',
-          text: '空托盘',
-        }]
-      }, ]
+    //界面头部-查询框
+    const searchParam = [{
+      key: "skuType",
+      type: "select",
+      label: "物料类型",
+      options: [{
+        value: '包装箱',
+        text: '包装箱',
+      }, {
+        value: '观察窗',
+        text: '观察窗',
+      }, {
+        value: '台面',
+        text: '台面',
+      }, {
+        value: '手把',
+        text: '手把',
+      }, {
+        value: '前板',
+        text: '前板',
+      }, {
+        value: '内衬',
+        text: '内衬',
+      }, {
+        value: 'KTP001',
+        text: '空托盘',
+      }]
+    },]
 
-      const search = function(value) {
-        console.log("主表查询" + JSON.stringify(value))
-        console.log(value)
-        state.param = value
-        tableRef.value.reload()
-
-      }
-
-      const onSelectChange = selectedRowKeys => {
-        state.selectedRowKeys = selectedRowKeys;
-      };
-
-      return {
-        state,
-        fetch,
-        search,
-        searchParam, // 查询参数
-        toolbar,
-        columns,
-        operate,
-        pagination,
-        onSelectChange,
-        tableRef,
-      };
+    const search = function (value) {
+      console.log("主表查询" + JSON.stringify(value))
+      console.log(value)
+      state.param = value
+      tableRef.value.reload()
 
     }
+
+    const onSelectChange = selectedRowKeys => {
+      state.selectedRowKeys = selectedRowKeys;
+    };
+
+    return {
+      state,
+      fetch,
+      search,
+      searchParam, // 查询参数
+      toolbar,
+      columns,
+      operate,
+      pagination,
+      onSelectChange,
+      tableRef,
+    };
+
   }
-  // }
+}
+// }
 </script>
diff --git a/src/view/wms/warehouse/channel/index.vue b/src/view/wms/warehouse/channel/index.vue
index 3822a9b..183abf5 100644
--- a/src/view/wms/warehouse/channel/index.vue
+++ b/src/view/wms/warehouse/channel/index.vue
@@ -1,25 +1,18 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- 码垛通道表列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -173,7 +166,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定删除该数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/warehouse/list/index.vue b/src/view/wms/warehouse/list/index.vue
index eeb31ce..313479b 100644
--- a/src/view/wms/warehouse/list/index.vue
+++ b/src/view/wms/warehouse/list/index.vue
@@ -192,7 +192,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定删除该数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/warehouse/loc/index.vue b/src/view/wms/warehouse/loc/index.vue
index 88cdbac..3e90672 100644
--- a/src/view/wms/warehouse/loc/index.vue
+++ b/src/view/wms/warehouse/loc/index.vue
@@ -309,7 +309,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择任务?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/warehouse/locExit/index.vue b/src/view/wms/warehouse/locExit/index.vue
index 9883e80..153eb6a 100644
--- a/src/view/wms/warehouse/locExit/index.vue
+++ b/src/view/wms/warehouse/locExit/index.vue
@@ -1,25 +1,18 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- 区域出入口列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -225,7 +218,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定删除该数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/warehouse/locGenerator/index.vue b/src/view/wms/warehouse/locGenerator/index.vue
index a525637..66eea91 100644
--- a/src/view/wms/warehouse/locGenerator/index.vue
+++ b/src/view/wms/warehouse/locGenerator/index.vue
@@ -251,7 +251,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择任务?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/warehouse/outbound/index.vue b/src/view/wms/warehouse/outbound/index.vue
index 73fb9f9..9ed7d35 100644
--- a/src/view/wms/warehouse/outbound/index.vue
+++ b/src/view/wms/warehouse/outbound/index.vue
@@ -1,23 +1,16 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
-  </page-layout>
+  <a-list-layout ref="pageRef">
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
+  </a-list-layout>
 </template>
 
 <script>
   import {
     message,
-    notification,
-    modal
+    Modal as modal
   } from '@hwork/ant-design-vue';
   import {
     ExclamationCircleOutlined
@@ -234,7 +227,7 @@
 
     // 取消
     const cancelMethod = (record) => {
-      Modal.confirm({
+      modal.confirm({
         title: '您是否确认取消该出库需求?',
         icon: createVNode(ExclamationCircleOutlined),
         okText: '确定',
@@ -256,7 +249,7 @@
               tableRef.value.reload()
             } else {
               message.destroy()
-              notification.error({
+              message.error({
                 message: '需求取消失败',
                 description: response.msg
               })
@@ -268,7 +261,7 @@
 
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定删除该数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/warehouse/plan/index.vue b/src/view/wms/warehouse/plan/index.vue
index 5df8dc0..a53d822 100644
--- a/src/view/wms/warehouse/plan/index.vue
+++ b/src/view/wms/warehouse/plan/index.vue
@@ -1,25 +1,18 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- 自增值定义列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -173,7 +166,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定删除该数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/warehouse/seqNum/index.vue b/src/view/wms/warehouse/seqNum/index.vue
index 6e65476..a37bdb2 100644
--- a/src/view/wms/warehouse/seqNum/index.vue
+++ b/src/view/wms/warehouse/seqNum/index.vue
@@ -1,25 +1,18 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- 自增值定义列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -200,7 +193,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定删除该数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/warehouse/sn/index.vue b/src/view/wms/warehouse/sn/index.vue
index 39e72c9..1a1c5f6 100644
--- a/src/view/wms/warehouse/sn/index.vue
+++ b/src/view/wms/warehouse/sn/index.vue
@@ -1,25 +1,18 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- 当前码垛SN列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -173,7 +166,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定删除该数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/warehouse/snHis/index.vue b/src/view/wms/warehouse/snHis/index.vue
index 79d8da2..1b6359a 100644
--- a/src/view/wms/warehouse/snHis/index.vue
+++ b/src/view/wms/warehouse/snHis/index.vue
@@ -1,25 +1,18 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- SN历史列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -180,7 +173,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定删除该数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/warehouse/snNoPlan/index.vue b/src/view/wms/warehouse/snNoPlan/index.vue
index 9328308..633ec2e 100644
--- a/src/view/wms/warehouse/snNoPlan/index.vue
+++ b/src/view/wms/warehouse/snNoPlan/index.vue
@@ -1,25 +1,18 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- SN历史列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -180,7 +173,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定删除该数据?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',
diff --git a/src/view/wms/warehouse/statistics/inventory/index.vue b/src/view/wms/warehouse/statistics/inventory/index.vue
index bf807e7..fc4771e 100644
--- a/src/view/wms/warehouse/statistics/inventory/index.vue
+++ b/src/view/wms/warehouse/statistics/inventory/index.vue
@@ -1,24 +1,17 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- 区域出入口列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
diff --git a/src/view/wms/warehouse/statistics/skuNeed/index.vue b/src/view/wms/warehouse/statistics/skuNeed/index.vue
index fd9d90c..1d4336d 100644
--- a/src/view/wms/warehouse/statistics/skuNeed/index.vue
+++ b/src/view/wms/warehouse/statistics/skuNeed/index.vue
@@ -1,24 +1,16 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
-      <!-- 区域出入口列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
diff --git a/src/view/wms/warehouse/track/index.vue b/src/view/wms/warehouse/track/index.vue
index 2b4ef71..c04b4d7 100644
--- a/src/view/wms/warehouse/track/index.vue
+++ b/src/view/wms/warehouse/track/index.vue
@@ -1,27 +1,20 @@
 <template>
-  <page-layout>
-    <a-row :gutter="[10, 10]">
-      <!-- 查询表单 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
-        </a-card>
-      </a-col>
+  <a-list-layout
+    ref="pageRef"
+  >
+    <template #search>
+      <pro-query :searchParam="searchParam" @on-search="search"></pro-query>
+    </template>
       <!-- 通道列表 -->
-      <a-col :span="24">
-        <a-card>
-          <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
-            :param="state.param" :pagination="pagination"
-            :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
-          </pro-table>
-        </a-card>
-      </a-col>
-    </a-row>
+    <pro-table ref="tableRef" :fetch="fetch" :columns="columns" :toolbar="toolbar" :operate="operate"
+      :param="state.param" :pagination="pagination"
+      :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }">
+    </pro-table>
     <save :visible="state.visibleSave" @close="closeSave"></save>
     <edit :visible="state.visibleEdit" @close="closeEdit" :record="state.recordEdit"></edit>
     <addConfig :visible="state.visibleSave" @close="closeSave"></addConfig>
     <info :visible="state.visibleInfo" @close="closeInfo" :record="state.recordInfo"></info>
-  </page-layout>
+  </a-list-layout>
 </template>
 
 <script>
@@ -171,7 +164,7 @@
       }
 
       const removeBatchMethod = (ids) => {
-        Modal.confirm({
+        modal.confirm({
           title: '您是否确定要删除选择通道?',
           icon: createVNode(ExclamationCircleOutlined),
           okText: '确定',