From f8186fc9336f6e786fdf266d98c2eb4b0202f315 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 17 Oct 2023 16:22:20 +0800
Subject: [PATCH] SEO

---
 src/assets/css/global.css        |   2 +-
 src/assets/css/global_table.css  |  22 ++
 src/views/user-list/UserList.vue | 416 +++++++++++++++++--------------
 3 files changed, 246 insertions(+), 194 deletions(-)
 create mode 100644 src/assets/css/global_table.css

diff --git a/src/assets/css/global.css b/src/assets/css/global.css
index 6e1ce09..e23a111 100644
--- a/src/assets/css/global.css
+++ b/src/assets/css/global.css
@@ -28,7 +28,7 @@
 
 /* 点击树结构项的选中颜色 */
 .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
-  background-color:  #409EFF;
+  background-color: #409EFF;
 }
 
 
diff --git a/src/assets/css/global_table.css b/src/assets/css/global_table.css
new file mode 100644
index 0000000..e95eddf
--- /dev/null
+++ b/src/assets/css/global_table.css
@@ -0,0 +1,22 @@
+/* 表格 表头 列间距控制 */
+.el-table th.el-table__cell>.cell{
+  text-align: center;  /* 表格 表头 对齐方式，默认 left */
+  padding-right: 2px;  /* 表格 表头 列间距控制，默认 10px */
+  padding-left: 2px;  /* 表格 表头 列间距控制，默认 10px */
+}
+
+/* 表格 表体 首列左间距控制 */
+.el-table--border .el-table__cell:first-child .cell {
+  padding-left: 2px; /* 表格 表体 首列左间距控制，默认 10px */
+}
+
+/* 表格 行列间距控制 ，默认 10 px*/
+.el-table__cell {
+  padding: 2px 2px 2px 2px;   /* 上，右，下，左 */
+}
+
+/* 表格单元格 .el-table .cell ，默认 10 px*/
+.cell {
+  padding-left: 2px;
+  padding-right: 2px;
+}
\ No newline at end of file
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index 416d463..8652e1d 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -1,109 +1,82 @@
 <template>
   <div>
-    <el-card class="orgindcard">
+    <el-card class="elcard">
       <div class="publiccss">用户管理</div>
       <!-- <el-button type="primary" @click="newlyincreased" style="margin-top: 20px"
         >新增</el-button
       > -->
-      <el-row style="margin-top: 10px">
-        <el-form ref="form" :model="form">
-          <el-col :span="4">
-            <el-form-item label="用户查询">
-              <el-input
-                v-model="pages.Filter"
-                clearable
-                @clear="getlist"
-                style="width: 200px"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="6">
-            <el-form-item label="手机号">
-              <el-input
-                v-model="pages.Filter"
-                style="width: 200px"
-              ></el-input>
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col :span="6">
-            <el-form-item label="姓名">
-              <el-input
-                v-model="pages.Filter"
-                style="width: 200px"
-              ></el-input>
-            </el-form-item>
-          </el-col> -->
-          <el-col :span="6">
-            <el-button type="primary" @click="inquireabout">查询</el-button>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div style="display: flex">
-        <div style="width: 10%; margin-top: 30px">
-          <el-tree
-            :data="treedata"
-            :props="defaultProps"
-            @node-click="handleNodeClick"
-          ></el-tree>
+      <div>
+        <div style="display: flex;padding: 2px 0px;">
+          
+            <el-input v-model="pages.Filter" clearable  @change="btnQuery" placeholder="输入查询关键字" style="width: 200px" size="small" />
+            <el-button style="margin-left: 5px;" type="primary" @click="btnQuery" size="small">查询</el-button>
         </div>
