d

iview-admin/src/view/appinfo/functree_page.vue

@@ -55,6 +55,9 @@ export default {
   methods: {
     onselnode(root, node, data) {},
     orgsave(treedata, modidata) {
+      // if(modidata.auths && modidata.auths.length>0){
+      //   modidata.sels=[]
+      // }
       saveFormData("/web/common/appCtl/saveFuncTree", {
         funcJson: treedata,
         curdata: modidata,

iview-admin/src/view/components/tables/forms/forms.vue

@@ -313,6 +313,9 @@ export default {
       //     return callback();
       //   };
       // }
+    },
+    noExpandAuth: {
+      type: Boolean,
     }
   },
   data() {
@@ -336,7 +339,7 @@ export default {
   computed: {},
   methods: {
     controlCtl(v, prop) {
-      this.$emit("controlctl",v,prop,this)
+      this.$emit("controlctl", v, prop, this);
     },
     setHeight() {
       let domel = this.$refs.formcard.$el;
@@ -406,7 +409,7 @@ export default {
             return;
           }
           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) {
               // console.log(
@@ -452,7 +455,9 @@ export default {
     this.initFormModel();
   },
   mounted() {
-    this.setHeight();
+    if (!this.noExpandAuth) {
+      this.setHeight();
+    }
   }
 };
 </script>

iview-admin/src/view/roleinfo/roleauth_page.vue

@@ -47,9 +47,9 @@ export default {
       getApp().then(res => {
         let rtn = res.data;
         if (rtn.status == 0) {
-          console.log(rtn.data.functionJSON);
-          let tmptreedata = JSON.parse(rtn.data.functionJSON);
-          this.treedata = tmptreedata; //
+          console.log(rtn.data.funcJson);
+          // let tmptreedata = JSON.parse(rtn.data.functionJSON);
+          this.treedata = rtn.data.funcJson; //
           //按照当前角色，去获取当前应用的功能权限，对返回的数据进行处理
           //赋予权限数据
           findAuthsByRoles([this.roleid]).then(res=>{
@@ -73,7 +73,7 @@ export default {
         } else {
           if(td.sels){
                  console.log(this.authdic)
-             td.sels = this.authdic[td.name];
+             td.sels = this.authdic[td.code];
           }
         }
       });
@@ -87,8 +87,8 @@ export default {
             let oneauth = {
               role_id: this.roleid,
               rolecode: this.rolecode,
-              bizcode: item.name,
-              codepath: item.codepath,
+              bizcode: item.code,
+              codepath: item.orgpath,
               authstrs: item.sels.join(",")
             };
             auths.push(oneauth);
@@ -158,6 +158,7 @@ export default {
                       on: {
                         "on-change": b => {
                           if (b) {
+                            console.log(data.auths)
                             data.sels = data.auths;
                           } else {
                             data.sels = [];

iview-admin/src/view/userinfo/accountinfo_page.vue

 <template>
-  <div>
-    <FormAccount ref="entinfo" :fminfo="entforminfo" style="height:100%">
-      <template v-slot:default="slotProps">
-        <Button @click="upentinfo">保存</Button>
-      </template>
-    </FormAccount>
-    <br>
-    <FormAccount ref="uinfo" :fminfo="forminfo">
-      <template v-slot:default="slotProps">
-        <Button @click="upuserinfo">保存</Button>
-      </template>
-    </FormAccount>
-    <br>
-    <FormAccount ref="pwdinfo" :fminfo="pwdinfo" :refvalidatemethod="validmethod">
-      <template v-slot:default="slotProps">
-        <Button @click="uppwdinfo">保存</Button>
-      </template>
-    </FormAccount>
-  </div>
+  <Row type="flex">
+    <Col span='24'>
+      <FormAccount ref="entinfo" :fminfo="entforminfo"  noExpandAuth>
+        <template v-slot:default="slotProps">
+          <Button @click="upentinfo">保存</Button>
+        </template>
+      </FormAccount>
+    </Col>
+    <Col span='24'>
+      <FormAccount ref="uinfo" :fminfo="forminfo"  noExpandAuth>
+        <template v-slot:default="slotProps">
+          <Button @click="upuserinfo">保存</Button>
+        </template>
+      </FormAccount>
+    </Col>
+    <Col span='24'>
+      <FormAccount ref="pwdinfo" :fminfo="pwdinfo" :refvalidatemethod="validmethod"  noExpandAuth>
+        <template v-slot:default="slotProps">
+          <Button @click="uppwdinfo">保存</Button>
+        </template>
+      </FormAccount>
+    </Col>
+  </Row>
 </template>
   <script>
 import FormAccount from "../components/tables/forms/forms";
+import PageSpace from "@/view/components/pagespace/page_space.vue";
 import { saveFormData } from "@/api/data";
 export default {
   name: "accountinfo_page",
@@ -95,7 +100,7 @@ export default {
                 style: "",
                 rules: [
                   { required: true, message: "  ", trigger: "blur" },
-                  { validator: "validatex", trigger: "blur",iscustom:true }
+                  { validator: "validatex", trigger: "blur", iscustom: true }
                 ]
               },
               {
@@ -106,7 +111,7 @@ export default {
                 style: "",
                 rules: [
                   { required: true, message: "  ", trigger: "blur" },
-                  { validator: "validatex", trigger: "blur",iscustom:true}
+                  { validator: "validatex", trigger: "blur", iscustom: true }
                 ]
               }
             ]
@@ -185,7 +190,8 @@ export default {
     };
   },
   components: {
-    FormAccount
+    FormAccount,
+    PageSpace
   },
   created() {},
   mounted() {

iview-admin/src/view/userinfo/tanentinfo_page.vue

 <template>
-  <div>
+  <PageSpace v-slot:default="{adjustHeight}">
     <BizTable
       ref="bt"
+      :tblheight="adjustHeight-120"
       :formatCol="formatCol"
       modelName="user"
       metaName="tanent_info"
@@ -11,10 +12,11 @@
       @onedit="onedit"
       @onexec="onexec"
     ></BizTable>
-  </div>
+   </PageSpace>
 </template>
   <script>
 import BizTable from "../components/tables/biztables";
+import PageSpace from "@/view/components/pagespace/page_space.vue";
 import { allowOrNot } from "@/api/user";
 export default {
   name: "userinfo_page",
@@ -22,7 +24,8 @@ export default {
     return {};
   },
   components: {
-    BizTable
+    BizTable,
+    PageSpace
   },
   mounted(){