lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-05-10 01:08:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
TinyAnts
2022-09-14 14:48:27 +08:00
parent 978580a005 66b1158d6e
commit 266ba03e30
9 changed files with 55 additions and 14 deletions
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

@@ -43,7 +43,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 }">