提交

src/views/permission/department/index.vue

@@ -35,7 +35,7 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item :label="$t('common.keyword')">
-              <el-input v-model="listQuery.keyword" :placeholder="$t('common.enterKeyword')"
+              <el-input v-model="listQuery.keyword" placeholder="请输入部门名称查询"
                 clearable @keyup.enter.native="search()" />
             </el-form-item>
           </el-col>
@@ -193,7 +193,7 @@ export default {
       this.treeLoading = true;
       this.organizeId=this.$store.state.user.userInfo.organizeId;
       if(this.organizeId=='96240625-934F-490B-8AA6-0BC775B18468'){
-        getOrganizeList().then(res => {
+        getOrganizeList({'hidden':'1'}).then(res => {
           this.treeData = res.data.list
           this.$nextTick(() => {
             if (!this.treeData.length) {

src/views/permission/organize/index.vue

@@ -5,7 +5,7 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item :label="$t('common.keyword')">
-              <el-input v-model="listQuery.keyword" :placeholder="$t('common.enterKeyword')"
+              <el-input v-model="listQuery.keyword" placeholder="请输入名称查询"
                         clearable @keyup.enter.native="search()" />
             </el-form-item>
           </el-col>

src/views/permission/position/index.vue

@@ -35,7 +35,7 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item :label="$t('common.keyword')">
-              <el-input v-model="listQuery.keyword" :placeholder="$t('common.enterKeyword')"
+              <el-input v-model="listQuery.keyword" placeholder="请输入岗位名称查询"
                 clearable @keyup.enter.native="search()" />
             </el-form-item>
           </el-col>
@@ -196,7 +196,7 @@ export default {
       this.organizeId=this.$store.state.user.userInfo.organizeId;
       if(this.organizeId=='96240625-934F-490B-8AA6-0BC775B18468'){
 
-        getOrganizeList().then(res => {
+        getOrganizeList({'hidden':'1'}).then(res => {
        /*   let topItem = {
             fullName: "全部",
             hasChildren: true,

src/views/permission/xlwjfflxr/index.vue

@@ -35,7 +35,7 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item :label="$t('common.keyword')">
-              <el-input v-model="listQuery.keyword" placeholder="请输入账号、姓名、性别或者手机号查询"
+              <el-input v-model="listQuery.keyword" placeholder="请输入姓名或者手机号查询"
                         clearable @keyup.enter.native="search()" />
             </el-form-item>
           </el-col>

src/views/permission/xlwjfflxr/person.vue

@@ -45,7 +45,7 @@
           </div>
           <div class="transfer-pane__body">
             <el-tree :data="treeData" :props="props" check-on-click-node
-                     :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick"
+                     :expand-on-click-node="false"  @node-click="handleNodeClick"
                      class="JNPF-common-el-tree" node-key="id" v-loading="loading" ref="tree"
                      :filter-node-method="filterNode">
               <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -243,11 +243,10 @@ export default {
       this.allList = this.treeToArray(this.treeData)*/
       let organizeId=this.$store.state.user.userInfo.organizeId;
       this.loading=false;
-  /*     if(organizeId=='96240625-934F-490B-8AA6-0BC775B18468'){
-        getOrganize(organizeId).then(res => {
-          /!* this.treeData = res.data.list *!/
+       if(organizeId=='96240625-934F-490B-8AA6-0BC775B18468'){
+         getOrganizeList({'hidden':'1'}).then(res => {
           console.log(res)
-          function removeDepartments(data) {
+        /*   function removeDepartments(data) {
             // 遍历数组中的每个对象
             for (let i = 0; i < data.length; i++) {
               const item = data[i];
@@ -270,14 +269,14 @@ export default {
           }
 
 // 使用示例
-          const processedData = removeDepartments(res.data);
-          console.log(processedData);
-          this.treeData=processedData;
+          const processedData = removeDepartments(res.data.list);
+          console.log(processedData); */
+          this.treeData=res.data.list;
           this.allList = this.treeToArray(this.treeData)
           this.loading=false;
         })
 
-      }else{ */
+      }else{
         getOrganize(organizeId).then(res => {
           console.log(res,'ggggggggggg')
           this.treeData = res.data;
@@ -286,7 +285,7 @@ export default {
 
         })
 
-     /*  } */
+       }
 
     },
     treeToArray(treeData) {