fix:修改通讯录

ea152651 · 无尘 · 46dcb71f · ea152651 · ea152651 · 46dcb71f
Commit ea152651 authored May 25, 2020 by 无尘
14 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 rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.3aa9715c35d6ba58140b6823406a4f51.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><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 src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.52b1a66fef3cbf367082.js></script><script type=text/javascript src=./static/js/vendor.f7a33833cf6ddd412235.js></script><script type=text/javascript src=./static/js/app.bf526286369e09163e95.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.34577c3881846a35f814f4e62c5be06c.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><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 src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.5531bceb7e947bf86a1e.js></script><script type=text/javascript src=./static/js/vendor.f7a33833cf6ddd412235.js></script><script type=text/javascript src=./static/js/app.1b5406cde392f7f5ce27.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.34577c3881846a35f814f4e62c5be06c.css
+++ b/dist/static/css/app.34577c3881846a35f814f4e62c5be06c.css
--- a/dist/static/css/app.3aa9715c35d6ba58140b6823406a4f51.css
+++ b/dist/static/css/app.3aa9715c35d6ba58140b6823406a4f51.css
--- a/dist/static/js/4.0818de0fe9e1425f752d.js
+++ b/dist/static/js/4.0818de0fe9e1425f752d.js
--- a/dist/static/js/3.a4ff3dc2f07755e9991b.js
+++ b/dist/static/js/3.a4ff3dc2f07755e9991b.js
--- a/dist/static/js/5.b3f327cb4499e1d9d88f.js
+++ b/dist/static/js/5.b3f327cb4499e1d9d88f.js
--- a/dist/static/js/6.49975f0236d705152f51.js
+++ b/dist/static/js/6.49975f0236d705152f51.js
--- a/dist/static/js/6.b1367f4d16e9445db15e.js
+++ b/dist/static/js/6.b1367f4d16e9445db15e.js
--- a/dist/static/js/app.bf526286369e09163e95.js
+++ b/dist/static/js/app.bf526286369e09163e95.js
--- a/dist/static/js/manifest.52b1a66fef3cbf367082.js
+++ b/dist/static/js/manifest.52b1a66fef3cbf367082.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,b,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[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(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},a={77:0};function d(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,d),a.l=!0,a.exports}d.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,d){c=a[e]=[f,d]});c[2]=f;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"773c4a607409e77f286a",1:"06c4e42e62c1f75191f0",2:"d6ab53f5132d06e49643",3:"a4ff3dc2f07755e9991b",4:"0818de0fe9e1425f752d",5:"b3f327cb4499e1d9d88f",6:"49975f0236d705152f51",7:"ece0a2d210892b176e55",8:"7d0a8e6532c58d0c2415",9:"4ce981bdbe4e844d17aa",10:"02124624923334445cee",11:"a10feac3eb71a1aa092d",12:"0b370ee5f1f094e8a182",13:"8b3c8b2d63fb98063c07",14:"659375879cb1d59d0654",15:"c012dfb61128edaf56c6",16:"fefb9f553e5b269f63df",17:"ebf1847c50132c6f96a7",18:"7fa0be27d3ea523f8826",19:"63ca1f785b71646ef739",20:"4f936f5247554d2c790d",21:"a261cb3933029837028f",22:"bb593e90b41132f15c1d",23:"091f2a220d4cf1c0cf2a",24:"7a57624e89e34e420a52",25:"326a8c2ad9617bfe863c",26:"458f45f2633ae24c5755",27:"aa816867f4d0cb0d6131",28:"53e6616ed021ab731d6c",29:"a449f52d59c8c87965fd",30:"d7ab25a9ea9d80dad1a5",31:"18ef42ac5cec84cc247e",32:"5eacba29ca41bf678f26",33:"5452d187803ec0ebd111",34:"8ebb62b8c3c38916341d",35:"8b91df719e56a8d2180f",36:"0e0065924c78e24fac14",37:"5dc35c4db0da65b72ba3",38:"67c2ba02c8cb8e2aeae7",39:"7a089e3108ce4b137839",40:"d0563bc66e10d0ec2ff3",41:"5b5fdd73c94a6be987a4",42:"5f24cb743057dc072bae",43:"51bc93dd50e72a7a505a",44:"e1dc95df16dac16d20f7",45:"2c6b2a0c1ecdf5dbf3c8",46:"501827f4d5d5c14ec5aa",47:"46097b0db930f8998e25",48:"077bb022acf95690f591",49:"c42081f55ebc34a3b283",50:"19df76a6b270a8693b5d",51:"0654d8793fee32332261",52:"7b9cdd5198d1a642e21d",53:"24a43ba6e9c5bffcffd5",54:"c96d447587079f964511",55:"a8319fbd2449d32a7fc6",56:"cbe5f3e6d8639c9bc87f",57:"1d1405bde56276d9e246",58:"bf40a856340d47b74470",59:"8c17fb7bfb27deb040a1",60:"f8533cffd0f274342e15",61:"24d3438dd8c7149c2b3e",62:"2c9efd39ab9c002347f2",63:"1cf4bbb0d08c6125bef5",64:"65cf15e914a79f48b78e",65:"52304eb24aada488c91f",66:"f513a198261eaa15284e",67:"e8e2d929f71e2eb570b7",68:"7c8716b3ed26ffda11fb",69:"18f0e63b47a729fc63d0",70:"b999d4bf8b805f03bd2b",71:"d19b0a20ea22d410b91d",72:"ae171a4233296a9ac4b4",73:"0c069b06ad167faadfc6",74:"1a9f6769ec276b6ccb89"}[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),f},d.m=e,d.c=f,d.d=function(e,c,f){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={77:0};function d(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,d),f.l=!0,f.exports}d.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,d){c=f[e]=[a,d]});c[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,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"773c4a607409e77f286a",1:"06c4e42e62c1f75191f0",2:"d6ab53f5132d06e49643",3:"55ec6b8a21dd86c2f615",4:"31fa6d4ee29a8aae2248",5:"73a0e3818658b09f6122",6:"b1367f4d16e9445db15e",7:"ece0a2d210892b176e55",8:"7d0a8e6532c58d0c2415",9:"4ce981bdbe4e844d17aa",10:"02124624923334445cee",11:"a10feac3eb71a1aa092d",12:"0b370ee5f1f094e8a182",13:"8b3c8b2d63fb98063c07",14:"659375879cb1d59d0654",15:"c012dfb61128edaf56c6",16:"fefb9f553e5b269f63df",17:"ebf1847c50132c6f96a7",18:"7fa0be27d3ea523f8826",19:"63ca1f785b71646ef739",20:"4f936f5247554d2c790d",21:"a261cb3933029837028f",22:"bb593e90b41132f15c1d",23:"091f2a220d4cf1c0cf2a",24:"7a57624e89e34e420a52",25:"326a8c2ad9617bfe863c",26:"458f45f2633ae24c5755",27:"aa816867f4d0cb0d6131",28:"53e6616ed021ab731d6c",29:"a449f52d59c8c87965fd",30:"d7ab25a9ea9d80dad1a5",31:"18ef42ac5cec84cc247e",32:"5eacba29ca41bf678f26",33:"5452d187803ec0ebd111",34:"8ebb62b8c3c38916341d",35:"8b91df719e56a8d2180f",36:"0e0065924c78e24fac14",37:"5dc35c4db0da65b72ba3",38:"67c2ba02c8cb8e2aeae7",39:"7a089e3108ce4b137839",40:"d0563bc66e10d0ec2ff3",41:"5b5fdd73c94a6be987a4",42:"5f24cb743057dc072bae",43:"51bc93dd50e72a7a505a",44:"e1dc95df16dac16d20f7",45:"2c6b2a0c1ecdf5dbf3c8",46:"501827f4d5d5c14ec5aa",47:"46097b0db930f8998e25",48:"077bb022acf95690f591",49:"c42081f55ebc34a3b283",50:"19df76a6b270a8693b5d",51:"0654d8793fee32332261",52:"7b9cdd5198d1a642e21d",53:"24a43ba6e9c5bffcffd5",54:"c96d447587079f964511",55:"a8319fbd2449d32a7fc6",56:"cbe5f3e6d8639c9bc87f",57:"1d1405bde56276d9e246",58:"bf40a856340d47b74470",59:"8c17fb7bfb27deb040a1",60:"f8533cffd0f274342e15",61:"24d3438dd8c7149c2b3e",62:"2c9efd39ab9c002347f2",63:"1cf4bbb0d08c6125bef5",64:"65cf15e914a79f48b78e",65:"52304eb24aada488c91f",66:"f513a198261eaa15284e",67:"e8e2d929f71e2eb570b7",68:"7c8716b3ed26ffda11fb",69:"18f0e63b47a729fc63d0",70:"b999d4bf8b805f03bd2b",71:"d19b0a20ea22d410b91d",72:"ae171a4233296a9ac4b4",73:"0c069b06ad167faadfc6",74:"1a9f6769ec276b6ccb89"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/company/add-relate.vue
+++ b/src/components/company/add-relate.vue
@@ -3,7 +3,7 @@
 * @Author       : 无尘
 * @Date         : 2020-02-13 16:13:59
 * @LastEditors: 无尘
- * @LastEditTime: 2020-05-22 16:43:38
+ * @LastEditTime: 2020-05-25 14:40:58
 * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\add-relate.vue
 -->
 <!--

--- a/src/components/company/contact-tree-filter.vue
+++ b/src/components/company/contact-tree-filter.vue
@@ -3,7 +3,7 @@
 * @Author       : 无尘
 * @Date         : 2020-02-27 13:53:03
 * @LastEditors: 无尘
- * @LastEditTime: 2020-03-17 18:39:53
+ * @LastEditTime: 2020-05-25 14:32:57
 * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\contact-tree-filter.vue
 -->
@@ -15,7 +15,7 @@
 <template>
  <el-tree :filter-node-method="filterNode" :data="groupData" :load="loadNode" node-key="departmentId" ref="groupTrees" lazy default-expand-all :props="defaultProps" :expand-on-click-node="false" @node-click="handleNodeClick">
    <span class="custom-tree-node" slot-scope="{ node, data }">
-      <span :class="['font-14 p-r-10 iconfont', data.isStore == 1 ? 'icondianpu-kuai' : 'iconqiye-tianchong', data.bindFlag == 1 ? 'color-2f54eb' : 'color-dedfe6']"></span><span class="font-14 color-606266">{{ node.label }}</span>
+      <span :class="['font-14 p-r-10 iconfont iconqiye-tianchong', departObj.departmentId == data.departmentId ? 'color-2f54eb' : 'color-dedfe6']"></span><span class="font-14 color-606266">{{ node.label }}</span>
    </span>
  </el-tree>
 </template>
@@ -32,6 +32,20 @@ export default {
      default() {
        return '';
      }
+    },
+    departObj: {
+      type: Object,
+      default() {
+        return {
+          departmentId: '',
+          departmentName: '',
+          wxDepartmentId: '',
+          parentId: '',
+          isStore: '',
+          staffCount: '',
+          bindFlag: ''
+        };
+      }
    }
  },
  data() {

--- a/src/components/company/new-depart-member.vue
+++ b/src/components/company/new-depart-member.vue
@@ -3,7 +3,7 @@
 * @Author       : 无尘
 * @Date         : 2020-02-13 14:02:40
 * @LastEditors: 无尘
- * @LastEditTime: 2020-05-22 14:36:57
+ * @LastEditTime: 2020-05-25 14:35:44
 * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\new-depart-member.vue
 -->
 <!--
@@ -44,16 +44,16 @@
          </el-table-column>
          <el-table-column prop="" label="导购ID">
            <template slot="header" slot-scope="scope">
-            <el-tooltip class="item" effect="light" placement="right">
+              <el-tooltip class="item" effect="light" placement="right">
-              <div slot="content">
+                <div slot="content">
-                是否使用好办3.0小程序
+                  是否使用好办3.0小程序
-              </div>
+                </div>
-              <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;">使用状态</span>
+                <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;">使用状态</span>
-            </el-tooltip>
+              </el-tooltip>
-          </template>
+            </template>
-          <template slot-scope="scope">
+            <template slot-scope="scope">
-            {{ scope.row.isCompleted }}
+              {{ scope.row.isCompleted }}
-          </template>
+            </template>
          </el-table-column>
          <el-table-column prop="" label="操作" show-overflow-tooltip>
            <template slot-scope="scope">
@@ -506,7 +506,7 @@ export default {
      if (Object.keys(newData)) {
        that.currentPage = 1;
        that.getTableList();
-        that.toGetNavData();
+        // that.toGetNavData();
      }
    }
  },