-        <div style="width: 90%">
-          <el-table
-            height="500"
-            :data="tableData"
-            style="width: 100%; margin-top: 20px"
-            border=""
-          >
-            <el-table-column type="index" label="#"></el-table-column>
-            <el-table-column prop="userName" label="用户名" width="">
-            </el-table-column>
-            <el-table-column prop="email" label="邮箱" width="">
-            </el-table-column>
-            <!-- <el-table-column prop="email" label="所属角色" width=""> </el-table-column> -->
-            <el-table-column prop="phoneNumber" label="手机号" width="">
-            </el-table-column>
-            <el-table-column prop="surname" label="姓名" width="">
-            </el-table-column>
+        
+        <div style="display: flex">
+          <div :style="'overflow: scroll;border: 1px solid;width:200px;height:' +(window.pageHeight < 600 ? 410 : window.pageHeight - 190) + 'px;'">
+            <el-tree
+              :data="treedata"
+              :props="defaultProps"
+              @node-click="handleNodeClick"
+              highlight-current
+            ></el-tree>
+          </div>
+          <div :style="'margin-left: 5px;width: '+(window.pageWidth - 200 - 90)+'px;'">
+            <el-table highlight-current-row
+              :height="window.pageHeight < 600 ? 410 : window.pageHeight - 190"              
+              :data="tableData" size="small" border>
+              <el-table-column type="index" label="序号" min-width="50" align="center"></el-table-column>
+              <el-table-column prop="userName" label="账号" min-width="100">
+              </el-table-column>
+              <el-table-column prop="email" label="邮箱" min-width="150">
+              </el-table-column>
+              <!-- <el-table-column prop="email" label="所属角色" width=""> </el-table-column> -->
+              <el-table-column prop="phoneNumber" label="手机号" min-width="130">
+              </el-table-column>
+              <el-table-column prop="surname" label="姓名" min-width="100">
+              </el-table-column>
 
-            <!-- <el-table-column prop="name" label="名称" width=""> </el-table-column> -->
-            <!-- <el-table-column prop="lastModificationTime" label="开始时间">
-          <template slot-scope="scope">
-            {{ scope.row.creationTime | dateFormat }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="lastModificationTime" label="结束时间">
-          <template slot-scope="scope">
-            {{ scope.row.lastModificationTime | dateFormat }}
-          </template>
-        </el-table-column> -->
-            <el-table-column label="操作" width="480">
-              <template slot-scope="scope">
-                <el-button
-                  type="primary"
-                  @click="newlyincreased"
-                  style="margin-top: 20px"
-                  >新增</el-button
-                >
-                <el-button type="primary" @click="editmony(scope.row)"
-                  >编辑</el-button
-                >
-                <el-button type="primary" @click="deleates(scope.row)"
-                  >删除</el-button
-                >
+              <!-- <el-table-column prop="name" label="名称" width=""> </el-table-column> -->
+              <!-- <el-table-column prop="lastModificationTime" label="开始时间">
+            <template slot-scope="scope">
+              {{ scope.row.creationTime | dateFormat }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="lastModificationTime" label="结束时间">
+            <template slot-scope="scope">
+              {{ scope.row.lastModificationTime | dateFormat }}
+            </template>
+          </el-table-column> -->
+              <el-table-column label="操作" min-width="400">
+                <template slot-scope="scope">
+                  <el-button
+                    type="primary"
+                    @click="newlyincreased"
+                    size="small">新增</el-button
+                  >
+                  <el-button type="primary" @click="editmony(scope.row)"
+                  size="small">编辑</el-button
+                  >
+                  <el-button type="primary" @click="deleates(scope.row)"
+                  size="small">删除</el-button
+                  >
 
-                <!-- <el-button type="primary" @click="binding(scope.row)"
-              >绑定组织</el-button
-            > -->
-                <el-button type="primary" @click="bandinuser(scope.row)"
-                  >绑定角色</el-button
-                >
-                <el-button type="primary" @click="editpassword(scope.row)"
-                  >修改密码</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
+                  <!-- <el-button type="primary" @click="binding(scope.row)"
+                >绑定组织</el-button
+              > -->
+                  <el-button type="primary" @click="bandinuser(scope.row)"
+                  size="small">绑定角色</el-button
+                  >
+                  <el-button type="primary" @click="editpassword(scope.row)"
+                  size="small">修改密码</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
         </div>
       </div>
+
       <!-- <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -117,13 +90,14 @@
       <el-dialog
         :title="title == 1 ? '新增用户' : '修改用户'"
         :visible.sync="dialogVisible"
-        width="40%"
+        width="700px"
         :close-on-click-modal="false"
       >
         <el-tabs
           v-model="activeName"
           v-if="title == 2 ? true : false"
           @tab-click="handleClick"
+          style="height:400px;"
         >
           <el-tab-pane label="用户信息" name="first">
             <el-form
@@ -136,11 +110,11 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="姓名" prop="surname">
-                    <el-input v-model="form.surname"></el-input> </el-form-item
+                    <el-input v-model="form.surname" size="small" /> </el-form-item
                 ></el-col>
                 <el-col :span="12">
                   <el-form-item label="用户名" prop="userName">
-                    <el-input v-model="form.userName"></el-input> </el-form-item
+                    <el-input v-model="form.userName" size="small" /> </el-form-item
                 ></el-col>
 
                 <!-- <el-col :span="12">
@@ -150,8 +124,7 @@
                 <el-col :span="12">
                   <el-form-item label="手机号" prop="phoneNumber">
                     <el-input
-                      v-model="form.phoneNumber"
-                    ></el-input> </el-form-item
+                      v-model="form.phoneNumber" size="small" /> </el-form-item
                 ></el-col>
                 <el-col :span="12">
                   <el-form-item label="科室">
@@ -171,8 +144,7 @@
                         children: 'treeChildren',
                         checkStrictly: true,
                         value: 'id',
-                      }"
-                    ></el-cascader>
+                      }" size="small" style="width:260px;" />
                   </el-form-item>
                 </el-col>
                 <!-- <el-col :span="12">
