mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 处理issues 

Merge pull request !2 from mlzhang/master
This commit is contained in:
Ants 2022-09-14 06:47:25 +00:00 committed by Gitee
parent 3868962b1e 4945f57d15
commit 66b1158d6e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
9 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/views/article/column/edit.vue
View File

@ -13,7 +13,7 @@
<el-form-item label="栏目名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入栏目名称" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-form-item label="排序" prop="sort" :min="0">
<div>
<el-input-number v-model="formData.sort" />
<div class="form-tips">默认为0， 数值越大越排前</div>

2
admin/src/views/article/lists/edit.vue
View File

@ -57,7 +57,7 @@
</el-form-item>
<el-form-item label="排序" prop="sort">
<div>
<el-input-number v-model="formData.sort" />
<el-input-number v-model="formData.sort" :min="0"/>
<div class="form-tips">默认为0， 数值越大越排前</div>
</div>
</el-form-item>

36
admin/src/views/organization/department/edit.vue
View File

@ -37,7 +37,7 @@
</el-form-item>
<el-form-item label="排序" prop="sort">
<div>
<el-input-number v-model="formData.sort" />
<el-input-number v-model="formData.sort" :min="0"/>
<div class="form-tips">默认为0， 数值越大越排前</div>
</div>
</el-form-item>
@ -70,7 +70,19 @@ const formData = reactive({
sort: 0,
isStop: 0
})
const checkMobile = (rule: any, value: any, callback: any) => {
if (!value) {
return callback(new Error('手机号不能为空'));
} else {
const reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/
console.log(reg.test(value));
if (reg.test(value)) {
callback();
} else {
return callback(new Error('请输入正确的手机号'));
}
}
}
const formRules = {
pid: [
{
@ -85,7 +97,25 @@ const formRules = {
message: '请输入部门名称',
trigger: ['blur']
}
]
],
duty: [
{
required: true,
message: '请输入负责人姓名',
trigger: ['blur']
}
],
mobile: [
{
required: true,
message: '请输入联系电话',
trigger: ['blur']
},
{
validator: checkMobile,
trigger: ['blur']
}
]
}
const { optionsData } = useDictOptions<{

8
admin/src/views/organization/post/edit.vue
View File

@ -18,13 +18,13 @@
</el-form-item>
<el-form-item label="排序" prop="sort">
<div>
<el-input-number v-model="formData.sort" />
<el-input-number v-model="formData.sort" :min="0"/>
<div class="form-tips">默认为0， 数值越大越排前</div>
</div>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-form-item label="备注" prop="remarks">
<el-input
v-model="formData.remark"
v-model="formData.remarks"
placeholder="请输入备注"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }"
@ -54,7 +54,7 @@ const formData = reactive({
name: '',
code: '',
sort: 0,
remark: '',
remarks: '',
isStop: 1
})

1
admin/src/views/organization/post/index.vue
View File

@ -34,6 +34,7 @@
<el-table-column label="岗位编码" prop="code" min-width="100" />
<el-table-column label="岗位名称" prop="name" min-width="100" />
<el-table-column label="排序" prop="sort" min-width="100" />
<el-table-column label="备注" prop="remarks" min-width="100" />
<el-table-column label="添加时间" prop="createTime" min-width="180" />
<el-table-column label="部门状态" prop="isStop" min-width="100">
<template #default="{ row }">

5
server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.mdd.admin.service.system.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mdd.admin.service.system.ISystemAuthPostService;
@ -86,7 +87,9 @@ public class SystemAuthPostServiceImpl implements ISystemAuthPostService {
"=:isStop@is_stop:int"
});
IPage<SystemAuthPost> iPage = systemAuthPostMapper.selectPage(new Page<>(page, limit), queryWrapper);
Page<SystemAuthPost> objectPage = new Page<>(page, limit);
objectPage.addOrder(OrderItem.asc("sort"));
IPage<SystemAuthPost> iPage = systemAuthPostMapper.selectPage(objectPage, queryWrapper);
List<SystemAuthPostVo> list = new ArrayList<>();
for (SystemAuthPost systemAuthPost : iPage.getRecords()) {

8
server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthAdminParam.java
View File

@ -2,12 +2,15 @@ package com.mdd.admin.validate.system;
import com.mdd.common.validator.annotation.IDMust;
import com.mdd.common.validator.annotation.IntegerContains;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
@ -56,6 +59,7 @@ public class SystemAuthAdminParam implements Serializable {
@IntegerContains(values = {0, 1}, message = "isMultipoint参数不在合法值内", groups = {create.class, update.class})
private Integer isMultipoint;
@NotNull(message = "排序号不能为空", groups = {SystemAuthRoleParam.create.class, SystemAuthRoleParam.update.class})
@DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class})
private Integer sort = 0;

3
server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthDeptParam.java
View File

@ -44,6 +44,7 @@ public class SystemAuthDeptParam {
@NotNull(message = "请选择状态", groups = {create.class, update.class})
@IntegerContains(values = {0, 1}, groups = {create.class, update.class})
private Integer isStop = 0;
@NotNull(message = "排序号不能为空", groups = {SystemAuthRoleParam.create.class, SystemAuthRoleParam.update.class})
@DecimalMin(value = "0", message = "排序号值不能少于0", groups = {SystemAuthAdminParam.create.class, SystemAuthAdminParam.update.class})
private Integer sort = 0;
}

4
server/like-admin/src/main/java/com/mdd/admin/validate/system/SystemAuthPostParam.java
View File

@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotNull;
/**
@ -38,7 +39,8 @@ public class SystemAuthPostParam {
@Length( max = 250, message = "岗位备注不能大于250个字符内", groups = {create.class, update.class})
private String remarks = "";
@NotNull(message = "排序号不能为空", groups = {SystemAuthRoleParam.create.class, SystemAuthRoleParam.update.class})
@DecimalMin(value = "0", message = "排序号值不能少于0", groups = {SystemAuthAdminParam.create.class, SystemAuthAdminParam.update.class})
private Integer sort = 0;
}