Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/views/system/dept/index.vue

@@ -361,7 +361,8 @@ export default {
         leader: undefined,
         phone: undefined,
         email: undefined,
-        status: "0"
+        status: "0",
+        isLock: "0"
       };
       this.resetForm("form");
     },

src/views/system/user/index.vue

@@ -328,6 +328,9 @@ export default {
           { required: true, message: "用户密码不能为空", trigger: "blur" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
         ],
+        orgId: [
+        { required: true, message: "所属机构不能为空", trigger: "blur" }
+        ],
         // email: [
         //   {
         //     type: "email",