@@ -259,24 +231,23 @@
             ></el-cascader> -->
           <!-- </el-tab-pane> -->
           <el-tab-pane label="科室操作权限">
-            <el-tree
-              :props="{
-                label: 'displayName',
-                children: 'treeChildren',
-              }"
-              :default-checked-keys="defaultchekedKeys"
-              :default-expand-all="true"
-              show-checkbox
-              :data="setupdepartments"
-              node-key="id"
-              @check="iscrentddepartment"
-              ref="department"
-            >
-            </el-tree>
+            <div style="overflow-y: scroll;height:350px;">
+              <el-tree
+                :props="{
+                  label: 'displayName',
+                  children: 'treeChildren',
+                }"
+                :default-checked-keys="department"
+                :default-expand-all="true"
+                show-checkbox
+                :data="setupdepartments"
+                node-key="id"
+                @check="iscrentddepartment"
+                ref="department" size="small" />
+            </div>
           </el-tab-pane>
         </el-tabs>
         <!-- //新增 -->
-
         <el-form
           v-show="title == 1 ? true : false"
           v-if="dialogVisible"
@@ -285,7 +256,7 @@
           label-width="80px"
           :rules="rules"
         >
-          <el-tabs>
+          <el-tabs style="height:400px;">
             <el-tab-pane label="用户信息">
               <el-row>
                 <el-col :span="12">
@@ -395,18 +366,20 @@
               </el-tree> -->
             </el-tab-pane>
             <el-tab-pane label="科室操作权限">
-              <el-tree
-                :data="newdepartment"
-                show-checkbox
-                :default-expand-all="true"
-                @check="ischesc"
-                node-key="id"
-                ref="tree"
-                :default-expanded-keys="nodekes"
-                :default-checked-keys="[5]"
-                :props="{ label: 'displayName', children: 'treeChildren' }"
-              >
-              </el-tree>
+              <div style="overflow-y: scroll;height:350px;">
+                <el-tree
+                  :data="newdepartment"
+                  show-checkbox
+                  :default-expand-all="true"
+                  @check="ischesc"
+                  node-key="id"
+                  ref="tree"
+                  :default-expanded-keys="nodekes"
+                  :default-checked-keys="[5]"
+                  :props="{ label: 'displayName', children: 'treeChildren' }"
+                >
+                </el-tree>
+              </div>
             </el-tab-pane>
           </el-tabs>
         </el-form>
