Skip to content

H
haoban-3
Commit 06a5db10 by 无尘
Options

fix：修改拖拽

parent 1807d3e6
Showing with 20 additions and 14 deletions
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.d134545b3f2e1d9887b37030c904c99c.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.b85d68064526a0bf2a22.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.7cca2ca63a73f4cb7db0.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.6bce25ede44b1085716ad2ab33c384d9.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.8078d6446ee806861158.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.7cca2ca63a73f4cb7db0.js></script></body></html>
\ No newline at end of file
dist/static/js/5.88f6ebafdb9bd92f2e37.js → dist/static/js/5.66dd126d9deb6e066b75.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.b85d68064526a0bf2a22.js → dist/static/js/manifest.8078d6446ee806861158.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,d,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 d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(f,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var f={},a={51:0};function b(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,b),a.l=!0,a.exports}b.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,b){c=a[e]=[f,b]});c[2]=f;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"c45bcf976d30908b84ed",1:"06c4e42e62c1f75191f0",2:"525af3dccf4c3bc5cfbe",3:"edbca100e837b95f44a7",4:"eca86cac3c54fcaa8626",5:"88f6ebafdb9bd92f2e37",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"bda5789112a4386ac684",9:"5e6b743726e7d8438871",10:"cdc6733af07fe3483e78",11:"529019747940d70381f8",12:"8c2e25b234e6c994122b",13:"c6a565d0720f1b46d51f",14:"a034fd161b8c1b267354",15:"fe7adb86092d73ec2e30",16:"bb5e6d72cbc8bf43e5b7",17:"95d3d2b81b6732c899cb",18:"60c4a5b5e95e2bedf55b",19:"01478f74b11f4c5331f5",20:"0102a2f1b04064870dd6",21:"3f61875b9947db83f539",22:"8a878bc68d8e77242e86",23:"b461f6f69b6e10b17d9e",24:"c3c4183c2d16bc4122ef",25:"ba5d34435c4883ae9830",26:"fb6ea4351fc707198373",27:"b9ff5ff2edab607b85a7",28:"4f6a94f55be21b7d981b",29:"7230ee80eb87622574bf",30:"a738e3eece7f36ed2a49",31:"173a8de29e234a01b5b5",32:"f2abb1a885f7699bd7e6",33:"eb76237602d8de1fbd56",34:"6cfbb247fbb23212e1ea",35:"ed9ebdd61aa7a7301b39",36:"e86539c9400400aeca81",37:"1145a4a2c5b1fcff9f42",38:"b2f8249a4fae8e857393",39:"3e41ffd585dc93ab1737",40:"3780b61e4643f698c49c",41:"0a7e6003bd8dd1ee7ccb",42:"5c52b5e60f51341e59ba",43:"c7dd7f301d4b783a8f21",44:"d54c40b3a3000921b29f",45:"0e2304df3af9e2d961ba",46:"b8a25437acb57de97830",47:"da9b899d98080bcbc0a4",48:"750f3261e51d2d100d96"}[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,d.appendChild(n),f},b.m=e,b.c=f,b.d=function(e,c,f){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,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 d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={51:0};function b(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,b),f.l=!0,f.exports}b.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,b){c=f[e]=[a,b]});c[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"c45bcf976d30908b84ed",1:"06c4e42e62c1f75191f0",2:"525af3dccf4c3bc5cfbe",3:"edbca100e837b95f44a7",4:"eca86cac3c54fcaa8626",5:"66dd126d9deb6e066b75",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"bda5789112a4386ac684",9:"5e6b743726e7d8438871",10:"cdc6733af07fe3483e78",11:"529019747940d70381f8",12:"8c2e25b234e6c994122b",13:"c6a565d0720f1b46d51f",14:"a034fd161b8c1b267354",15:"fe7adb86092d73ec2e30",16:"bb5e6d72cbc8bf43e5b7",17:"95d3d2b81b6732c899cb",18:"60c4a5b5e95e2bedf55b",19:"01478f74b11f4c5331f5",20:"0102a2f1b04064870dd6",21:"3f61875b9947db83f539",22:"8a878bc68d8e77242e86",23:"b461f6f69b6e10b17d9e",24:"c3c4183c2d16bc4122ef",25:"ba5d34435c4883ae9830",26:"fb6ea4351fc707198373",27:"b9ff5ff2edab607b85a7",28:"4f6a94f55be21b7d981b",29:"7230ee80eb87622574bf",30:"a738e3eece7f36ed2a49",31:"173a8de29e234a01b5b5",32:"f2abb1a885f7699bd7e6",33:"eb76237602d8de1fbd56",34:"6cfbb247fbb23212e1ea",35:"ed9ebdd61aa7a7301b39",36:"e86539c9400400aeca81",37:"1145a4a2c5b1fcff9f42",38:"b2f8249a4fae8e857393",39:"3e41ffd585dc93ab1737",40:"3780b61e4643f698c49c",41:"0a7e6003bd8dd1ee7ccb",42:"5c52b5e60f51341e59ba",43:"c7dd7f301d4b783a8f21",44:"d54c40b3a3000921b29f",45:"0e2304df3af9e2d961ba",46:"b8a25437acb57de97830",47:"da9b899d98080bcbc0a4",48:"750f3261e51d2d100d96"}[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,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/company/wx-tree.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-08-14 16:51:07
* @LastEditors: 无尘
* @LastEditTime: 2020-03-09 17:22:36
* @LastEditTime: 2020-03-09 18:03:40
-->
<!--
<wx-tree v-model="itemData" ></wx-tree>
......@@ -27,7 +27,7 @@ import wxTree from './wx-tree.vue';
</div>
</div>
</div>
<li-row v-if="item.expand || !item.children.length" :itemObj="item" :itemData="item.children" @changeParent="changeParent" @refreshRecycle="refreshRecycle"></li-row
<li-row v-show="item.expand || !item.children.length" :itemObj="item" :itemData="item.children" @changeParent="changeParent" @refreshRecycle="refreshRecycle"></li-row
><!-- v-show="!!item.children.length && item.expand" -->
</li>
</draggable>
......@@ -183,6 +183,15 @@ export default {
const that = this;
// that.$store.dispatch('saveAddInfo', );
console.log('wx:change:', value, that.itemObj);
// 跨级移动后还要判断原来父级有没有子级，设置
if (value['removed']) {
if (that.itemData.length) {
console.log('跨级移动remove:',)
that.itemObj.hasSonNode = true;
}else {
that.itemObj.hasSonNode = false;
}
}
const objKey = !!value['added'] ? 'added' : !!value['moved'] ? 'moved' : 'removed';
if (!!objKey) {
......@@ -254,14 +263,7 @@ export default {
that.$store.dispatch('saveEditInfo', that.itemObj);
return false;
}
// if (objKey == 'removed') {
// if (that.itemObj.addFlag) {
// that.$emit('changeParent', that.itemObj, 'edit');
// }
// that.$store.dispatch('saveEditInfo', newEle);
// that.$store.dispatch('saveEditInfo', that.itemObj);
// return false;
// }
// 企业微信跨级移动,如果是新增部门跨级移动，删老数据---属于新增
if (objKey == 'added' && newEle.addFlag && !!newEle.wxEnterpriseId) {
console.log('跨级移动，如果是新增部门跨级移动！，删除老数据');
......@@ -288,6 +290,10 @@ export default {
}
// 企业微信跨级移动,如果是老部门
if (objKey == 'added' && !newEle.addFlag && !!newEle.wxEnterpriseId) {
if (that.itemData.length) {
console.log(that.itemObj)
that.itemObj.hasSonNode = true;
}
// 去掉重复的父级
let storeEditDataWx = [];
that.$store.state.editDepartment.forEach(ele => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment