fix: 修改门店架构搜索

88bf0c40 · 无尘 · 76fb114f · 88bf0c40 · 88bf0c40 · 88bf0c40
Commit 88bf0c40 authored Jul 01, 2019 by 无尘
4 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.200185dc378aef47bd1c.js></script><script type=text/javascript src=./static/js/vendor.ccdd3a2984b37616bc62.js></script><script type=text/javascript src=./static/js/app.d0684246c06d34757221.js></script></body></html>
\ No newline at end of file
+<!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.43077fb326b227d79690.js></script><script type=text/javascript src=./static/js/vendor.ccdd3a2984b37616bc62.js></script><script type=text/javascript src=./static/js/app.d0684246c06d34757221.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/0.1758b29fb68b8c89cec5.js
+++ b/dist/static/js/0.1758b29fb68b8c89cec5.js
--- a/dist/static/js/manifest.200185dc378aef47bd1c.js
+++ b/dist/static/js/manifest.200185dc378aef47bd1c.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(d,b,n){for(var r,t,o,i=0,u=[];i<d.length;i++)t=d[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(c&&c(d,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var d={},a={81:0};function f(c){if(d[c])return d[c].exports;var a=d[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,f),a.l=!0,a.exports}f.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var d=new Promise(function(d,f){c=a[e]=[d,f]});c[2]=d;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:"1758b29fb68b8c89cec5",1:"0ebe3ead93207dc78a78",2:"fdf82093764059c1200c",3:"3282d88c1532d0ca9c9e",4:"01be0f85b0acd6f1d6df",5:"b4c96ac4faf7502b62f1",6:"12282235c2ce7ff45d56",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:"663ea5d2777417161410",21:"b0e7348ff74371924c3b",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 c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),d},f.m=e,f.c=d,f.d=function(e,c,d){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:d})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!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:"4f8a57d44a06171c53f3",1:"0ebe3ead93207dc78a78",2:"fdf82093764059c1200c",3:"3282d88c1532d0ca9c9e",4:"01be0f85b0acd6f1d6df",5:"b4c96ac4faf7502b62f1",6:"12282235c2ce7ff45d56",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:"663ea5d2777417161410",21:"b0e7348ff74371924c3b",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/components/common/vueSelectStore.vue
+++ b/src/components/common/vueSelectStore.vue
@@ -127,6 +127,7 @@ export default {
      menusObj: {},
      defaultOpen: [], // 默认展开节点的 key 的数组
      selectedList: [], // 已经选择的数据集合
+      copyData: [], // 搜索的时候 copy 已选
      brandSelection: 0, // 看了代码发现这里是取的索引值,不是品牌 id
      brands: [],
      hasOpened: false,
@@ -167,11 +168,15 @@ export default {
          let resData = res.data;
          if (resData.errorCode == 1) {
            that.searchTextData = [];
-            that.searchTextData = [...resData.result.departmentList, ...resData.result.storeList, ...resData.result.searchList];
-            that.searchTextData.forEach(ele => {
+            let mergeData = [...resData.result.departmentList, ...resData.result.storeList, ...resData.result.searchList];
+            mergeData.forEach(ele => {
              ele.label = ele.name || ele.storeName; // 新增
              ele.id = ele.groupId || ele.storeId || ele.employeeClerkId; // 新增
            });
+            that.searchTextData = mergeData;
+            that.$nextTick(() => {
+              that.$refs.searchTree.setCheckedNodes(that.copyData);
+            });
          } else {
            errMsg.errorMsg(resData);
          }
@@ -262,6 +267,18 @@ export default {
      this.$emit('handleTreeSelection', obj, node, 'node');
    },
    /**
+     * 去重
+     *
+     */
+    deleteRepeat(arr) {
+      let hash = {};
+      arr = arr.reduce(function(item, next) {
+        hash[next.id] ? '' : (hash[next.id] = true && item.push(next));
+        return item;
+      }, []);
+      return arr;
+    },
+    /**
     * 获取当前复选框状态改变的节点，如果被选中，将禁用展开
     */
    getCurrentNode: _throttle(function(data, ifChecked, son) {
@@ -269,7 +286,7 @@ export default {
      let that = this;
      data.disableOpen = ifChecked;
      that.$nextTick(() => {
-        that.selectedList = that.$refs.tree.getCheckedNodes();
+        that.selectedList = that.deleteRepeat(that.$refs.tree.getCheckedNodes().concat(that.$refs.searchTree.getCheckedNodes()));
        if (that.treeSet.isSingle && that.selectedList.length > 1) {
          let index = that.selectedList.indexOf(data);
          that.selectedList.splice(1 - index, 1);
@@ -284,9 +301,8 @@ export default {
    searchCheck: _throttle(function(obj, isCheck, child) {
      let that = this;
      // console.log(obj, isCheck, child);
-
      that.$nextTick(() => {
-        that.selectedList = that.$refs.searchTree.getCheckedNodes();
+        that.selectedList = that.deleteRepeat(that.$refs.searchTree.getCheckedNodes().concat(that.$refs.tree.getCheckedNodes()));
        // 判断单选
        if (that.treeSet.isSingle && that.selectedList.length > 1) {
          let index = that.selectedList.indexOf(obj);
@@ -467,9 +483,11 @@ export default {
     * 外抛已选的数据
     */
    submitSelected(e) {
+      let that = this;
+      that.searchText = '';
      e.preventDefault();
-      this.$emit('handleSelectedList', this.selectedList);
-      this.treeSet.dialogVisible = false;
+      that.$emit('handleSelectedList', that.selectedList);
+      that.treeSet.dialogVisible = false;
    },
    /**
     * 选择品牌
@@ -530,9 +548,9 @@ export default {
    }
  },
  watch: {
-    searchText(newK, old) {
-      // this.$refs.tree.filter(newK);
-    },
+    /* searchText(newK, old) {
+      this.$refs.tree.filter(newK);
+    }, */
    defaultList: {
      handler(newValue, oldValue) {
        // 每次选择确认后，发现后端接口返回的数据和，这时候确认后返回的数据是不一样的；