Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/views/personal/index.vue

@@ -17,7 +17,7 @@
 								<el-col :span="24" class="personal-title mb18">{{ currentTime }}，{{ info.userName }}，生活变的再糟糕，也不妨碍我变得更好！ </el-col>
 								<!-- 昵称 -->
 								<el-col :xs="24" :sm="24" class="personal-item mb6">
-									<div class="personal-item-label">昵称：</div>
+									<div class="personal-item-label">姓名：</div>
 									<div v-if="isEditStatus" class="personal-item-value">{{ info.userNickname }}</div>
 									<el-input v-else class="personal-item-value personal-item-value-edit" v-model="info.userNickname"></el-input>
 								</el-col>
@@ -378,4 +378,5 @@ const dateChange = (e: any) => {
 			}
 		}
 	}
-}</style>
+}
+</style>

src/views/system/assess/totalIndex/component/addItem.vue

@@ -122,7 +122,7 @@ export default defineComponent({
 			isShowDialog: false,
 			ruleForm: {
 				userName: '', // 账户名称
-				userNickname: '', // 用户昵称
+				userNickname: '', // 姓名
 				roleSign: '', // 关联角色
 				department: [], // 组织
 				phone: '', // 手机号

src/views/system/manage/user/component/editUser.vue

@@ -169,8 +169,8 @@ export default defineComponent({
 			},
 			//表单校验
 			rules: {
-				userName: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
-				userNickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
+				userName: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
+				userNickname: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
 				deptId: [{ required: true, message: '归属组织不能为空', trigger: 'blur' }],
 				postIds: [{ required: true, message: '岗位不能为空', trigger: 'blur' }],
 				roleIds: [{ required: true, message: '角色不能为空', trigger: 'blur' }],

src/views/system/manage/user/index.vue

@@ -62,8 +62,7 @@
 						<!-- <el-table-column type="selection" width="55" align="center" /> -->
 						<el-table-column type="index" label="序号" width="60" align="center" />
 						<el-table-column prop="userName" label="用户名" v-col="'userName'" min-width="120" show-overflow-tooltip></el-table-column>
-						<el-table-column prop="userNickname" label="昵称" v-col="'userName'" min-width="120" show-overflow-tooltip></el-table-column>
-						<el-table-column prop="userNickname" label="姓名" v-col="'userNickname'" min-width="160" show-overflow-tooltip></el-table-column>
+						<el-table-column prop="userNickname" label="姓名" v-col="'userNickname'" width="160" show-overflow-tooltip></el-table-column>
 						<el-table-column prop="dept.deptName" label="组织" v-col="'deptName'" show-overflow-tooltip></el-table-column>
 						<el-table-column label="角色" min-width="120" prop="rolesNames" v-col="'rolesNames'" :show-overflow-tooltip="true"></el-table-column>
 						<el-table-column prop="mobile" label="手机号" v-col="'mobile'" width="120" align="center"></el-table-column>