Skip to content

O
office-web
Commit 9e6761de by 无尘
Options

fix: 修改 在职员工筛选

parent 8f031554
Showing with 32 additions and 15 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.f67635317a92fbb0d597cb0489dc6949.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script src=https://cdn.ravenjs.com/3.26.2/vue/raven.min.js crossorigin=anonymous></script><script>Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.3cf075cc3b46c4dafd59.js></script><script type=text/javascript src=./static/js/vendor.2a06374a31d674ca49d2.js></script><script type=text/javascript src=./static/js/app.2a1ad6040a1ec278014d.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 href=./static/css/app.f67635317a92fbb0d597cb0489dc6949.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script src=https://cdn.ravenjs.com/3.26.2/vue/raven.min.js crossorigin=anonymous></script><script>Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.1272ab604e1b73299e78.js></script><script type=text/javascript src=./static/js/vendor.2a06374a31d674ca49d2.js></script><script type=text/javascript src=./static/js/app.2a1ad6040a1ec278014d.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.3cf075cc3b46c4dafd59.js → dist/static/js/manifest.1272ab604e1b73299e78.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,d,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(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={},c={73:0};function b(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,b),c.l=!0,c.exports}b.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,b){a=c[e]=[f,b]});a[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:"a445e74b3900f3876c72",1:"0ebe3ead93207dc78a78",2:"c8863e7a9d4b284238db",3:"e1a859c969621af21987",4:"59afc6b09559f1ebc067",5:"b2540360eda0ee16006c",6:"00b931389a74250125a3",7:"50747c5f602fa39713ee",8:"ccfd1bb81626da46f432",9:"b916c8d12141617e4db2",10:"84a1849b0202f4273f23",11:"48cce40bd1119cfef79d",12:"8a1633b353b37d5bfcd2",13:"50f2f7291e012aa2feab",14:"94920536d81601122060",15:"35d29be8ae21328d7a1a",16:"7016f834cadae9b57028",17:"2c76434ec01b2b5ee02f",18:"d07d6af2aa0d5ee86261",19:"7ed28ae00b8809d6d671",20:"8f48037229efe39f46f1",21:"2103d8428d4f707fa369",22:"dec9447a8c45f2a2c7bb",23:"bd9202e3991ee39668e6",24:"54f2906c51709913d672",25:"4f9db49437ea94436d03",26:"1649432938888d71b3c9",27:"67137144c98b28cc5a30",28:"140ad99228544036c969",29:"30037b5674e7675b1da7",30:"fa0e0e20a9883b94be73",31:"a8e20732b0b0f62f5c5a",32:"509f0e1d73c3190be53a",33:"d649a5e4d061985d1c3a",34:"4977e6b9167f796404b9",35:"718d90637b7e54754f31",36:"6b7ba3c82f569f7a47e0",37:"f8bf84592943c5dfbf8a",38:"db0ccdb9d831a1fee238",39:"8861e4489f26fe322990",40:"c6cf553f8eb155ae6f1a",41:"119ab10f2d353ddcdbc8",42:"3cda7effdd6238c3e2d9",43:"afd187ba0590923ba9e5",44:"77199a317327d7ebcf4b",45:"5b64fee2aa3e6c3e3fc9",46:"588053d1bdb79f78028d",47:"e53a7b3b284d29858fae",48:"75da586a106599c730c1",49:"028b1255269b880f351b",50:"4289d8f282974207066c",51:"98c3602fc3a9ab54693a",52:"5ea13e39ab6e51a9054f",53:"5232792298264e487629",54:"4749eb7f37153ac94005",55:"bea6622b77dd0e24b535",56:"a2faa30e5f1c6aeb57be",57:"9064c84ce91fad83fe44",58:"04dbe15e8a9576b15187",59:"b62232922e7ccdd7242e",60:"956a6a3b0b11e618bd1b",61:"c220c6bad221831a72f6",62:"f797b18bb14b4d79151b",63:"b05b4ec28d2829c54f65",64:"0be98c69b2be684d451f",65:"e069a6e1df52acf3f14f",66:"9f1afb5a13b54ea92a02",67:"d674abd10a01e3c004c8",68:"2189902bf2848c91608c",69:"4087b90ee08d0100519f",72:"e19aae5a21dcfad3391e"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),f},b.m=e,b.c=f,b.d=function(e,a,f){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,d,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(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={},c={73:0};function b(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,b),c.l=!0,c.exports}b.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,b){a=c[e]=[f,b]});a[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:"a445e74b3900f3876c72",1:"0ebe3ead93207dc78a78",2:"c8863e7a9d4b284238db",3:"e1a859c969621af21987",4:"59afc6b09559f1ebc067",5:"b2540360eda0ee16006c",6:"00b931389a74250125a3",7:"5313d9fa9c253fd213a1",8:"ccfd1bb81626da46f432",9:"b916c8d12141617e4db2",10:"84a1849b0202f4273f23",11:"48cce40bd1119cfef79d",12:"8a1633b353b37d5bfcd2",13:"b54fd93a7f5be81f3f90",14:"94920536d81601122060",15:"35d29be8ae21328d7a1a",16:"7016f834cadae9b57028",17:"2c76434ec01b2b5ee02f",18:"d07d6af2aa0d5ee86261",19:"7ed28ae00b8809d6d671",20:"8f48037229efe39f46f1",21:"2103d8428d4f707fa369",22:"dec9447a8c45f2a2c7bb",23:"bd9202e3991ee39668e6",24:"54f2906c51709913d672",25:"4f9db49437ea94436d03",26:"1649432938888d71b3c9",27:"67137144c98b28cc5a30",28:"140ad99228544036c969",29:"30037b5674e7675b1da7",30:"fa0e0e20a9883b94be73",31:"a8e20732b0b0f62f5c5a",32:"509f0e1d73c3190be53a",33:"d649a5e4d061985d1c3a",34:"4977e6b9167f796404b9",35:"718d90637b7e54754f31",36:"6b7ba3c82f569f7a47e0",37:"f8bf84592943c5dfbf8a",38:"db0ccdb9d831a1fee238",39:"8861e4489f26fe322990",40:"c6cf553f8eb155ae6f1a",41:"119ab10f2d353ddcdbc8",42:"3cda7effdd6238c3e2d9",43:"afd187ba0590923ba9e5",44:"77199a317327d7ebcf4b",45:"5b64fee2aa3e6c3e3fc9",46:"588053d1bdb79f78028d",47:"e53a7b3b284d29858fae",48:"75da586a106599c730c1",49:"028b1255269b880f351b",50:"4289d8f282974207066c",51:"98c3602fc3a9ab54693a",52:"5ea13e39ab6e51a9054f",53:"5232792298264e487629",54:"4749eb7f37153ac94005",55:"bea6622b77dd0e24b535",56:"a2faa30e5f1c6aeb57be",57:"9064c84ce91fad83fe44",58:"04dbe15e8a9576b15187",59:"b62232922e7ccdd7242e",60:"956a6a3b0b11e618bd1b",61:"c220c6bad221831a72f6",62:"f797b18bb14b4d79151b",63:"b05b4ec28d2829c54f65",64:"0be98c69b2be684d451f",65:"e069a6e1df52acf3f14f",66:"9f1afb5a13b54ea92a02",67:"d674abd10a01e3c004c8",68:"2189902bf2848c91608c",69:"4087b90ee08d0100519f",72:"e19aae5a21dcfad3391e"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),f},b.m=e,b.c=f,b.d=function(e,a,f){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/employeeRecord/employeeList.vue
......@@ -20,7 +20,7 @@
</div>
<el-button type="primary" @click="showExportSet">导出<i class="el-icon-upload el-icon--right"></i></el-button>
</div>
<ul class="selector-selected-list" v-if="selectionList.length > 0">
<ul class="selector-selected-list" v-if="!!selectionList.length">
<template v-for="(sld, index) in selectionList">
<li :key="index + sld.id + sld.label" class="sld">{{ sld.label }} <i class="el-icon-close" @click="delSld(sld, sld.isStoreGroup)"></i></li>
</template>
......@@ -35,7 +35,7 @@
<el-dialog :title="typeTitle" :visible.sync="dialogVisible" width="480px">
<handle-dialog :employee="employeeObj" :handleType="handleType" :typeTitle="typeTitle" @handleSuccess="handleSuccess"></handle-dialog>
</el-dialog>
<vue-select-store ref="storeSelector" @handleSelectedList="handleStoreSelectedList"></vue-select-store>
<vue-select-store ref="storeSelector" :defaultList="defaultStoreList" @handleSelectedList="handleStoreSelectedList"></vue-select-store>
<vue-select-employee ref="departmentSelector" @handleSelectedList="handleSelectedList" :changed="changed" :treeData="treeData" :defaultSelection="adDefaultSelection"></vue-select-employee>
</div>
</template>
......@@ -115,7 +115,7 @@ export default {
departMentSet: {},
storeSet: {},
treeData: {},
selectionList: [],
selectionList: [], // 门店，行政架构已选择的条件
disabled: true,
chooseClerkIdList: [],
chooseGroupIdList: [],
......@@ -123,7 +123,8 @@ export default {
adList: [],
adDefaultSelection: [],
stList: [],
changed: 0
changed: 0,
defaultStoreList: [] // 默认门店选择
};
},
methods: {
......@@ -194,10 +195,12 @@ export default {
this.formatSelectionList(arr);
},
handleStoreSelectedList(list) {
this.stList = list;
let arr = this.selectionList.concat(list);
this.selectionList = arr;
this.formatSelectionList(arr);
let that = this;
that.stList = list;
that.defaultStoreList = list;
let arr = that.selectionList.concat(list);
that.selectionList = arr;
that.formatSelectionList(arr);
},
formatSelectionList(list) {
let newList = this.unique(list);
......@@ -233,9 +236,23 @@ export default {
delSld(sld, isStoreGroup) {
// 删除选择的导出字段
let that = this;
let idx = this.selectionList.indexOf(sld);
this.selectionList.splice(idx, 1);
this.formatSelectionList(this.selectionList);
let idx = that.selectionList.indexOf(sld);
that.selectionList.splice(idx, 1);
if (sld.type == 3 || (sld.hasOwnProperty('isStoreGroup') && sld.isStoreGroup == 1)) {
that.defaultStoreList.forEach((ele, index) => {
if ((ele.id = sld.id)) {
that.defaultStoreList.splice(index, 1);
}
});
}
if (sld.hasOwnProperty('isStoreGroup') && sld.isStoreGroup == 0) {
that.adDefaultSelection.forEach((ele, index) => {
if ((ele.id = sld.id)) {
that.adDefaultSelection.splice(index, 1);
}
});
}
that.formatSelectionList(that.selectionList);
that.adList.forEach(ad => {
if (ad.id == sld.id) {
that.adList.splice(that.adList.indexOf(ad), 1);
......
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