@@ -515,7 +515,7 @@ export default {
    if (Object.keys(that.departObj)) {
      that.currentPage = 1;
      that.getTableList();
-      that.toGetNavData();
+      // that.toGetNavData();
    }
  }
 };

--- a/src/views/business/contacts.vue
+++ b/src/views/business/contacts.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-03-20 14:36:37
 * @LastEditors: 无尘
- * @LastEditTime: 2020-04-28 10:02:02
+ * @LastEditTime: 2020-05-25 14:36:40
 -->
 <template>
  <div class="contacts-wrap common-set-wrap">
@@ -18,43 +18,46 @@
                <el-input placeholder="请输入内容" v-model="searchInput" class="w-225" @keyup.native="value => toInput(value, searchInput)" clearable @clear="clearInput"></el-input>
                <span class="iconfont iconzuzhijiagouguanli p-l-10 cursor-pointer" @click="toManage"></span>
              </div>
-              <div class="help-body flex flex-space-between" @click="showHelp"><span class="font-12 color-2f54eb">查看使用帮助</span><span class="font-14 color-2f54eb el-icon-arrow-right"></span></div>
+              <!--<div class="help-body flex flex-space-between" @click="showHelp"><span class="font-12 color-2f54eb">查看使用帮助</span><span class="font-14 color-2f54eb el-icon-arrow-right"></span></div>
+              -->
              <div class="left-tree p-t-14">
                <contact-tree v-if="!searchInput" :departObj="departObj" :itemData="wxData" v-model="wxData" @getSelectData="getSelectData"></contact-tree>
