Skip to content

H
haoban-3
Commit fbfdf17d by 无尘
Options

fix: 修改同步

parent a9940d79
Showing with 61 additions and 10 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.767b2a6d9a5a4ef2679018f47e71a9b0.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.fa8c106d4f8aaa753c48.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.02482fc6c950708da9c3.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.24.css><link href=./static/css/app.2cd776cd93d3e07d5c3b972448c69cb7.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.bf16cd1e25db6f14363f.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.af325d5b32025e596196.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.fa8c106d4f8aaa753c48.js → dist/static/js/manifest.bf16cd1e25db6f14363f.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,d){for(var t,b,o,i=0,u=[];i<c.length;i++)b=c[i],f[b]&&u.push(f[b][0]),f[b]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(a&&a(c,r,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)o=n(n.s=d[i]);return o};var c={},f={51:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,n.nc&&d.setAttribute("nonce",n.nc),d.src=n.p+"static/js/"+e+"."+{0:"ed79ed28bfe898286e57",1:"fe9dec1f31b04053fd7e",2:"ea958c9e158c332b7237",3:"d715905b742fe34107f2",4:"30834c96bb9b0077ac40",5:"0da955c9fa041d847549",6:"d3b7d39504b6b9597ca5",7:"ddf2c5c8c6975b3815b6",8:"26149a7b07759ee490a8",9:"953eb88291293fece61b",10:"945a04aa0601d3b0354c",11:"d0feaf79e893058f9bc2",12:"3b9c756b15cf547445f5",13:"d847d9cd9013c7382389",14:"9825bb69e60b8030c230",15:"c1117d9330908aed96b7",16:"a1ed8e0a47ebf04d6891",17:"a1ec441ec8e1ab687983",18:"b053a154baa10bb1dc17",19:"8b94ea26eb72d7923a08",20:"4763fa67ea02253a0f61",21:"d2f3f5a185db33bc7dd0",22:"b74669cf1a738ca66a7e",23:"626773aa5e85ed4f5e49",24:"60d42c953fd179617b16",25:"e8b3f57e88d638409ae9",26:"161e48f124bffd6210b1",27:"d9bc2e42a9916006c06a",28:"c73366d4dd88740471c2",29:"9a8a4580e68abe70067b",30:"228a3b991afd830e5824",31:"173a8de29e234a01b5b5",32:"205393102445f4b2cbce",33:"206ff8b8205ef4af4818",34:"dce139ae594034f17a52",35:"7fc60577c1a1196f86a8",36:"7aefdf568875c4573343",37:"5cc17ec6574aee56310f",38:"11fa4a08a95df9d72fdb",39:"08a8ae773d968431c7f3",40:"f6ef482085cccdca5f67",41:"d2e13a048e460fe7db63",42:"b3cb81e91ea8bbe48221",43:"6264d321d2afb8caa859",44:"5d07858f9c655b349c19",45:"f07b2ac63f2a7cb86072",46:"4cf7eeaa722092397c88",47:"acccaa54fb8f710cddc4",48:"97204bd2fd532b0f15c7"}[e]+".js";var t=setTimeout(b,12e4);function b(){d.onerror=d.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return d.onerror=d.onload=b,r.appendChild(d),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,b){for(var t,d,o,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(a&&a(c,r,b);u.length;)u.shift()();if(b)for(i=0;i<b.length;i++)o=n(n.s=b[i]);return o};var c={},f={51:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],b=document.createElement("script");b.type="text/javascript",b.charset="utf-8",b.async=!0,b.timeout=12e4,n.nc&&b.setAttribute("nonce",n.nc),b.src=n.p+"static/js/"+e+"."+{0:"ed79ed28bfe898286e57",1:"fe9dec1f31b04053fd7e",2:"ea958c9e158c332b7237",3:"d715905b742fe34107f2",4:"30834c96bb9b0077ac40",5:"642085b1c049c661585c",6:"d3b7d39504b6b9597ca5",7:"ddf2c5c8c6975b3815b6",8:"26149a7b07759ee490a8",9:"953eb88291293fece61b",10:"945a04aa0601d3b0354c",11:"d0feaf79e893058f9bc2",12:"3b9c756b15cf547445f5",13:"d847d9cd9013c7382389",14:"9825bb69e60b8030c230",15:"c1117d9330908aed96b7",16:"a1ed8e0a47ebf04d6891",17:"a1ec441ec8e1ab687983",18:"b053a154baa10bb1dc17",19:"8b94ea26eb72d7923a08",20:"4763fa67ea02253a0f61",21:"d2f3f5a185db33bc7dd0",22:"b74669cf1a738ca66a7e",23:"626773aa5e85ed4f5e49",24:"60d42c953fd179617b16",25:"e8b3f57e88d638409ae9",26:"161e48f124bffd6210b1",27:"d9bc2e42a9916006c06a",28:"c73366d4dd88740471c2",29:"9a8a4580e68abe70067b",30:"228a3b991afd830e5824",31:"173a8de29e234a01b5b5",32:"205393102445f4b2cbce",33:"206ff8b8205ef4af4818",34:"dce139ae594034f17a52",35:"7fc60577c1a1196f86a8",36:"7aefdf568875c4573343",37:"5cc17ec6574aee56310f",38:"11fa4a08a95df9d72fdb",39:"08a8ae773d968431c7f3",40:"f6ef482085cccdca5f67",41:"d2e13a048e460fe7db63",42:"b3cb81e91ea8bbe48221",43:"6264d321d2afb8caa859",44:"5d07858f9c655b349c19",45:"f07b2ac63f2a7cb86072",46:"4cf7eeaa722092397c88",47:"acccaa54fb8f710cddc4",48:"97204bd2fd532b0f15c7"}[e]+".js";var t=setTimeout(d,12e4);function d(){b.onerror=b.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return b.onerror=b.onload=d,r.appendChild(b),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/company/wx-tree.vue
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* @version: 1.0.0 * @version: 1.0.0
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-08-14 16:51:07 * @Date: 2019-08-14 16:51:07
* @LastEditors : 无尘 * @LastEditors: 无尘
* @LastEditTime : 2020-03-02 14:06:03 * @LastEditTime: 2020-03-05 18:27:52
--> -->
<!-- <!--
<wx-tree v-model="itemData" ></wx-tree> <wx-tree v-model="itemData" ></wx-tree>
...@@ -98,6 +98,30 @@ export default { ...@@ -98,6 +98,30 @@ export default {
return false; return false;
} }
console.log('父级非新增：', itemObj, flag); console.log('父级非新增：', itemObj, flag);
let storeAddData = [];
if (that.$store.state.addDepartment.length) {
// 去掉重复的父级
that.$store.state.addDepartment.forEach(ele => {
if (ele.departmentId != itemObj.departmentId) {
storeAddData.push(ele);
}
});
that.$store.dispatch('clearAddData');
that.$store.dispatch('saveAddInfo', storeAddData);
}
let storeEditData = [];
if (that.$store.state.editDepartment.length) {
// 去掉重复的父级
that.$store.state.editDepartment.forEach(ele => {
if (ele.departmentId != itemObj.departmentId) {
storeEditData.push(ele);
}
});
that.$store.dispatch('clearEditData');
that.$store.dispatch('saveEditInfo', storeEditData);
}
if (flag == 'add') { if (flag == 'add') {
that.$store.dispatch('saveAddInfo', itemObj); that.$store.dispatch('saveAddInfo', itemObj);
} }
...@@ -181,10 +205,11 @@ export default { ...@@ -181,10 +205,11 @@ export default {
that.$nextTick(() => { that.$nextTick(() => {
// 企业微信同级移动排序 // 企业微信同级移动排序
if (objKey == 'moved') { if (objKey == 'moved') {
that.$store.dispatch('saveEditInfo', newEle);
if (that.itemObj.addFlag) { if (that.itemObj.addFlag) {
that.$emit('changeParent', that.itemObj, 'edit'); that.$emit('changeParent', that.itemObj, 'edit');
return false;
} }
that.$store.dispatch('saveEditInfo', newEle);
that.$store.dispatch('saveEditInfo', that.itemObj); that.$store.dispatch('saveEditInfo', that.itemObj);
return false; return false;
} }
...@@ -198,18 +223,20 @@ export default { ...@@ -198,18 +223,20 @@ export default {
// } // }
// 企业微信跨级移动 // 企业微信跨级移动
if (objKey == 'added' && !!newEle.wxEnterpriseId) { if (objKey == 'added' && !!newEle.wxEnterpriseId) {
that.$store.dispatch('saveEditInfo', newEle);
if (that.itemObj.addFlag) { if (that.itemObj.addFlag) {
that.$emit('changeParent', that.itemObj, 'edit'); that.$emit('changeParent', that.itemObj, 'edit');
return false;
} }
that.$store.dispatch('saveEditInfo', newEle);
that.$store.dispatch('saveEditInfo', that.itemObj); that.$store.dispatch('saveEditInfo', that.itemObj);
} }
// gic 移动到企业微信 // gic 移动到企业微信
if (objKey == 'added' && !newEle.wxEnterpriseId) { if (objKey == 'added' && !newEle.wxEnterpriseId) {
that.$store.dispatch('saveAddInfo', newEle);
if (that.itemObj.addFlag) { if (that.itemObj.addFlag) {
that.$emit('changeParent', that.itemObj, 'edit'); that.$emit('changeParent', that.itemObj, 'edit');
return false;
} }
that.$store.dispatch('saveAddInfo', newEle);
that.$store.dispatch('saveEditInfo', that.itemObj); that.$store.dispatch('saveEditInfo', that.itemObj);
} }
}); });
...@@ -299,11 +326,15 @@ export default { ...@@ -299,11 +326,15 @@ export default {
}; };
that.additem.children.push(childObj); that.additem.children.push(childObj);
// 增加的字段 // 增加的字段
that.$store.dispatch('saveAddInfo', childObj);
console.log(that.itemObj, that.itemObj.addFlag);
if (that.itemObj.addFlag) { if (that.itemObj.addFlag) {
that.$emit('changeParent', that.itemObj, 'add'); that.$emit('changeParent', that.itemObj, 'add');
return false;
} }
// 父级
that.$store.dispatch('saveAddInfo', that.additem); that.$store.dispatch('saveAddInfo', that.additem);
that.$store.dispatch('saveAddInfo', childObj);
that.$forceUpdate(); that.$forceUpdate();
}, },
......
src/store/store.js
/*
* @Descripttion: 当前组件信息
* @version: 1.0.0
* @Author: 无尘
* @Date: 2020-03-04 09:21:53
* @LastEditors: 无尘
* @LastEditTime: 2020-03-05 18:15:50
*/
import Vuex from 'vuex'; import Vuex from 'vuex';
import Vue from 'vue'; import Vue from 'vue';
import * as types from './types'; import * as types from './types';
...@@ -38,6 +46,12 @@ export default new Vuex.Store({ ...@@ -38,6 +46,12 @@ export default new Vuex.Store({
saveDel: (state, data) => { saveDel: (state, data) => {
state.delDepartment.push(data); state.delDepartment.push(data);
}, },
clearAdd: state => {
state.addDepartment = [];
},
clearEdit: state => {
state.editDepartment = [];
},
clearData: state => { clearData: state => {
state.addDepartment = []; state.addDepartment = [];
state.editDepartment = []; state.editDepartment = [];
...@@ -54,6 +68,12 @@ export default new Vuex.Store({ ...@@ -54,6 +68,12 @@ export default new Vuex.Store({
saveDelInfo(context, data) { saveDelInfo(context, data) {
context.commit('saveDel', data); context.commit('saveDel', data);
}, },
clearAddData(context, data) {
context.commit('clearAdd');
},
clearEditData(context, data) {
context.commit('clearEdit');
},
clearTreeData(context, data) { clearTreeData(context, data) {
context.commit('clearData'); context.commit('clearData');
} }
......
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