fix: 修改同步

575fc6b8 · 无尘 · c01e6c5c · 575fc6b8 · 575fc6b8 · c01e6c5c
Commit 575fc6b8 authored Mar 12, 2020 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 rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.ea6270b53acd67543a13e66227cd8ebe.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.4e731d38b78957919144.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.c1628cb0ee4b4d7e345c.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 rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.62501d61d3555b110fd41a56f2f583ad.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.ff2d91789a56e6e23c1b.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.c1628cb0ee4b4d7e345c.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.62501d61d3555b110fd41a56f2f583ad.css
+++ b/dist/static/css/app.62501d61d3555b110fd41a56f2f583ad.css
--- a/dist/static/css/app.ea6270b53acd67543a13e66227cd8ebe.css
+++ b/dist/static/css/app.ea6270b53acd67543a13e66227cd8ebe.css
--- a/dist/static/css/public.css
+++ b/dist/static/css/public.css
@@ -1163,7 +1163,7 @@ button.el-button--danger.is-plain {
 .sortable-chosen.sortable-ghost > .li-cell-copy::after {
  content: " ";
  position: absolute;
-  left: 20px;
+  left: 60px;
  bottom: 3px;
  width: 100%;
  height: 2px;

--- a/dist/static/js/5.613d6d6605b92574e8dd.js
+++ b/dist/static/js/5.613d6d6605b92574e8dd.js
--- a/dist/static/js/manifest.4e731d38b78957919144.js
+++ b/dist/static/js/manifest.4e731d38b78957919144.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,b,o,i=0,u=[];i<a.length;i++)b=a[i],d[b]&&u.push(d[b][0]),d[b]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=f(f.s=r[i]);return o};var a={},d={51:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,f.nc&&r.setAttribute("nonce",f.nc),r.src=f.p+"static/js/"+e+"."+{0:"91eb4904aa495d01b271",1:"06c4e42e62c1f75191f0",2:"81489599fa9cded4cd8f",3:"69d773fe63645c5c027d",4:"f1674bae959e941960b1",5:"613d6d6605b92574e8dd",6:"c7a878992a5af3d83f33",7:"c17157f1c4fc3d3b8c42",8:"046fad46a415c0979300",9:"5e6b743726e7d8438871",10:"cdc6733af07fe3483e78",11:"529019747940d70381f8",12:"8c2e25b234e6c994122b",13:"fee9390ab9550cf82206",14:"a034fd161b8c1b267354",15:"e2410478e3a7240b7adc",16:"bb5e6d72cbc8bf43e5b7",17:"95d3d2b81b6732c899cb",18:"60c4a5b5e95e2bedf55b",19:"d7d691e18789d84baad8",20:"844ad5ee593eae63c52e",21:"770311f70228fba8e90b",22:"81f4a1e7120e15df0ea9",23:"ab3d7ca5a4ac86082013",24:"40fac2805362183128cd",25:"478df3da4cb7c7af6a47",26:"d2a69d136f7452d5784b",27:"da711b22b7b9fb1b1e92",28:"7acc9215b2460e498c48",29:"569ed25c8b4bf00254de",30:"df323bb62359327d7053",31:"c48508436d387ecab7e5",32:"fdc8fb944fc839a5f0c9",33:"64721b581ad65fc06a5c",34:"1f69600f84ea88db4621",35:"51630c67df4e611a358a",36:"030f99cc1cb0eb54f38a",37:"722ec3ee74746d1f0771",38:"11fa4a08a95df9d72fdb",39:"7dfcaaab2bdeab04f8e8",40:"26ef55c1adb75adce860",41:"409fc320bb5afcd95dbe",42:"54ea7e2ab19fe82e5d03",43:"5d2d83cd76295aac795e",44:"894c9353222f503048dd",45:"e943700ad9539430cc2a",46:"3ebb7632373e949c4784",47:"db2230e175441528fa76",48:"bda5c55f72a191ae99c2"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},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 c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,b,o,i=0,u=[];i<a.length;i++)b=a[i],f[b]&&u.push(f[b][0]),f[b]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var a={},f={51: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 n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"91eb4904aa495d01b271",1:"06c4e42e62c1f75191f0",2:"81489599fa9cded4cd8f",3:"69d773fe63645c5c027d",4:"f1674bae959e941960b1",5:"3436e8cff19ce4f67dc6",6:"c7a878992a5af3d83f33",7:"c17157f1c4fc3d3b8c42",8:"046fad46a415c0979300",9:"5e6b743726e7d8438871",10:"cdc6733af07fe3483e78",11:"529019747940d70381f8",12:"8c2e25b234e6c994122b",13:"fee9390ab9550cf82206",14:"a034fd161b8c1b267354",15:"e2410478e3a7240b7adc",16:"bb5e6d72cbc8bf43e5b7",17:"95d3d2b81b6732c899cb",18:"60c4a5b5e95e2bedf55b",19:"d7d691e18789d84baad8",20:"844ad5ee593eae63c52e",21:"770311f70228fba8e90b",22:"81f4a1e7120e15df0ea9",23:"ab3d7ca5a4ac86082013",24:"40fac2805362183128cd",25:"478df3da4cb7c7af6a47",26:"d2a69d136f7452d5784b",27:"da711b22b7b9fb1b1e92",28:"7acc9215b2460e498c48",29:"569ed25c8b4bf00254de",30:"df323bb62359327d7053",31:"c48508436d387ecab7e5",32:"fdc8fb944fc839a5f0c9",33:"64721b581ad65fc06a5c",34:"1f69600f84ea88db4621",35:"51630c67df4e611a358a",36:"030f99cc1cb0eb54f38a",37:"722ec3ee74746d1f0771",38:"11fa4a08a95df9d72fdb",39:"7dfcaaab2bdeab04f8e8",40:"26ef55c1adb75adce860",41:"409fc320bb5afcd95dbe",42:"54ea7e2ab19fe82e5d03",43:"5d2d83cd76295aac795e",44:"894c9353222f503048dd",45:"e943700ad9539430cc2a",46:"3ebb7632373e949c4784",47:"db2230e175441528fa76",48:"bda5c55f72a191ae99c2"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),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/wx-tree.vue
+++ b/src/components/company/wx-tree.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-08-14 16:51:07
 * @LastEditors: 无尘
