diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less
index b27871b0..194a03a4 100644
--- a/jero-web/src/assets/less/common.less
+++ b/jero-web/src/assets/less/common.less
@@ -58,4 +58,13 @@
 }
 
 /**隐藏样式-modal确定按钮 */
-.jee-hidden{display: none}
\ No newline at end of file
+.jee-hidden{display: none}
+
+.ant-col-md-6{
+  padding-left: 18px !important;
+  padding-right: 18px  !important;
+
+}
+.table-page-search-wrapper .ant-form-inline .ant-form-item{
+  margin-bottom: 12px;
+}
diff --git a/jero-web/src/components/jero/JEditor.vue b/jero-web/src/components/jero/JEditor.vue
index 559bee41..46a9294a 100644
--- a/jero-web/src/components/jero/JEditor.vue
+++ b/jero-web/src/components/jero/JEditor.vue
@@ -73,7 +73,7 @@ export default {
           formData.append('file', blobInfo.blob(), blobInfo.filename())
           formData.append('biz', 'jeditor')
           formData.append('jeditor', '1')
-          uploadAction(window._CONFIG.domianURL + '/sys/common/upload', formData).then((res) => {
+          uploadAction('/sys/common/upload', formData).then((res) => {
             if (res.success) {
               if (res.message === 'local') {
                 const img = 'data:image/jpeg;base64,' + blobInfo.base64()
@@ -84,6 +84,28 @@ export default {
               }
             }
           })
+        },
+        paste_postprocess: function(plugin, args) {
+          console.log(args.node,"kkkkkk");
+          args.node.setAttribute('id', 'hello');
+        },
+        init_instance_callback: editor => {
+          if (this.value) {
+            editor.setContent(this.value)
+          }
+          this.hasInit = true
+
+          editor.on('NodeChange Change KeyUp SetContent', () => {
+            this.hasChange = true
+            // const val = editor.getContent().replace(/<p><img\s?src="data.*?<\/p>/g, '')
+            this.$emit('input', editor.getContent())
+          })
+
+          editor.on('paste', evt => {
+            // 监听粘贴事件
+            console.log('监听粘贴事件', evt)
+            this.onPaste(evt)
+          })
         }
       },
       myValue: this.value,
@@ -94,7 +116,60 @@ export default {
     this.initATabsChangeAutoReload()
   },
   methods: {
+    onPaste(event, success, failure) {
+      // let _this = this
+      let self = this
 
+      // 实现图⽚粘贴上传
+      const items = (event.clipboardData || window.clipboardData).items
+      // items为伪数组微信/QQ截图以及此富⽂本区域内复制粘贴的length为1,⿏标右键复制粘贴图⽚以及⽂本的复制粘贴的length为2
+      let len = items.length
+      for (let i = 0; i < len; i++) {
+        if (items[i].kind == "file" && items[i].type.indexOf("image") != -1) {
+          // 判断是否为图⽚类型
+          event.preventDefault() // 如果是图⽚阻⽌⾃动粘贴到富⽂本编辑器
+          let file = items[i].getAsFile() // 获取⽂件数据
+          let blob = new Blob([file], { type: file.type }) //实例化⼀个blob 将图⽚⼤⼩以及类型初始化到blob⾥
+          // let index = file.name.lastIndexOf(".")
+          // let fileName =
+          //   Date.now() + file.name.substring(index, file.name.length)
+          // fileName --- 图⽚名称可⾃⾏处理
+          console.log("粘贴的是图⽚类型", blob, file)
+          // let file = blobInfo.blob()
+          const isLt2M = file.size / 1024 < 500
+          if (!isLt2M) {
+            this.$message.warning("上传失败，图片不可超过500KB!")
+            return false
+          }
+          const formdate = new FormData()
+          formdate.append("file", file) //imageFile文件名和后端统一
+          uploadAction('/sys/common/upload', formdate).then((res) => {
+            debugger
+            if (res.success) {
+              if (res.message === 'local') {
+                const img = 'data:image/jpeg;base64,' + blob.base64()
+                success(img)
+              } else {
+                const img = getFileAccessHttpUrl(res.message)
+                editor.execCommand(
+                  "mceReplaceContent",
+                  false,
+                  `<img class="wscnph" src="${img}" >`
+                );
+              }
+            }
+          })
+
+            .catch(function(err) {
+              // 上传错误可⾃⾏给出提⽰
+              self.$message.error(err)
+            })
+        } else {
+          // 不是图⽚类型直接粘贴, 跳过oss上传处理
+          console.log("粘贴的不是图⽚")
+        }
+      }
+    },
     reload () {
       this.reloading = true
       this.$nextTick(() => {
diff --git a/jero-web/src/components/jero/JSuperQuery.vue b/jero-web/src/components/jero/JSuperQuery.vue
index 1695e13b..e9d399b0 100644
--- a/jero-web/src/components/jero/JSuperQuery.vue
+++ b/jero-web/src/components/jero/JSuperQuery.vue
@@ -19,7 +19,7 @@
         <a-button v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
       </a-button-group>
     </a-tooltip>
-    <a-button v-else type="primary" icon="filter" @click="handleOpen">高级查询</a-button>
+    <a-button v-else type="default" icon="filter" @click="handleOpen">高级查询</a-button>
   </slot>
 
   <j-modal
diff --git a/jero-web/src/components/jero/modal/JPopupOnlReport.vue b/jero-web/src/components/jero/modal/JPopupOnlReport.vue
index 937ae964..ca66dae7 100644
--- a/jero-web/src/components/jero/modal/JPopupOnlReport.vue
+++ b/jero-web/src/components/jero/modal/JPopupOnlReport.vue
@@ -28,12 +28,13 @@
 
           <a-col :md="8" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchByquery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <a @click="handleToggleSearch" style="margin-right: 28px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
+              <a-button type="primary" @click="searchByquery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+
             </span>
           </a-col>
 
diff --git a/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue b/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue
index 5a6e62f3..6fbddfdb 100644
--- a/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue
+++ b/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue
@@ -20,12 +20,12 @@
           <!-- 动态生成的查询条件 -->
           <j-select-biz-query-item v-if="queryConfig.length>0" v-show="showMoreQueryItems" :queryParam="queryParam" :queryConfig="queryConfig" @pressEnter="searchQuery"/>
           <!-- 按钮 -->
+          <a @click="handleToggleSearch" style="margin-right: 28px">
+            {{ toggleSearchStatus ? '收起' : '展开' }}
+            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+          </a>
           <a-button :style="{marginBottom:'12px'}" type="primary" @click="searchQuery" icon="search">查询</a-button>
           <a-button :style="{marginBottom:'12px'}" type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-          <a v-if="queryConfig.length>0" @click="showMoreQueryItems=!showMoreQueryItems" style="margin-left: 8px">
-            {{ showMoreQueryItems ? '收起' : '展开' }}
-            <a-icon :type="showMoreQueryItems ? 'up' : 'down'"/>
-          </a>
         </a-form>
 
         <a-table
diff --git a/jero-web/src/components/onlineForm/onlineForm.js b/jero-web/src/components/onlineForm/onlineForm.js
index 4535a342..70c02739 100644
--- a/jero-web/src/components/onlineForm/onlineForm.js
+++ b/jero-web/src/components/onlineForm/onlineForm.js
@@ -29406,7 +29406,7 @@
               "margin-left": "8px"
             },
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "reload"
             },
             on: {
@@ -29425,7 +29425,7 @@
             staticClass: "table-operator"
           }, [e.buttonSwitch.add ? n("a-button", {
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "plus"
             },
             on: {
@@ -31710,7 +31710,7 @@
             }
           }, [e._v("查询")]), n("a-button", {
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "reload"
             },
             on: {
@@ -37656,7 +37656,7 @@
               "margin-left": "8px"
             },
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "reload"
             },
             on: {
@@ -39018,7 +39018,7 @@
               "margin-left": "8px"
             },
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "reload"
             },
             on: {
@@ -43922,7 +43922,7 @@
               "margin-left": "8px"
             },
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "reload"
             },
             on: {
@@ -45162,7 +45162,7 @@
               "margin-left": "8px"
             },
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "reload"
             },
             on: {
@@ -45172,7 +45172,7 @@
             staticClass: "table-operator"
           }, [n("a-button", {
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "plus"
             },
             on: {
@@ -66840,7 +66840,7 @@
               "margin-left": "8px"
             },
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "reload"
             },
             on: {
@@ -67912,7 +67912,7 @@
               "margin-left": "8px"
             },
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "reload"
             },
             on: {
@@ -72474,7 +72474,7 @@
               "margin-left": "8px"
             },
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "reload"
             },
             on: {
@@ -72495,7 +72495,7 @@
             staticClass: "table-operator"
           }, [n("a-button", {
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "plus"
             },
             on: {
@@ -72503,7 +72503,7 @@
             }
           }, [e._v("新增")]), n("a-button", {
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "highlight"
             },
             on: {
@@ -72511,7 +72511,7 @@
             }
           }, [e._v("自定义按钮")]), n("a-button", {
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "strikethrough"
             },
             on: {
@@ -72519,7 +72519,7 @@
             }
           }, [e._v("JS增强")]), n("a-button", {
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "filter"
             },
             on: {
@@ -72527,7 +72527,7 @@
             }
           }, [e._v("SQL增强")]), n("a-button", {
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "tool"
             },
             on: {
@@ -72535,7 +72535,7 @@
             }
           }, [e._v("JAVA增强")]), n("a-button", {
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "database"
             },
             on: {
@@ -72543,7 +72543,7 @@
             }
           }, [e._v("导入数据库表")]), n("a-button", {
             attrs: {
-              type: "primary",
+              type: "default",
               icon: "database"
             },
             on: {
diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index cd1e3cf2..faf58836 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -7,11 +7,14 @@
 <!--    </span>-->
     <!-- update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
 <!--    <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">-->
-      <a-select
+    <span class='search-box'>
+        <a-icon  type='search'   />
+    </span>
+    <a-select
         class="search-input"
         showSearch
         :showArrow="false"
-        placeholder="搜索菜单"
+        placeholder="请输入搜索内容"
         optionFilterProp="children"
         :filterOption="filterOption"
         :open="isMobile()?true:null"
@@ -20,7 +23,7 @@
         @change="searchMethods"
         @blur="hiddenClick"
       >
-        <a-icon slot="suffixIcon" type="search" />
+
         <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>
       </a-select>
 <!--    </component>-->
@@ -272,6 +275,18 @@ export default {
 </script>
 
 <style lang="less" scoped>
+  .search-box {
+    display: inline-block;
+    transition: all 0.3s;
+    height: 30px;
+    width: 25px;
+    margin-top: 0px;
+    line-height: 28px;
+    background: #F7F8FA;
+    text-align: right;
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+  }
   /* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
   /* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
   .user-wrapper .search-input {
diff --git a/jero-web/src/views/demo/JeroDemoList.vue b/jero-web/src/views/demo/JeroDemoList.vue
index a5909e9a..23c03b83 100644
--- a/jero-web/src/views/demo/JeroDemoList.vue
+++ b/jero-web/src/views/demo/JeroDemoList.vue
@@ -41,12 +41,12 @@
           </template>
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a @click="handleToggleSearch" style="margin-right: 28px">
+              {{ toggleSearchStatus ? '收起' : '展开' }}
+              <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+            </a>
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </a-col>
           </span>
         </a-row>
diff --git a/jero-web/src/views/demo/list/TableInnerEditList.vue b/jero-web/src/views/demo/list/TableInnerEditList.vue
index f95cc2ac..27cea0de 100644
--- a/jero-web/src/views/demo/list/TableInnerEditList.vue
+++ b/jero-web/src/views/demo/list/TableInnerEditList.vue
@@ -49,12 +49,12 @@
           </template>
           <a-col :md="!advanced && 8 || 24" :sm="24">
             <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
-              <a-button type="primary">查询</a-button>
-              <a-button style="margin-left: 8px">重置</a-button>
-              <a @click="toggleAdvanced" style="margin-left: 8px">
+              <a @click="toggleAdvanced" style="margin-right: 28px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'" />
               </a>
+              <a-button type="primary">查询</a-button>
+              <a-button style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/jero-web/src/views/demo/list/TableList.vue b/jero-web/src/views/demo/list/TableList.vue
index 8b2ec0d8..f8e4ad4c 100644
--- a/jero-web/src/views/demo/list/TableList.vue
+++ b/jero-web/src/views/demo/list/TableList.vue
@@ -49,12 +49,12 @@
           </template>
           <a-col :md="!advanced && 8 || 24" :sm="24">
             <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
-              <a-button type="primary">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-              <a @click="toggleAdvanced" style="margin-left: 8px">
+              <a @click="toggleAdvanced" style="margin-right: 28px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
+              <a-button type="primary">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/jero-web/src/views/modules/message/SysMessageList.vue b/jero-web/src/views/modules/message/SysMessageList.vue
index 96108457..438377e1 100644
--- a/jero-web/src/views/modules/message/SysMessageList.vue
+++ b/jero-web/src/views/modules/message/SysMessageList.vue
@@ -15,21 +15,21 @@
               <j-input placeholder="请输入发送内容" v-model="queryParam.esContent"></j-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
+<!--          <template v-if="toggleSearchStatus">-->
             <a-col :md="6" :sm="8">
               <a-form-item label="接收人">
                 <j-input placeholder="请输入接收人" v-model="queryParam.esReceiver"></j-input>
               </a-form-item>
             </a-col>
-          </template>
+<!--          </template>-->
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
             </span>
           </a-col>
 
@@ -39,11 +39,11 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" v-show="show" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" v-show="show" icon="download" @click="handleExportXls('消息')">导出</a-button>
+      <a-button @click="handleAdd" v-show="show" type="default" icon="plus">新增</a-button>
+      <a-button type="default" v-show="show" icon="download" @click="handleExportXls('消息')">导出</a-button>
       <a-upload v-show="show" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
                 @change="handleImportExcel" :before-upload='beforeUpload'>
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="default" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
diff --git a/jero-web/src/views/modules/message/SysMessageTemplateList.vue b/jero-web/src/views/modules/message/SysMessageTemplateList.vue
index 17c314c4..4a7e38fd 100644
--- a/jero-web/src/views/modules/message/SysMessageTemplateList.vue
+++ b/jero-web/src/views/modules/message/SysMessageTemplateList.vue
@@ -16,21 +16,21 @@
               <j-input placeholder="请输入模板内容" v-model="queryParam.templateContent"></j-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
+<!--          <template v-if="toggleSearchStatus">-->
             <a-col :md="6" :sm="8">
               <a-form-item label="模板标题">
                 <j-input placeholder="请输入模板标题" v-model="queryParam.templateName"></j-input>
               </a-form-item>
             </a-col>
-          </template>
+<!--          </template>-->
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
             </span>
           </a-col>
 
@@ -40,11 +40,11 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('消息模板')">导出</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus">新增</a-button>
+      <a-button type="default" icon="download" @click="handleExportXls('消息模板')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
                 @change="handleImportExcel" :before-upload='beforeUpload'>
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="default" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
diff --git a/jero-web/src/views/system/DataLogList.vue b/jero-web/src/views/system/DataLogList.vue
index 967497fa..340ef7ca 100644
--- a/jero-web/src/views/system/DataLogList.vue
+++ b/jero-web/src/views/system/DataLogList.vue
@@ -17,8 +17,8 @@
 
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+                  <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
+                  <a-button type="default" style="margin-left: 8px" icon="reload" @click="searchReset">重置</a-button>
                </a-col>
             </span>
         </a-row>
diff --git a/jero-web/src/views/system/DepartList.vue b/jero-web/src/views/system/DepartList.vue
index 526c20ee..932dcba5 100644
--- a/jero-web/src/views/system/DepartList.vue
+++ b/jero-web/src/views/system/DepartList.vue
@@ -5,11 +5,11 @@
 
         <!-- 按钮操作区域 -->
         <a-row style="margin-left: 14px">
-          <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
-          <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
-          <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
+          <a-button @click="handleAdd(1)" type="default">添加部门</a-button>
+          <a-button @click="handleAdd(2)" type="default">添加下级</a-button>
+          <a-button type="default" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
           <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
-            <a-button type="primary" icon="import">导入</a-button>
+            <a-button type="default" icon="import">导入</a-button>
           </a-upload>
           <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
           <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
diff --git a/jero-web/src/views/system/DepartListSync.vue b/jero-web/src/views/system/DepartListSync.vue
index 50b5aeed..0832b1fd 100644
--- a/jero-web/src/views/system/DepartListSync.vue
+++ b/jero-web/src/views/system/DepartListSync.vue
@@ -5,11 +5,11 @@
 
         <!-- 按钮操作区域 -->
         <a-row style="margin: 0 0 0 14px" class="table-operator">
-          <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
-          <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
-          <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
+          <a-button @click="handleAdd(1)" type="default">添加部门</a-button>
+          <a-button @click="handleAdd(2)" type="default">添加下级</a-button>
+          <a-button type="default" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
           <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
-            <a-button type="primary" icon="import">导入</a-button>
+            <a-button type="default" icon="import">导入</a-button>
           </a-upload>
           <j-third-app-button biz-type="depart" :selected-row-keys="selectedRowKeys" syncToApp @sync-finally="onSyncFinally"/>
           <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue
index 603a3972..ae9ef6d7 100644
--- a/jero-web/src/views/system/DictList.vue
+++ b/jero-web/src/views/system/DictList.vue
@@ -5,34 +5,34 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="12">
-          <a-col :md="7" :sm="8">
+          <a-col :md="6" :sm="8">
             <a-form-item label="字典名称" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
               <j-input placeholder="请输入字典名称" v-model="queryParam.dictName"></j-input>
             </a-form-item>
           </a-col>
-          <a-col :md="7" :sm="8">
+          <a-col :md="6" :sm="8">
             <a-form-item label="字典编号" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
               <j-input placeholder="请输入字典编号" v-model="queryParam.dictCode"></j-input>
             </a-form-item>
           </a-col>
-          <a-col :md="7" :sm="8">
+          <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>
       </a-form>
 
       <div class="table-operator" style="border-top: 5px">
-        <a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:dict:operation'">添加</a-button>
-        <a-button type="primary" icon="download" @click="handleExportXls('字典信息')" v-has="'sys:dict:operation'">导出</a-button>
+        <a-button @click="handleAdd" type="default" icon="plus" v-has="'sys:dict:operation'">添加</a-button>
+        <a-button type="default" icon="download" @click="handleExportXls('字典信息')" v-has="'sys:dict:operation'">导出</a-button>
         <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" :before-upload='beforeUpload' @change="handleImportExcel" v-has="'sys:dict:operation'">
-          <a-button type="primary" icon="import">导入</a-button>
+          <a-button type="default" icon="import">导入</a-button>
         </a-upload>
-        <a-button type="primary" icon="sync" @click="refleshCache()">刷新缓存</a-button>
+        <a-button type="default" icon="sync" @click="refleshCache()">刷新缓存</a-button>
 
-        <a-button type="primary" icon="hdd" @click="openDeleteList">回收站</a-button>
+        <a-button type="default" icon="hdd" @click="openDeleteList">回收站</a-button>
       </div>
 
       <a-table
diff --git a/jero-web/src/views/system/PermissionList.vue b/jero-web/src/views/system/PermissionList.vue
index ddf1bc50..d9057f3c 100644
--- a/jero-web/src/views/system/PermissionList.vue
+++ b/jero-web/src/views/system/PermissionList.vue
@@ -3,12 +3,12 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus">新增</a-button>
       <a-button
         @click="batchDel"
         v-if="selectedRowKeys.length > 0"
-        ghost
-        type="primary"
+        
+        type="default"
         icon="delete">批量删除
       </a-button>
     </div>
diff --git a/jero-web/src/views/system/QuartzJobList.vue b/jero-web/src/views/system/QuartzJobList.vue
index cc4d7025..5d7b112e 100644
--- a/jero-web/src/views/system/QuartzJobList.vue
+++ b/jero-web/src/views/system/QuartzJobList.vue
@@ -24,7 +24,7 @@
           <a-col :md="6" :sm="10" >
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
 
@@ -34,10 +34,10 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('定时任务信息')">导出</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus">新增</a-button>
+      <a-button type="default" icon="download" @click="handleExportXls('定时任务信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :before-upload='beforeUpload' :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="default" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue
index c2f0ae9d..22da9453 100644
--- a/jero-web/src/views/system/RoleUserList.vue
+++ b/jero-web/src/views/system/RoleUserList.vue
@@ -7,7 +7,7 @@
           <!-- 搜索区域 -->
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="12" :sm="8">
+              <a-col :md="6" :sm="8">
                 <a-form-item label="角色名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                   <j-input placeholder="" v-model="queryParam.roleName"></j-input>
                 </a-form-item>
@@ -22,9 +22,9 @@
               </a-col>
               -->
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="12" :sm="24">
+            <a-col :md="6" :sm="24">
                <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </a-col>
           </span>
             </a-row>
@@ -32,7 +32,7 @@
         </div>
         <!-- 操作按钮区域 -->
         <div class="table-operator" style="margin: 5px 0 10px 2px">
-          <a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button>
+          <a-button @click="handleAdd" type="default" icon="plus">新建角色</a-button>
           <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
 <!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
 <!--            <a-button type="primary" icon="import">导入</a-button>-->
diff --git a/jero-web/src/views/system/SysAnnouncementList.vue b/jero-web/src/views/system/SysAnnouncementList.vue
index 87d6f357..7369536b 100644
--- a/jero-web/src/views/system/SysAnnouncementList.vue
+++ b/jero-web/src/views/system/SysAnnouncementList.vue
@@ -14,7 +14,7 @@
           <a-col :span="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
 
@@ -24,7 +24,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus">新增</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel">
diff --git a/jero-web/src/views/system/SysCategoryList.vue b/jero-web/src/views/system/SysCategoryList.vue
index 874e2423..f4e4142a 100644
--- a/jero-web/src/views/system/SysCategoryList.vue
+++ b/jero-web/src/views/system/SysCategoryList.vue
@@ -3,10 +3,10 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:category:add'">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('分类字典')" v-has="'sys:category:export'">导出</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus" v-has="'sys:category:add'">新增</a-button>
+      <a-button type="default" icon="download" @click="handleExportXls('分类字典')" v-has="'sys:category:export'">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"  :action="importExcelUrl" :before-upload='beforeUpload' @change="handleImportExcel" v-has="'sys:category:import'">
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="default" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0" v-has="'sys:category:del'">
         <a-menu slot="overlay">
diff --git a/jero-web/src/views/system/SysCheckRuleList.vue b/jero-web/src/views/system/SysCheckRuleList.vue
index 363a8f48..aceff637 100644
--- a/jero-web/src/views/system/SysCheckRuleList.vue
+++ b/jero-web/src/views/system/SysCheckRuleList.vue
@@ -21,11 +21,11 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
             </span>
           </a-col>
 
@@ -35,10 +35,10 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('编码校验规则')">导出</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus">新增</a-button>
+      <a-button type="default" icon="download" @click="handleExportXls('编码校验规则')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="default" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
diff --git a/jero-web/src/views/system/SysDataSourceList.vue b/jero-web/src/views/system/SysDataSourceList.vue
index 4ae522d5..9574f1c6 100644
--- a/jero-web/src/views/system/SysDataSourceList.vue
+++ b/jero-web/src/views/system/SysDataSourceList.vue
@@ -21,7 +21,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
 
@@ -31,10 +31,10 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('多数据源管理')">导出</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus">新增</a-button>
+      <a-button type="default" icon="download" @click="handleExportXls('多数据源管理')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="default" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
diff --git a/jero-web/src/views/system/SysFillRuleList.vue b/jero-web/src/views/system/SysFillRuleList.vue
index 865d0c2d..ed37850f 100644
--- a/jero-web/src/views/system/SysFillRuleList.vue
+++ b/jero-web/src/views/system/SysFillRuleList.vue
@@ -18,7 +18,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -27,10 +27,10 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('填值规则')">导出</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus">新增</a-button>
+      <a-button type="default" icon="download" @click="handleExportXls('填值规则')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="default" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
diff --git a/jero-web/src/views/system/SysGatewayRouteList.vue b/jero-web/src/views/system/SysGatewayRouteList.vue
index be9d3a8a..607a8c4e 100644
--- a/jero-web/src/views/system/SysGatewayRouteList.vue
+++ b/jero-web/src/views/system/SysGatewayRouteList.vue
@@ -2,7 +2,7 @@
   <a-card :bordered="false">
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="showModal(null)" type="primary" icon="plus">新增</a-button>
+      <a-button @click="showModal(null)" type="default" icon="plus">新增</a-button>
     </div>
     <div>
       <a-table
diff --git a/jero-web/src/views/system/SysUserOnlineList.vue b/jero-web/src/views/system/SysUserOnlineList.vue
index e1942d51..46bdb09c 100644
--- a/jero-web/src/views/system/SysUserOnlineList.vue
+++ b/jero-web/src/views/system/SysUserOnlineList.vue
@@ -12,7 +12,7 @@
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/jero-web/src/views/system/TenantList.vue b/jero-web/src/views/system/TenantList.vue
index e5bcabf5..7d0724bd 100644
--- a/jero-web/src/views/system/TenantList.vue
+++ b/jero-web/src/views/system/TenantList.vue
@@ -11,7 +11,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus">新增</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index ed8c677e..8adf2d7f 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -19,7 +19,7 @@
           <a-col :span="8" >
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
 
@@ -28,7 +28,7 @@
     </div>
 
     <div class="table-operator">
-      <a-button type="primary" @click="readAll" icon="book">全部标注已读</a-button>
+      <a-button type="default" @click="readAll" icon="book">全部标注已读</a-button>
     </div>
 
     <a-table
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index 23d628b3..d4b2b0ab 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -22,13 +22,13 @@
             </a-form-item>
           </a-col>
 
-          <template v-if="toggleSearchStatus">
+
             <a-col :md="6" :sm="8">
               <a-form-item label="真实名字">
                 <j-input placeholder="请输入真实名字" v-model="queryParam.realname"></j-input>
               </a-form-item>
             </a-col>
-
+          <template v-if="toggleSearchStatus">
             <a-col :md="6" :sm="8">
               <a-form-item label="手机号码">
                 <a-input placeholder="请输入完整手机号精准查询" v-model="queryParam.phone"></a-input>
@@ -74,12 +74,12 @@
 
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+               <a @click="handleToggleSearch" style="margin-right: 28px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
 
@@ -89,13 +89,13 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus" >添加用户</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus" >添加用户</a-button>
+      <a-button type="default" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="default" icon="import">导入</a-button>
       </a-upload>
-      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">回收站</a-button>
-      <a-button type="primary" icon="hdd" @click="roleAssignment">角色配置</a-button>
+      <a-button type="default" icon="hdd" @click="recycleBinVisible=true">回收站</a-button>
+      <a-button type="default" icon="hdd" @click="roleAssignment">角色配置</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" @click="handleMenuClick">
           <a-menu-item key="1">
diff --git a/jero-web/src/views/system/log/LoginLogList.vue b/jero-web/src/views/system/log/LoginLogList.vue
index f39b6c53..1006eb93 100644
--- a/jero-web/src/views/system/log/LoginLogList.vue
+++ b/jero-web/src/views/system/log/LoginLogList.vue
@@ -27,7 +27,7 @@
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24" >
                 <a-button type="primary"  style="left: 10px" @click="searchQuery" icon="search">查询</a-button>
-                <a-button type="primary"  @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px">重置</a-button>
+                <a-button type="defaultdefault"  @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px">重置</a-button>
             </a-col>
           </span>
 
diff --git a/jero-web/src/views/system/log/OperatorLogList.vue b/jero-web/src/views/system/log/OperatorLogList.vue
index 2e99714d..9ed280ac 100644
--- a/jero-web/src/views/system/log/OperatorLogList.vue
+++ b/jero-web/src/views/system/log/OperatorLogList.vue
@@ -32,7 +32,7 @@
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24" >
                 <a-button type="primary"  style="left: 10px" @click="searchQuery" icon="search">查询</a-button>
-                <a-button type="primary"  @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px">重置</a-button>
+                <a-button type="default"  @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px">重置</a-button>
             </a-col>
           </span>
 
diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue
index aafed7c3..5513bd49 100644
--- a/jero-web/src/views/system/modules/DeptUserInfo.vue
+++ b/jero-web/src/views/system/modules/DeptUserInfo.vue
@@ -13,7 +13,7 @@
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24">
              <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="default" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </a-col>
           </span>
         </a-row>
@@ -22,8 +22,8 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="margin-top: -15px">
       <!--<a-button @click="handleEdit" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
-      <a-button @click="handleAddUserDepart" type="primary" icon="plus">添加已有用户</a-button>
-      <a-button @click="handleAdd" type="primary" icon="plus" style="margin-top: 16px">新建用户</a-button>
+      <a-button @click="handleAddUserDepart" type="default" icon="plus">添加已有用户</a-button>
+      <a-button @click="handleAdd" type="default" icon="plus" style="margin-top: 16px">新建用户</a-button>
 
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
diff --git a/jero-web/src/views/system/modules/SelectUserListModal.vue b/jero-web/src/views/system/modules/SelectUserListModal.vue
index 5e427efc..9b5dbaa0 100644
--- a/jero-web/src/views/system/modules/SelectUserListModal.vue
+++ b/jero-web/src/views/system/modules/SelectUserListModal.vue
@@ -53,12 +53,13 @@
 
           <a-col :span="6" >
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchByquery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+                 <a @click="handleToggleSearch" style="margin-right: 28px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
+              <a-button type="primary" @click="searchByquery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+
             </span>
           </a-col>