傅行帆 6 years ago
parent
commit
c3c40dc01a

+ 0
- 2
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/RoleServiceImpl.java View File

76
 		LocalDateTime dateTime = LocalDateTime.now();
76
 		LocalDateTime dateTime = LocalDateTime.now();
77
 		sysRole.setCreateUser(userId);
77
 		sysRole.setCreateUser(userId);
78
 		sysRole.setCreateDate(dateTime);
78
 		sysRole.setCreateDate(dateTime);
79
-		sysRole.setUpdateUser(userId);
80
-		sysRole.setUpdateDate(dateTime);
81
 		//校验角色名不能相同
79
 		//校验角色名不能相同
82
 		SysRole checkSysRole = roleMapper.selectByRoleName(sysRole.getRoleName());
80
 		SysRole checkSysRole = roleMapper.selectByRoleName(sysRole.getRoleName());
83
 		if (null != checkSysRole){
81
 		if (null != checkSysRole){

+ 4
- 2
VUECODE/smart-property-manage/src/views/account/add/role-add.vue View File

47
           { required: true, message: '请输入角色名称', trigger: 'blur' }
47
           { required: true, message: '请输入角色名称', trigger: 'blur' }
48
         ],
48
         ],
49
         menuArray: [
49
         menuArray: [
50
-          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
51
         ]
50
         ]
52
       },
51
       },
53
       defaultProps: {
52
       defaultProps: {
69
     submitForm(formName) { // 提交
68
     submitForm(formName) { // 提交
70
       // 获取选中的树形节点 key
69
       // 获取选中的树形节点 key
71
       this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
70
       this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
72
-      console.log(this.ruleForm.menuArray)
71
+      if (this.ruleForm.menuArray.length < 1) {
72
+        this.$message.error("请至少选择一个活动性质")
73
+        return
74
+      }
73
       this.$refs[formName].validate((valid) => {
75
       this.$refs[formName].validate((valid) => {
74
         if (valid) {
76
         if (valid) {
75
           this.addRole()
77
           this.addRole()

+ 2
- 2
VUECODE/smart-property-manage/src/views/account/user/addUser.vue View File

1
 <template>
1
 <template>
2
   <div id="root">
2
   <div id="root">
3
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
3
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
4
-      <el-form-item label="员工名称" prop="userName">
4
+      <el-form-item label="姓名" prop="userName">
5
         <el-input v-model="ruleForm.userName"/>
5
         <el-input v-model="ruleForm.userName"/>
6
       </el-form-item>
6
       </el-form-item>
7
      <el-form-item class="filter-item" label="手机号" prop="loginName" >
7
      <el-form-item class="filter-item" label="手机号" prop="loginName" >
55
       },
55
       },
56
       rules: {
56
       rules: {
57
         userName: [
57
         userName: [
58
-          { required: true, message: '名', trigger: 'blur' }
58
+          { required: true, message: '请输入姓名', trigger: 'blur' }
59
         ],
59
         ],
60
         loginName: [
60
         loginName: [
61
           { required: true, message: '请输入手机号', trigger: 'blur' }
61
           { required: true, message: '请输入手机号', trigger: 'blur' }

+ 3
- 4
VUECODE/smart-property-manage/src/views/account/user/editUser.vue View File

1
 <template>
1
 <template>
2
   <div id="root">
2
   <div id="root">
3
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
3
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
4
-       <el-form-item label="员工名称" prop="userName">
4
+       <el-form-item label="姓名" prop="userName">
5
           <el-input v-model="ruleForm.userName"/>
5
           <el-input v-model="ruleForm.userName"/>
6
        </el-form-item>
6
        </el-form-item>
7
     
7
     
55
         children: 'children'
55
         children: 'children'
56
       },
56
       },
57
       rules: {
57
       rules: {
58
-        roleName: [
59
-            { required: true, message: '请输入活动名称', trigger: 'blur' },
60
-            { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
58
+        userName: [
59
+            { required: true, message: '请输入姓名', trigger: 'blur' }
61
           ],
60
           ],
62
         loginName: [
61
         loginName: [
63
           { required: true, message: '请输入手机号', trigger: 'blur' }
62
           { required: true, message: '请输入手机号', trigger: 'blur' }