@@ -417,6 +390,7 @@
           >
         </span>
       </el-dialog>
+
       <!-- 绑定用户组织弹框 -->
       <el-dialog
         title="绑定组织"
@@ -560,7 +534,6 @@ export default {
       orgId: [],
       confarmPassWord: "", //确认密码
       usersName: "", //用户名
-      defaultchekedKeys: [], //默认选中的科室
       department: [], //选中的科室
       setupdepartments: [], //设置科室
       newPassWord: "", //新密码
@@ -650,7 +623,7 @@ export default {
       checkList: [], //多选框
       pages: {
         SkipCount: 0,
-        MaxResultCount: 100,
+        MaxResultCount: 1000,
         Filter: "",
         // Filter:{
         //   userName:this.form.userName,
@@ -673,12 +646,12 @@ export default {
     };
   },
   computed: {
-    ...mapState(["changepassword"]),
+    ...mapState(["window","changepassword"]),
   },
   created() {
     this.password = this.changepassword;
     console.log(this.password);
-    this.getlist();
+    this.btnQuery();
     this.gettreedata();
     this.idkes = localStorage.getItem("dataidkes");
   },
@@ -703,6 +676,7 @@ export default {
         this.tableData = res.data;
       });
     },
+
     iscrentddepartment() {
       this.department = this.$refs.department.getCheckedKeys(true);
       console.log(this.department, "wwww");
@@ -767,11 +741,20 @@ export default {
         });
       }
     },
+
     //用户列表查询
