Merge remote-tracking branch 'origin/fencang' into fencang

src/utils/strUtil.js

@@ -0,0 +1,7 @@
+//封装字符串相关的方法
+export function isBlank(value) {
+    value = value.trim();
+    if (value === "" || value === null || value === "string") {
+        return true;
+    }
+}

src/views/userManage/admin/authAdmin.vue

@@ -99,6 +99,7 @@
                 :before-close="hideForm"
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
+                v-if="formVisible"
                 width="70%"
                 top="5vh"
             >
@@ -195,6 +196,7 @@ import {
 
 import store from "../../../store/index";
 import {findConfig} from "@/api/thrsys/spsSyncStatus";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
     id: "",
@@ -333,24 +335,23 @@ export default {
         },
         // 刷新表单
         resetForm() {
-      if (this.$refs["dataForm"]) {
+            this.$nextTick(() => {
-        // 清空验证信息表单
-        this.$refs["dataForm"].clearValidate();
-        // 刷新表单
                 this.$refs["dataForm"].resetFields();
-      }
+                this.$refs["dataForm"].clearValidate();
+            })
         },
         // 隐藏表单
         hideForm() {
             // 更改值
             this.formVisible = !this.formVisible;
             // 清空表单
-      this.$refs["dataForm"].resetFields();
+            this.$refs["dataForm"].resetFields(); //清除表单数据
             return true;
         },
         // 显示表单
         handleForm(index, row) {
             this.formVisible = true;
+            this.resetForm();
             this.formData = JSON.parse(JSON.stringify(formJson));
             if (row !== null) {
                 this.formData = Object.assign({}, row);
@@ -364,6 +365,20 @@ export default {
             }
         },
         formSubmit() {
+            if (isBlank(this.formData.userName)) {
+                this.$message.error("用户账号不能为空");
+                return;
+            } else if (isBlank(this.formData.passWord)) {
+                this.$message.error("密码不能为空")
+                return;
+            } else if (isBlank(this.formData.employeeName)) {
+                this.$message.error("用户名称不能为空");
+                return;
+            } else if (this.formData.roles.length === 0) {
+                this.$message.error("未指定角色！")
+                return;
+            }
+
             this.$refs["dataForm"].validate(valid => {
                 if (valid) {
                     this.formLoading = true;