From 867845a2ddff4eb19a0dad914e573e97613fb16b Mon Sep 17 00:00:00 2001 From: Jason <5340635+wen-jason@user.noreply.gitee.com> Date: Thu, 15 Sep 2022 14:17:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=BC=B9=E7=AA=97=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=97=A8=E7=AA=97=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/components/popover-input/index.vue | 2 +- admin/src/components/popup/index.vue | 2 +- admin/src/views/article/column/edit.vue | 1 - admin/src/views/consumer/lists/detail.vue | 5 +- admin/src/views/message/short_letter/edit.vue | 1 - .../views/organization/department/edit.vue | 45 ++- admin/src/views/organization/post/edit.vue | 3 +- admin/src/views/permission/admin/edit.vue | 1 - admin/src/views/permission/menu/edit.vue | 275 +++++++++--------- admin/src/views/permission/role/auth.vue | 1 - admin/src/views/permission/role/edit.vue | 1 - admin/src/views/setting/dict/data/edit.vue | 1 - admin/src/views/setting/dict/type/edit.vue | 1 - admin/src/views/setting/storage/edit.vue | 1 - 14 files changed, 161 insertions(+), 179 deletions(-) diff --git a/admin/src/components/popover-input/index.vue b/admin/src/components/popover-input/index.vue index a95d5a26..0b1cbcde 100644 --- a/admin/src/components/popover-input/index.vue +++ b/admin/src/components/popover-input/index.vue @@ -26,7 +26,7 @@ diff --git a/admin/src/views/consumer/lists/detail.vue b/admin/src/views/consumer/lists/detail.vue index 58e78362..b89d7b74 100644 --- a/admin/src/views/consumer/lists/detail.vue +++ b/admin/src/views/consumer/lists/detail.vue @@ -45,7 +45,7 @@ }, { label: '女', - value: 0 + value: 2 } ]" @confirm="handleEdit($event, 'sex')" @@ -79,6 +79,7 @@ import type { FormInstance } from 'element-plus' import { getUserDetail, userEdit } from '@/api/consumer' import feedback from '@/utils/feedback' +import { isEmpty } from '@/utils/util' const route = useRoute() const formData = reactive({ @@ -108,7 +109,7 @@ const getDetails = async () => { } const handleEdit = async (value: string, field: string) => { - if (!value) return + if (isEmpty(value)) return await userEdit({ id: route.query.id, field, diff --git a/admin/src/views/message/short_letter/edit.vue b/admin/src/views/message/short_letter/edit.vue index c919d04e..504de9b2 100644 --- a/admin/src/views/message/short_letter/edit.vue +++ b/admin/src/views/message/short_letter/edit.vue @@ -5,7 +5,6 @@ title="设置存储" :async="true" width="550px" - :clickModalClose="true" @confirm="handleSubmit" @close="handleClose" > diff --git a/admin/src/views/organization/department/edit.vue b/admin/src/views/organization/department/edit.vue index 53112cd1..f1d13624 100644 --- a/admin/src/views/organization/department/edit.vue +++ b/admin/src/views/organization/department/edit.vue @@ -5,7 +5,6 @@ :title="popupTitle" :async="true" width="550px" - :clickModalClose="true" @confirm="handleSubmit" @close="handleClose" > @@ -37,7 +36,7 @@
- +
默认为0， 数值越大越排前
 @@ -71,17 +70,17 @@ const formData = reactive({ 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(); + if (!value) { + return callback(new Error('手机号不能为空')) } else { - return callback(new Error('请输入正确的手机号')); + 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: [ @@ -98,24 +97,24 @@ const formRules = { trigger: ['blur'] } ], - duty: [ + duty: [ { required: true, message: '请输入负责人姓名', trigger: ['blur'] } ], - mobile: [ - { - required: true, - message: '请输入联系电话', - trigger: ['blur'] - }, - { - validator: checkMobile, - trigger: ['blur'] - } - ] + mobile: [ + { + required: true, + message: '请输入联系电话', + trigger: ['blur'] + }, + { + validator: checkMobile, + trigger: ['blur'] + } + ] } const { optionsData } = useDictOptions<{ diff --git a/admin/src/views/organization/post/edit.vue b/admin/src/views/organization/post/edit.vue index 160a03df..8dedad8c 100644 --- a/admin/src/views/organization/post/edit.vue +++ b/admin/src/views/organization/post/edit.vue @@ -5,7 +5,6 @@ :title="popupTitle" :async="true" width="550px" - :clickModalClose="true" @confirm="handleSubmit" @close="handleClose" > @@ -18,7 +17,7 @@
- +
默认为0， 数值越大越排前
 diff --git a/admin/src/views/permission/admin/edit.vue b/admin/src/views/permission/admin/edit.vue index dea10b0b..521574d5 100644 --- a/admin/src/views/permission/admin/edit.vue +++ b/admin/src/views/permission/admin/edit.vue @@ -5,7 +5,6 @@ :title="popupTitle" :async="true" width="550px" - :clickModalClose="true" @confirm="handleSubmit" @close="handleClose" > diff --git a/admin/src/views/permission/menu/edit.vue b/admin/src/views/permission/menu/edit.vue index 271da053..4d6a13b7 100644 --- a/admin/src/views/permission/menu/edit.vue +++ b/admin/src/views/permission/menu/edit.vue @@ -5,116 +5,110 @@ :title="popupTitle" :async="true" width="550px" - :clickModalClose="true" @confirm="handleSubmit" @close="handleClose" > - - - - - 目录 - 菜单 - 按钮 - - - - - - - - - - - + + + + 目录 + 菜单 + 按钮 + + + + + + + + + + + - + +
+ +
+ 访问的路由地址，如：`admin`，如外网地址需内链访问则以`http(s)://`开头 +
+
+ + +
+ + +
+ 访问的组件路径，如：`permission/admin/index`，默认在`views`目录下 +
+
+ + +
+ +
+ 访问详情页面，编辑页面时，菜单高亮显示，如`/consumer/lists` +
+
+ + +
+ +
+ 将作为server端API验权使用，如`system:admin:list`，请谨慎修改 +
+
+ + +
- -
- 访问的路由地址，如：`admin`，如外网地址需内链访问则以`http(s)://`开头 -
+
- - -
- - -
- 访问的组件路径，如：`permission/admin/index`，默认在`views`目录下 -
+
+ 访问路由的默认传递参数，如：`{"id": 1, "name": + "admin"}`或`id=1&name=admin`
- - -
- -
- 访问详情页面，编辑页面时，菜单高亮显示，如`/consumer/lists` -
-
- - -
- -
- 将作为server端API验权使用，如`system:admin:list`，请谨慎修改 -
-
- - -
-
- -
-
- 访问路由的默认传递参数，如：`{"id": 1, "name": - "admin"}`或`id=1&name=admin` -
-
- - - -
- - 显示 - 隐藏 - -
- 选择隐藏则路由将不会出现在侧边栏，但仍然可以访问 -
+ +
+ + 显示 + 隐藏 + +
+ 选择隐藏则路由将不会出现在侧边栏，但仍然可以访问
- - -
- - 正常 - 停用 - -
- 选择停用则路由将不会出现在侧边栏，也不能被访问 -
-
- - -
- -
数值越大越排前
-
- - - +
+ + +
+ + 正常 + 停用 + +
选择停用则路由将不会出现在侧边栏，也不能被访问
+
+ + +
+ +
数值越大越排前
+
+ +
diff --git a/admin/src/views/permission/role/auth.vue b/admin/src/views/permission/role/auth.vue index 1b793a27..3e16834b 100644 --- a/admin/src/views/permission/role/auth.vue +++ b/admin/src/views/permission/role/auth.vue @@ -5,7 +5,6 @@ title="权限设置" :async="true" width="550px" - :clickModalClose="true" @confirm="handleSubmit" @close="handleClose" > diff --git a/admin/src/views/permission/role/edit.vue b/admin/src/views/permission/role/edit.vue index 91f5a101..db4a1a54 100644 --- a/admin/src/views/permission/role/edit.vue +++ b/admin/src/views/permission/role/edit.vue @@ -5,7 +5,6 @@ :title="popupTitle" :async="true" width="550px" - :clickModalClose="true" @confirm="handleSubmit" @close="handleClose" > diff --git a/admin/src/views/setting/dict/data/edit.vue b/admin/src/views/setting/dict/data/edit.vue index 5d954c05..787ecb20 100644 --- a/admin/src/views/setting/dict/data/edit.vue +++ b/admin/src/views/setting/dict/data/edit.vue @@ -5,7 +5,6 @@ :title="popupTitle" :async="true" width="550px" - :clickModalClose="true" @confirm="handleSubmit" @close="handleClose" > diff --git a/admin/src/views/setting/dict/type/edit.vue b/admin/src/views/setting/dict/type/edit.vue index 02cfe0a6..23888ebb 100644 --- a/admin/src/views/setting/dict/type/edit.vue +++ b/admin/src/views/setting/dict/type/edit.vue @@ -5,7 +5,6 @@ :title="popupTitle" :async="true" width="550px" - :clickModalClose="true" @confirm="handleSubmit" @close="handleClose" > diff --git a/admin/src/views/setting/storage/edit.vue b/admin/src/views/setting/storage/edit.vue index c56cd27e..9fc41b72 100644 --- a/admin/src/views/setting/storage/edit.vue +++ b/admin/src/views/setting/storage/edit.vue @@ -5,7 +5,6 @@ title="设置存储" :async="true" width="550px" - :clickModalClose="true" @confirm="handleSubmit" @close="handleClose" >