zhaoke 2 rokov pred
rodič
commit
ea8c545790

+ 3 - 8
src/router/routes/routes-file-four.js

@@ -144,26 +144,21 @@ const accountRoutes = {
       },
       children: [
         {
-          path: "/account",
+          path: "/",
           name: "accountHome",
           component: {
             render(c) {
               return c("router-view");
             },
           },
-          redirect: "/account",
-          // meta: {
-          //   title: '账号管理',
-          //   roles: ['account_page']
-          // },
+          redirect: "/",
           meta: {
-            title: "账号管理",
             keepAlive: false,
             roles: ["account_page"],
           },
           children: [
             {
-              path: "/account",
+              path: "/",
               component: () => import("@/views/accountManagement/components/accountHome"),
               meta: {
                 title: "账号管理",

+ 24 - 0
src/views/accountManagement/components/accountHome.vue

@@ -100,6 +100,11 @@
                 <el-button size="medium" @click="resetPwd" style="position: relative;top: 4px;" class="r26" type="primary">重置密码</el-button>
               </div> -->
             </el-form-item>
+            <el-form-item label="账号组关联" prop="user_gropu_id">
+              <el-select style="width: 100%" v-model="ruleForm.user_group_id" placeholder="请选择">
+                <el-option v-for="item in options" :key="item.v" :label="item.k" :value="item.v"> </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="账号描述" prop="user_comment">
               <el-input v-model="ruleForm.user_comment" size="medium" type="textarea" :rows="3" placeholder="请输入角色描述" />
             </el-form-item>
@@ -155,6 +160,7 @@ export default {
         user_status: "",
         user_comment: "",
         user_pwd: "",
+        user_group_id: "",
       },
       rules: {
         // 协议信息表单验证
@@ -169,6 +175,7 @@ export default {
         children: "children",
         label: "user_group_name",
       },
+      options: [],
     };
   },
   computed: {
@@ -206,12 +213,26 @@ export default {
       this.accountList();
     }
     this.getGroup();
+    this.getGroupSelect();
   },
   methods: {
     // 随机生成密码
     resetPwd() {
       this.ruleForm.PassWord = pwdProduce(this.pwdLengthBegin, this.pwdLengthEnd, this.pwdStruc);
     },
+    //
+    async getGroupSelect() {
+      const res = await Query({
+        id: 18035,
+        dataContent: [],
+      });
+      if (res.code == 0) {
+        const { listValues } = res.returnData;
+        this.options = listValues;
+      } else {
+        this.$message.error(res.message);
+      }
+    },
     //获取用户组
     async getGroup() {
       const res = await Query({
@@ -237,6 +258,8 @@ export default {
     //用户组点击
     handleNodeClick(data) {
       if (data.user_group_id != -1 && data.up_user_group_id != -2) {
+        this.PageIndex = 1;
+        this.pages = 1;
         this.getAccountData(data.user_group_id);
       } else {
         this.clearSearchData();
@@ -307,6 +330,7 @@ export default {
         const { listValues } = res.returnData;
         const obj = listValues[0];
         this.ruleForm = obj;
+        console.log(this.ruleForm);
         this.oldPwd = obj.user_pwd;
         this.ruleForm.event = 2;
       } else {

+ 3 - 0
src/views/authorityManagement/components/authorityRoleHome.vue

@@ -182,6 +182,7 @@ export default {
     //确认删除
     remove() {
       this.index.event = 3;
+      this.index.operator_id = sessionStorage.getItem("User_Id");
       this.editRoles(this.index);
     },
     //角色新增
@@ -251,9 +252,11 @@ export default {
         if (valid) {
           if (this.editType == "add") {
             this.ruleForm.event = 1;
+            this.ruleForm.operator_id = sessionStorage.getItem("User_Id");
             this.editRoles(this.ruleForm);
           } else {
             this.ruleForm.event = 2;
+            this.ruleForm.operator_id = sessionStorage.getItem("User_Id");
             this.editRoles(this.ruleForm);
           }
           this.resetForm("ruleForm");