-    inquireabout() {
-      this.getlist();
-      //  usreslist()
+    // inquireabout() {
+    //   this.getlist();
+    //   //  usreslist()
+    // },
+    btnQuery(){
+      getapi(`/api/identity/users/getlist?Filter=${this.pages.Filter}&MaxResultCount=${this.pages.MaxResultCount}`).then(res =>{
+        if(res.code != -1){
+          this.tableData = res.data.items
+        }
+      })
     },
+
     onchang(v) {
       // this.form.roleNames[0] = v;
       console.log(v);
@@ -781,14 +764,16 @@ export default {
       this.values = value;
       console.log(value);
     },
-    getlist() {
-      usreslist(this.pages).then((res) => {
-        this.tableData = res.data.items;
 
-        this.total = res.data.totalCount;
-        console.log(res);
-      });
-    },
+    // getlist() {
+    //   usreslist(this.pages).then((res) => {
+    //     this.tableData = res.data.items;
+
+    //     this.total = res.data.totalCount;
+    //     console.log(res);
+    //   });
+    // },
+
     //绑定
     binding(row) {
       this.bindingdialogVisible = true;
@@ -946,44 +931,75 @@ export default {
               isActive: true,
               // roleNames: this.form.roleNames,
             };
-            if (this.form.roleNames.length != 0) {
-              console.log(this.form.roleNames);
-              // let tempArr=[]
 
-              editmodify(this.form.id, obj).then((res) => {
-                if (res.code == 1) {
-                  this.$message.success("修改成功");
-                  this.dialogVisible = false;
-                  this.getlist();
-                }
-                console.log(res);
-                if (res.code == 1) {
-                  selectbinding({
-                    userId: this.form.id,
-                    orgId: this.orgId[0],
-                  }).then((res) => {
-                    console.log(res);
-                    postapi(
-                      `/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,
-                      this.orgId
-                    ).then((res) => {
-                      console.log(this.orgId);
-                      // this.$message.success("操作成功");
-                    });
-                    // this.$message.success("修改绑定组织成功");
-                  });
-                  // postapi(
-                  //   `/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,
-                  //   this.department
-                  // ).then((res) => {
-                  //   // this.$message.success("操作成功");
-                  // });
-                  console.log("aaaaaa");
-                }
-              });
-            } else {
-              this.$message.success("请选则用户");
+            if (this.form.roleNames.length == 0) {
+              this.$message.warning("请选则用户角色");
+              return
             }
+
+            let msg=''
+
+            //更新用户与所属角色
+            postapi(`/api/identity/users/update?id=${this.form.id}`,obj
+            ).then(res => {
+              if(res.code != -1){  //更新科室权限
+                return postapi(`/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,this.department)
+              }else{
+                msg = res.message
+              }   
+            }).then( res=>{
+              if(res.code != -1 && this.orgId.length > 0){
+                return postapi('/api/app/organization-units/user-organization-unit',{ userId: this.form.id, orgId: this.orgId[this.orgId.length - 1]})
+              }else{
+                msg = res.message
+              }            
+            })
+            
+            if(msg){
+              this.$message.error(msg);
+            }else{
+              this.$message.success("操作成功！");
+            }
+
+            //
+            //   console.log(this.form.roleNames);
+            //   // let tempArr=[]              
+            //   editmodify(this.form.id, obj).then((res) => {
+            //     if (res.code == 1) {
+            //       this.$message.success("修改成功");
+            //       this.dialogVisible = false;
+            //       this.getlist();
+            //     }
+            //     console.log(res);
+            //     if (res.code == 1) {
+            //       selectbinding({
+            //         userId: this.form.id,
+            //         orgId: this.orgId[0],
+            //       }).then((res) => {
+            //         console.log(res);
+                    
+            //         //api/app/organization-units/user-organization-unit
+            //         postapi(
+            //           `/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,
+            //           this.orgId
+            //         ).then((res) => {
+            //           console.log(this.orgId);
+            //           // this.$message.success("操作成功");
+            //         });
+            //         // this.$message.success("修改绑定组织成功");
+            //       });
+            //       // postapi(
+            //       //   `/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,
+            //       //   this.department
+            //       // ).then((res) => {
+            //       //   // this.$message.success("操作成功");
+            //       // });
+            //       console.log("aaaaaa");
+            //     }
+            //   });
+            // } else {
+            //   this.$message.success("请选则用户");
+            // }
           }
         }
       });
@@ -1051,12 +1067,21 @@ export default {
             this.$set(this.form, "roleNames", []);
           }
         });
-        //科室编辑
+
+        //根据用户ID查组织信息
+        getapi(`/api/app/organization-units/organization-unit-by-user-id/${row.id}`).then(res =>{
+          console.log(`/api/app/organization-units/organization-unit-by-user-id/${row.id}`,res)
+          if(res.code != -1 && res.data.length > 0){
+            this.orgId = [res.data[0].id]
+          }
+        })
+       
+        //获取科室权限 编辑
         getapi(
           `/api/app/abpuserdepartment/getuserdepartment?UserId=${row.id}`
         ).then((res) => {
           // default-checked-keys
-          this.defaultchekedKeys = res.data;
+          this.department = res.data;
           console.log(res, "科室");
         });
       }
@@ -1090,16 +1115,16 @@ export default {
           console.log("options", this.options);
         }
       });
-      console.log(row);
-      usersinits(row.id).then((res) => {
-        this.orgId = res.data[res.data.length - 1].displayName;
-        this.orgIds = res.data[0].displayName;
-        let list = res.data;
-        this.defaultKeys = list.map((item) => {
-          return item.id;
-        });
-        console.log("defaultKeys", this.defaultKeys);
-      });
+      // console.log(row);
+      // usersinits(row.id).then((res) => {
+      //   this.orgId = res.data[res.data.length - 1].displayName;
+      //   this.orgIds = res.data[0].displayName;
+      //   let list = res.data;
+      //   this.defaultKeys = list.map((item) => {
+      //     return item.id;
+      //   });
+      //   console.log("defaultKeys", this.defaultKeys);
+      // });
     },
     //分页
     handleSizeChange(v) {
@@ -1113,12 +1138,17 @@ export default {
   },
 };
 </script>
-<style  scoped>
+<style scoped>
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global_dialog.css";
+@import "../../assets/css/global.css";
+
 ::v-deep .el-card {
   margin-top: -15px;
   /* background-color: #000; */
   border-radius: 15px;
 }
+
 /* ::v-deep .el-card__body {
  
   margin-top: -15px;