fix: 修改共享通讯录

e0ce61b4 · 无尘 · de39c141 · e0ce61b4 · e0ce61b4 · de39c141
Commit e0ce61b4 authored Feb 14, 2019 by 无尘
6 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.0cfdcfe0edd35fbbdd83fc8551914db6.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.6d87d82916085c2aefb9.js></script><script type=text/javascript src=./static/js/vendor.fe6bbed1214c1931680c.js></script><script type=text/javascript src=./static/js/app.6dd7e4c2fbe899de87b6.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.0cfdcfe0edd35fbbdd83fc8551914db6.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.956442f7794f2bbac0b9.js></script><script type=text/javascript src=./static/js/vendor.fe6bbed1214c1931680c.js></script><script type=text/javascript src=./static/js/app.6dd7e4c2fbe899de87b6.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/2.0d6d73e32c05342a6b4f.js
+++ b/dist/static/js/2.0d6d73e32c05342a6b4f.js
--- a/dist/static/js/2.26e802bc83eddccb044e.js
+++ b/dist/static/js/2.26e802bc83eddccb044e.js
--- a/dist/static/js/manifest.6d87d82916085c2aefb9.js
+++ b/dist/static/js/manifest.6d87d82916085c2aefb9.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={44:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"058fa855216adb025c6e",1:"4e5dc79adcf9e1d40da1",2:"26e802bc83eddccb044e",3:"ee5f96ccd86096fdb93d",4:"92900e5c5378a99d4039",5:"187486e9ce4832c7a496",6:"bcf4532e6a55dfcc50de",7:"20c8fc01a64d0bee7908",8:"bc9879c18e0eefd45736",9:"15688b0db662eb3c8a3c",10:"57f2fb8bbc63839f5773",11:"904fb1ec168a22ec03a3",12:"f33078370ab13436ea86",13:"08722ee45125c71ddcc4",14:"77e4db510298dea69bac",15:"c1af29c03e9ea581b088",16:"042df5fb4761f8d63732",17:"887050bb5f0658f1b46d",18:"fac3599983193321b888",19:"24d3b04047c477417e69",20:"017a9cfa661e84320607",21:"1a97216861297187e706",22:"9396f058f548a7ff200d",23:"2d4fb5655c6a50627ac3",24:"33e12e5c70ce1cff61d1",25:"e272d1fc498ba8f986ef",26:"2b908724cc25801d0b99",27:"865536a443cc6232569b",28:"9e07fe8f120cba9b2df2",29:"04489cdf017d8777c1b9",30:"14142bcb973f0afe0a18",31:"a62c5926bf4e4421463d",32:"85f2494136f65d3a6b5a",33:"3bf02e95ad50680b4afe",34:"c8f046d51079355bae4b",35:"885a801d42aaff93b690",36:"87aa13a9b3d819fd2237",37:"66e202bba2f9514c92ad",38:"98a6c7e8051c5e9fc18e",39:"8045d12e71a739a946f9",40:"0342cde8f52fadd8217e",43:"13848f214bb993c20004"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={44:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"058fa855216adb025c6e",1:"4e5dc79adcf9e1d40da1",2:"0d6d73e32c05342a6b4f",3:"ee5f96ccd86096fdb93d",4:"92900e5c5378a99d4039",5:"187486e9ce4832c7a496",6:"bcf4532e6a55dfcc50de",7:"20c8fc01a64d0bee7908",8:"bc9879c18e0eefd45736",9:"15688b0db662eb3c8a3c",10:"57f2fb8bbc63839f5773",11:"904fb1ec168a22ec03a3",12:"f33078370ab13436ea86",13:"08722ee45125c71ddcc4",14:"77e4db510298dea69bac",15:"c1af29c03e9ea581b088",16:"042df5fb4761f8d63732",17:"887050bb5f0658f1b46d",18:"fac3599983193321b888",19:"24d3b04047c477417e69",20:"017a9cfa661e84320607",21:"1a97216861297187e706",22:"9396f058f548a7ff200d",23:"2d4fb5655c6a50627ac3",24:"33e12e5c70ce1cff61d1",25:"e272d1fc498ba8f986ef",26:"2b908724cc25801d0b99",27:"865536a443cc6232569b",28:"9e07fe8f120cba9b2df2",29:"04489cdf017d8777c1b9",30:"14142bcb973f0afe0a18",31:"a62c5926bf4e4421463d",32:"85f2494136f65d3a6b5a",33:"3bf02e95ad50680b4afe",34:"c8f046d51079355bae4b",35:"885a801d42aaff93b690",36:"87aa13a9b3d819fd2237",37:"66e202bba2f9514c92ad",38:"98a6c7e8051c5e9fc18e",39:"8045d12e71a739a946f9",40:"0342cde8f52fadd8217e",43:"13848f214bb993c20004"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/contacts/share/searchMenu.vue
+++ b/src/components/contacts/share/searchMenu.vue
 <template>
  <div class="searh-menu-container">
    <div class="p-0-15">
-      <el-input prefix-icon="el-icon-search" v-model="searchKey" placeholder="姓名/手机号/部门名称" clearable @clear="clearFn" @keyup.enter.native="searchFn"></el-input>
+      <el-input
+        prefix-icon="el-icon-search"
+        v-model="searchKey"
+        placeholder="姓名/手机号/部门名称"
+        clearable
+        @clear="clearFn"
+        @keyup.enter.native="searchFn">
+      </el-input>
      <slot name="buttonBox"></slot>
    </div>
    <template v-if="!searchResultShow">
@@ -10,19 +17,36 @@
          <p class="area-title">{{area.title}}</p>
          <p class="share-title">我方共享给对方的所有人员</p>
          <div class="p-0-15">
-            <el-tree class="search-menu" node-key="id" :default-expanded-keys="defaultOpen" :data="area.shares[0].childrens" :highlight-current="true" :expand-on-click-node="false" :props="myProps" @node-click="handleNodeClick">
+            <el-tree
+              class="search-menu"
+              node-key="id"
+              :default-expanded-keys="defaultOpen"
+              :data="area.shares[0].childrens"
+              :highlight-current="true"
+              :expand-on-click-node="false"
+              :props="myProps"
+              @node-click="handleNodeClick">
              <span class="custom-tree-node" slot-scope="{ node, data }">
-                                <i class="iconfont" :class="node.level == 1 ? 'icon-2zuzhijiagou' : 'icon-tongshi-zuzhijiagou'"></i>
+                <i class="iconfont" :class="node.level == 1 ? 'icon-2zuzhijiagou' : 'icon-tongshi-zuzhijiagou'"></i>
-                                <span>{{ node.label }}</span>
+                <span>{{ node.label }}</span>
              </span>
            </el-tree>
          </div>
          <p class="share-title">对方共享给我方的所有人员<i class="el-icon-upload"></i></p>
          <div class="p-0-15">
-            <el-tree v-if="!searchResultShow" class="search-menu" node-key="id" :default-expanded-keys="defaultOpen" :data="area.shares[1].childrens" :highlight-current="true" :expand-on-click-node="false" :props="myProps" @node-click="handleNodeClick">
+            <el-tree
+              v-if="!searchResultShow"
+              class="search-menu"
+              node-key="id"
+              :default-expanded-keys="defaultOpen"
+              :data="area.shares[1].childrens"
+              :highlight-current="true"
+              :expand-on-click-node="false"
+              :props="myProps"
+              @node-click="handleNodeClick">
              <span class="custom-tree-node" slot-scope="{ node, data }">
-                                <i class="iconfont" :class="node.level == 1 ? 'icon-2zuzhijiagou' : 'icon-tongshi-zuzhijiagou'"></i>
+                <i class="iconfont" :class="node.level == 1 ? 'icon-2zuzhijiagou' : 'icon-tongshi-zuzhijiagou'"></i>
-                                <span>{{ node.label }}</span>
+                <span>{{ node.label }}</span>
              </span>
            </el-tree>
          </div>
@@ -97,7 +121,7 @@ export default {
      let shareArea = [];
      let userInfo = window.localStorage.getItem("userInfo");
      let enterpriseId = JSON.parse(userInfo).enterpriseId;
-      let ths = this;
+      let that = this;
      let hasFirst = false;
      treeData.forEach((rlt, index) => {
        if (rlt.exportEnterpriseId == enterpriseId) { // 根据exportEnterpriseId判断企业是否为自己的企业
@@ -110,40 +134,41 @@ export default {
          // rlt.shares = [rlt];
          rlt.childrens = rlt.ext.sharedContactDepartmentStoreGroupList;
          rlt.childrens.forEach(group => {
-            ths.formatGroup(group, 1);
+            that.formatGroup(group, 1);
          });
          if (!hasFirst) {
            hasFirst = true;
-            ths.$emit("getEmployeeFirst", rlt.childrens[0]);
+            that.$emit("getEmployeeFirst", rlt.childrens[0]);
          }
-          this.defaultOpen.push(rlt.childrens[0].id);
+          that.defaultOpen.push(rlt.childrens[0].id);
-          this.defaultOpen.push(rlt.childrens[1].id);
+          that.defaultOpen.push(rlt.childrens[1].id);
          treeData.forEach(son => {
            if (son.exportEnterpriseId == rlt.importEnterpriseId) {
              son.childrens = son.ext.sharedContactDepartmentStoreGroupList;
              son.childrens.forEach(group => {
-                ths.formatGroup(group, 0);
+                that.formatGroup(group, 0);
              });
              obj.shares.push(son);
-              this.defaultOpen.push(son.childrens[0].id);
+              that.defaultOpen.push(son.childrens[0].id);
-              this.defaultOpen.push(son.childrens[1].id);
+              that.defaultOpen.push(son.childrens[1].id);
            }
          });
          shareArea.push(obj);
        }
      });
-      console.log(shareArea);
+      console.log("shareArea:",shareArea);
-      this.shareArea = shareArea;
+      that.shareArea = shareArea;
+      that.$forceUpdate();
    },
    formatGroup(group, isMine) {
-      let ths = this;
+      let that = this;
      group.id = group.sharedContactGroupId;
      group.label = group.name;
      group.isMine = isMine;
      if (!!group.ext && !!group.ext.sharedContactDepartmentStoreGroupList) {
        group.childrens = group.ext.sharedContactDepartmentStoreGroupList;
        group.childrens.forEach(son => {
-          ths.formatGroup(son, isMine);
+          that.formatGroup(son, isMine);
        });
      }
    },
@@ -232,11 +257,13 @@ export default {
  },
  watch: {
    treeData(newArr, old) {
+      console.log("treeData-newArr:",newArr)
      this.formatGroupData(newArr);
    }
  },
  mounted() {
    this.formatGroupData(this.treeData);
+    console.log('this.treeData:', this.treeData)
  }
 };

--- a/src/views/contacts/shareContact.vue
+++ b/src/views/contacts/shareContact.vue
@@ -527,6 +527,7 @@ export default {
          that.loading = false;
        }else {
          errMsg.errorMsg(resData)
+          that.loading = false;
        }
      }).catch(e => {
        that.$message.error({
@@ -539,6 +540,7 @@ export default {
     */
    getEmployeeFirst(obj) {
      this.groupInfo = obj;
+      console.log('First:',obj)
      this.getEmployee();
    },
    getEmployee() {