diff --git a/config/index.js b/config/index.js
index 43b70bd..100676c 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "192.168.20.97", // can be overwritten by process.env.HOST
+    host: "localhost", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

diff --git a/config/index.js b/config/index.js
index 43b70bd..100676c 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "192.168.20.97", // can be overwritten by process.env.HOST
+    host: "localhost", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index f532b07..ced76ad 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -355,7 +355,6 @@
           id: undefined,
           login: "",
           realName: "",
-          pwd: "",
           userType: 0,
           orgId: undefined,
           groupId: undefined,
@@ -367,8 +366,7 @@
         fieldList: [
           { label: "用户名", value: "login", type: "input", required: true },
           { label: "姓名", value: "realName", type: "input", required: true },
-          { label: "密码", value: "pwd", type: "password", required: true },
-          { label: "手机号", value: "mobile", type: "input", validator: checkPhone },
+          { label: "手机号", value: "mobile", type: "input", required: true, validator: checkPhone },
           { label: "用户类型", value: "userType", type: "select", list: "userType", disabled: true },
           { label: "所属部门", value: "orgId", type: "treeselect", list: "deptTree", required: true },
           { label: "所属分组", value: "groupName", type: "input", disabled: true },

diff --git a/config/index.js b/config/index.js
index 43b70bd..100676c 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "192.168.20.97", // can be overwritten by process.env.HOST
+    host: "localhost", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index f532b07..ced76ad 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -355,7 +355,6 @@
           id: undefined,
           login: "",
           realName: "",
-          pwd: "",
           userType: 0,
           orgId: undefined,
           groupId: undefined,
@@ -367,8 +366,7 @@
         fieldList: [
           { label: "用户名", value: "login", type: "input", required: true },
           { label: "姓名", value: "realName", type: "input", required: true },
-          { label: "密码", value: "pwd", type: "password", required: true },
-          { label: "手机号", value: "mobile", type: "input", validator: checkPhone },
+          { label: "手机号", value: "mobile", type: "input", required: true, validator: checkPhone },
           { label: "用户类型", value: "userType", type: "select", list: "userType", disabled: true },
           { label: "所属部门", value: "orgId", type: "treeselect", list: "deptTree", required: true },
           { label: "所属分组", value: "groupName", type: "input", disabled: true },
diff --git a/src/components/index.vue b/src/components/index.vue
index 4f99894..e859c51 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -30,7 +30,7 @@
           style="cursor: pointer"
         />
 
-        <el-dropdown id="UserName">
+        <!-- <el-dropdown id="UserName">
           <span>
             {{ LoginName }}
             <i class="el-icon-arrow-down el-icon--right" style="color:#fff"></i>
@@ -38,6 +38,21 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item>修改密码</el-dropdown-item>
           </el-dropdown-menu>
+        </el-dropdown> -->
+        <el-dropdown class="dropdown" trigger="click" @command="handleCommand">
+          <div class="user-account">
+            <span class="txt">{{LoginName}}</span>
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              v-for="(item, index) in dropdownList"
+              :key="index"
+              :command="item.command"
+            >
+              {{item.key}}
+            </el-dropdown-item>
+          </el-dropdown-menu>
         </el-dropdown>
         <div class="ChangeBGC" @click="ChangeBGC()">换肤</div>
       </el-header>
@@ -202,6 +217,23 @@
         </el-main>
       </el-container>
     </el-container>
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :rules="formInfo.rules"
+        :field-list="formInfo.fieldList"
+        :label-width="formInfo.labelWidth"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
   </div>
 </template>
 <script>
@@ -214,9 +246,54 @@
       MenuWidth: 200,
       LoginName: "系统管理员", //登录用户名称
       userId: "",
-      flag: true
+      flag: true,
+      dropdownList:[
+        {key:'修改密码',command:'updatePw'}
+      ],
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          updatePw: '修改密码'
+        },
+        visible: false,
+        btLoading: false,
+        width: "500px",
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading: true}
+        ]
+      },
+      //表单相关
+      formInfo:{
+        ref: null,
+        data: {
+          userNo:'', //账户
+          password:'',  //原始密码
+          newpassword:'', //新密码
+        },
+        fieldList: [
+          {label:'账户',value:'userNo',disabled:true,type:'input',required:true,className:'el-form-block'},
+          {label:'原密码',value:'password',type:'password',required:true,className:'el-form-block'},
+          {label:'新密码',value:'newpassword',type:'password',required:true,className:'el-form-block'},
+        ],
+        rules: {},
+        labelWidth: '100px'
+      }
     };
   },