-                <contact-tree-filter v-show="searchInput" :searchSelect="searchInput" @resetCheckData="resetCheckData"></contact-tree-filter>
+                <contact-tree-filter v-show="searchInput" :departObj="departObj" :searchSelect="searchInput" @resetCheckData="resetCheckData"></contact-tree-filter>
              </div>
            </div>
          </div>
          <div class="apps-content-right">
            <div class="content-right-body border-box" style="min-height: 100%;">
+              <new-depart-member :departObj="departObj"></new-depart-member>
              <!-- 查看是否是部门，不是门店 -->
-              <depart-list v-if="departObj.isStore == 0" :departObj="departObj" @resetData="resetData" @changeDepart="changeDepart" @addDepart="addDepart"></depart-list>
+              <!-- <depart-list v-if="departObj.isStore == 0" :departObj="departObj" @resetData="resetData" @changeDepart="changeDepart" @addDepart="addDepart"></depart-list>
-              <depart-member v-if="departObj.isStore == 0" :departObj="departObj"></depart-member>
+              <depart-member v-if="departObj.isStore == 0" :departObj="departObj"></depart-member>-->
              <!-- 门店的显示门店成员 -->
-              <store-member v-if="departObj.isStore == 1" :departObj="departObj" @changeDepart="changeDepart"></store-member>
+              <!-- <store-member v-if="departObj.isStore == 1" :departObj="departObj" @changeDepart="changeDepart"></store-member>-->
            </div>
          </div>
        </div>
      </div>
    </div>
    <!-- <vue-gic-footer></vue-gic-footer> -->
