fix: 修改行政架构搜索

3a34c08c · 无尘 · b35832a7 · 3a34c08c · b35832a7 · 3a34c08c
Commit 3a34c08c authored Jul 03, 2019 by 无尘
7 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.331635e1d8d4bf397026093390c55587.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.cf3a75aff2df9736ddc5.js></script><script type=text/javascript src=./static/js/vendor.ccdd3a2984b37616bc62.js></script><script type=text/javascript src=./static/js/app.ae32de3d5f895c010a31.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.331635e1d8d4bf397026093390c55587.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.636c30c6d93789d2fe88.js></script><script type=text/javascript src=./static/js/vendor.ccdd3a2984b37616bc62.js></script><script type=text/javascript src=./static/js/app.ae32de3d5f895c010a31.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/0.92da72568e6af5eba72a.js
+++ b/dist/static/js/0.92da72568e6af5eba72a.js
--- a/dist/static/js/0.a86e6028834c2c306cfa.js
+++ b/dist/static/js/0.a86e6028834c2c306cfa.js
--- a/dist/static/js/manifest.cf3a75aff2df9736ddc5.js
+++ b/dist/static/js/manifest.cf3a75aff2df9736ddc5.js
-!function(e){var d=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(d&&d(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var a={},c={81:0};function f(d){if(a[d])return a[d].exports;var c=a[d]={i:d,l:!1,exports:{}};return e[d].call(c.exports,c,c.exports,f),c.l=!0,c.exports}f.e=function(e){var d=c[e];if(0===d)return new Promise(function(e){e()});if(d)return d[2];var a=new Promise(function(a,f){d=c[e]=[a,f]});d[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"92da72568e6af5eba72a",1:"0ebe3ead93207dc78a78",2:"fdf82093764059c1200c",3:"3282d88c1532d0ca9c9e",4:"01be0f85b0acd6f1d6df",5:"b4c96ac4faf7502b62f1",6:"f23f1b5d7188825408f6",7:"57af0bc90206c6098149",8:"9bd56928cea92db3c119",9:"860dbe8cf83334f9e3c0",10:"956d97940afe04265b88",11:"2d0a192288361dd95250",12:"3d3797e96dc9e8cc5bd4",13:"c01b6415e93d21d1c19f",14:"d9f8f7e5598d599d6b6a",15:"360a92075d219ac84088",16:"bdc37aea4c14db4484c6",17:"18d7b200f29fbb0cc9c8",18:"abdaeaa2156762ec876d",19:"2b9b49e18e64eeb57067",20:"d5bc42e9568015f2689e",21:"93b01771494d9916a557",22:"ae3ca1d035af160b7832",23:"9efbbc6dd315a676ce09",24:"4637a4566383d6e864cf",25:"4f9db49437ea94436d03",26:"e0b684b65d0dbf5d032b",27:"acda88d3c2aa77c9f51c",28:"e1b3c97634b8203082e4",29:"a00a8b4033e1feddfe67",30:"07a39afe8e9361ef44b8",31:"8e77909f1af264b00346",32:"ec0bbd85e6d55909453d",33:"d649a5e4d061985d1c3a",34:"629893b7dd561b646232",35:"d6f0ed32cea79ea624b3",36:"61a1c2681f78e1fd7e80",37:"4353ffce2e97d528bc9b",38:"23b83bd7920693bc35c6",39:"45b7d5b9dbe354877342",40:"18605687ea6ee1539453",41:"78d64ae1581e8ea232cc",42:"56b8d3d551364d7fcf73",43:"dd9e90d8053228b68228",44:"28172dd8dbf35ac350fa",45:"bfad77aa2ad556a32c7c",46:"5e58d02bfb5d53a3e1b5",47:"de0e290ed4c878d0c8c3",48:"6d564387f233c08c800d",49:"eec7bfd1339e83b6fbaf",50:"100db538fff484dd15a0",51:"2710eabc553efae96bbc",52:"1604f87e176e9b354231",53:"42705000b69211a7f7c9",54:"0ec4dfcab9e82667bc72",55:"4b30f436aa310224c29c",56:"d314f0b594c371787d1b",57:"bd1111dcf7321d41dfc1",58:"0b7db83130f5e98d8d8c",59:"9c18352c710f14a3d66d",60:"a91050b5b99485f47ea9",61:"574bada574060a38996c",62:"2f343bde61cf6cf1f46b",63:"038dd5957146c985c766",64:"fa6912661e4aa582bced",65:"9e73109e0288d419a92a",66:"630e2da73073a213de7f",67:"6ebaabb1bf8bdb208677",68:"ba49712f562eff6edbc3",69:"6262c1a9179f86d6e8cc",70:"d5759f121e5783b4c558",71:"95b66215f468ac6aa391",72:"b9aea07ebd1f712eee71",73:"18ea446164b9b7002fde",74:"3a4f20982bf349c4bf08",75:"9d6001a41243544ee007",76:"20c34513d3349ef2f6ee",77:"9f9f5c7a26a4045cd5f7",80:"c4a24f0beb29dbd2892a"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var d=c[e];0!==d&&(d&&d[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},f.m=e,f.c=a,f.d=function(e,d,a){f.o(e,d)||Object.defineProperty(e,d,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var d=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(d,"a",d),d},f.o=function(e,d){return Object.prototype.hasOwnProperty.call(e,d)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var d=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(d&&d(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var c={},a={81:0};function f(d){if(c[d])return c[d].exports;var a=c[d]={i:d,l:!1,exports:{}};return e[d].call(a.exports,a,a.exports,f),a.l=!0,a.exports}f.e=function(e){var d=a[e];if(0===d)return new Promise(function(e){e()});if(d)return d[2];var c=new Promise(function(c,f){d=a[e]=[c,f]});d[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"a86e6028834c2c306cfa",1:"0ebe3ead93207dc78a78",2:"fdf82093764059c1200c",3:"3282d88c1532d0ca9c9e",4:"01be0f85b0acd6f1d6df",5:"b4c96ac4faf7502b62f1",6:"f23f1b5d7188825408f6",7:"57af0bc90206c6098149",8:"9bd56928cea92db3c119",9:"860dbe8cf83334f9e3c0",10:"956d97940afe04265b88",11:"2d0a192288361dd95250",12:"3d3797e96dc9e8cc5bd4",13:"c01b6415e93d21d1c19f",14:"d9f8f7e5598d599d6b6a",15:"360a92075d219ac84088",16:"bdc37aea4c14db4484c6",17:"18d7b200f29fbb0cc9c8",18:"abdaeaa2156762ec876d",19:"2b9b49e18e64eeb57067",20:"d5bc42e9568015f2689e",21:"93b01771494d9916a557",22:"ae3ca1d035af160b7832",23:"9efbbc6dd315a676ce09",24:"4637a4566383d6e864cf",25:"4f9db49437ea94436d03",26:"e0b684b65d0dbf5d032b",27:"acda88d3c2aa77c9f51c",28:"e1b3c97634b8203082e4",29:"a00a8b4033e1feddfe67",30:"07a39afe8e9361ef44b8",31:"8e77909f1af264b00346",32:"ec0bbd85e6d55909453d",33:"d649a5e4d061985d1c3a",34:"629893b7dd561b646232",35:"d6f0ed32cea79ea624b3",36:"61a1c2681f78e1fd7e80",37:"4353ffce2e97d528bc9b",38:"23b83bd7920693bc35c6",39:"45b7d5b9dbe354877342",40:"18605687ea6ee1539453",41:"78d64ae1581e8ea232cc",42:"56b8d3d551364d7fcf73",43:"dd9e90d8053228b68228",44:"28172dd8dbf35ac350fa",45:"bfad77aa2ad556a32c7c",46:"5e58d02bfb5d53a3e1b5",47:"de0e290ed4c878d0c8c3",48:"6d564387f233c08c800d",49:"eec7bfd1339e83b6fbaf",50:"100db538fff484dd15a0",51:"2710eabc553efae96bbc",52:"1604f87e176e9b354231",53:"42705000b69211a7f7c9",54:"0ec4dfcab9e82667bc72",55:"4b30f436aa310224c29c",56:"d314f0b594c371787d1b",57:"bd1111dcf7321d41dfc1",58:"0b7db83130f5e98d8d8c",59:"9c18352c710f14a3d66d",60:"a91050b5b99485f47ea9",61:"574bada574060a38996c",62:"2f343bde61cf6cf1f46b",63:"038dd5957146c985c766",64:"fa6912661e4aa582bced",65:"9e73109e0288d419a92a",66:"630e2da73073a213de7f",67:"6ebaabb1bf8bdb208677",68:"ba49712f562eff6edbc3",69:"6262c1a9179f86d6e8cc",70:"d5759f121e5783b4c558",71:"95b66215f468ac6aa391",72:"b9aea07ebd1f712eee71",73:"18ea446164b9b7002fde",74:"3a4f20982bf349c4bf08",75:"9d6001a41243544ee007",76:"20c34513d3349ef2f6ee",77:"9f9f5c7a26a4045cd5f7",80:"c4a24f0beb29dbd2892a"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var d=a[e];0!==d&&(d&&d[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},f.m=e,f.c=c,f.d=function(e,d,c){f.o(e,d)||Object.defineProperty(e,d,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var d=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(d,"a",d),d},f.o=function(e,d){return Object.prototype.hasOwnProperty.call(e,d)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -6,17 +6,17 @@ import { Message } from 'element-ui';
 /**
 * 获取好办 企业 id
 */
-if (!!localStorage.getItem('userInfo')) {
+/* if (!!localStorage.getItem('userInfo')) {
  let haobanSign = JSON.parse(localStorage.getItem('userInfo')).enterpriseId;
  Vue.axios.defaults.headers.post['haobansign'] = haobanSign;
  Vue.axios.defaults.headers.get['haobansign'] = haobanSign;
-}
+} */
 Vue.axios.defaults.timeout = 25000;
 let local = window.location.origin;
-/* if (local.indexOf('localhost') != -1) {
+if (local.indexOf('localhost') != -1) {
  local = 'http://www.gicdev.com';
-} */
+}
 Vue.axios.interceptors.request.use(
  config => {

--- a/src/components/common/vueSelectEmployee.vue
+++ b/src/components/common/vueSelectEmployee.vue
 <template>
-  <el-dialog :title="treeSet.isSelectPerson ? '选择人员' : '选择部门'" width="660px" :visible.sync="treeSet.dialogVisible">
+  <el-dialog :title="treeSet.isSelectPerson ? '选择人员' : '选择部门'" width="660px" :visible.sync="treeSet.dialogVisible" :before-close="handleClose">
    <div class="transfer-area">
      <div class="select-area t-a-select">
        <p class="title">选择</p>
        <div class="tree-div">
          <div class="input-container">
-            <el-input v-model="searchText" placeholder="请输入内容" suffix-icon="el-icon-search"></el-input>
+            <el-input v-model="searchText" placeholder="请输入内容" suffix-icon="el-icon-search" @keyup.native="value => toInput(e, searchText)"></el-input>
          </div>
-          <!-- :default-expanded-keys="defaultOpen" -->
+          <div class="search-tree" v-show="searchText != '' && showSearch">
-          <el-tree class="search-menu" node-key="id" ref="tree" :check-strictly="true" :data="menuData" show-checkbox :highlight-current="true" :expand-on-click-node="false" icon-class="open-child" :props="myProps" :filter-node-method="filterNode" @check-change="getCurrentNode" @node-expand="nodeOpen" @node-collapse="nodeClose" @node-click="handleNodeClick">
+            <el-tree class="search-menu" node-key="id" ref="employTree" :check-strictly="true" :data="searchTextData" show-checkbox :highlight-current="true" :expand-on-click-node="false" icon-class="open-child" :props="myProps" @check="searchCheck">
-            <span class="custom-tree-node" :class="data.disableOpen ? 'disable-open' : ''" slot-scope="{ node, data }">
+              <span class="custom-tree-node" :class="data.disableOpen ? 'disable-open' : ''" slot-scope="{ node, data }">
-              <span>{{ data.label }}</span>
+                <span>{{ data.label }}</span>
-              <span class="open-btn" v-if="data.childrens">
-                <el-button @click="nodeOpen(data, node)" :disabled="data.disableOpen" type="text" size="small">{{ data.handleWord }}</el-button>
              </span>
-            </span>
+            </el-tree>
-          </el-tree>
+          </div>
+          <div class="search-menu-tree" v-show="searchText == ''">
+            <!-- :default-expanded-keys="defaultOpen" -->
+            <el-tree class="search-menu" node-key="id" ref="tree" :check-strictly="true" :data="menuData" show-checkbox :highlight-current="true" :expand-on-click-node="false" icon-class="open-child" :props="myProps" :filter-node-method="filterNode" @check-change="getCurrentNode" @node-expand="nodeOpen" @node-collapse="nodeClose" @node-click="handleNodeClick">
+              <span class="custom-tree-node" :class="data.disableOpen ? 'disable-open' : ''" slot-scope="{ node, data }">
+                <span>{{ data.label }}</span>
+                <span class="open-btn" v-if="data.childrens">
+                  <el-button @click="nodeOpen(data, node)" :disabled="data.disableOpen" type="text" size="small">{{ data.handleWord }}</el-button>
+                </span>
+              </span>
+            </el-tree>
+          </div>
        </div>
      </div>
      <div class="selected-area t-a-select">
@@ -46,6 +55,7 @@
 <script>
 // import { formatTreeData, deepCopy } from '@/utils/index';
 import { getRequest } from '@/api/api';
+import { _debounce, _throttle } from '@/common/js/public';
 export default {
  name: 'vue-select-employee',
  props: {
@@ -99,6 +109,9 @@ export default {
  data() {
    return {
      searchText: '', // 搜索关键词
+      searchTextData: [],
+      searchTextDataCopy: [],
+      showSearch: false,
      myProps: {
        children: 'childrens',
        label: 'label',
@@ -112,6 +125,46 @@ export default {
  },
  methods: {
    /**
+     * 关闭对话框
+     */
+    handleClose(done) {
+      this.searchText = '';
+      done();
+    },
+    /**
+     * 输入搜索
+     *
+     */
+    toInput: _debounce(function(e, value) {
+      let that = this;
+      that.copyData = JSON.parse(JSON.stringify(that.selectedList));
+      if (value == '') {
+        that.showSearch = false;
+        return false;
+      }
+      that.searchTextData = [];
+      that.getSearchData();
+    }, 500),
+    /**
+     *  获取搜索数据
+     *
+     */
+    getSearchData() {
+      let that = this;
+      if (that.searchText == '') {
+        return false;
+      }
+      let mergeData = that.searchTextDataCopy.filter(ele => {
+        if (that.treeSet.isSelectPerson) {
+          return (ele.type == 1 && ele.name.includes(that.searchText)) || (ele.name.includes(that.searchText) && ele.type == 2 && ele.hasPression == 1);
+        } else {
+          return ele.type == 2 && ele.name.includes(that.searchText) && ele.hasPression == 1;
+        }
+      });
+      that.searchTextData = JSON.parse(JSON.stringify(mergeData));
+      that.showSearch = true;
+    },
+    /**
     * 获取分组架构
     */
    getGroupData() {
@@ -125,9 +178,15 @@ export default {
          let treeData = [];
          let personData = [];
          if (res.data.errorCode == 1) {
-            treeData = res.data.result.departmentList || [];
+            treeData = JSON.parse(JSON.stringify(res.data.result.departmentList)) || [];
-            personData = res.data.result.searchList || [];
+            personData = JSON.parse(JSON.stringify(res.data.result.searchList)) || [];
            that.formatGroupData(treeData, personData);
+            let middleData = [...res.data.result.departmentList, ...res.data.result.searchList];
+            middleData.forEach(ele => {
+              ele.label = ele.name; // 新增
+              ele.id = ele.groupId || ele.employeeClerkId; // 新增
+            });
+            that.searchTextDataCopy = middleData;
          }
        })
        .catch(e => {});
@@ -183,7 +242,7 @@ export default {
        /* eslint-disable */
        if (that.treeSet.isSelectPerson && group.hasPression == 1)
          employees.forEach(person => {
-          // 如果需要现实人，需要将人通过employeeClerkId 和 groupId组装谁
+          // 如果需要显示人，需要将人通过employeeClerkId 和 groupId组装谁
          person.label = person.name;
          person.id = person.employeeClerkId;
          if (person.departmentId == group.groupId) {
@@ -240,10 +299,50 @@ export default {
      }
    },
    /**
+     * 搜索 tree  选择
+     *
+     */
+    searchCheck: _throttle(function(obj, checkObj) {
+      // console.log(obj, checkObj,checkObj.checkedKeys.includes(obj.id));
+      let that = this;
+      if (checkObj.checkedKeys.includes(obj.id)) {
+        that.selectedList.push(obj);
+        let copySelectedList = JSON.parse(JSON.stringify(that.selectedList));
+        let midData = [];
+        copySelectedList.forEach((ele, index) => {
+          if (ele.id != obj.id) {
+            midData.push(ele);
+          }
+        });
+        midData.push(obj);
+        that.selectedList = midData;
+        that.$refs.tree.setCheckedKeys(that.selectedList.map(ele => ele.id));
+        if (that.treeSet.isSingle && that.selectedList.length > 1) {
+          that.selectedList = [obj];
+          that.$refs.tree.setCheckedKeys([obj.id]);
+          that.$refs.employTree.setCheckedKeys([obj.id]);
+        }
+      } else {
+        let copySelectedList = JSON.parse(JSON.stringify(that.selectedList));
+        let midData = [];
+        copySelectedList.forEach((ele, index) => {
+          if (ele.id != obj.id) {
+            midData.push(ele);
+          }
+        });
+        that.selectedList = midData;
+        that.$refs.tree.setCheckedKeys(that.selectedList.map(ele => ele.id));
+        if (that.treeSet.isSingle && that.selectedList.length > 1) {
+          that.selectedList = [];
+        }
+      }
+      this.$forceUpdate();
+    },100),
+    /**
     * 节点展开时，禁用复选框
     */
    nodeOpen(data, self) {
-      data.disabled = true;
+      // data.disabled = true;
      // data.disableOpen = true;
      data.handleWord = '收起';
      // data.disableOpen = false;
@@ -283,6 +382,7 @@ export default {
    submitSelected() {
      this.$emit('handleSelectedList', this.treeSet.isSingle ? this.selectedList[0] : this.selectedList);
      this.treeSet.dialogVisible = false;
+      this.searchText = '';
    },
    /**
     * 渲染回显数据
@@ -306,9 +406,9 @@ export default {
    this.getGroupData();
  },
  watch: {
-    searchText(newK, old) {
+    /* searchText(newK, old) {
      this.$refs.tree.filter(newK);
-    },
+    }, */
    treeSet: {
      handler(newValue, oldValue) {
        if (newValue.dialogVisible) {
@@ -320,7 +420,10 @@ export default {
    changed() {
      this.getGroupData(); // 监听到场景变化，重新渲染数据
    }
-  }
+  },
+  destroyed() {
+    this.searchText = '';
+  },
 };
 </script>
 <style lang="scss">

--- a/src/components/common/vueSelectStore.vue
+++ b/src/components/common/vueSelectStore.vue
 <template>
-  <el-dialog :title="treeSet.isSelectPerson ? '选择人员' : '选择部门'" width="660px" :visible.sync="treeSet.dialogVisible">
+  <el-dialog :title="treeSet.isSelectPerson ? '选择人员' : '选择部门'" width="660px" :visible.sync="treeSet.dialogVisible" :before-close="handleClose">
    <div class="transfer-area">
      <div class="select-area t-a-select">
        <p class="title">选择</p>
@@ -139,6 +139,13 @@ export default {
  },
  methods: {
    /**
+     * 关闭对话框
+     */
+    handleClose(done) {
+      this.searchText = '';
+      done();
+    },
+    /**
     * 输入搜索
     *
     */
@@ -661,6 +668,7 @@ export default {
  },
  destroyed() {
    this.brandSelection = '';
+    this.searchText = '';
  },
 };
 </script>