fix: 修改共享通讯录 table判断

c70a1bb4 · 无尘 · 6693bed9 · c70a1bb4 · c70a1bb4 · c70a1bb4
Commit c70a1bb4 authored Feb 14, 2019 by 无尘
8 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.650e5d9da04580c4a614a9f411a2d0ef.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.2aad89833fb5296c2d36.js></script><script type=text/javascript src=./static/js/vendor.fe6bbed1214c1931680c.js></script><script type=text/javascript src=./static/js/app.fcc6245b351db2c52627.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.0cfdcfe0edd35fbbdd83fc8551914db6.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.d71259f1a35d5e77241c.js></script><script type=text/javascript src=./static/js/vendor.fe6bbed1214c1931680c.js></script><script type=text/javascript src=./static/js/app.fcc6245b351db2c52627.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.650e5d9da04580c4a614a9f411a2d0ef.css
+++ b/dist/static/css/app.650e5d9da04580c4a614a9f411a2d0ef.css
--- a/dist/static/js/2.58f05cc98f18864e3eed.js
+++ b/dist/static/js/2.58f05cc98f18864e3eed.js
--- a/dist/static/js/2.d1074b81c4bfff1e7fcd.js
+++ b/dist/static/js/2.d1074b81c4bfff1e7fcd.js
--- a/dist/static/js/manifest.2aad89833fb5296c2d36.js
+++ b/dist/static/js/manifest.2aad89833fb5296c2d36.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,b,d,i=0,u=[];i<a.length;i++)b=a[i],f[b]&&u.push(f[b][0]),f[b]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=n(n.s=t[i]);return d};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:"d1074b81c4bfff1e7fcd",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:"421e7b88a9f2266350a4",28:"ab73354ef434c56eb52a",29:"67a274bbebe4b7b5c3f3",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 o=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(o);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=b,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
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);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:"58f05cc98f18864e3eed",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:"421e7b88a9f2266350a4",28:"ab73354ef434c56eb52a",29:"67a274bbebe4b7b5c3f3",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 o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,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/clerkView.vue
+++ b/src/components/contacts/share/clerkView.vue
 <template>
  <div>
    <el-table
-            @selection-change="selectMember"
      ref="clerkViewTable"
      class="diy-table"
-            height="445"
-            :data="tableData">
-            <el-table-column
-                type="selection"
-                width="42"
-            ></el-table-column>
-            <el-table-column
-                label="门店"
-                width="175"
-                prop="employeeStoreName"
-            ></el-table-column>
-            <el-table-column
-                label="门店code"
-                prop="storeCode"
-                width="175"
-            ></el-table-column>
+      :height="tableData.length? tableH:'auto'"
+      :data="tableData"
+      @selection-change="selectMember" >
+      <el-table-column type="selection" width="42"></el-table-column>
+      <el-table-column label="门店" width="175" prop="employeeStoreName"></el-table-column>
+      <el-table-column label="门店code" prop="storeCode" width="175"></el-table-column>
      <el-table-column>
        <template slot="header" slot-scope="scope">
          <ul class="diy-header">
@@ -54,16 +43,17 @@ export default {
  props: {
    tableData: {
      type: Array,
-            default() {
+      default () {
        return [];
      }
    }
  },
  data() {
    return {
+      tableH: window.screen.availHeight - 440 - 250,
      storeType: 0,
      typeArr: ["全部类型", "自营", "联营", "代理(加盟)", "代销", "托管"],
-            storeStatus:"",
+      storeStatus: "",
      showChildMember: false
    };
  },
@@ -89,31 +79,40 @@ export default {
    }
  }
 };
+
 </script>
 <style lang="scss">
-  .diy-table {
+.diy-table {
  .diy-header {
    display: flex;
+
    .name {
      width: 130px;
    }
-                .phone, .position {
+
+    .phone,
+    .position {
      width: 125px;
    }
+
    .status {
      width: 100px;
    }
  }
+
  .clerk-obj-li {
    display: flex;
    padding: 10px 0;
    margin-bottom: 25px;
    line-height: 32px;
+
    &:last-child {
      margin-bottom: 0;
    }
+
    .clerk-name {
      width: 130px;
+
      .manager {
        display: inline-block;
        width: 30px;
@@ -121,17 +120,21 @@ export default {
        line-height: 16px;
        vertical-align: middle;
        text-align: center;
-                        background:rgba(247,203,39,1);
-                        border-radius:2px;
+        background: rgba(247, 203, 39, 1);
+        border-radius: 2px;
        color: #fff;
        font-size: 10px;
      }
    }
-                .clerk-phone, .clerk-position {
+
+    .clerk-phone,
+    .clerk-position {
      width: 125px;
    }
+
    .clerk-status {
      width: 100px;
+
      .status-icon {
        width: 34px;
        height: 32px;
@@ -140,13 +143,13 @@ export default {
        background: #ECF5FF;
        border: 1px solid #D9ECFF;
        border-radius: 4px;
+
        &.is-active {
          color: #409EFF;
        }
      }
    }
  }
-      }
-</style>
-
+}

+</style>
--- a/src/components/contacts/share/employeeList.vue
+++ b/src/components/contacts/share/employeeList.vue
@@ -45,7 +45,7 @@ export default {
  },
  data() {
    return {
-      tableH: window.screen.availHeight - 440 - 180,
+      tableH: window.screen.availHeight - 440 - 250,
      tableData: []
    };
  },
@@ -78,7 +78,6 @@ export default {
    // this.tableData = arr;
    let list = this.employeeList;
    let arr = [];
-    console.log(list, " this.list");
    list.forEach(clerk => {
      clerk.ext.employeeClerk.sharedContactEmployeeStoreId = clerk.sharedContactEmployeeStoreId;
      arr.push(clerk.ext.employeeClerk);
@@ -88,7 +87,6 @@ export default {
  watch: {
    employeeList(list) {
      let arr = [];
-      console.log(list, " this.list");
      list.forEach(clerk => {
        clerk.ext.employeeClerk.sharedContactEmployeeStoreId = clerk.sharedContactEmployeeStoreId;
        arr.push(clerk.ext.employeeClerk);

--- a/src/views/contacts/shareContact.vue
+++ b/src/views/contacts/shareContact.vue
@@ -91,7 +91,7 @@
                  @selectMember="selectMember"
                  :groupInfo="groupInfo">
                </employee-list>
-                <div class="pagination">
+                <div class="pagination" v-if="!!employeeList.length>
                  <el-pagination
                    background
                    :page-sizes="[20, 40, 60, 80]"