diff --git a/src/views/system/ConfusionList.vue b/src/views/system/ConfusionList.vue
index 861bdff..ed754ee 100644
--- a/src/views/system/ConfusionList.vue
+++ b/src/views/system/ConfusionList.vue
@@ -24,7 +24,7 @@
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button  class="reset-button" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
             </a-col>
           </a-row>
@@ -199,6 +199,6 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style scoped lang="less">
 @import '~@assets/less/common.less';
 </style>
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 3d48037..c1fce68 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -103,28 +103,28 @@
                            @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
                            v-decorator="['orgCode', validatorRules.orgCode ]"/>
                 </a-form-item>
-                <a-form-item
-                  :labelCol="labelCol"
-                  :wrapperCol="wrapperCol"
-                  label="机构类型">
-                  <template v-if="orgCategoryDisabled">
-                    <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-                      <a-radio value="1">
-                        公司
-                      </a-radio>
-                    </a-radio-group>
-                  </template>
-                  <template v-else>
-                    <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-                      <a-radio value="2">
-                        部门
-                      </a-radio>
-                      <a-radio value="3">
-                        岗位
-                      </a-radio>
-                    </a-radio-group>
-                  </template>
-                </a-form-item>
+<!--                <a-form-item-->
+<!--                  :labelCol="labelCol"-->
+<!--                  :wrapperCol="wrapperCol"-->
+<!--                  label="机构类型">-->
+<!--                  <template v-if="orgCategoryDisabled">-->
+<!--                    <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">-->
+<!--                      <a-radio value="1">-->
+<!--                        公司-->
+<!--                      </a-radio>-->
+<!--                    </a-radio-group>-->
+<!--                  </template>-->
+<!--                  <template v-else>-->
+<!--                    <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">-->
+<!--                      <a-radio value="2">-->
+<!--                        部门-->
+<!--                      </a-radio>-->
+<!--                      <a-radio value="3">-->
+<!--                        岗位-->
+<!--                      </a-radio>-->
+<!--                    </a-radio-group>-->
+<!--                  </template>-->
+<!--                </a-form-item>-->
                 <a-form-item
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
@@ -154,7 +154,7 @@
                 </a-form-item>
               </a-form>
               <div class="anty-form-btn">
-                <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">重置</a-button>
+                <a-button @click="emptyCurrForm"  class="reset-button" htmlType="button" icon="sync">重置</a-button>
                 <a-button @click="submitCurrForm" :disabled="disabledStatus" type="primary" htmlType="button"
                           icon="form">保存
                 </a-button>
@@ -653,7 +653,8 @@ export default {
 
 }
 </script>
-<style scoped>
+<style scoped lang="less">
+@import '~@assets/less/common.less';
 .ant-card-body .table-operator {
   margin: 15px;
 }
diff --git a/src/views/system/DictItemList.vue b/src/views/system/DictItemList.vue
index c75a8ad..7a13088 100644
--- a/src/views/system/DictItemList.vue
+++ b/src/views/system/DictItemList.vue
@@ -37,7 +37,7 @@
               <a-col :md="7" :sm="24">
               <span style="float: left;" class="table-page-search-submitButtons">
                 <a-button type="primary" @click="searchQuery">搜索</a-button>
-                <a-button type="primary" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a-button class="reset-button" @click="searchReset" style="margin-left: 8px">重置</a-button>
               </span>
               </a-col>
             </a-row>
@@ -223,6 +223,7 @@
   }
 </script>
 <style lang="less" scoped>
+@import '~@assets/less/common.less';
 //update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
 /deep/ .data-rule-invalid{
   background: #f4f4f4;
diff --git a/src/views/system/DictList.vue b/src/views/system/DictList.vue
index 8ea6a0e..852cb8b 100644
--- a/src/views/system/DictList.vue
+++ b/src/views/system/DictList.vue
@@ -20,7 +20,7 @@
             <a-col :md="7" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search" v-has="'sys:dict:search'">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button  class="reset-button" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
             </a-col>
           </a-row>
@@ -220,6 +220,6 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style scoped lang="less">
 @import '~@assets/less/common.less';
 </style>
diff --git a/src/views/system/QuartzJobList.vue b/src/views/system/QuartzJobList.vue
index 79ecd40..04aeb76 100644
--- a/src/views/system/QuartzJobList.vue
+++ b/src/views/system/QuartzJobList.vue
@@ -26,7 +26,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  class="reset-button" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button  >
             </span>
             </a-col>
 
@@ -294,6 +294,6 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style scoped lang="less">
 @import '~@assets/less/common.less';
 </style>
diff --git a/src/views/system/modules/DepartModal.vue b/src/views/system/modules/DepartModal.vue
index 07c0f9e..7489b0d 100644
--- a/src/views/system/modules/DepartModal.vue
+++ b/src/views/system/modules/DepartModal.vue
@@ -30,28 +30,28 @@
             :disabled="condition">
           </a-tree-select>
         </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="机构类型">
-          <template v-if="seen">
-            <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-              <a-radio value="1">
-                公司
-              </a-radio>
-            </a-radio-group>
-          </template>
-          <template v-else>
-            <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-              <a-radio value="2">
-                部门
-              </a-radio>
-              <a-radio value="3">
-                岗位
-              </a-radio>
-            </a-radio-group>
-          </template>
-        </a-form-item>
+<!--        <a-form-item-->
+<!--          :labelCol="labelCol"-->
+<!--          :wrapperCol="wrapperCol"-->
+<!--          label="机构类型">-->
+<!--          <template v-if="seen">-->
+<!--            <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">-->
+<!--              <a-radio value="1">-->
+<!--                公司-->
+<!--              </a-radio>-->
+<!--            </a-radio-group>-->
+<!--          </template>-->
+<!--          <template v-else>-->
+<!--            <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">-->
+<!--              <a-radio value="2">-->
+<!--                部门-->
+<!--              </a-radio>-->
+<!--              <a-radio value="3">-->
+<!--                岗位-->
+<!--              </a-radio>-->
+<!--            </a-radio-group>-->
+<!--          </template>-->
+<!--        </a-form-item>-->
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index de3ea41..e40b38b 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -390,7 +390,7 @@ export default {
 
       }
       that.$nextTick(() => {
-        that.form.setFieldsValue(pick(this.model, 'username', 'realname', 'email', 'phone', 'post','selecteddeparts'))
+        that.form.setFieldsValue(pick(this.model, 'username', 'realname', 'email', 'phone', 'post','selecteddeparts','emailPassword'))
       })
       //身份为上级显示负责部门，否则不显示
       if (this.model.userIdentity == '2') {