diff --git a/src/option/system/dict.js b/src/option/system/dict.js index 4d8496a..edd0d4a 100644 --- a/src/option/system/dict.js +++ b/src/option/system/dict.js @@ -1,5 +1,8 @@ export const optionParent = { - height: 'auto', + searchShowBtn: false, + refreshBtn: false, + columnBtn: false, + height: "auto", calcHeight: 30, tip: false, searchShow: true, @@ -22,9 +25,9 @@ export const optionParent = { { required: true, message: "请输入字典编号", - trigger: "blur" - } - ] + trigger: "blur", + }, + ], }, { label: "字典名称", @@ -35,9 +38,9 @@ export const optionParent = { { required: true, message: "请输入字典名称", - trigger: "blur" - } - ] + trigger: "blur", + }, + ], }, { label: "字典排序", @@ -49,9 +52,9 @@ export const optionParent = { { required: true, message: "请输入字典排序", - trigger: "blur" - } - ] + trigger: "blur", + }, + ], }, { label: "封存", @@ -62,12 +65,12 @@ export const optionParent = { dicData: [ { label: "否", - value: 0 + value: 0, }, { label: "是", - value: 1 - } + value: 1, + }, ], value: 0, slot: true, @@ -75,20 +78,23 @@ export const optionParent = { { required: true, message: "请选择封存", - trigger: "blur" - } - ] + trigger: "blur", + }, + ], }, { label: "字典备注", prop: "remark", - hide: true - } - ] + hide: true, + }, + ], }; export const optionChild = { - height: 'auto', + searchShowBtn: false, + refreshBtn: false, + columnBtn: false, + height: "auto", calcHeight: 95, tip: false, searchShow: true, @@ -113,9 +119,9 @@ export const optionChild = { { required: true, message: "请输入字典编号", - trigger: "blur" - } - ] + trigger: "blur", + }, + ], }, { label: "字典名称", @@ -126,9 +132,9 @@ export const optionChild = { { required: true, message: "请输入字典名称", - trigger: "blur" - } - ] + trigger: "blur", + }, + ], }, { label: "上级字典", @@ -137,7 +143,7 @@ export const optionChild = { dicData: [], hide: true, props: { - label: "title" + label: "title", }, addDisabled: true, editDisabled: true, @@ -145,9 +151,9 @@ export const optionChild = { { required: false, message: "请选择上级字典", - trigger: "click" - } - ] + trigger: "click", + }, + ], }, { label: "字典键值", @@ -157,9 +163,9 @@ export const optionChild = { { required: true, message: "请输入字典键值", - trigger: "blur" - } - ] + trigger: "blur", + }, + ], }, { label: "字典排序", @@ -171,9 +177,9 @@ export const optionChild = { { required: true, message: "请输入字典排序", - trigger: "blur" - } - ] + trigger: "blur", + }, + ], }, { label: "封存", @@ -184,12 +190,12 @@ export const optionChild = { dicData: [ { label: "否", - value: 0 + value: 0, }, { label: "是", - value: 1 - } + value: 1, + }, ], value: 0, slot: true, @@ -197,14 +203,14 @@ export const optionChild = { { required: true, message: "请选择封存", - trigger: "blur" - } - ] + trigger: "blur", + }, + ], }, { label: "字典备注", prop: "remark", - hide: true - } - ] + hide: true, + }, + ], }; diff --git a/src/option/system/dictbiz.js b/src/option/system/dictbiz.js index 1c604a7..df1b9a0 100644 --- a/src/option/system/dictbiz.js +++ b/src/option/system/dictbiz.js @@ -1,4 +1,7 @@ export const optionParent = { + searchShowBtn: false, + refreshBtn: false, + columnBtn: false, height: "auto", calcHeight: 30, tip: false, @@ -89,6 +92,9 @@ export const optionParent = { }; export const optionChild = { + searchShowBtn: false, + refreshBtn: false, + columnBtn: false, height: "auto", calcHeight: 95, tip: false, diff --git a/src/option/user/info.js b/src/option/user/info.js index bb63f44..1c1fcb0 100644 --- a/src/option/user/info.js +++ b/src/option/user/info.js @@ -1,5 +1,5 @@ import website from "../../config/website"; -import { Message } from 'element-ui'; +import { Message } from "element-ui"; // export default { // tabs: true, // tabsActive: 1, @@ -91,95 +91,105 @@ import { Message } from 'element-ui'; // } export const userInfoOption = { - column: [{ - label: '头像', - prop: 'avatar', - type: 'upload', - listType: 'picture-img', - propsHttp: { - home: website.filePrex, - res: 'data', - url: 'link', + column: [ + { + label: "头像", + prop: "avatar", + type: "upload", + listType: "picture-img", + propsHttp: { + home: website.filePrex, + res: "data", + url: "link", + }, + fileType: "img", //img/video/audio, + accept: "image/png, image/jpeg", + action: "/api/blade-resource/oss/endpoint/put-file", + tip: "只能上传jpg/png用户头像,且不超过500kb", + span: 12, + row: true, + uploadBefore: (file, done, loading) => { + if (["image/png", "image/jpeg"].indexOf(file.type) == -1) { + Message({ + message: "只能上传jpg/png用户头像", + type: "error", + }); + loading(); + } else { + done(); + } + }, }, - fileType: 'img',//img/video/audio, - accept: 'image/png, image/jpeg', - action: '/api/blade-resource/oss/endpoint/put-file', - tip: '只能上传jpg/png用户头像,且不超过500kb', - span: 12, - row: true, - uploadBefore: (file, done, loading) => { - if (['image/png', 'image/jpeg'].indexOf(file.type) == -1) { - Message({ - message: '只能上传jpg/png用户头像', - type: 'error' - }); - loading(); - } - else { - done(); - } - } - }, { - label: '姓名', - span: 12, - row: true, - prop: 'realName', - }, { - label: '用户名', - span: 12, - row: true, - prop: 'name' - }, { - label: '手机号', - span: 12, - row: true, - prop: 'phone', - }, { - label: '邮箱', - prop: 'email', - span: 12, - row: true, - }] -} + // { + // label: '姓名', + // span: 12, + // row: true, + // prop: 'realName', + // }, { + // label: '用户名', + // span: 12, + // row: true, + // prop: 'name' + // }, { + // label: '手机号', + // span: 12, + // row: true, + // prop: 'phone', + // }, { + // label: '邮箱', + // prop: 'email', + // span: 12, + // row: true, + // } + ], +}; export const userPwdOption = { - column: [{ - label: '原密码', - span: 12, - row: true, - type: 'password', - prop: 'oldPassword', - rules: [{ - required: true, - message: "请输入原密码", - trigger: "blur" - }] - }, { - label: '新密码', - span: 12, - row: true, - type: 'password', - prop: 'newPassword', - rules: [{ - required: true, - message: "请输入新密码", - trigger: "blur" - }] - }, { - label: '确认密码', - span: 12, - row: true, - type: 'password', - prop: 'newPassword1', - rules: [{ validator: validatePass2, trigger: 'blur' }] - }] -} + column: [ + { + label: "原密码", + span: 12, + row: true, + type: "password", + prop: "oldPassword", + rules: [ + { + required: true, + message: "请输入原密码", + trigger: "blur", + }, + ], + }, + { + label: "新密码", + span: 12, + row: true, + type: "password", + prop: "newPassword", + rules: [ + { + required: true, + message: "请输入新密码", + trigger: "blur", + }, + ], + }, + { + label: "确认密码", + span: 12, + row: true, + type: "password", + prop: "newPassword1", + rules: [{ validator: validatePass2, trigger: "blur" }], + }, + ], +}; const validatePass2 = (rule, value, callback) => { - if (value === '') { - callback(new Error('请再次输入密码')); + if (value === "") { + callback(new Error("请再次输入密码")); } else if (value !== this.obj.password) { - callback(new Error('两次输入密码不一致!')); + callback(new Error("两次输入密码不一致!")); } else { callback(); } -}; \ No newline at end of file +}; diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index a31bdcf..20cebfc 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -183,6 +183,7 @@ }, filters: {}, created() { + console.log('userInfo',this.userInfo) }, mounted() { listenfullscreen(this.setScreen); diff --git a/src/views/articlelist/index.vue b/src/views/articlelist/index.vue index 96d1729..3aea93a 100644 --- a/src/views/articlelist/index.vue +++ b/src/views/articlelist/index.vue @@ -47,6 +47,9 @@ export default { }, selectionList: [], option: { + searchShowBtn:false, + refreshBtn:false, + columnBtn:false, height: 'auto', calcHeight: 30, tip: false, diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue index 8722671..3f2894a 100644 --- a/src/views/authority/role.vue +++ b/src/views/authority/role.vue @@ -107,6 +107,9 @@ total: 0 }, option: { + searchShowBtn:false, + refreshBtn:false, + columnBtn:false, tip: false, simplePage: true, searchShow: true, diff --git a/src/views/blacklist/index.vue b/src/views/blacklist/index.vue index 4a1bac7..c0df49a 100644 --- a/src/views/blacklist/index.vue +++ b/src/views/blacklist/index.vue @@ -33,6 +33,9 @@ export default { }, selectionList: [], option: { + searchShowBtn:false, + refreshBtn:false, + columnBtn:false, height: 'auto', calcHeight: 30, tip: false, diff --git a/src/views/booklist/index.vue b/src/views/booklist/index.vue index a4d7d48..280850c 100644 --- a/src/views/booklist/index.vue +++ b/src/views/booklist/index.vue @@ -409,6 +409,9 @@ export default { viewBtn: false, editBtn: false, delBtn: false, + searchShowBtn:false, + refreshBtn:false, + columnBtn:false, column: [ { label: "体检人姓名", diff --git a/src/views/booknumber/index.vue b/src/views/booknumber/index.vue index b92b506..65bed08 100644 --- a/src/views/booknumber/index.vue +++ b/src/views/booknumber/index.vue @@ -113,6 +113,9 @@ export default { height: 'auto', calcHeight: 30, tip: false, + searchShowBtn:false, + refreshBtn:false, + columnBtn:false, searchShow: true, searchMenuSpan: 6, border: true, diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue index 8f0f43e..fa64fe5 100644 --- a/src/views/statistics/index.vue +++ b/src/views/statistics/index.vue @@ -58,6 +58,9 @@ export default { }, isRegister: false, option: { + searchShowBtn:false, + refreshBtn:false, + columnBtn:false, height: 'auto', calcHeight: 30, tip: false, diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue index 3c8f799..5a477b2 100644 --- a/src/views/system/dept.vue +++ b/src/views/system/dept.vue @@ -53,6 +53,9 @@ export default { total: 0, }, option: { + searchShowBtn:false, + refreshBtn:false, + columnBtn:false, lazy: true, tip: false, simplePage: true, diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue index 8d70338..2ac38ff 100644 --- a/src/views/system/menu.vue +++ b/src/views/system/menu.vue @@ -69,6 +69,9 @@ total: 0, }, option: { + searchShowBtn:false, + refreshBtn:false, + columnBtn:false, lazy: true, tip: false, simplePage: true, diff --git a/src/views/system/user.vue b/src/views/system/user.vue index ad3da07..4aa1db4 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -157,6 +157,9 @@ export default { } }, option: { + searchShowBtn:false, + refreshBtn:false, + columnBtn:false, height: 'auto', calcHeight: 80, tip: false,