zc

src/api/commonality/permission.js

@@ -30,6 +30,13 @@ export function systemUserDropAuthList(data) {
     data: data
   })
 }
+export function systemUserLabDropAuthList(data) {
+  return request({
+    url: '/system/user/lab/dropAuthList',
+    method: 'post',
+    data: data
+  })
+}
 
 
 

src/views/integratedManagement/buildingManagement/index.vue

@@ -6,6 +6,11 @@
         <p style="color:#0183FA;font-size:18px;">{{schoolName}}</p>
         <div class="terr-max-box" v-for="(item,index) in treeList" :key="index">
           <div class="max-name-box">
+            <p v-if="!item.buildFloorVoList[0]" style="width:16px;"></p>
+            <span v-if="!item.onType&&item.buildFloorVoList[0]" @click="terrClick(item)"
+                  class="el-icon-caret-right" style="font-size:20px;margin-right:5px;color: #333;cursor: pointer;"></span>
+            <span v-if="item.onType&&item.buildFloorVoList[0]" @click="terrClick(item)"
+                  class="el-icon-caret-bottom" style="font-size:20px;margin-right:5px;color: #333;cursor: pointer;"></span>
             <p class="max-name" :class="checkTreeId==item.id?'check-color':''" @click="clickCheckTree(item,1)">
               {{item.name}}</p>
             <el-dropdown @command="(command)=>handleCommand(command,item)" trigger="click">
@@ -16,7 +21,7 @@
               </el-dropdown-menu>
             </el-dropdown>
           </div>
-          <div class="terr-big-box" v-for="(itemOne,indexOne) in item.buildFloorVoList" :key="indexOne">
+          <div v-if="item.onType" class="terr-big-box" v-for="(itemOne,indexOne) in item.buildFloorVoList" :key="indexOne">
             <div class="big-name-box">
               <p v-if="!itemOne.buildFloorVoList[0]" style="width:16px;"></p>
               <span v-if="!itemOne.onType&&itemOne.buildFloorVoList[0]" @click="terrClick(itemOne)"