- * @LastEditTime: 2020-03-12 18:33:10
+ * @LastEditTime: 2020-03-12 19:56:50
 -->
 <!--
 <wx-tree v-model="itemData" ></wx-tree>
@@ -27,7 +27,8 @@ import wxTree from './wx-tree.vue';
            </div>
          </div>
        </div>
-        <li-row :class="['cell-child', !item.expand ? 'cell-child-show' : '']" :itemObj="item" :itemData="item.children" @changeParent="changeParent" @refreshRecycle="refreshRecycle"></li-row
+        <!-- 门店下级不能放部门 -->
+        <li-row v-if="item.isStore == 0" :class="['cell-child', !item.expand && item.isStore == 0 ? 'cell-child-show' : '']" :itemObj="item" :itemData="item.children" @changeParent="changeParent" @refreshRecycle="refreshRecycle"></li-row
        ><!-- v-show="(item.expand && item.isStore == 0) || (!item.children.length && item.isStore == 0)" -->
      </li>
    </draggable>
@@ -760,6 +761,9 @@ ul {
  white-space: nowrap;
  // overflow: hidden;
  text-overflow: ellipsis;
+  .li-cell-inner {
+    line-height: 33px;
+  }
  .tree-left {
    .color-fff {
      color: #fff;

--- a/static/css/public.css
+++ b/static/css/public.css
@@ -1163,7 +1163,7 @@ button.el-button--danger.is-plain {
 .sortable-chosen.sortable-ghost > .li-cell-copy::after {
  content: " ";
  position: absolute;
-  left: 20px;
+  left: 60px;
  bottom: 3px;
  width: 100%;
  height: 2px;