Skip to content

Z
zhichan
Commit 0375f807 by 蒋勇
Options

d

parent 6651bc71
Showing with 134 additions and 129 deletions
iview-admin/src/libs/util.js
...@@ -7,25 +7,26 @@ const { title, cookieExpires, useI18n } = config ...@@ -7,25 +7,26 @@ const { title, cookieExpires, useI18n } = config
export const TOKEN_KEY = 'token' export const TOKEN_KEY = 'token'
export const btnAuthFilter = (metainfo, user) => { export const btnAuthFilter = (metainfo, user) => {
// console.log(".................................................",metainfo.list) console.log("----------------------------------------------------------------------btnAuthFilter-----------------------------------------------")
// let authbtns=[]
// let keyswithauth=Object.keys(metainfo.auths).filter(authname=>{
// let hasAuth=user.access.some(authitem=>{
// return authitem.auths.indexOf(authname)>=0
// })
// return hasAuth
// })
// if(keyswithauth){
// keyswithauth.forEach(k=>{
// metainfo.auths[k].forEach(bt=>{
// authbtns.push(bt)
// })
// })
// }
// metainfo.auths=authbtns
let authbtns = [] let authbtns = []
let keyswithauth = Object.keys(metainfo.auths).filter(authname => { let keyswithauth = Object.keys(metainfo.auths).filter(authname => {
return true return true
if(user.isSuper || user.isAdmin){
return true
}
let authins=user.access.filter(tti=>{
if(metainfo.bizCode==tti.bizcode && tti.authstrs.indexOf(authname)>=0){
return true
}else{
return false
}
})
if(authins.length>0){
return true
}else{
return false
}
}) })
if (keyswithauth) { if (keyswithauth) {
keyswithauth.forEach(k => { keyswithauth.forEach(k => {
...@@ -35,6 +36,7 @@ export const btnAuthFilter = (metainfo, user) => { ...@@ -35,6 +36,7 @@ export const btnAuthFilter = (metainfo, user) => {
}) })
} }
metainfo.auths = authbtns metainfo.auths = authbtns
console.log(metainfo)
return metainfo return metainfo
} }
...@@ -61,6 +63,9 @@ const showThisMenuEle = (item, access, user) => { ...@@ -61,6 +63,9 @@ const showThisMenuEle = (item, access, user) => {
return false return false
} }
} }
if(item.name=="tanents_info" && (user.isAdmin && !user.isSuper)){
return false
}
let fts = user.access.filter(it => { let fts = user.access.filter(it => {
return it.codepath.indexOf(item.name) >= 0 return it.codepath.indexOf(item.name) >= 0
}) })
......
iview-admin/src/router/routers.js
...@@ -176,8 +176,8 @@ export default [ ...@@ -176,8 +176,8 @@ export default [
component: () => import('@/view/update/update-table.vue') component: () => import('@/view/update/update-table.vue')
}, },
{ {
path: 'update_paste_page', path: 'update_paste_pagex',
name: 'update_paste_page', name: 'update_paste_pagex',
meta: { meta: {
icon: 'md-clipboard', icon: 'md-clipboard',
title: '结算信息' title: '结算信息'
......
iview-admin/src/store/module/meta.js
...@@ -18,11 +18,11 @@ export default { ...@@ -18,11 +18,11 @@ export default {
}, },
getters: { getters: {
user_info: (state, getters, {user}) => btnAuthFilter(state.user_info,user),//定义一个函数添加权限控制逻辑 user_info: (state, getters, {user}) => btnAuthFilter(state.user_info,user.userobj),//定义一个函数添加权限控制逻辑
tanent_info: (state, getters, {user}) => btnAuthFilter(state.tanent_info,user),//定义一个函数添加权限控制逻辑 tanent_info: (state, getters, {user}) => btnAuthFilter(state.tanent_info,user.userobj),//定义一个函数添加权限控制逻辑
role_info: (state, getters, {user}) => btnAuthFilter(state.role_info,user),//定义一个函数添加权限控制逻辑 role_info: (state, getters, {user}) => btnAuthFilter(state.role_info,user.userobj),//定义一个函数添加权限控制逻辑
app_info: (state, getters, {user}) => btnAuthFilter(state.app_info,user),//定义一个函数添加权限控制逻辑 app_info: (state, getters, {user}) => btnAuthFilter(state.app_info,user.userobj),//定义一个函数添加权限控制逻辑
route_info: (state, getters, {user}) => btnAuthFilter(state.route_info,user),//定义一个函数添加权限控制逻辑 route_info: (state, getters, {user}) => btnAuthFilter(state.route_info,user.userobj),//定义一个函数添加权限控制逻辑
dict_info:state=>state.dict_info dict_info:state=>state.dict_info
}, },
actions: { actions: {
......
iview-admin/src/store/module/metainfo/tanentinfo.js
...@@ -36,12 +36,7 @@ export default { ...@@ -36,12 +36,7 @@ export default {
] ]
} }
], ],
lists: [ lists: null
{
title: "子列表",
bizCode: "xxx"
}
]
}, },
"search": { "search": {
name: "search", name: "search",
......
iview-admin/src/store/module/metainfo/userinfo.js
export default { export default {
bizCode: "userinfo", bizCode: "user_info",
name: "用户信息维护", name: "用户信息维护",
list: [ list: [
{ title: '账号', key: 'userName', sortable: true, insearch: true},//slot--自定义列 insearch--是否快速查询 { title: '账号', key: 'userName', sortable: true, insearch: true},//slot--自定义列 insearch--是否快速查询
...@@ -39,12 +39,7 @@ export default { ...@@ -39,12 +39,7 @@ export default {
] ]
} }
], ],
lists: [ lists:null
{
title: "子列表",
bizCode: "xxx"
}
]
}, },
"search": { "search": {
name: "search", name: "search",
......
iview-admin/src/view/components/tables/biztables.vue
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
:fminfo="forminfo" :fminfo="forminfo"
style="height:100%" style="height:100%"
:refvalidatemethod="refvalidatemethod" :refvalidatemethod="refvalidatemethod"
v-if="showedform"
> >
<template v-slot:default="slotProps"> <template v-slot:default="slotProps">
<Button <Button
...@@ -380,8 +379,8 @@ export default { ...@@ -380,8 +379,8 @@ export default {
if (key == "adv-search") { if (key == "adv-search") {
this.advsearch(); this.advsearch();
} }
this.$emit("onexec", key, row, btninfo); this.$emit("onexec", key, row?row:null, btninfo);
console.log(key, row, "ddddddddddddddddddddddddddddddd");
}, },
doquery(q, k) { doquery(q, k) {
if (k == "cancel-search") { if (k == "cancel-search") {
...@@ -432,7 +431,10 @@ export default { ...@@ -432,7 +431,10 @@ export default {
this.fetchData(); this.fetchData();
} }
}, },
created() {}, created() {
console.log("created..........................................")
console.log(this.metainfo)
},
computed: { computed: {
searchinfo() { searchinfo() {
return this.metainfo["search"]; return this.metainfo["search"];
......
iview-admin/src/view/components/tables/forms/childs/modelselects.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<script> <script>
import { refQuery } from "@/api/meta"; import { refQuery } from "@/api/meta";
export default { export default {
name: "remoteselects", name: "modelselects",
components: {}, components: {},
model: { model: {
prop: "value", prop: "value",
......
iview-admin/src/view/components/tables/forms/forms.vue
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
</Row> </Row>
</template> </template>
</TabPane> </TabPane>
<TabPane <TabPane
:disabled="tabDisabled[lst.bizCode]" :disabled="tabDisabled[lst.bizCode]"
v-for="lst in forminfo.lists" v-for="lst in forminfo.lists"
:key="lst.bizCode" :key="lst.bizCode"
...@@ -141,86 +141,91 @@ ...@@ -141,86 +141,91 @@
v-for="ctl in group.ctls" v-for="ctl in group.ctls"
:key="ctl.prop" :key="ctl.prop"
> >
<FormItem v-if="ctlVisable[ctl.prop]" :label="ctl.label" :prop="ctl.prop"> <FormItem v-if="ctlVisable[ctl.prop]" :label="ctl.label" :prop="ctl.prop">
<template v-if="ctl.type=='input'"> <template v-if="ctl.type=='input'">
<input <input
v-model="formModel[ctl.prop]" type="text"
:placeholder="ctl.placeHolder" v-model="formModel[ctl.prop]"
:disabled="ctl.disabled" :placeholder="ctl.placeHolder"
:style="ctl.style" :style="ctl.style"
> >
</template> </template>
<template v-if="ctl.type=='btn'"> <template v-if="ctl.type=='btn'">
<button :type="ctl.btncss" :icon="ctl.icon">{{ctl.label}}</button> <button :type="ctl.btncss" :icon="ctl.icon">{{ctl.label}}</button>
</template> </template>
<template v-if="ctl.type=='dic-select'"> <template v-if="ctl.type=='dic-select'">
<DicSelect <DicSelect
v-model="formModel[ctl.prop]" v-model="formModel[ctl.prop]"
:dicName="ctl.dicName" :dicName="ctl.dicName"
:placeHolder="ctl.placeHolder" :placeHolder="ctl.placeHolder"
:isMulti="ctl.isMulti" :isMulti="ctl.isMulti"
></DicSelect> ></DicSelect>
</template> </template>
<template v-if="ctl.type=='model-select'"> <template v-if="ctl.type=='model-select'">
<ModelSelect <ModelSelect
v-model="formModel[ctl.prop]" v-model="formModel[ctl.prop]"
:refModel="ctl.refModel" :refModel="ctl.refModel"
:placeHolder="ctl.placeHolder" :placeHolder="ctl.placeHolder"
:isMulti="ctl.isMulti" :isMulti="ctl.isMulti"
></ModelSelect> :labelField="ctl.labelField"
</template> :valueField="ctl.valueField"
<template v-if="ctl.type=='remote-select'"> ></ModelSelect>
<RemoteSelect </template>
v-model="formModel[ctl.prop]" <template v-if="ctl.type=='remote-select'">
:refModel="ctl.refModel" <RemoteSelect
:placeHolder="ctl.placeHolder" v-model="formModel[ctl.prop]"
:isMulti="ctl.isMulti" :refModel="ctl.refModel"
></RemoteSelect> :placeHolder="ctl.placeHolder"
</template> :isMulti="ctl.isMulti"
<template v-if="ctl.type=='switch'"> :labelField="ctl.labelField"
<Switchs :valueField="ctl.valueField"
v-model="formModel[ctl.prop]" ></RemoteSelect>
:openlabel="ctl.opentext" </template>
:closelabel="ctl.closetext" <template v-if="ctl.type=='switch'">
:truecolor="ctl.truecolor" <Switchs
:falsecolor="ctl.falsecolor" v-model="formModel[ctl.prop]"
></Switchs> :openlabel="ctl.opentext"
</template> :closelabel="ctl.closetext"
<template v-if="ctl.type=='checkgroup'"> :truecolor="ctl.truecolor"
<Checkgroups :falsecolor="ctl.falsecolor"
v-model="formModel[ctl.prop]" ></Switchs>
:dicName="ctl.dicName" </template>
:refModel="ctl.refModel" <template v-if="ctl.type=='checkgroup'">
:isborder="ctl.isBorder" <Checkgroups
></Checkgroups> v-model="formModel[ctl.prop]"
</template> :dicName="ctl.dicName"
<template v-if="ctl.type=='radiogroup'"> :refModel="ctl.refModel"
<Radiogroups :isborder="ctl.isBorder"
v-model="formModel[ctl.prop]" ></Checkgroups>
:dicName="ctl.dicName" </template>
:refModel="ctl.refModel" <template v-if="ctl.type=='radiogroup'">
:isborder="ctl.isBorder" <Radiogroups
></Radiogroups> v-model="formModel[ctl.prop]"
</template> :dicName="ctl.dicName"
<template v-if="ctl.type=='upload'"> :refModel="ctl.refModel"
<Uploads v-model="formModel[ctl.prop]"></Uploads> :isborder="ctl.isBorder"
</template> ></Radiogroups>
<template v-if="ctl.type=='password'"> </template>
<input <template v-if="ctl.type=='upload'">
type="password" <Uploads v-model="formModel[ctl.prop]"></Uploads>
v-model="formModel[ctl.prop]" </template>
:placeholder="ctl.placeHolder" <template v-if="ctl.type=='password'">
> <input
</template> type="password"
<template v-if="ctl.type=='textarea'"> v-model="formModel[ctl.prop]"
<Input :placeholder="ctl.placeHolder"
v-model="formModel[ctl.prop]" >
type="textarea" </template>
:placeholder="ctl.placeHolder" <template v-if="ctl.type=='textarea'">
:style="ctl.style" <Input
/> v-model="formModel[ctl.prop]"
</template> type="textarea"
</FormItem> :placeholder="ctl.placeHolder"
:style="ctl.style"
:autosize="{minRows:20,maxRows:50}"
/>
</template>
</FormItem>
</Col> </Col>
</Row> </Row>
</template> </template>
...@@ -290,9 +295,11 @@ export default { ...@@ -290,9 +295,11 @@ export default {
methods: { methods: {
getInitWhere(initWhereObj) { getInitWhere(initWhereObj) {
let refwhere = {}; let refwhere = {};
refwhere[initWhereObj.fieldName] = this.formModel[ if(initWhereObj){
initWhereObj.valueField refwhere[initWhereObj.fieldName] = this.formModel[
]; initWhereObj.valueField
];
}
return refwhere; return refwhere;
}, },
tabselected(bizcode) { tabselected(bizcode) {
...@@ -382,9 +389,7 @@ export default { ...@@ -382,9 +389,7 @@ export default {
this.initFormModel(); this.initFormModel();
}, },
mounted() { mounted() {
$(window).resize(()=>{
// this.$refs.formcard.
})
} }
}; };
</script> </script>
......
iview-admin/src/view/roleinfo/roleinfo_page.vue
...@@ -22,7 +22,10 @@ export default { ...@@ -22,7 +22,10 @@ export default {
}, },
methods: { methods: {
onexec(k, row) { onexec(k, row) {
this.$router.push({ name: "role_auth",query:{roleid:row.id,rolecode:row.code}}) if(k=="auth"){
this.$router.push({ name: "role_auth",query:{roleid:row.id,rolecode:row.code}})
}
}, },
// onnew() { // onnew() {
// this.$refs.bt.setFormCtlVisable("userName", true); // this.$refs.bt.setFormCtlVisable("userName", true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment