Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

src/views/system/user/index.vue

@@ -343,14 +343,14 @@
       </el-col>
     </el-row>
   <!-- 重置密码对话框 -->
-    <DialogCom :title="title" :visible.sync="close" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <DialogCom :title="title" :visible.sync="close"  width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules">
         <el-row>
        
           <el-col :span="10">
-            <el-form-item  label="密码" prop="password" >
+            <el-form-item  label="密码" prop="password" label-width="100PX">
               <el-input
-              style="width: 317px;"
+              style="width: 500px;"
                 v-model="form.password"
                 placeholder="请输入密码"
                 autocomplete="off"
@@ -579,15 +579,17 @@ import { getInfo } from "@/api/login";
 import { getRoles } from "@/api/system/public";
 import request from "@/utils/request";
 export default {
-  name: "User",
   dicts: [
     "sys_normal_disable",
     "sys_user_sex",
     "sys_user_is_lock",
     "sys_yes_no",
   ],
-  components: { OrgTree },
+
+  name: "User",
   mixins: [tableList],
+  components: { OrgTree },
+
   data() {
     return {
       defaultProps: {
@@ -734,10 +736,6 @@ export default {
     };
   },
 
-  created() {},
-  mounted() {
-    this.getAllRoles();
-  },
   watch: {
     // 'form.orgId'(newValue) {
     //   if (this.isRoleIdsChanged) {
@@ -760,6 +758,13 @@ export default {
     //   deep: true
     // }
   },
+
+  created() {},
+
+  mounted() {
+    this.getAllRoles();
+  },
+
   methods: {
     changeRoleIds() {
       //手动关闭下拉框
@@ -1196,8 +1201,9 @@ export default {
       // console.log(this.$refs.upload.getFile(),"this.$refs.upload")
       this.$refs.upload.submit();
     },
-  },
+  }
 };
 </script>
+
 <style lang="scss"></style>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>