Skip to content

Z
zhichan
Commit fbb06699 by 蒋勇
Options

d

parent 38a41d22
Showing with 52 additions and 34 deletions
iview-admin/src/view/appinfo/functree_page.vue
...@@ -55,6 +55,9 @@ export default { ...@@ -55,6 +55,9 @@ export default {
methods: { methods: {
onselnode(root, node, data) {}, onselnode(root, node, data) {},
orgsave(treedata, modidata) { orgsave(treedata, modidata) {
// if(modidata.auths && modidata.auths.length>0){
// modidata.sels=[]
// }
saveFormData("/web/common/appCtl/saveFuncTree", { saveFormData("/web/common/appCtl/saveFuncTree", {
funcJson: treedata, funcJson: treedata,
curdata: modidata, curdata: modidata,
......
iview-admin/src/view/components/tables/forms/forms.vue
...@@ -313,6 +313,9 @@ export default { ...@@ -313,6 +313,9 @@ export default {
// return callback(); // return callback();
// }; // };
// } // }
},
noExpandAuth: {
type: Boolean,
} }
}, },
data() { data() {
...@@ -336,7 +339,7 @@ export default { ...@@ -336,7 +339,7 @@ export default {
computed: {}, computed: {},
methods: { methods: {
controlCtl(v, prop) { controlCtl(v, prop) {
this.$emit("controlctl",v,prop,this) this.$emit("controlctl", v, prop, this);
}, },
setHeight() { setHeight() {
let domel = this.$refs.formcard.$el; let domel = this.$refs.formcard.$el;
...@@ -406,7 +409,7 @@ export default { ...@@ -406,7 +409,7 @@ export default {
return; return;
} }
m.ctls.forEach(ctl => { m.ctls.forEach(ctl => {
this.$set(this.ctlVisable, ctl.prop, ctl.isHide?false:true); this.$set(this.ctlVisable, ctl.prop, ctl.isHide ? false : true);
if (ctl.rules && ctl.rules.length >= 0) { if (ctl.rules && ctl.rules.length >= 0) {
// console.log( // console.log(
...@@ -452,7 +455,9 @@ export default { ...@@ -452,7 +455,9 @@ export default {
this.initFormModel(); this.initFormModel();
}, },
mounted() { mounted() {
this.setHeight(); if (!this.noExpandAuth) {
this.setHeight();
}
} }
}; };
</script> </script>
......
iview-admin/src/view/roleinfo/roleauth_page.vue
...@@ -47,9 +47,9 @@ export default { ...@@ -47,9 +47,9 @@ export default {
getApp().then(res => { getApp().then(res => {
let rtn = res.data; let rtn = res.data;
if (rtn.status == 0) { if (rtn.status == 0) {
console.log(rtn.data.functionJSON); console.log(rtn.data.funcJson);
let tmptreedata = JSON.parse(rtn.data.functionJSON); // let tmptreedata = JSON.parse(rtn.data.functionJSON);
this.treedata = tmptreedata; // this.treedata = rtn.data.funcJson; //
//按照当前角色，去获取当前应用的功能权限，对返回的数据进行处理 //按照当前角色，去获取当前应用的功能权限，对返回的数据进行处理
//赋予权限数据 //赋予权限数据
findAuthsByRoles([this.roleid]).then(res=>{ findAuthsByRoles([this.roleid]).then(res=>{
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
} else { } else {
if(td.sels){ if(td.sels){
console.log(this.authdic) console.log(this.authdic)
td.sels = this.authdic[td.name]; td.sels = this.authdic[td.code];
} }
} }
}); });
...@@ -87,8 +87,8 @@ export default { ...@@ -87,8 +87,8 @@ export default {
let oneauth = { let oneauth = {
role_id: this.roleid, role_id: this.roleid,
rolecode: this.rolecode, rolecode: this.rolecode,
bizcode: item.name, bizcode: item.code,
codepath: item.codepath, codepath: item.orgpath,
authstrs: item.sels.join(",") authstrs: item.sels.join(",")
}; };
auths.push(oneauth); auths.push(oneauth);
...@@ -158,6 +158,7 @@ export default { ...@@ -158,6 +158,7 @@ export default {
on: { on: {
"on-change": b => { "on-change": b => {
if (b) { if (b) {
console.log(data.auths)
data.sels = data.auths; data.sels = data.auths;
} else { } else {
data.sels = []; data.sels = [];
......
iview-admin/src/view/userinfo/accountinfo_page.vue
<template> <template>
<div> <Row type="flex">
<FormAccount ref="entinfo" :fminfo="entforminfo" style="height:100%"> <Col span='24'>
<template v-slot:default="slotProps"> <FormAccount ref="entinfo" :fminfo="entforminfo" noExpandAuth>
<Button @click="upentinfo">保存</Button> <template v-slot:default="slotProps">
</template> <Button @click="upentinfo">保存</Button>
</FormAccount> </template>
<br> </FormAccount>
<FormAccount ref="uinfo" :fminfo="forminfo"> </Col>
<template v-slot:default="slotProps"> <Col span='24'>
<Button @click="upuserinfo">保存</Button> <FormAccount ref="uinfo" :fminfo="forminfo" noExpandAuth>
</template> <template v-slot:default="slotProps">
</FormAccount> <Button @click="upuserinfo">保存</Button>
<br> </template>
<FormAccount ref="pwdinfo" :fminfo="pwdinfo" :refvalidatemethod="validmethod"> </FormAccount>
<template v-slot:default="slotProps"> </Col>
<Button @click="uppwdinfo">保存</Button> <Col span='24'>
</template> <FormAccount ref="pwdinfo" :fminfo="pwdinfo" :refvalidatemethod="validmethod" noExpandAuth>
</FormAccount> <template v-slot:default="slotProps">
</div> <Button @click="uppwdinfo">保存</Button>
</template>
</FormAccount>
</Col>
</Row>
</template> </template>
<script> <script>
import FormAccount from "../components/tables/forms/forms"; import FormAccount from "../components/tables/forms/forms";
import PageSpace from "@/view/components/pagespace/page_space.vue";
import { saveFormData } from "@/api/data"; import { saveFormData } from "@/api/data";
export default { export default {
name: "accountinfo_page", name: "accountinfo_page",
...@@ -95,7 +100,7 @@ export default { ...@@ -95,7 +100,7 @@ export default {
style: "", style: "",
rules: [ rules: [
{ required: true, message: " ", trigger: "blur" }, { required: true, message: " ", trigger: "blur" },
{ validator: "validatex", trigger: "blur",iscustom:true } { validator: "validatex", trigger: "blur", iscustom: true }
] ]
}, },
{ {
...@@ -106,7 +111,7 @@ export default { ...@@ -106,7 +111,7 @@ export default {
style: "", style: "",
rules: [ rules: [
{ required: true, message: " ", trigger: "blur" }, { required: true, message: " ", trigger: "blur" },
{ validator: "validatex", trigger: "blur",iscustom:true} { validator: "validatex", trigger: "blur", iscustom: true }
] ]
} }
] ]
...@@ -185,7 +190,8 @@ export default { ...@@ -185,7 +190,8 @@ export default {
}; };
}, },
components: { components: {
FormAccount FormAccount,
PageSpace
}, },
created() {}, created() {},
mounted() { mounted() {
......
iview-admin/src/view/userinfo/tanentinfo_page.vue
<template> <template>
<div> <PageSpace v-slot:default="{adjustHeight}">
<BizTable <BizTable
ref="bt" ref="bt"
:tblheight="adjustHeight-120"
:formatCol="formatCol" :formatCol="formatCol"
modelName="user" modelName="user"
metaName="tanent_info" metaName="tanent_info"
...@@ -11,10 +12,11 @@ ...@@ -11,10 +12,11 @@
@onedit="onedit" @onedit="onedit"
@onexec="onexec" @onexec="onexec"
></BizTable> ></BizTable>
</div> </PageSpace>
</template> </template>
<script> <script>
import BizTable from "../components/tables/biztables"; import BizTable from "../components/tables/biztables";
import PageSpace from "@/view/components/pagespace/page_space.vue";
import { allowOrNot } from "@/api/user"; import { allowOrNot } from "@/api/user";
export default { export default {
name: "userinfo_page", name: "userinfo_page",
...@@ -22,7 +24,8 @@ export default { ...@@ -22,7 +24,8 @@ export default {
return {}; return {};
}, },
components: { components: {
BizTable BizTable,
PageSpace
}, },
mounted(){ mounted(){
......
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