Skip to content

O
office-web
Commit 59e61927 by xiaohai
Options

merge conflict and build for test

parent f546883b
Showing with 11 additions and 7 deletions
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.61b9985aedce6798cf9511d8f0fedec6.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.e10c5913cc7df68cad4f.js></script><script type=text/javascript src=./static/js/vendor.524761e5c779827c0dbf.js></script><script type=text/javascript src=./static/js/app.4aeba69dbc69bc2064dd.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.61b9985aedce6798cf9511d8f0fedec6.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.02ba22fc7ad3a06b9db0.js></script><script type=text/javascript src=./static/js/vendor.8d2ca7519a4dbf3c2574.js></script><script type=text/javascript src=./static/js/app.4aeba69dbc69bc2064dd.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.02ba22fc7ad3a06b9db0.js 0 → 100644
!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={43: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:"d73f23dda4a4da2754f0",1:"26fc7c6e9b4ccca95f46",2:"fb678d9d21cb986ef9ab",3:"6b50e8651aec22b535c5",4:"0dccbeb384a458517ae8",5:"5289f9d9d272d774f9a7",6:"1cfc190be082172b30c3",7:"baa1f65b93f6e2ad112b",8:"47e3369fb1f988741929",9:"926da949c22346f61e60",10:"5614d3673a92e370b9b1",11:"f6e7b64dec5aff9cee5e",12:"08b3df5c992e0c2bc3f4",13:"ebd6dd7ee23e5703e425",14:"5ff2c6e238558d0c5365",15:"2820a6071be7b560ff7d",16:"18b9cdbb5f17195148ba",17:"6028707d0deea461e86a",18:"883dde6f28edff95cea1",19:"39879d07beb4c6b71c52",20:"48c7dac836dc8f07b246",21:"0c95a879bf810ea693f0",22:"1e34bcb0dd0d10584a8a",23:"4271056c10cccd524b66",24:"a65971a02be425cfe7d7",25:"6cc97e6afe73c2b498f9",26:"47454b21c2e8bc230179",27:"e1dae8eea7cebb0399b2",28:"dbd9d86ae779ffab47d2",29:"0e3a1c8173246dac0cd3",30:"cc7fd72ffc3cb0e4c4c4",31:"3461b00cec4520ebdbb7",32:"b527bfac02836c524400",33:"6895e9eb632169971ddb",34:"2349d9830c9a4d627933",35:"58d4c515235752f2886d",36:"0a78880adaedb759c3c1",37:"f0f5cfddc9cd88a9bdb3",38:"d4cc702714768d377ace",39:"49fa68a28383c75d8ac7",42:"aba74eb87387aac73c65"}[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}}([]);
//# sourceMappingURL=manifest.02ba22fc7ad3a06b9db0.js.map
\ No newline at end of file
dist/static/js/manifest.e10c5913cc7df68cad4f.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,f){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 r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(c&&c(a,r,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)o=n(n.s=f[i]);return o};var a={},d={43:0};function n(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,n),d.l=!0,d.exports}n.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,n){c=d[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,n.nc&&f.setAttribute("nonce",n.nc),f.src=n.p+"static/js/"+e+"."+{0:"d73f23dda4a4da2754f0",1:"26fc7c6e9b4ccca95f46",2:"fb678d9d21cb986ef9ab",3:"6b50e8651aec22b535c5",4:"0dccbeb384a458517ae8",5:"5289f9d9d272d774f9a7",6:"1cfc190be082172b30c3",7:"baa1f65b93f6e2ad112b",8:"47e3369fb1f988741929",9:"926da949c22346f61e60",10:"5614d3673a92e370b9b1",11:"f6e7b64dec5aff9cee5e",12:"08b3df5c992e0c2bc3f4",13:"ebd6dd7ee23e5703e425",14:"dbe2d759dd74464a50d6",15:"2820a6071be7b560ff7d",16:"18b9cdbb5f17195148ba",17:"6028707d0deea461e86a",18:"883dde6f28edff95cea1",19:"39879d07beb4c6b71c52",20:"48c7dac836dc8f07b246",21:"0c95a879bf810ea693f0",22:"1e34bcb0dd0d10584a8a",23:"4271056c10cccd524b66",24:"a65971a02be425cfe7d7",25:"6cc97e6afe73c2b498f9",26:"47454b21c2e8bc230179",27:"e1dae8eea7cebb0399b2",28:"dbd9d86ae779ffab47d2",29:"0e3a1c8173246dac0cd3",30:"cc7fd72ffc3cb0e4c4c4",31:"3461b00cec4520ebdbb7",32:"b527bfac02836c524400",33:"6895e9eb632169971ddb",34:"2349d9830c9a4d627933",35:"58d4c515235752f2886d",36:"0a78880adaedb759c3c1",37:"f0f5cfddc9cd88a9bdb3",38:"d4cc702714768d377ace",39:"49fa68a28383c75d8ac7",42:"aba74eb87387aac73c65"}[e]+".js";var t=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(t);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return f.onerror=f.onload=b,r.appendChild(f),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}}([]);
//# sourceMappingURL=manifest.e10c5913cc7df68cad4f.js.map
\ No newline at end of file
dist/static/js/vendor.524761e5c779827c0dbf.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.8d2ca7519a4dbf3c2574.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/contacts/addDepartment.vue
...@@ -72,7 +72,10 @@ export default { ...@@ -72,7 +72,10 @@ export default {
path: '' path: ''
} }
], ],
departInfo: {}, departInfo: {
parentName: "",
chainName: ""
},
testList: [], testList: [],
treeSet: { treeSet: {
isSelectPerson: false, isSelectPerson: false,
...@@ -209,10 +212,11 @@ export default { ...@@ -209,10 +212,11 @@ export default {
* 处理已选部门 * 处理已选部门
*/ */
handleSelectedList(group) { handleSelectedList(group) {
console.log(group); console.log(group, this.changed);
if (this.changed == "parent") { if (this.changed == "parent") {
this.departInfo.parentId = group ? group.id : ""; this.departInfo.parentId = group ? group.id : "";
this.departInfo.parentName = group ? group.label : ""; this.departInfo.parentName = group ? group.label : "";
this.departInfo.chainName = group ? group.label : "";
} else if (this.changed == "but") { } else if (this.changed == "but") {
this.butList = group; this.butList = group;
} else if (this.changed == "special") { } else if (this.changed == "special") {
......
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