1、2323

Former-commit-id: ed6853d01c035424ec7d4b091f7e91decc51d5db

src/main/resources/modules/SpringBoot/resources/static/css/base.css

@@ -634,8 +634,8 @@ code {
 
 .loading-bar {
     width: 100%;
-    padding: 0px;
-    top: 0px;
+    padding: 0!important;
+    top: 0!important;
     box-shadow: 0px 0px 0px 0px;
     border: 0px;
 }

src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl

@@ -242,7 +242,7 @@
             },
             onReset: function (form) {
                 this.$refs[form].resetFields();
-                this.w('重置成功');
+                nav.w('重置成功');
             },
             onPageChange: function (pageNumber) {
                 this.vm.pageNumber = pageNumber;
@@ -344,7 +344,7 @@
                                 if (response.errors.length > 0) {
                                     nav.e(response.errors[0].message);
                                 } else {
-                                    this.s("删除成功");
+                                    nav.s("删除成功");
                                     this.onFind();
                                 }
                             }.bind(this))
@@ -354,7 +354,7 @@
             },
             onBitchDelete: function () {
                 if (this.select.length == 0) {
-                    this.w("至少选中一项");
+                    nav.w("至少选中一项");
                 } else {
                     this.$confirm('将删除已选择的项, 是否继续?', '提示', {
                         confirmButtonText: '确定',
@@ -377,7 +377,7 @@
                                                     }
                                                 }
                                                 if (this.select.length === 0) {
-                                                    this.s("删除成功")
+                                                    nav.s("删除成功")
                                                     this.onFind();
                                                 }
                                             }

src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl

@@ -145,11 +145,11 @@
 
                 <p style="text-indent: 2em;">if (response.errors.length > 0) {</p>
 
-                <p style="text-indent: 4em;">this.e(response.errors[0].message);</p>
+                <p style="text-indent: 4em;">nav.e(response.errors[0].message);</p>
 
                 <p style="text-indent: 2em;">} else {</p>
 
-                <p style="text-indent: 4em;">this.i("Ajax调用成功!");</p>
+                <p style="text-indent: 4em;">nav.i("Ajax调用成功!");</p>
 
                 <p style="text-indent: 2em;">}</p>
 
@@ -179,13 +179,13 @@
 
                 <p style="text-indent: 4em;">req.onError();</p>
 
-                <p style="text-indent: 4em;">this.e(response.errors[0].message);</p>
+                <p style="text-indent: 4em;">nav.e(response.errors[0].message);</p>
 
                 <p style="text-indent: 2em;">} else {</p>
 
                 <p style="text-indent: 4em;">req.onSuccess();</p>
 
-                <p style="text-indent: 4em;">this.i("文件上传成功!");</p>
+                <p style="text-indent: 4em;">nav.i("文件上传成功!");</p>
 
                 <p style="text-indent: 2em;">}</p>
 
@@ -1030,9 +1030,9 @@
             doAjax: function () {
                 this.$ajax.login({}).then(function (response) {
                     if (response.errors.length > 0) {
-                        this.e(response.errors[0].message);
+                        nav.e(response.errors[0].message);
                     } else {
-                        this.i("Ajax调用成功!");
+                        nav.i("Ajax调用成功!");
                     }
                 }.bind(this))
             },
@@ -1056,10 +1056,10 @@
                 this.$ajax.upload(req.file).then(function (response) {
                     if (response.errors.length > 0) {
                         req.onError();
-                        this.e(response.errors[0].message);
+                        nav.e(response.errors[0].message);
                     } else {
                         req.onSuccess();
-                        this.i("文件上传成功!");
+                        nav.i("文件上传成功!");
                     }
                 }.bind(this))
             },
@@ -1077,7 +1077,7 @@
                 this.$refs[formName].resetFields();
             },
             handleEdit: function (index, row) {
-                this.i("编辑");
+                nav.i("编辑");
             },
 
             showMessage: function () {

src/main/resources/modules/SpringBoot/resources/templates/screen/login.ftl

@@ -124,9 +124,9 @@
                                 .post(function (response) {
                                     this.isSubmit = false;
                                     if (response.errors.length > 0) {
-                                        this.e(response.errors[0].message);
+                                        nav.e(response.errors[0].message);
                                     } else {
-                                        this.i("登录成功!", function () {
+                                        nav.i("登录成功!", function () {
                                             location.href = "/"
                                         });
                                     }

src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl

@@ -312,7 +312,7 @@
                         this.onDelete(item);
                         break;
                     default:
-                        this.w("未找到对应的命令");
+                        nav.w("未找到对应的命令");
                         break;
                 }
             },

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl

@@ -342,7 +342,7 @@
                         this.onDelete(item);
                         break;
                     default:
-                        this.w("未找到对应的命令");
+                        nav.w("未找到对应的命令");
                         break;
                 }
             },

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl

@@ -247,7 +247,7 @@
                         }
                         break;
                     default:
