From e698c3cef156c5b3101d52c0b884b7a09d97a480 Mon Sep 17 00:00:00 2001 From: danshihao Date: Thu, 25 Apr 2024 16:58:37 +0800 Subject: [PATCH] =?UTF-8?q?[fix=2083991]=20=E9=BB=98=E8=AE=A4=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E8=B4=A6=E5=8F=B7=E4=B8=8D=E8=83=BD=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/vant/DictPicker.vue | 4 ++++ src/components/vant/SelectPicker.vue | 4 ++++ src/main.js | 1 + src/views/mobile/mine/Mine.vue | 2 ++ src/views/systemOverview/systemSettings/SystemSettings.vue | 3 +-- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/vant/DictPicker.vue b/src/components/vant/DictPicker.vue index 4e075b1..d83e66f 100644 --- a/src/components/vant/DictPicker.vue +++ b/src/components/vant/DictPicker.vue @@ -51,6 +51,10 @@ export default { methods: { // 打开下拉,并且获取下拉数据 onOpen () { + // 如果是被禁用就不打开弹框 + if (Object.hasOwnProperty.call(this.$attrs, 'disabled') && this.$attrs.disabled !== false) { + return + } this.show = true this.dictOptions = [ { text: '请选择', value: undefined }, diff --git a/src/components/vant/SelectPicker.vue b/src/components/vant/SelectPicker.vue index 73caf7b..9682176 100644 --- a/src/components/vant/SelectPicker.vue +++ b/src/components/vant/SelectPicker.vue @@ -81,6 +81,10 @@ export default { methods: { // 打开下拉,并且获取下拉数据 onOpen () { + // 如果是被禁用就不打开弹框 + if (Object.hasOwnProperty.call(this.$attrs, 'disabled') && this.$attrs.disabled !== false) { + return + } this.show = true this.options = [ { [this.labelKey]: '请选择', [this.valueKey]: undefined }, diff --git a/src/main.js b/src/main.js index 1d36132..2778a13 100644 --- a/src/main.js +++ b/src/main.js @@ -79,6 +79,7 @@ Viewer.setDefaults({ }) Vue.prototype.global = { emptyLine: '—', + adminUserList: ['admin', 'admin2', 'admin3'], // 默认的三个管理员用户名 maxUploadFileSize: 1024 * 1024 * 20 // 上传文件最大20MB } SSO.init(() => { diff --git a/src/views/mobile/mine/Mine.vue b/src/views/mobile/mine/Mine.vue index a1a9302..ec9e46b 100644 --- a/src/views/mobile/mine/Mine.vue +++ b/src/views/mobile/mine/Mine.vue @@ -24,6 +24,7 @@ @@ -64,6 +65,7 @@ export default { selecteddeparts: { rules: [{ required: true, message: '请选择所属单位' }], validateTrigger: 'change' }, phone: { rules: [{ required: true, message: '请输入联系方式' }, { validator: this.validateMobile }], validateTrigger: 'blur' } }, + model: {}, // 部门下拉 departList: [], fileList: [] diff --git a/src/views/systemOverview/systemSettings/SystemSettings.vue b/src/views/systemOverview/systemSettings/SystemSettings.vue index 90addc3..aaefca8 100644 --- a/src/views/systemOverview/systemSettings/SystemSettings.vue +++ b/src/views/systemOverview/systemSettings/SystemSettings.vue @@ -409,8 +409,7 @@ export default { }, // 是否是默认管理员账号,不可删除 isDefaultAdmin ({ username }) { - const usernameArr = ['admin', 'admin2', 'admin3'] - return usernameArr.includes(username) + return this.global.adminUserList.includes(username) }, // 恢复默认配置 handleResetSysSettingForm () {