@@ -569,6 +574,7 @@
         systemBuildingGetTreeList({}).then(response => {
           if (response.data[0]) {
             for (let i = 0; i < response.data.length; i++) {
+              response.data[i].onType = true
               for (let o = 0; o < response.data[i].buildFloorVoList.length; o++) {
                 response.data[i].buildFloorVoList[o].onType = true
               }
@@ -581,7 +587,7 @@
             }
             let obj = {
               parentId: this.checkTreeId ? this.checkTreeId : response.data[0].id,
-              type:this.checkTreeType
+              // type:this.checkTreeType
             }
             if(this.checkTreeType == 3){
               this.resetQuery()
@@ -646,7 +652,7 @@
           }
           let obj = {
             parentId: item.id,
-            type:this.checkTreeType
+            // type:this.checkTreeType
           }
           this.$set(this,'parentId',item.parentId);
           if(type == 3){

src/views/integratedManagement/laboratoryManagement/layoutManagement/index.vue

@@ -6,10 +6,15 @@
         <div class="tree-box scrollbar-box" v-if="treeList[0]">
           <div class="terr-max-box" v-for="(item,index) in treeList" :key="index">
             <div class="max-name-box">
+              <p v-if="!item.buildFloorVoList[0]" style="width:16px;"></p>
+              <span v-if="!item.onType&&item.buildFloorVoList[0]" @click="terrClick(item)"
+                    class="el-icon-caret-right" style="font-size:20px;margin-right:5px;color: #333;cursor: pointer;"></span>
+              <span v-if="item.onType&&item.buildFloorVoList[0]" @click="terrClick(item)"
+                    class="el-icon-caret-bottom" style="font-size:20px;margin-right:5px;color: #333;cursor: pointer;"></span>
               <p class="max-name" :class="checkTreeId==item.id?'check-color':''" @click="clickCheckTree(item,1)">
                 {{item.name}}</p>
             </div>
-            <div class="terr-big-box" v-for="(itemOne,indexOne) in item.buildFloorVoList" :key="indexOne">
+            <div v-if="item.onType" class="terr-big-box" v-for="(itemOne,indexOne) in item.buildFloorVoList" :key="indexOne">
               <div class="big-name-box">
                 <p v-if="!itemOne.buildFloorVoList[0]" style="width:16px;"></p>
                 <span v-if="!itemOne.onType&&itemOne.buildFloorVoList[0]" @click="terrClick(itemOne)"
@@ -344,6 +349,7 @@
         systemBuildingGetTreeList({}).then(response => {
           if (response.data[0]) {
             for (let i = 0; i < response.data.length; i++) {
+              response.data[i].onType = true
               for (let o = 0; o < response.data[i].buildFloorVoList.length; o++) {
                 response.data[i].buildFloorVoList[o].onType = true
               }

src/views/integratedManagement/laboratoryManagement/subject/addSubject.vue

@@ -281,7 +281,7 @@
 <script>
 import {
   getDeptDropList, systemBuildingGetOptList, laboratoryClassMoldGetList,
-   systemRoomInfoGetList,systemUserDropAuthList
+   systemRoomInfoGetList,systemUserLabDropAuthList
 } from '@/api/commonality/permission'
 import {
   laboratoryInfoBrandGetClassifyBySubId, laboratoryLevelConfigGetCalculateByData, laboratoryLevelConfigGetList,
@@ -773,7 +773,7 @@ import { chemicalMsdsEdit } from '@/api/chemicalManage'
         /** 下列人员-懒加载 */
         userSelectList(query) {
           if (query !== '' && query.length>1) {
-            systemUserDropAuthList({"nameOrAccount":query,'userType':'1'}).then(response => {
+            systemUserLabDropAuthList({"nameOrAccount":query,'userType':'1'}).then(response => {
               this.$set(this,'optionsUser',response.data);
             });
           } else {
@@ -782,7 +782,7 @@ import { chemicalMsdsEdit } from '@/api/chemicalManage'
         },
         userSelectListOne(query) {
           if (query !== '' && query.length>1) {
-            systemUserDropAuthList({"nameOrAccount":query,'userType':''}).then(response => {
+            systemUserLabDropAuthList({"nameOrAccount":query,'userType':''}).then(response => {
               this.$set(this,'optionsUserOne',response.data);
             });
           } else {

src/views/integratedManagement/personnelManage/studentInfo/index.vue

@@ -30,16 +30,16 @@
               <el-option label="停用" :value="false"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="" prop="cardNumSimple">
-            <el-select v-model="queryParams.cardNumSimple" clearable placeholder="请选择校园卡" style="width:160px;">
-              <el-option
-                v-for="item in professionOptions"
-                :key="item.postId"
-                :label="item.postName"
-                :value="item.postId">
-              </el-option>
-            </el-select>
-          </el-form-item>
+          <!--<el-form-item label="" prop="cardNumSimple">-->
+            <!--<el-select v-model="queryParams.cardNumSimple" clearable placeholder="请选择校园卡" style="width:160px;">-->
+              <!--<el-option-->
+                <!--v-for="item in professionOptions"-->
+                <!--:key="item.postId"-->
+                <!--:label="item.postName"-->
+                <!--:value="item.postId">-->
+              <!--</el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
           <el-form-item v-hasPermiRouter="['system:user:import']">
             <import-component :importConfig="importConfig"></import-component>
           </el-form-item>

src/views/integratedManagement/personnelManage/teacherInfo/index.vue

@@ -42,6 +42,18 @@
                 style="width: 150px"
               />
             </el-form-item>
+            <el-form-item label="" prop="position">
+              <el-select v-model="queryParams.position"
+                         style="width: 170px"
+                         filterable placeholder="身份">
+                <el-option
+                  v-for="item in systemPostList"
+                  :key="item.postId"
+                  :label="item.postName"
+                  :value="item.postId">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="" prop="userState">
               <el-select
                 v-model="queryParams.userState"
@@ -57,21 +69,21 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="" prop="cardNumSimple" >
-              <el-select
-                v-model="queryParams.cardNumSimple"
-                placeholder="请选择校园卡"
-                clearable
-                style="width: 150px"
-              >
-                <el-option
-                  v-for="dict in postionList"
-                  :key="dict.postId"
-                  :label="dict.postName"
-                  :value="dict.postId"
-                />
-              </el-select>
-            </el-form-item>
+            <!--<el-form-item label="" prop="cardNumSimple" >-->
+              <!--<el-select-->
+                <!--v-model="queryParams.cardNumSimple"-->
+                <!--placeholder="请选择校园卡"-->
+                <!--clearable-->
+                <!--style="width: 150px"-->
+              <!--&gt;-->
+                <!--<el-option-->
+                  <!--v-for="dict in postionList"-->
+                  <!--:key="dict.postId"-->
+                  <!--:label="dict.postName"-->
+                  <!--:value="dict.postId"-->
+                <!--/>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
             <el-form-item v-hasPermiRouter="['system:user:import']">
               <import-component :importConfig="importConfig"></import-component>
             </el-form-item>
@@ -215,7 +227,7 @@
   import bindingCardPage from "./bindingCardPage.vue"
   import { setDeptAdd,setDeptUpdate,setDeptDelete,setDeptSort,systemDeptOrganizeStructureByDept,
     systemUserList,systemUserEditState,systemUserResetPasswd,systemUserDelete,
-    systemUserDetail,} from "@/api/commonality/permission";
+    systemUserDetail,systemPostSelect,} from "@/api/commonality/permission";
   import exportComponent from "@/components/exportComponent/exportComponent.vue";
   import importComponent from "@/components/importComponent/importComponent.vue";
 
@@ -306,6 +318,7 @@
           searchValue: "",
           userState: "",
           cardNumSimple: "",
+          position:'',
           userType:1,
         },
         //表格扩展选择器---需要在@selection-change绑定的方法内监控selection数组长度
@@ -326,6 +339,8 @@
             dictValue:true,
           },
         ],
+        //身份列表
+        systemPostList:[],
         //职位列表
         postionList: [
           {
@@ -373,6 +388,7 @@
     },
     created() {
       this.systemDeptOrganizeStructureByDept();
+      this.systemPostSelect();
       this.getList();
     },
     methods: {
@@ -382,6 +398,12 @@
           this.$set(this,'deptOptions',response.data);
         });
       },
+      //身份列表
+      systemPostSelect(){
+        systemPostSelect({}).then(response => {
+          this.$set(this,'systemPostList',response.data);
+        });
+      },
       // 筛选节点
       filterNode(value, data) {
         if (!value) return true;
@@ -553,6 +575,7 @@
           searchValue: "",
           userState: "",
           cardNumSimple: "",
+          position: "",
           userType:1,
         });
         this.systemDeptOrganizeStructureByDept();