Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

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);
     },
     //左侧添加按钮

src/views/fee-settings/Diagnosis.vue

@@ -3,6 +3,15 @@
     <div style="width: 95%">
       <el-card class="elcard" style="border-radius: 15px">
         <div class="publiccss">诊断</div>
+        <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"
@@ -17,14 +26,14 @@
               </el-table-column>
               <el-table-column prop="creatorName" label="创建者" width="">
               </el-table-column>
-          <el-table-column prop="creationTime" label="创建时间" width="200">
+              <!-- <el-table-column prop="creationTime" label="创建时间" width="200">
             <template slot-scope="scope">
               {{ scope.row.creationTime | dateFormat }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
               <el-table-column prop="lastModifierName" label="修改者" width="">
               </el-table-column>
-          <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> -->
               <el-table-column label="操作" width="">
                 <template>
                   <el-tag
                     class="move"
-                style="cursor: move; margin-left: 15px;background-color: rgb(245, 245, 245);border:none"
+                    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)"
+                      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目标数组

src/views/user-list/UserList.vue

@@ -38,7 +38,17 @@
           </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="width: 90%">
           <el-table
+            height="500"
             :data="tableData"
             style="width: 100%; margin-top: 20px"
             border=""
@@ -46,7 +56,8 @@
             <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="email" label="所属角色" width=""> </el-table-column> -->
             <el-table-column prop="phoneNumber" label="手机号" width="">
             </el-table-column>
@@ -83,6 +94,8 @@
               </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");