Skip to content

H
haoban-3
Commit f79669ea by 无尘
Options

fix: 修改同步部门

parent 53e54972
Showing with 34 additions and 11 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.e88842fb50416ed69587253e938247fd.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.1fa5f5e96fa9e63d0c14.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.786f4b584eb5b0dc95f2.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.90744323232ff8915e5958ab4dde2ea4.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.ad6ba4cfbdd123fb1c2e.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.786f4b584eb5b0dc95f2.js></script></body></html>
\ No newline at end of file
dist/static/js/5.a941d3d4ea09abf029d4.js → dist/static/js/5.b941e84b207414fc1864.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.1fa5f5e96fa9e63d0c14.js → dist/static/js/manifest.ad6ba4cfbdd123fb1c2e.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var c={},d={51:0};function f(a){if(c[a])return c[a].exports;var d=c[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var a=d[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=d[e]=[c,f]});a[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"dbf05147df3025a8713a",1:"06c4e42e62c1f75191f0",2:"04bbdf2959ba14011f91",3:"bae7d0de2e12a122b1cc",4:"4d0090c25a6537e2d779",5:"a941d3d4ea09abf029d4",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"bda5789112a4386ac684",9:"f9c1d8815c8d35b14861",10:"8144b2952e608c99c868",11:"e17569badebc0d03b94f",12:"106cadf87efaf0fd28ce",13:"0f01707cee8bf5918701",14:"a034fd161b8c1b267354",15:"fe7adb86092d73ec2e30",16:"97a9b1a559ec27dad923",17:"7446f565455fbad09abd",18:"65b8c661308214b7851e",19:"74ba19395c578980c999",20:"7f3a92bcf5a66089600a",21:"0ec7408bb99f857e7132",22:"cb80178f17dc0f1c1385",23:"0bfefe1fb2943c2d9f63",24:"d38696f55116fb585eae",25:"38258b0c4882cceb6247",26:"839ceddcbb7c83ecd658",27:"d9bc2e42a9916006c06a",28:"8041015221e712dfacfb",29:"a99995fa30469c828e9b",30:"228a3b991afd830e5824",31:"25fdf8d4a8892be0c481",32:"22fcab94d4b8d6c87e72",33:"af03022c94f58809aa77",34:"dce139ae594034f17a52",35:"ed9ebdd61aa7a7301b39",36:"e86539c9400400aeca81",37:"c74e9e3d53219b3ac1ff",38:"424a8230959ada09c944",39:"7dfcaaab2bdeab04f8e8",40:"26ef55c1adb75adce860",41:"409fc320bb5afcd95dbe",42:"6323f9cc051bdb6fd81e",43:"a7cd861dacf5abddd542",44:"894c9353222f503048dd",45:"45e4397c0ca09b32eb25",46:"b8a25437acb57de97830",47:"da9b899d98080bcbc0a4",48:"750f3261e51d2d100d96"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},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,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={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 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:"dbf05147df3025a8713a",1:"06c4e42e62c1f75191f0",2:"04bbdf2959ba14011f91",3:"bae7d0de2e12a122b1cc",4:"4d0090c25a6537e2d779",5:"b941e84b207414fc1864",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"bda5789112a4386ac684",9:"f9c1d8815c8d35b14861",10:"8144b2952e608c99c868",11:"e17569badebc0d03b94f",12:"106cadf87efaf0fd28ce",13:"0f01707cee8bf5918701",14:"a034fd161b8c1b267354",15:"fe7adb86092d73ec2e30",16:"97a9b1a559ec27dad923",17:"7446f565455fbad09abd",18:"65b8c661308214b7851e",19:"74ba19395c578980c999",20:"7f3a92bcf5a66089600a",21:"0ec7408bb99f857e7132",22:"cb80178f17dc0f1c1385",23:"0bfefe1fb2943c2d9f63",24:"d38696f55116fb585eae",25:"38258b0c4882cceb6247",26:"839ceddcbb7c83ecd658",27:"d9bc2e42a9916006c06a",28:"8041015221e712dfacfb",29:"a99995fa30469c828e9b",30:"228a3b991afd830e5824",31:"25fdf8d4a8892be0c481",32:"22fcab94d4b8d6c87e72",33:"af03022c94f58809aa77",34:"dce139ae594034f17a52",35:"ed9ebdd61aa7a7301b39",36:"e86539c9400400aeca81",37:"c74e9e3d53219b3ac1ff",38:"424a8230959ada09c944",39:"7dfcaaab2bdeab04f8e8",40:"26ef55c1adb75adce860",41:"409fc320bb5afcd95dbe",42:"6323f9cc051bdb6fd81e",43:"a7cd861dacf5abddd542",44:"894c9353222f503048dd",45:"45e4397c0ca09b32eb25",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,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
src/components/company/wx-tree.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-08-14 16:51:07
* @LastEditors: 无尘
* @LastEditTime: 2020-03-06 16:01:16
* @LastEditTime: 2020-03-06 17:05:44
-->
<!--
<wx-tree v-model="itemData" ></wx-tree>
......@@ -175,6 +175,7 @@ export default {
}
});
},
/* eslint-disable */
async changeData(value) {
const that = this;
// that.$store.dispatch('saveAddInfo', );
......@@ -188,10 +189,10 @@ export default {
if (value[objKey].element.departmentId == that.itemObj.children[index].departmentId) {
sort = index;
that.itemObj.children[index].level = that.itemObj.level + 1;
that.itemObj.children[index].addFlag = objKey == 'added' && !that.itemObj.children[index].wxEnterpriseId ? true : false;
that.itemObj.children[index].addFlag = that.itemObj.children[index].addFlag ? that.itemObj.children[index].addFlag : objKey == 'added' && !that.itemObj.children[index].wxEnterpriseId ? true : false;
}
if (that.itemObj.children[index].children.length) {
await that.handleAdded(that.itemObj.children[index], objKey == 'added' && !that.itemObj.children[index].wxEnterpriseId);
await that.handleAdded(that.itemObj.children[index], that.itemObj.children[index].addFlag ? that.itemObj.children[index].addFlag : objKey == 'added' && !that.itemObj.children[index].wxEnterpriseId);
}
}
let newEle = JSON.parse(JSON.stringify(value[objKey].element));
......@@ -201,13 +202,19 @@ export default {
newEle.level = that.itemObj.level + 1;
newEle.sort = sort;
// 只有gic部门移入企业微信才加 addFlag
newEle.addFlag = objKey == 'added' && !newEle.wxEnterpriseId ? true : false;
newEle.addFlag = newEle.addFlag ? newEle.addFlag : objKey == 'added' && !newEle.wxEnterpriseId ? true : false;
// 移入如果是多层级结构，就要循环遍历
if (newEle.children.length) {
await that.handleAdded(newEle, newEle.addFlag);
}
console.log('移入部门数据：', newEle);
that.$nextTick(() => {
// 同级移动，如果是新增部门同级移动，不用存数据
console.log('同级移动，如果是新增部门同级移动！');
if (objKey == 'moved' && newEle.addFlag) {
console.log('同级移动，如果是新增部门同级移动！');
return false;
}
// 企业微信同级移动排序, 移动的时候还要去重
if (objKey == 'moved') {
// 从存储的数据中查找当前移动的部门是否存在，存在了就要删除老数据，
......@@ -364,6 +371,22 @@ export default {
if (mod == 'modify') {
that.modItem.label = name;
that.modItem.departmentName = name;
// 如果是新增后又编辑，---属于新增
if (that.modItem.addFlag) {
// 去掉重复的父级
let storeAddData = [];
that.$store.state.addDepartment.forEach(ele => {
if (ele.departmentId != that.modItem.departmentId) {
storeAddData.push(ele);
}
});
that.$store.dispatch('clearAddData');
storeAddData.forEach(ele => {
that.$store.dispatch('saveAddInfo', ele);
});
that.$store.dispatch('saveAddInfo', that.modItem);
return false;
}
that.$store.dispatch('saveEditInfo', that.modItem);
return false;
}
......
src/views/business/orgStructSet.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-03-06 16:09:05
* @LastEditTime: 2020-03-06 16:42:32
-->
<template>
<div class="my-customer-wrap common-set-wrap">
......@@ -156,7 +156,7 @@ export default {
*/
saveData: _debounce(function() {
const that = this; //!that.$store.state.addDepartment.length &&
if (!that.$store.state.editDepartment.length) {
if (!that.$store.state.addDepartment.length && !that.$store.state.editDepartment.length) {
showMsg.showmsg('暂无修改，无法同步', 'warning');
return false;
}
......@@ -166,7 +166,7 @@ export default {
postSaveData() {
const that = this;
let para = {
// addDepartment: JSON.stringify(that.$store.state.addDepartment),
addDepartment: JSON.stringify(that.$store.state.addDepartment),
editDepartment: JSON.stringify(that.$store.state.editDepartment)
};
postRequest('/haoban-manage3-web/department-batch-sync', para)
......
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