+  watch: {
+    "dialogInfo.visible"(val) {
+      let formInfo = this.formInfo;
+      if (!val) {
+        if (formInfo.ref) {
+          formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.dialogInfo.btLoading = false;
+      }
+    }
+  },
   methods: {
     MenuSHOW: function() {
       if (this.MenuWidth == 200) {
@@ -325,17 +402,77 @@
     ZhuXIao() {
       this.$router.push({ path: "/Login" });
       sessionStorage.clear();
+    },
+    // 初始化验证
+    initRules(){
+      let formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    handleCommand(command){
+      const dialogInfo = this.dialogInfo
+      const formInfo = this.formInfo
+      switch(command){
+        //修改密码
+        case 'updatePw':
+          dialogInfo.type = command;
+          dialogInfo.visible = true
+          this.formInfo.data.userNo = localStorage.getItem("USERNO");
+          break;
+      }
+    },
+    //点击事件
+    handleClick(event, data) {
+      const formInfo = this.formInfo;
+      const dialogInfo = this.dialogInfo;
+      switch(event) {
+        //保存
+        case 'save':
+          formInfo.ref.validate(valid => {
+            if(valid){
+              let api; let params = formInfo.data;
+              dialogInfo.btLoading = true;
+              this.$http.post(this.nozzle.updateUserPwd,{data:params}).then(res =>{
+                dialogInfo.btLoading = false;
+                if(res.data.code === 1) {
+                  dialogInfo.visible = false;
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+              }).catch(e =>{
+                dialogInfo.btLoading = false;
+                console.log(e);
+              })
+            }
+          })
+          break
+        //关闭
+        case "close":
+          dialogInfo.visible = false;
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        userNo:'', //账户
+        password:'',  //原始密码
+        newpassword:'', //新密码
+      };
     }
   },
   mounted: function() {
     //添加菜单
     // this.LoadMenu();
     // this.loadLoginName();
+    this.initRules();
     this.LoginName = locasto.getItem("USERName");
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 #IndexTop {
   width: 100%;
   height: 100%;
@@ -352,4 +489,9 @@
 /deep/.el-icon-arrow-down el-icon--right {
   color: #fff !important;
 }
+.dropdown{
+  float: right;
+  @include sc(16px,#fff);
+  cursor: pointer;
+}
 </style>

diff --git a/config/index.js b/config/index.js
index 43b70bd..100676c 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "192.168.20.97", // can be overwritten by process.env.HOST
+    host: "localhost", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index f532b07..ced76ad 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -355,7 +355,6 @@
           id: undefined,
           login: "",
           realName: "",
-          pwd: "",
           userType: 0,
           orgId: undefined,
           groupId: undefined,
@@ -367,8 +366,7 @@
         fieldList: [
           { label: "用户名", value: "login", type: "input", required: true },
           { label: "姓名", value: "realName", type: "input", required: true },
-          { label: "密码", value: "pwd", type: "password", required: true },
-          { label: "手机号", value: "mobile", type: "input", validator: checkPhone },
+          { label: "手机号", value: "mobile", type: "input", required: true, validator: checkPhone },
           { label: "用户类型", value: "userType", type: "select", list: "userType", disabled: true },
           { label: "所属部门", value: "orgId", type: "treeselect", list: "deptTree", required: true },
           { label: "所属分组", value: "groupName", type: "input", disabled: true },
diff --git a/src/components/index.vue b/src/components/index.vue
index 4f99894..e859c51 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -30,7 +30,7 @@
           style="cursor: pointer"
         />
 
-        <el-dropdown id="UserName">
+        <!-- <el-dropdown id="UserName">
           <span>
             {{ LoginName }}
             <i class="el-icon-arrow-down el-icon--right" style="color:#fff"></i>
@@ -38,6 +38,21 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item>修改密码</el-dropdown-item>
           </el-dropdown-menu>
+        </el-dropdown> -->
+        <el-dropdown class="dropdown" trigger="click" @command="handleCommand">
+          <div class="user-account">
+            <span class="txt">{{LoginName}}</span>
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              v-for="(item, index) in dropdownList"
+              :key="index"
+              :command="item.command"
+            >
+              {{item.key}}
+            </el-dropdown-item>
+          </el-dropdown-menu>
         </el-dropdown>
         <div class="ChangeBGC" @click="ChangeBGC()">换肤</div>
       </el-header>
@@ -202,6 +217,23 @@
         </el-main>
       </el-container>
     </el-container>
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :rules="formInfo.rules"
+        :field-list="formInfo.fieldList"
+        :label-width="formInfo.labelWidth"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
   </div>
 </template>
 <script>
@@ -214,9 +246,54 @@
       MenuWidth: 200,
       LoginName: "系统管理员", //登录用户名称
       userId: "",
-      flag: true
+      flag: true,
+      dropdownList:[
+        {key:'修改密码',command:'updatePw'}
+      ],
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          updatePw: '修改密码'
+        },
+        visible: false,
+        btLoading: false,
+        width: "500px",
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading: true}
+        ]
+      },
+      //表单相关
+      formInfo:{
+        ref: null,
+        data: {
+          userNo:'', //账户
+          password:'',  //原始密码
+          newpassword:'', //新密码
+        },
+        fieldList: [
+          {label:'账户',value:'userNo',disabled:true,type:'input',required:true,className:'el-form-block'},
+          {label:'原密码',value:'password',type:'password',required:true,className:'el-form-block'},
+          {label:'新密码',value:'newpassword',type:'password',required:true,className:'el-form-block'},
+        ],
+        rules: {},
+        labelWidth: '100px'
+      }
     };
   },
+  watch: {
+    "dialogInfo.visible"(val) {
+      let formInfo = this.formInfo;
+      if (!val) {
+        if (formInfo.ref) {
+          formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.dialogInfo.btLoading = false;
+      }
+    }
+  },
   methods: {
     MenuSHOW: function() {
       if (this.MenuWidth == 200) {
@@ -325,17 +402,77 @@
     ZhuXIao() {
       this.$router.push({ path: "/Login" });
       sessionStorage.clear();
+    },
+    // 初始化验证
+    initRules(){
+      let formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    handleCommand(command){
+      const dialogInfo = this.dialogInfo
+      const formInfo = this.formInfo
+      switch(command){
+        //修改密码
+        case 'updatePw':
+          dialogInfo.type = command;
+          dialogInfo.visible = true
+          this.formInfo.data.userNo = localStorage.getItem("USERNO");
+          break;
+      }
+    },
+    //点击事件
+    handleClick(event, data) {
+      const formInfo = this.formInfo;
+      const dialogInfo = this.dialogInfo;
+      switch(event) {
+        //保存
+        case 'save':
+          formInfo.ref.validate(valid => {
+            if(valid){
+              let api; let params = formInfo.data;
+              dialogInfo.btLoading = true;
+              this.$http.post(this.nozzle.updateUserPwd,{data:params}).then(res =>{
+                dialogInfo.btLoading = false;
+                if(res.data.code === 1) {
+                  dialogInfo.visible = false;
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+              }).catch(e =>{
+                dialogInfo.btLoading = false;
+                console.log(e);
+              })
+            }
+          })
+          break
+        //关闭
+        case "close":
+          dialogInfo.visible = false;
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        userNo:'', //账户
+        password:'',  //原始密码
+        newpassword:'', //新密码
+      };
     }
   },
   mounted: function() {
     //添加菜单
     // this.LoadMenu();
     // this.loadLoginName();
+    this.initRules();
     this.LoginName = locasto.getItem("USERName");
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 #IndexTop {
   width: 100%;
   height: 100%;
@@ -352,4 +489,9 @@
 /deep/.el-icon-arrow-down el-icon--right {
   color: #fff !important;
 }
+.dropdown{
+  float: right;
+  @include sc(16px,#fff);
+  cursor: pointer;
+}
 </style>
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index 9549f27..537ce78 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -46,21 +46,21 @@
               type="text"
               size="small"
               @click="handleClick('update', scope.row)"
-              v-has="'m9-2-b3'"
+              v-has="'m9-1-2'"
               >修改用户</el-button
             >
             <el-button
               type="text"
               size="small"
               @click="handleClick('delete', scope.row)"
-              v-has="'m9-2-b4'"
+              v-has="'m9-1-3'"
               >删除用户</el-button
             >
             <el-button
               type="text"
               size="small"
               @click="handleClick('reset', scope.row)"
-              v-has="'m9-2-b4'"
+              v-has="'m9-1-4'"
               >重置密码</el-button
             >
           </template>
@@ -275,6 +275,27 @@
           }
           dialogInfo.visible = true;
           break;
+        //重置密码
+        case "reset":
+          this.$confirm("此操作会重置该用户密码为初始手机号, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(res =>{
+            this.$http.post(this.nozzle.resetUserPwd,{data:{userId:data.id}}).then(res =>{
+              if(res.data.code === 1) {
+                this.loadGridData();
+              }
+              this.$message({
+                message: res.data.msg,
+                type: res.data.code === 1 ? "success" : "error",
+                showClose: true
+              });
+            }).catch(e => {
+              message(e);
+            });
+          });
+          break;
         //删除用户
         case "delete":
           this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
@@ -333,7 +354,7 @@
                     type: res.data.code === 1 ? "success" : "error",
                     showClose: true
                   });
-                  dialogInfo.btLoading = true;
+                  dialogInfo.btLoading = false;
                 })
                 .catch(e => {
                   dialogInfo.btLoading = false;
@@ -347,12 +368,6 @@
         case "close":
           dialogInfo.visible = false;
           break;
-        case "reset":
-          this.$confirm("将重置该用户密码为初始手机号, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          });
       }
     },
     ALSizeChange(val) {

diff --git a/config/index.js b/config/index.js
index 43b70bd..100676c 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,7 +87,7 @@
     },
 
     // Various Dev Server settings
-    host: "192.168.20.97", // can be overwritten by process.env.HOST
+    host: "localhost", // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index f532b07..ced76ad 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -355,7 +355,6 @@
           id: undefined,
           login: "",
           realName: "",
-          pwd: "",
           userType: 0,
           orgId: undefined,
           groupId: undefined,
@@ -367,8 +366,7 @@
         fieldList: [
           { label: "用户名", value: "login", type: "input", required: true },
           { label: "姓名", value: "realName", type: "input", required: true },
-          { label: "密码", value: "pwd", type: "password", required: true },
-          { label: "手机号", value: "mobile", type: "input", validator: checkPhone },
+          { label: "手机号", value: "mobile", type: "input", required: true, validator: checkPhone },
           { label: "用户类型", value: "userType", type: "select", list: "userType", disabled: true },
           { label: "所属部门", value: "orgId", type: "treeselect", list: "deptTree", required: true },
           { label: "所属分组", value: "groupName", type: "input", disabled: true },
diff --git a/src/components/index.vue b/src/components/index.vue
index 4f99894..e859c51 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -30,7 +30,7 @@
           style="cursor: pointer"
         />
 
-        <el-dropdown id="UserName">
+        <!-- <el-dropdown id="UserName">
           <span>
             {{ LoginName }}
             <i class="el-icon-arrow-down el-icon--right" style="color:#fff"></i>
@@ -38,6 +38,21 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item>修改密码</el-dropdown-item>
           </el-dropdown-menu>
+        </el-dropdown> -->
+        <el-dropdown class="dropdown" trigger="click" @command="handleCommand">
+          <div class="user-account">
+            <span class="txt">{{LoginName}}</span>
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              v-for="(item, index) in dropdownList"
+              :key="index"
+              :command="item.command"
+            >
+              {{item.key}}
+            </el-dropdown-item>
+          </el-dropdown-menu>
         </el-dropdown>
         <div class="ChangeBGC" @click="ChangeBGC()">换肤</div>
       </el-header>
@@ -202,6 +217,23 @@
         </el-main>
       </el-container>
     </el-container>
+    <page-dialog
+      :title="dialogInfo.title[dialogInfo.type]"
+      :visible.sync="dialogInfo.visible"
+      :width="dialogInfo.width"
+      :bt-loading="dialogInfo.btLoading"
+      :bt-list="dialogInfo.btList"
+      @handleClick="handleClick"
+    >
+      <page-form
+        :ref-obj.sync="formInfo.ref"
+        :data="formInfo.data"
+        :rules="formInfo.rules"
+        :field-list="formInfo.fieldList"
+        :label-width="formInfo.labelWidth"
+        @handleClick="handleClick"
+      />
+    </page-dialog>
   </div>
 </template>
 <script>
@@ -214,9 +246,54 @@
       MenuWidth: 200,
       LoginName: "系统管理员", //登录用户名称
       userId: "",
-      flag: true
+      flag: true,
+      dropdownList:[
+        {key:'修改密码',command:'updatePw'}
+      ],
+      //弹窗相关
+      dialogInfo:{
+        title: {
+          updatePw: '修改密码'
+        },
+        visible: false,
+        btLoading: false,
+        width: "500px",
+        type: '',
+        btList: [
+          {label:'关闭',type:'',icon:'',event:'close',show:true},
+          {label:'保存',type:'primary',icon:'',event:'save',show:true,loading: true}
+        ]
+      },
+      //表单相关
+      formInfo:{
+        ref: null,
+        data: {
+          userNo:'', //账户
+          password:'',  //原始密码
+          newpassword:'', //新密码
+        },
+        fieldList: [
+          {label:'账户',value:'userNo',disabled:true,type:'input',required:true,className:'el-form-block'},
+          {label:'原密码',value:'password',type:'password',required:true,className:'el-form-block'},
+          {label:'新密码',value:'newpassword',type:'password',required:true,className:'el-form-block'},
+        ],
+        rules: {},
+        labelWidth: '100px'
+      }
     };
   },
+  watch: {
+    "dialogInfo.visible"(val) {
+      let formInfo = this.formInfo;
+      if (!val) {
+        if (formInfo.ref) {
+          formInfo.ref.resetFields();
+        }
+        this.resetForm();
+        this.dialogInfo.btLoading = false;
+      }
+    }
+  },
   methods: {
     MenuSHOW: function() {
       if (this.MenuWidth == 200) {
@@ -325,17 +402,77 @@
     ZhuXIao() {
       this.$router.push({ path: "/Login" });
       sessionStorage.clear();
+    },
+    // 初始化验证
+    initRules(){
+      let formInfo = this.formInfo;
+      formInfo.rules = this.$initRules(formInfo.fieldList);
+    },
+    handleCommand(command){
+      const dialogInfo = this.dialogInfo
+      const formInfo = this.formInfo
+      switch(command){
+        //修改密码
+        case 'updatePw':
+          dialogInfo.type = command;
+          dialogInfo.visible = true
+          this.formInfo.data.userNo = localStorage.getItem("USERNO");
+          break;
+      }
+    },
+    //点击事件
+    handleClick(event, data) {
+      const formInfo = this.formInfo;
+      const dialogInfo = this.dialogInfo;
+      switch(event) {
+        //保存
+        case 'save':
+          formInfo.ref.validate(valid => {
+            if(valid){
+              let api; let params = formInfo.data;
+              dialogInfo.btLoading = true;
+              this.$http.post(this.nozzle.updateUserPwd,{data:params}).then(res =>{
+                dialogInfo.btLoading = false;
+                if(res.data.code === 1) {
+                  dialogInfo.visible = false;
+                }
+                this.$message({
+                  message: res.data.msg,
+                  type: res.data.code === 1 ? "success" : "error",
+                  showClose: true
+                });
+              }).catch(e =>{
+                dialogInfo.btLoading = false;
+                console.log(e);
+              })
+            }
+          })
+          break
+        //关闭
+        case "close":
+          dialogInfo.visible = false;
+          break;
+      }
+    },
+    //重置表单
+    resetForm() {
+      this.formInfo.data = {
+        userNo:'', //账户
+        password:'',  //原始密码
+        newpassword:'', //新密码
+      };
     }
   },
   mounted: function() {
     //添加菜单
     // this.LoadMenu();
     // this.loadLoginName();
+    this.initRules();
     this.LoginName = locasto.getItem("USERName");
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 #IndexTop {
   width: 100%;
   height: 100%;
@@ -352,4 +489,9 @@
 /deep/.el-icon-arrow-down el-icon--right {
   color: #fff !important;
 }
+.dropdown{
+  float: right;
+  @include sc(16px,#fff);
+  cursor: pointer;
+}
 </style>
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index 9549f27..537ce78 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -46,21 +46,21 @@
               type="text"
               size="small"
               @click="handleClick('update', scope.row)"
-              v-has="'m9-2-b3'"
+              v-has="'m9-1-2'"
               >修改用户</el-button
             >
             <el-button
               type="text"
               size="small"
               @click="handleClick('delete', scope.row)"
-              v-has="'m9-2-b4'"
+              v-has="'m9-1-3'"
               >删除用户</el-button
             >
             <el-button
               type="text"
               size="small"
               @click="handleClick('reset', scope.row)"
-              v-has="'m9-2-b4'"
+              v-has="'m9-1-4'"
               >重置密码</el-button
             >
           </template>
@@ -275,6 +275,27 @@
           }
           dialogInfo.visible = true;
           break;
+        //重置密码
+        case "reset":
+          this.$confirm("此操作会重置该用户密码为初始手机号, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(res =>{
+            this.$http.post(this.nozzle.resetUserPwd,{data:{userId:data.id}}).then(res =>{
+              if(res.data.code === 1) {
+                this.loadGridData();
+              }
+              this.$message({
+                message: res.data.msg,
+                type: res.data.code === 1 ? "success" : "error",
+                showClose: true
+              });
+            }).catch(e => {
+              message(e);
+            });
+          });
+          break;
         //删除用户
         case "delete":
           this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
@@ -333,7 +354,7 @@
                     type: res.data.code === 1 ? "success" : "error",
                     showClose: true
                   });
-                  dialogInfo.btLoading = true;
+                  dialogInfo.btLoading = false;
                 })
                 .catch(e => {
                   dialogInfo.btLoading = false;
@@ -347,12 +368,6 @@
         case "close":
           dialogInfo.visible = false;
           break;
-        case "reset":
-          this.$confirm("将重置该用户密码为初始手机号, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          });
       }
     },
     ALSizeChange(val) {
diff --git a/src/util/group.js b/src/util/group.js
index b9c9812..eddc815 100644
--- a/src/util/group.js
+++ b/src/util/group.js
@@ -22,6 +22,8 @@
   deleteSysuser:"/deleteSysuser", //删除用户信息
   updateSysuser:"/updateSysuser", //修改用户信息
   addSysuser:"/addSysuser", //新增用户信息
+  resetUserPwd:"/resetPwd", //重置用户密码
+  updateUserPwd:"/updatePwd",  //修改用户密码
 
   orgGetOrgTree: "/org/getOrgTree", //获取组织信息
   orgDeleteOrg: "/org/deleteOrg", //删除组织信息