-    <help-dialog v-if="helpShow" @closeHelp="closeHelp"></help-dialog>
+    <!--<help-dialog v-if="helpShow" @closeHelp="closeHelp"></help-dialog>-->
-    <contact-sync-dialog v-if="syncStatusData.syncStatus == 1 || syncStatusData.syncStatus == 2 || syncStatusData.syncStatus == 3" :syncData="syncStatusData"></contact-sync-dialog>
+    <!--<contact-sync-dialog v-if="syncStatusData.syncStatus == 1 || syncStatusData.syncStatus == 2 || syncStatusData.syncStatus == 3" :syncData="syncStatusData"></contact-sync-dialog>
    <sync-fail v-if="syncStatusData.syncStatus == 5" :syncData="syncStatusData" @refreshSync="refreshSync" @repeatSync="repeatSync"></sync-fail>
+    -->
  </div>
 </template>
 <script>
-import contactSyncDialog from '@/components/company/contact-sync-dialog.vue';
+/* import contactSyncDialog from '@/components/company/contact-sync-dialog.vue';
 import syncFail from '@/components/company/sync-fail.vue';
-import helpDialog from '@/components/company/help-dialog.vue';
+import helpDialog from '@/components/company/help-dialog.vue'; */
 import navCrumb from '@/components/nav/nav.vue';
 import contactTree from '@/components/company/contact-tree.vue';
-import departList from '@/components/company/depart-list.vue';
+// import departList from '@/components/company/depart-list.vue';
-import departMember from '@/components/company/depart-member.vue';
+// import departMember from '@/components/company/depart-member.vue';
-import storeMember from '@/components/company/store-member.vue';
+// import storeMember from '@/components/company/store-member.vue';
 // import contactTreeSearch from '@/components/company/contact-tree-search.vue';
 import contactTreeFilter from '@/components/company/contact-tree-filter.vue';
+import newDepartMember from '@/components/company/new-depart-member.vue';
 import { getRequest } from '@/api/api';
 import errMsg from '@/common/js/error';
 import { _debounce } from '@/common/js/public';
@@ -63,13 +66,14 @@ export default {
  components: {
    navCrumb,
    contactTree,
-    departList,
-    departMember,
-    storeMember,
    contactTreeFilter,
-    helpDialog,
+    // departList,
-    contactSyncDialog,
+    // departMember,
-    syncFail
+    // storeMember,
+    // helpDialog,
+    // contactSyncDialog,
+    // syncFail,
+    newDepartMember
  },
  data() {
    return {