From 835c2b7c4f4a2353892f55e6708b325fad25bf32 Mon Sep 17 00:00:00 2001
From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com>
Date: Sun, 8 Oct 2023 12:01:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 086635a..5e6f2a6 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -51,7 +51,7 @@
                     style="width: 20px; line-height: 150px; padding-top: 5px"
                   />
                 </span>
-                用用户权限管理</span
+                用户权限</span
               >
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item

From 02cef580d4cce4738cef6e8baf3928f15ad731e1 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Sun, 8 Oct 2023 18:08:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fee-settings/Asbitem.vue   |   2 +-
 src/views/fee-settings/Diagnosis.vue | 116 +++++++++++++++++++--------
 src/views/user-list/UserList.vue     | 110 ++++++++++++++++---------
 3 files changed, 155 insertions(+), 73 deletions(-)

diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index 4048a0d..ebe1b8e 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -539,6 +539,7 @@
   </div>
 </template>
 <script>
+import { mapState } from "vuex";
 import Sortable from "sortablejs";
 import { getapi, postapi, deletapi } from "@/api/api";
 import { examinationgender, instrumentlist } from "@/request/systemapi";
@@ -924,7 +925,6 @@ export default {
     rightindex(item, index) {
       this.nums = index;
       this.leftobj = item;
-
       console.log(this.leftobj);
     },
     //左侧添加按钮
diff --git a/src/views/fee-settings/Diagnosis.vue b/src/views/fee-settings/Diagnosis.vue
index 8a51677..b25ad94 100644
--- a/src/views/fee-settings/Diagnosis.vue
+++ b/src/views/fee-settings/Diagnosis.vue
@@ -3,28 +3,37 @@
     <div style="width: 95%">
       <el-card class="elcard" style="border-radius: 15px">
         <div class="publiccss">诊断</div>
-        <el-table
-          :data="tableData"
-          style="width: 100%; margin-top: 20px"
-          row-key="id"
-          class="el-table__body-wrapper tbody"
-          @row-click="rowick"
-          highlight-current-row
-        >
-          <el-table-column prop="id" label="编号" width="300">
-          </el-table-column>
-          <el-table-column prop="displayName" label="名称" width="">
-          </el-table-column>
-          <el-table-column prop="creatorName" label="创建者" width="">
-          </el-table-column>
-          <el-table-column prop="creationTime" label="创建时间" width="200">
+        <div class="" style="display: flex">
+          <div style="margin-left: 5px; margin-top: 15px; width: 15%">
+            <el-tree
+              :data="treedata"
+              :props="defaultProps"
+              @node-click="handleNodeClick"
+            ></el-tree>
+          </div>
+          <div style="width: 80%">
+            <el-table
+              :data="tableData"
+              style="width: 100%; margin-top: 20px"
+              row-key="id"
+              class="el-table__body-wrapper tbody"
+              @row-click="rowick"
+              highlight-current-row
+            >
+              <el-table-column prop="id" label="编号" width="300">
+              </el-table-column>
+              <el-table-column prop="displayName" label="名称" width="">
+              </el-table-column>
+              <el-table-column prop="creatorName" label="创建者" width="">
+              </el-table-column>
+              <!-- <el-table-column prop="creationTime" label="创建时间" width="200">
             <template slot-scope="scope">
               {{ scope.row.creationTime | dateFormat }}
             </template>
-          </el-table-column>
-          <el-table-column prop="lastModifierName" label="修改者" width="">
-          </el-table-column>
-          <el-table-column
+          </el-table-column> -->
+              <el-table-column prop="lastModifierName" label="修改者" width="">
+              </el-table-column>
+              <!-- <el-table-column
             prop="lastModificationTime"
             label="修改时间"
             width="200"
@@ -32,22 +41,33 @@
             <template slot-scope="scope">
               {{ scope.row.lastModificationTime | dateFormat }}
             </template>
-          </el-table-column>
-          <el-table-column label="操作" width="">
-            <template>
-              <el-tag
-                class="move"
-                style="cursor: move; margin-left: 15px;background-color: rgb(245, 245, 245);border:none"
-                draggable="true"
-              >
-                <i
-                  class="el-icon-d-caret"
-                  style="width: 1rem; height: 1rem;color: rgb(113, 113, 113)"
-                ></i>
-              </el-tag>
-            </template>
-          </el-table-column>
-        </el-table>
+          </el-table-column> -->
+              <el-table-column label="操作" width="">
+                <template>
+                  <el-tag
+                    class="move"
+                    style="
+                      cursor: move;
+                      margin-left: 15px;
+                      background-color: rgb(245, 245, 245);
+                      border: none;
+                    "
+                    draggable="true"
+                  >
+                    <i
+                      class="el-icon-d-caret"
+                      style="
+                        width: 1rem;
+                        height: 1rem;
+                        color: rgb(113, 113, 113);
+                      "
+                    ></i>
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
         <!--  -->
         <!-- <span style="margin-top: 10px; padding: 5px; margin-left: 28.5%"
           >项目类别</span
@@ -280,6 +300,7 @@ import { examinationgender, diagsislist } from "@/request/systemapi";
 export default {
   data() {
     return {
+      treedata: [], //树形结构
       num: 0,
       rightdata: [], //右侧数据
       leftdata: [], //左侧数据
@@ -357,6 +378,10 @@ export default {
       ary2: [],
       nums: 0,
       curRow: {},
+      defaultProps: {
+        children: "treeChildren",
+        label: "displayName",
+      },
     };
   },
   created() {
@@ -365,8 +390,26 @@ export default {
   },
   mounted() {
     this.rowDrop();
+    this.getlisttree();
   },
   methods: {
+    getlisttree() {
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        this.treedata = res.data;
+        console.log(res);
+      });
+    },
+    //树形结构点击
+    handleNodeClick(data) {
+      postapi("/api/app/diagnosis/getlistinsuggestion", {
+        diagnosisName: data.diagnosisName,
+        itemTypeId: data.id,
+      }).then((res) => {
+        this.tableData = res.data;
+        console.log(res);
+      });
+      console.log(data);
+    },
     Onsubmit() {
       let sampleGroupId = this.form.id;
       console.log(this.form.id);
@@ -444,6 +487,9 @@ export default {
     gitprojectcategory() {
       getapi("/api/app/item-type/by-code-all").then((res) => {
         this.projectid = res.data;
+        // this.tableData = res.data;
+        
+        console.log(res);
       });
     },
     //ary1 需要追加的数据  ary2目标数组
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index ac39db5..f9ba1f4 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -38,22 +38,33 @@
           </el-col>
         </el-form>
       </el-row>
-      <el-table
-        :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>
-        <!-- <el-table-column prop="name" label="名称" width=""> </el-table-column> -->
-        <!-- <el-table-column prop="lastModificationTime" label="开始时间">
+      <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="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>
+            <!-- <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>
@@ -63,26 +74,28 @@
             {{ scope.row.lastModificationTime | dateFormat }}
           </template>
         </el-table-column> -->
-        <el-table-column label="操作" width="430">
-          <template slot-scope="scope">
-            <el-button type="primary" @click="deleates(scope.row)"
-              >删除</el-button
-            >
-            <el-button type="primary" @click="editmony(scope.row)"
-              >编辑</el-button
-            >
-            <!-- <el-button type="primary" @click="binding(scope.row)"
+            <el-table-column label="操作" width="430">
+              <template slot-scope="scope">
+                <el-button type="primary" @click="deleates(scope.row)"
+                  >删除</el-button
+                >
+                <el-button type="primary" @click="editmony(scope.row)"
+                  >编辑</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="bandinuser(scope.row)"
+                  >绑定角色</el-button
+                >
+                <el-button type="primary" @click="editpassword(scope.row)"
+                  >修改密码</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
       <!-- <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -368,7 +381,9 @@
         </el-form>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="addlsit" class="bulletcommit">确 定</el-button>
+          <el-button type="primary" @click="addlsit" class="bulletcommit"
+            >确 定</el-button
+          >
         </span>
       </el-dialog>
       <!-- 绑定用户组织弹框 -->
@@ -433,7 +448,9 @@
         </el-select>
         <span slot="footer" class="dialog-footer">
           <el-button @click="useerdialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="Identifyusers" class="bulletcommit">确 定</el-button>
+          <el-button type="primary" @click="Identifyusers" class="bulletcommit"
+            >确 定</el-button
+          >
         </span>
       </el-dialog>
       <!-- 修改密码弹框 -->
@@ -457,7 +474,9 @@
           <el-button @click="editpassworddialogVisible = false"
             >取 消</el-button
           >
-          <el-button type="primary" @click="Changepassword" class="bulletcommit">确 定</el-button>
+          <el-button type="primary" @click="Changepassword" class="bulletcommit"
+            >确 定</el-button
+          >
         </span>
       </el-dialog>
     </el-card>
@@ -500,6 +519,12 @@ let validatePassword = /^[a-zA-Z0-9@\$\^\.\*\\?]\{6,15}$/;
 export default {
   data() {
     return {
+      treedata: [],
+      defaultProps: {
+        children: "treeChildren",
+        label: "displayName",
+      },
+      orgIds:[],
       orgId: [],
       confarmPassWord: "", //确认密码
       usersName: "", //用户名
@@ -622,10 +647,21 @@ export default {
     this.password = this.changepassword;
     console.log(this.password);
     this.getlist();
+    this.gettreedata();
     this.idkes = localStorage.getItem("dataidkes");
   },
 
   methods: {
+    gettreedata() {
+      getapi("/api/app/organization-units/by-code-all").then((res) => {
+        this.treedata = res.data;
+        console.log(res);
+      });
+    },
+    handleNodeClick(data) {
+      this.department=data.displayName
+      console.log(data);
+    },
     iscrentddepartment() {
       this.department = this.$refs.department.getCheckedKeys(true);
       console.log(this.department, "www");