From 2666d68ca1fe7c08db00edc6c156befd19f49327 Mon Sep 17 00:00:00 2001 From: mlzhang <1371582736@qq.com> Date: Sat, 10 Sep 2022 21:34:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=20#I5QLCI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/organization/department/edit.vue | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/admin/src/views/organization/department/edit.vue b/admin/src/views/organization/department/edit.vue index 5deff7be..92661d32 100644 --- a/admin/src/views/organization/department/edit.vue +++ b/admin/src/views/organization/department/edit.vue @@ -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<{ -- Gitee From f3c1adbfd3518d8fea211ab7ecc38f717f6f2a05 Mon Sep 17 00:00:00 2001 From: mlzhang <1371582736@qq.com> Date: Sat, 10 Sep 2022 21:53:52 +0800 Subject: [PATCH 2/5] :fix: #I5QLSA --- admin/src/views/organization/post/edit.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/src/views/organization/post/edit.vue b/admin/src/views/organization/post/edit.vue index 70d08e66..e1f2c583 100644 --- a/admin/src/views/organization/post/edit.vue +++ b/admin/src/views/organization/post/edit.vue @@ -22,9 +22,9 @@
默认为0， 数值越大越排前
- + Date: Sat, 10 Sep 2022 22:01:20 +0800 Subject: [PATCH 3/5] :bug: issues #I5QLRX --- .../admin/service/system/impl/SystemAuthPostServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java index 8dee1509..8dfcd7f3 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthPostServiceImpl.java @@ -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 iPage = systemAuthPostMapper.selectPage(new Page<>(page, limit), queryWrapper); + Page objectPage = new Page<>(page, limit); + objectPage.addOrder(OrderItem.asc("sort")); + IPage iPage = systemAuthPostMapper.selectPage(objectPage, queryWrapper); List list = new ArrayList<>(); for (SystemAuthPost systemAuthPost : iPage.getRecords()) { -- Gitee From f4ac51de8be063e931819c39194c548e74580e05 Mon Sep 17 00:00:00 2001 From: mlzhang <1371582736@qq.com> Date: Sat, 10 Sep 2022 22:04:18 +0800 Subject: [PATCH 4/5] :sparkles: issues#I5QLRV --- admin/src/views/organization/post/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/src/views/organization/post/index.vue b/admin/src/views/organization/post/index.vue index afa742ce..12eb5567 100644 --- a/admin/src/views/organization/post/index.vue +++ b/admin/src/views/organization/post/index.vue @@ -34,6 +34,7 @@ +