Commit 4ec9d1fa by xiaohai

build for test

parent 21473ecb
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.75ee9a7c9c3737a6e38d4f473099208a.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.13f9d5352483a38c8083.js></script><script type=text/javascript src=./static/js/vendor.8db0e36d5f27c5533158.js></script><script type=text/javascript src=./static/js/app.01560f2504112aa0e808.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.0e5d0de85c950d58016dd4e765a41fc7.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.b26bff17d683a2125796.js></script><script type=text/javascript src=./static/js/vendor.8db0e36d5f27c5533158.js></script><script type=text/javascript src=./static/js/app.1b68a7c2ffad51a11286.js></script></body></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,r,a){for(var t,o,b,i=0,u=[];i<f.length;i++)o=f[i],d[o]&&u.push(d[o][0]),d[o]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(c&&c(f,r,a);u.length;)u.shift()();if(a)for(i=0;i<a.length;i++)b=n(n.s=a[i]);return b};var f={},d={39:0};function n(c){if(f[c])return f[c].exports;var d=f[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 f=new Promise(function(f,n){c=d[e]=[f,n]});c[2]=f;var r=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,n.nc&&a.setAttribute("nonce",n.nc),a.src=n.p+"static/js/"+e+"."+{0:"14a08cbd0f94340b8999",1:"26fc7c6e9b4ccca95f46",2:"faf312b9ad2305132499",3:"cec5685499e6e5f2fcd3",4:"59efdb19a328f51cd6c7",5:"f1f65bbf64972c1d755c",6:"8c27cddc488decf36e16",7:"a3c3b315783ce7f7a825",8:"819c914ef9380f090c90",9:"82a7e79e3828246f7066",10:"2ab72fd3172795e93e23",11:"7bcb1b22e9e5cdcd830f",12:"b36ac0c6ccad6cfed0eb",13:"abf93dee15b9b810c8cd",14:"035476c86b22d02e86d6",15:"e5dfd86e41100dd837e6",16:"db6227c6cf2c2d48d7c4",17:"67dd1babb9349b060475",18:"d1abc56a68773870c55e",19:"17a52a422912ae92f236",20:"01b051aa7d821165490c",21:"dfc52277a8d638888299",22:"90db595bb5b087918aea",23:"16053d5d0a2441d7eb54",24:"745e26ccd982cf8f87ca",25:"27d078fb88f77616f64f",26:"d4009226205dc1bafbe3",27:"174e2ff2b42fd752fd7d",28:"85e583b8bbedd49e5849",29:"084b68bd50ee5df0283c",30:"5c3baf1b5c4e15c42acf",31:"c5a44ed34c78fb4fd15e",32:"ac08444493d3f5224184",33:"c514c9bb2685dfef71ca",34:"575d470f8edba6478562",35:"258a67d96ee038e18880",38:"28fd0e3287c530f9d886"}[e]+".js";var t=setTimeout(o,12e4);function o(){a.onerror=a.onload=null,clearTimeout(t);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return a.onerror=a.onload=o,r.appendChild(a),f},n.m=e,n.c=f,n.d=function(e,c,f){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},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.13f9d5352483a38c8083.js.map
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,a,d){for(var t,o,b,i=0,u=[];i<f.length;i++)o=f[i],n[o]&&u.push(n[o][0]),n[o]=0;for(t in a)Object.prototype.hasOwnProperty.call(a,t)&&(e[t]=a[t]);for(c&&c(f,a,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)b=r(r.s=d[i]);return b};var f={},n={39:0};function r(c){if(f[c])return f[c].exports;var n=f[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,r){c=n[e]=[f,r]});c[2]=f;var a=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,r.nc&&d.setAttribute("nonce",r.nc),d.src=r.p+"static/js/"+e+"."+{0:"14a08cbd0f94340b8999",1:"26fc7c6e9b4ccca95f46",2:"f0f5aad99079e1bff44b",3:"f266c3b848d41bca75e7",4:"ee3b1e11c84c7086b1a9",5:"f1f65bbf64972c1d755c",6:"8c27cddc488decf36e16",7:"a3c3b315783ce7f7a825",8:"819c914ef9380f090c90",9:"82a7e79e3828246f7066",10:"2ab72fd3172795e93e23",11:"7bcb1b22e9e5cdcd830f",12:"b36ac0c6ccad6cfed0eb",13:"abf93dee15b9b810c8cd",14:"035476c86b22d02e86d6",15:"e5dfd86e41100dd837e6",16:"db6227c6cf2c2d48d7c4",17:"67dd1babb9349b060475",18:"d1abc56a68773870c55e",19:"17a52a422912ae92f236",20:"01b051aa7d821165490c",21:"dfc52277a8d638888299",22:"90db595bb5b087918aea",23:"16053d5d0a2441d7eb54",24:"745e26ccd982cf8f87ca",25:"27d078fb88f77616f64f",26:"d4009226205dc1bafbe3",27:"174e2ff2b42fd752fd7d",28:"85e583b8bbedd49e5849",29:"084b68bd50ee5df0283c",30:"5c3baf1b5c4e15c42acf",31:"c5a44ed34c78fb4fd15e",32:"ac08444493d3f5224184",33:"c514c9bb2685dfef71ca",34:"575d470f8edba6478562",35:"258a67d96ee038e18880",38:"28fd0e3287c530f9d886"}[e]+".js";var t=setTimeout(o,12e4);function o(){d.onerror=d.onload=null,clearTimeout(t);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return d.onerror=d.onload=o,a.appendChild(d),f},r.m=e,r.c=f,r.d=function(e,c,f){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.b26bff17d683a2125796.js.map
\ No newline at end of file
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<a :href="'#/employee?addnew=1&departmentId='+groupInfo.departmentId"> <a :href="'#/employee?addnew=1&departmentId='+groupInfo.departmentId">
<el-button type="primary">添加成员</el-button> <el-button type="primary">添加成员</el-button>
</a> </a>
<a :href="'#/employeeIo?departmentId='+groupInfo.departmentId"><el-button>批量导入/导出</el-button></a> <a :href="'#/employeeIo?importCode=employee&departmentId='+groupInfo.departmentId"><el-button>批量导入/导出</el-button></a>
<el-button type="danger" plain @click="delMembers" :disabled="disabledDel">批量删除</el-button> <el-button type="danger" plain @click="delMembers" :disabled="disabledDel">批量删除</el-button>
<el-button class="J_show-children"><el-checkbox class="m-r-10" v-model="showChildMember" @change="setChildMemberShow"></el-checkbox><a class="a-href">显示子成员</a></el-button> <el-button class="J_show-children"><el-checkbox class="m-r-10" v-model="showChildMember" @change="setChildMemberShow"></el-checkbox><a class="a-href">显示子成员</a></el-button>
</div> </div>
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
<div class="step-div"> <div class="step-div">
<span class="ft-large"></span>上传收集完毕的员工信息表 <span class="ft-large"></span>上传收集完毕的员工信息表
<div class="d-u-btn m-t-20"> <div class="d-u-btn m-t-20">
<!-- <el-button type="primary" @click.stop="handleUpload">选择文件</el-button> -->
<el-upload <el-upload
class="upload-demo" class="upload-demo"
ref="upload" ref="upload"
...@@ -40,11 +39,10 @@ ...@@ -40,11 +39,10 @@
<el-button slot="trigger" size="small" type="primary">选取文件</el-button> <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<div slot="tip" class="el-upload__tip">文件格式必须为xls或xlsx格式</div> <div slot="tip" class="el-upload__tip">文件格式必须为xls或xlsx格式</div>
</el-upload> </el-upload>
<!-- <p class="warming">文件格式必须为xls或xlsx格式</p> -->
</div> </div>
</div> </div>
<div class="up-btn-div"> <div class="up-btn-div">
<el-button type="primary" @click="submitUpload" :disabled="fileList.length == 0">上传</el-button> <el-button type="primary" @click="submitUpload('upload')" :disabled="fileList.length == 0">上传</el-button>
</div> </div>
</div> </div>
<div class="handle-area import" v-else-if="type == 'export'"> <div class="handle-area import" v-else-if="type == 'export'">
...@@ -59,7 +57,6 @@ ...@@ -59,7 +57,6 @@
<div class="step-div"> <div class="step-div">
<span class="ft-large"></span>上传修改好的员工信息表 <span class="ft-large"></span>上传修改好的员工信息表
<div class="d-u-btn m-t-20"> <div class="d-u-btn m-t-20">
<!-- <el-button type="primary" @click.stop="handleUpload">选择文件</el-button> -->
<el-upload <el-upload
class="upload-demo" class="upload-demo"
ref="uploadEdit" ref="uploadEdit"
...@@ -73,11 +70,20 @@ ...@@ -73,11 +70,20 @@
<el-button slot="trigger" size="small" type="primary">选取文件</el-button> <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<div slot="tip" class="el-upload__tip">文件格式必须为xls或xlsx格式</div> <div slot="tip" class="el-upload__tip">文件格式必须为xls或xlsx格式</div>
</el-upload> </el-upload>
<!-- <p class="warming">文件格式必须为xls或xlsx格式</p> -->
</div> </div>
</div> </div>
<div class="up-btn-div"> <div class="up-btn-div">
<el-button type="primary" @click="submitUpload" :disabled="fileList.length == 0">上传</el-button> <el-button type="primary" @click="submitUpload('uploadEdit')" :disabled="fileList.length == 0">上传</el-button>
</div>
</div>
<div class="handle-area import" v-else>
<div class="title-area">
<div class="tip">
导入总条数:0条,成功导入0条,<span class="red">错误导入0条</span>
</div>
<a href="">
<el-button type="primary">导出错误记录</el-button>
</a>
</div> </div>
</div> </div>
</div> </div>
...@@ -104,11 +110,15 @@ export default { ...@@ -104,11 +110,15 @@ export default {
methods: { methods: {
resetList(val) { resetList(val) {
this.fileList = []; this.fileList = [];
if (val == "note") {
this.getErrorNote();
}
}, },
getErrorNote() { getErrorNote() {
let ths = this; let ths = this;
let params = { let params = {
departmentId: ths.$route.query.departmentId departmentId: ths.$route.query.departmentId,
importCode: ths.$route.query.importCode
}; };
getRequest("/haoban-manage-web/error-log-page", params) getRequest("/haoban-manage-web/error-log-page", params)
.then(res => { .then(res => {
...@@ -126,8 +136,8 @@ export default { ...@@ -126,8 +136,8 @@ export default {
handlePreview(file) { handlePreview(file) {
console.log(file); console.log(file);
}, },
submitUpload() { submitUpload(upload) {
this.$refs.upload.submit(); this.$refs[upload].submit();
}, },
getChange(file, fileList) { getChange(file, fileList) {
console.log(file, fileList); console.log(file, fileList);
...@@ -150,7 +160,9 @@ export default { ...@@ -150,7 +160,9 @@ export default {
} }
}, },
beforeMount() { beforeMount() {
this.getErrorNote(); if (this.type == "note") {
this.getErrorNote();
}
} }
} }
</script> </script>
...@@ -204,6 +216,17 @@ export default { ...@@ -204,6 +216,17 @@ export default {
padding: 25px 20px; padding: 25px 20px;
margin-top: 24px; margin-top: 24px;
color: #606266; color: #606266;
.title-area {
display: flex;
height: 32px;
line-height: 32px;
.tip {
flex: 1;
.red {
color: red;
}
}
}
.step-div { .step-div {
.d-u-btn { .d-u-btn {
display:inline-block; display:inline-block;
......
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