10

src/views/integratedManagement/buildingManagement/index.vue

@@ -3,6 +3,21 @@
   <div class="app-container buildingManagement">
     <div class="max-left-box">
       <div class="tree-box scrollbar-box" v-if="treeList[0]">
+        <div>
+          <el-form :model="threeParams" class="form-box" ref="queryForm"
+          :inline="true" style="width:100%;display: flex">
+            <el-form-item label="" prop="name">
+              <el-input
+                maxLength="30"
+                v-model="threeParams.name"
+                placeholder="楼栋/楼层"
+                style="width: 150px"
+              />
+            </el-form-item>
+            <p class="page-inquire-common-style-button" style="width:50px;" @click="getTree">查询</p>
+            <p class="page-reset-common-style-button" style="width:50px;" @click="resetTree">重置</p>
+          </el-form>
+        </div>
         <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">
@@ -333,6 +348,10 @@
         dialogRoomTitle:"",
         dialogRoomOpen:false,
         dialogRoomForm:{},
+        //树查询条件
+        threeParams:{
+          name:'',
+        },
       }
     },
     created() {
@@ -342,6 +361,13 @@
       this.getTreeList();
     },
     methods: {
+      getTree(){
+        this.getTreeList();
+      },
+      resetTree(){
+        this.$set(this.threeParams,'name','');
+        this.getTreeList();
+      },
       //新增学校/楼栋/楼层数据
       addBuildFloor(type) {
         this.$refs['dialogForm'].validate(valid => {
@@ -571,7 +597,7 @@
       },
       //获取学校/楼栋/楼层树状数据
       getTreeList() {
-        systemBuildingGetTreeList({}).then(response => {
+        systemBuildingGetTreeList(this.threeParams).then(response => {
           if (response.data[0]) {
             for (let i = 0; i < response.data.length; i++) {
               response.data[i].onType = true
@@ -580,6 +606,7 @@
               }
             }
             this.$set(this, 'treeList', response.data)
+            this.clickCheckTree(response.data[0],1);
             if (!this.checkTreeId) {
               this.$set(this, 'checkTreeId', response.data[0].id)
               this.$set(this, 'yxName', response.data[0].name)

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

@@ -3,6 +3,21 @@
   <div class="app-container building">
     <div class="buildingManagement" v-if="pageType == 1">
       <div class="max-left-box">
+        <div>
+          <el-form :model="threeParams" class="form-box" ref="queryForm"
+                   :inline="true" style="width:100%;display: flex">
+            <el-form-item label="" prop="name">
+              <el-input
+                maxLength="30"
+                v-model="threeParams.name"
+                placeholder="楼栋/楼层"
+                style="width: 150px;margin-right:10px;margin-left:-10px;"
+              />
+            </el-form-item>
+            <p class="page-inquire-common-style-button" style="width:50px;margin-right:10px;" @click="getTree">查询</p>
+            <p class="page-reset-common-style-button" style="width:50px;" @click="resetTree">重置</p>
+          </el-form>
+        </div>
         <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">
@@ -331,6 +346,10 @@
         zoomData: null,
         minZoomData: null,
         dialogBuildingData:[],
+        //树查询条件
+        threeParams:{
+          name:'',
+        },
       }
     },
     created() {
@@ -340,13 +359,21 @@
       this.systemBuildingGetTreeList()
       this.getDicts('layout_room_type').then(response => {
         this.roomTypeOptions = response.data
+        this.clickCheckTree(response.data[0],1);
         this.roomTypeOptions.push({ label: '其他', value: '-99' })
       })
     },
     methods: {
+      getTree(){
+        this.systemBuildingGetTreeList();
+      },
+      resetTree(){
+        this.$set(this.threeParams,'name','');
+        this.systemBuildingGetTreeList();
+      },
       //获取学校/楼栋/楼层数据
       systemBuildingGetTreeList() {
-        systemBuildingGetTreeList({}).then(response => {
+        systemBuildingGetTreeList(this.threeParams).then(response => {
           if (response.data[0]) {
             for (let i = 0; i < response.data.length; i++) {
               response.data[i].onType = true

src/views/systemManagement/organizationalStructure/index.vue

@@ -36,14 +36,14 @@
           <el-table-column label="名称" align="left" prop="deptName"  show-overflow-tooltip/>
           <el-table-column label="简称" align="left" prop="deptShortName" width="200" show-overflow-tooltip/>
           <el-table-column label="编号" align="left" prop="deptNum" width="200" show-overflow-tooltip>
-            <template slot-scope="scope" v-if="scope.row.deptId != parentId ">{{scope.row.deptNum}}</template>
+            <template slot-scope="scope" v-if="scope.row.level != 1">{{scope.row.deptNum}}</template>
           </el-table-column>
           <el-table-column label="是否为学院" align="left" prop="content" width="140" show-overflow-tooltip>
-            <template slot-scope="scope" v-if="scope.row.deptId != parentId ">{{scope.row.deptType == 1 ? '学院' : ''}}</template>
+            <template slot-scope="scope" v-if="scope.row.level != 1">{{scope.row.deptType == 1 ? '学院' : ''}}</template>
           </el-table-column>
           <el-table-column label="状态" align="left" prop="state" width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <div v-if="scope.row.deptId != parentId"
+              <div v-if="scope.row.level != 1"
                    v-hasPermiRouter="['system:dept:edit']">
                 <el-switch
                   @click.native="tableButton(4,scope.row)"
@@ -73,12 +73,12 @@
                    v-hasPermiRouter="['system:dept:edit']"
                 >编辑</p>
                 <p class="table-button-p"
-                   v-if="scope.row.deptId != parentId "
+                   v-if="scope.row.level != 1"
                    @click="tableButton(3,scope.row)"
                    v-hasPermiRouter="['system:dept:del']"
                 >删除</p>
                 <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-                             v-if="scope.row.deptId != parentId "
+                             v-if="scope.row.level != 1"
                              v-hasPermiRouter="['system:dept:move']">
                   <p class="table-button-p">更多>></p>
                   <el-dropdown-menu slot="dropdown">
@@ -118,7 +118,7 @@
             <el-radio :label="false">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="treeForm.parentId == parentId"
+        <el-form-item v-if="treeForm.level == 2"
                        label="部门类型" prop="deptType" label-width="90px">
           <el-radio-group v-model="treeForm.deptType" style="margin:4px 0 0 10px;">
             <el-radio :label="1">学院</el-radio>
@@ -162,7 +162,7 @@
                   <el-radio :label="false">禁用</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item v-if="treeAddForm.parentId == parentId"
+              <el-form-item v-if="treeAddForm.level == 1"
                             label="部门类型" :prop="'teaCherDpetList.' + index + '.deptType'" :rules="rules.deptType" label-width="90px">
                 <el-radio-group v-model="item.deptType" style="margin:4px 0 0 10px;">
                   <el-radio :label="1">学院</el-radio>
@@ -309,7 +309,7 @@
               deptName:this.treeForm.deptName,
               deptShortName:this.treeForm.deptShortName,
               state:this.treeForm.state,
-              deptType:this.treeForm.parentId == this.parentId ? this.treeForm.deptType : 0,
+              deptType:this.treeForm.level == 2 ? this.treeForm.deptType : 0,
             };
             setDeptUpdate(obj).then(response => {
               this.treeOpen = false;
@@ -334,7 +334,7 @@
                 deptName:this.treeAddForm.teaCherDpetList[i].deptName,
                 deptShortName:this.treeAddForm.teaCherDpetList[i].deptShortName,
                 state:this.treeAddForm.teaCherDpetList[i].state,
-                deptType:this.treeAddForm.parentId == this.parentId ? this.treeAddForm.teaCherDpetList[i].deptType : 0,
+                deptType:this.treeAddForm.level == 2 ? this.treeAddForm.teaCherDpetList[i].deptType : 0,
               }
               newObj.teaCherDpetList.push(obj);
             }
@@ -392,13 +392,14 @@
           //新增
           let obj = {
             parentId:row.deptId,
+            level:row.level,
             teaCherDpetList:[
               {
                 deptNum:"",
                 deptName:"",
                 deptShortName:"",
                 state:true,
-                deptType:row.deptId == this.parentId ? 1:0
+                deptType:row.level == 1 ? 1:0
               }
             ]
           }
@@ -410,6 +411,7 @@
           let newObj = {
             deptId:obj.deptId,
             parentId:obj.parentId,
+            level:obj.level,
             deptNum:obj.deptNum,
             deptName:obj.deptName,
             deptShortName:obj.deptShortName,