-                        this.w("未找到对应的命令");
+                        nav.w("未找到对应的命令");
                         break;
                 }
             }

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl

@@ -231,7 +231,7 @@
                         this.onDelete(item);
                         break;
                     default:
-                        this.w("未找到对应的命令");
+                        nav.w("未找到对应的命令");
                         break;
                 }
             }

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl

@@ -239,7 +239,7 @@
                         this.onDelete(item);
                         break;
                     default:
-                        this.w("未找到对应的命令");
+                        nav.w("未找到对应的命令");
                         break;
                 }
             },

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/resource.ftl

@@ -350,7 +350,7 @@
                         this.onDelete(item);
                         break;
                     default:
-                        this.w("未找到对应的命令");
+                        nav.w("未找到对应的命令");
                         break;
                 }
             },

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl

@@ -247,7 +247,7 @@
                         this.onDelete(item);
                         break;
                     default:
-                        this.w("未找到对应的命令");
+                        nav.w("未找到对应的命令");
                         break;
                 }
             },

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl

@@ -270,7 +270,7 @@
                                         if (response.errors.length > 0) {
                                             nav.e(response.errors[0].message);
                                         } else {
-                                            this.s("注销成功");
+                                            nav.s("注销成功");
                                             this.onFind();
                                         }
                                     }.bind(this))
@@ -279,7 +279,7 @@
                         });
                         break;
                     default:
-                        this.w("未找到对应的命令");
+                        nav.w("未找到对应的命令");
                         break;
                 }
             },

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl

@@ -15,7 +15,7 @@
                 <el-input-dict v-model="vm.userStatus" clearable size="small" placeholder="请输入用户状态" dict-name="USER_STATUS"></el-input-dict>
             </el-form-item>
             <el-form-item label="部门机构" prop="deptCode">
-                <el-input-dept clearable size="small"></el-input-dept>
+                <el-input-dept v-model="vm.deptCode" clearable size="small"></el-input-dept>
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" size="small" icon="el-icon-search" @click="onSearch">搜索</el-button>
@@ -153,7 +153,7 @@
                 <el-input-dict v-model="form.userStatus" clearable size="small" placeholder="请输入用户状态" dict-name="USER_STATUS"></el-input-dict>
             </el-form-item>
             <el-form-item label="部门机构" prop="deptCode">
-                <el-input-dept clearable size="small"></el-input-dept>
+                <el-input-dept v-model="form.deptCode" clearable size="small"></el-input-dept>
             </el-form-item>
             <el-form-item label="用户角色" prop="roleList">
                 <el-transfer v-model="form.roleList" :data="roleList" :titles="['未选角色','已选角色']"></el-transfer>
@@ -177,9 +177,7 @@
                 userCode: "",
                 userAlias: "",
                 userStatus: "",
-                deptId: "",
                 deptCode: "",
-                deptName: "",
                 pageNumber: 1,
                 pageSize: 10,
                 totalCount: 0,
@@ -195,9 +193,7 @@
                 userAlias: "",
                 userPwd: "",
                 userStatus: "1",
-                deptId: "",
                 deptCode: "",
-                deptName: "",
                 rowVersion: ""
             },
             formRules: {
@@ -219,13 +215,9 @@
                 userStatus: [
                     {required: true, message: '用户状态不能为空', trigger: 'blur'},
                 ],
-                deptId: [],
                 deptCode: [
                     {min: 1, max: 50, message: '部门代码长度在 1 到 50 个字符', trigger: 'blur'}
-                ],
-                deptName: [
-                    {min: 1, max: 100, message: '部门名称长度在 1 到 100 个字符', trigger: 'blur'}
-                ],
+                ]
             },
             roleList: []
         },
@@ -265,7 +257,7 @@
                         this.onDelete(item);
                         break;
                     default:
-                        this.w("未找到对应的命令");
+                        nav.w("未找到对应的命令");
                         break;
                 }
             },

src/main/resources/modules/SpringBoot/test/system/UserTest.java

@@ -116,9 +116,7 @@ public class UserTest {
         request.setUserCode("");
         request.setUserAlias("test");
         request.setUserStatus("code");
-        request.setDeptId(1L);
         request.setDeptCode("A01");
-        request.setDeptName("部门名称");
 
         UserFindResponse response = userManager.find(request, token);