Skip to content

O
office-web
Commit b800a6bc by 无尘
Options

fix: 修改行政架构选择组件

parent 5ccd1094
Showing with 34 additions and 19 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.35e97d8935da0ce36ba98531c7daf936.css rel=stylesheet></head><body style="min-width: 1400px;"><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>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.ede6e7d8f7af8e8c07cc.js></script><script type=text/javascript src=./static/js/vendor.28541dbeac66c2b0770e.js></script><script type=text/javascript src=./static/js/app.c3a54b932b59a2b27a21.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.35e97d8935da0ce36ba98531c7daf936.css rel=stylesheet></head><body style="min-width: 1400px;"><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>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.ab3c6dbe4e51f63f3177.js></script><script type=text/javascript src=./static/js/vendor.28541dbeac66c2b0770e.js></script><script type=text/javascript src=./static/js/app.96ff0fd722a160f7a7ef.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/0.0a1c08028f618b0029df.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.1179895fb223ec45079b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.ede6e7d8f7af8e8c07cc.js → dist/static/js/manifest.ab3c6dbe4e51f63f3177.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],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(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={80:0};function d(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,d),f.l=!0,f.exports}d.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,d){a=f[e]=[c,d]});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,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"0a1c08028f618b0029df",1:"0ebe3ead93207dc78a78",2:"979deb10fce5b2fefcdb",3:"c2fd89730cdd6d5b8904",4:"a7739bd271890b9783da",5:"585fa5e680c961f3e6ea",6:"657b140c98f462652267",7:"be8e7edee46425036d65",8:"9180c86d724863021ea1",9:"c0ab7f07dafdf33c45a8",10:"bc4f603351d381704d20",11:"2cfce44be1d5002c95f1",12:"4016edb8deca6d842c91",13:"34bd3d823e73c2a4d360",14:"8719a4be4e72a548434c",15:"44c53617b1c7157b2b3d",16:"8bbab7f0b523d759a78c",17:"1e3d1d8042e00004f1d6",18:"c930c090830262321506",19:"cc7b1ebd6f9ba0b8b16f",20:"81f6c674a6461ef85896",21:"08e506839eb7346cac08",22:"5a40199f94d4ea1b6837",23:"5ed1b5fd3abff19ce342",24:"76b4e7e91dd85e30a622",25:"b1a072a021ca5876e8df",26:"2c0979f3bd7ee7896b97",27:"d06c17faef5f94ce3538",28:"3d946787d17a55b8aec9",29:"70873e3ed623495d6cdf",30:"e16084cc0e35a7c402f8",31:"6ebf6fd2fb1d413dbbe9",32:"084a3fa0e9d86187adab",33:"a61bb39442525ba257fb",34:"4e9d79b9cd4fc8ef64d5",35:"56d42fcc424a3d614be7",36:"ccec8570d9108294281e",37:"97738eb5460b201748ed",38:"4922763f6bf4d8a5fe35",39:"873618a0a695aab4ea71",40:"07e1860698ac67bb2d63",41:"2437a351e138d54530f7",42:"85f33f1f34822f8b4494",43:"2058a7dd9a35991230bb",44:"26529d299fa7b1a1f97a",45:"879e8b8e34fd7c58247a",46:"56a09c315fec48803136",47:"b630596a508cb57973a4",48:"d979e11090ad6978fa17",49:"52867121cd605885ce35",50:"8e23db0b98b81fb9fa92",51:"3af7210dfb262608914c",52:"dd784a024602f71dd3c4",53:"ba55300752dec12ba21c",54:"a834471c436fde266802",55:"f17ab600dad59c0971a4",56:"950642a0966ed28c76a9",57:"a572a9ffb3ed29596ba0",58:"54d755af2660294c43ce",59:"bdd2981f6ae08955333e",60:"34909629679cfbb6b9e3",61:"9abde0a0878b085fc774",62:"3edbfb7b8910942f64cf",63:"c3d47d05a87104c506fe",64:"68123a6c1e967539946a",65:"f4f7e3f4ecb0250e9119",66:"901deeff367aae2dcc0e",67:"53db8f85e4be34984914",68:"7b9bfeea88eab8a0c88b",69:"518fa345263ef1bb9abc",70:"402183ad00e111b62764",71:"458af30d30795059cdbe",72:"37f6b09ae31da0373148",73:"18ea446164b9b7002fde",74:"2b90f6b5ae29a26aa9ce",75:"44714b271d06e1e87012",76:"2aa54224090068b0b0fe",79:"177f5627a2a311e067eb"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,b,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 b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},c={80:0};function d(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,d),c.l=!0,c.exports}d.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,d){a=c[e]=[f,d]});a[2]=f;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:"1179895fb223ec45079b",1:"0ebe3ead93207dc78a78",2:"979deb10fce5b2fefcdb",3:"c2fd89730cdd6d5b8904",4:"a7739bd271890b9783da",5:"585fa5e680c961f3e6ea",6:"657b140c98f462652267",7:"90e6a6f38346b0a8b924",8:"9180c86d724863021ea1",9:"c0ab7f07dafdf33c45a8",10:"bc4f603351d381704d20",11:"2cfce44be1d5002c95f1",12:"6e5d140fabbc797fe7a3",13:"34bd3d823e73c2a4d360",14:"8719a4be4e72a548434c",15:"4e05a90cc5d9a054dae6",16:"fc1264890c2669f41a52",17:"1e3d1d8042e00004f1d6",18:"c930c090830262321506",19:"cc7b1ebd6f9ba0b8b16f",20:"81f6c674a6461ef85896",21:"08e506839eb7346cac08",22:"5a40199f94d4ea1b6837",23:"5ed1b5fd3abff19ce342",24:"76b4e7e91dd85e30a622",25:"b1a072a021ca5876e8df",26:"2c0979f3bd7ee7896b97",27:"d06c17faef5f94ce3538",28:"3d946787d17a55b8aec9",29:"70873e3ed623495d6cdf",30:"e16084cc0e35a7c402f8",31:"6ebf6fd2fb1d413dbbe9",32:"084a3fa0e9d86187adab",33:"a61bb39442525ba257fb",34:"4e9d79b9cd4fc8ef64d5",35:"56d42fcc424a3d614be7",36:"ccec8570d9108294281e",37:"97738eb5460b201748ed",38:"4922763f6bf4d8a5fe35",39:"873618a0a695aab4ea71",40:"07e1860698ac67bb2d63",41:"2437a351e138d54530f7",42:"85f33f1f34822f8b4494",43:"2058a7dd9a35991230bb",44:"26529d299fa7b1a1f97a",45:"879e8b8e34fd7c58247a",46:"56a09c315fec48803136",47:"b630596a508cb57973a4",48:"d979e11090ad6978fa17",49:"52867121cd605885ce35",50:"8e23db0b98b81fb9fa92",51:"3af7210dfb262608914c",52:"dd784a024602f71dd3c4",53:"ba55300752dec12ba21c",54:"a834471c436fde266802",55:"f17ab600dad59c0971a4",56:"950642a0966ed28c76a9",57:"a572a9ffb3ed29596ba0",58:"54d755af2660294c43ce",59:"bdd2981f6ae08955333e",60:"34909629679cfbb6b9e3",61:"9abde0a0878b085fc774",62:"3edbfb7b8910942f64cf",63:"c3d47d05a87104c506fe",64:"68123a6c1e967539946a",65:"f4f7e3f4ecb0250e9119",66:"901deeff367aae2dcc0e",67:"53db8f85e4be34984914",68:"7b9bfeea88eab8a0c88b",69:"518fa345263ef1bb9abc",70:"402183ad00e111b62764",71:"458af30d30795059cdbe",72:"37f6b09ae31da0373148",73:"18ea446164b9b7002fde",74:"2b90f6b5ae29a26aa9ce",75:"44714b271d06e1e87012",76:"2aa54224090068b0b0fe",79:"177f5627a2a311e067eb"}[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,b.appendChild(n),f},d.m=e,d.c=f,d.d=function(e,a,f){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/common/vueSelectEmployee.vue
...@@ -211,7 +211,7 @@ export default { ...@@ -211,7 +211,7 @@ export default {
that.menuData = [group]; that.menuData = [group];
that.defaultOpen.push(group.id); that.defaultOpen.push(group.id);
group.handleWord = '收起'; group.handleWord = '收起';
console.log(group); // console.log(group);
} }
} }
that.menusObj[group.id] = group; that.menusObj[group.id] = group;
......
src/components/common/vueSelectStore.vue
...@@ -386,14 +386,17 @@ export default { ...@@ -386,14 +386,17 @@ export default {
* 选择品牌 * 选择品牌
*/ */
selectBrand(val) { selectBrand(val) {
this.menuData = [this.brands[val]]; // 默认品牌数据为分组第一层数据 let that = this;
this.brands[val].hasLoad = true; that.$nextTick(() => {
this.firstRender = true; that.menuData = [that.brands[val]]; // 默认品牌数据为分组第一层数据
if (this.selectType != 'group') { that.brands[val].hasLoad = true;
// 如果选择的不是 group （即：只选分组） that.firstRender = true;
this.getStoreList(this.menuData[0]); if (that.selectType != 'group') {
} // 如果选择的不是 group （即：只选分组）
this.renderDefault(); that.getStoreList(that.menuData[0]);
}
that.renderDefault();
});
}, },
/** /**
* 渲染回显数据 * 渲染回显数据
......
src/components/contacts/employeeInfo.vue
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<el-switch v-model="info.managerMode" active-color="#409EFF" inactive-color="#DCDFE6"> </el-switch> <el-switch v-model="info.managerMode" active-color="#409EFF" inactive-color="#DCDFE6"> </el-switch>
</div> </div>
</div> </div>
<vue-select-employee ref="parentSelector" :treeSet="treeSet" @handleSelectedList="handleSelectedList" :treeData="treeData"></vue-select-employee> <vue-select-employee ref="parentSelector" :defaultSelection="defaultSelection" :treeSet="treeSet" :treeData="treeData" @handleSelectedList="handleSelectedList"></vue-select-employee>
</div> </div>
</template> </template>
<script> <script>
...@@ -88,6 +88,7 @@ export default { ...@@ -88,6 +88,7 @@ export default {
phoneNumber: '', phoneNumber: '',
departmentName: '' departmentName: ''
}, },
defaultSelection: [],
rules: { rules: {
name: [{ required: true, message: '请输入员工姓名', trigger: 'blur' }, { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }], name: [{ required: true, message: '请输入员工姓名', trigger: 'blur' }, { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }],
phoneNumber: [{ required: true, validator: validatePhone, trigger: 'blur' }], phoneNumber: [{ required: true, validator: validatePhone, trigger: 'blur' }],
...@@ -131,9 +132,18 @@ export default { ...@@ -131,9 +132,18 @@ export default {
}, },
handleSelectedList(obj) { handleSelectedList(obj) {
// 获取选部门空间选择的父层分组 // 获取选部门空间选择的父层分组
this.info.departmentId = obj.id;
this.info.departmentName = obj.label;
// console.log(this.info); // console.log(this.info);
let that = this;
if (obj) {
that.defaultSelection = [obj]; // 增加默认已选数据
that.info.departmentId = obj.id;
that.info.departmentName = obj.label;
}else {
that.defaultSelection = [];
that.info.departmentId = '';
that.info.departmentName = '';
}
}, },
getEmployInfo() { getEmployInfo() {
let that = this; let that = this;
......
src/components/employeeRecord/employeeList.vue
...@@ -289,18 +289,20 @@ export default { ...@@ -289,18 +289,20 @@ export default {
}, },
delSld(sld, isStoreGroup) { delSld(sld, isStoreGroup) {
// 删除选择的导出字段 // 删除选择的导出字段
console.log(sld);
// isStoreGroup 区分行政架构和门店架构
let that = this; let that = this;
let idx = that.selectionList.indexOf(sld); let idx = that.selectionList.indexOf(sld);
that.selectionList.splice(idx, 1); that.selectionList.splice(idx, 1);
if (sld.type == 3 || (sld.hasOwnProperty('isStoreGroup') && sld.isStoreGroup == 1)) { // isClerk : 0-员工（行政架构），1-店员（门店架构）
if (sld.type == 3 || (sld.hasOwnProperty('isStoreGroup') && sld.isStoreGroup == 1) || (sld.hasOwnProperty('isClerk') && sld.isClerk == 1)) {
that.defaultStoreList.forEach((ele, index) => { that.defaultStoreList.forEach((ele, index) => {
if (ele.id == sld.id) { if (ele.id == sld.id) {
that.defaultStoreList.splice(index, 1); that.defaultStoreList.splice(index, 1);
} }
}); });
} }
if (sld.hasOwnProperty('isStoreGroup') && sld.isStoreGroup == 0) { if ((sld.hasOwnProperty('isStoreGroup') && sld.isStoreGroup == 0) || (sld.hasOwnProperty('isClerk') && sld.isClerk == 0)) {
that.adDefaultSelection.forEach((ele, index) => { that.adDefaultSelection.forEach((ele, index) => {
if (ele.id == sld.id) { if (ele.id == sld.id) {
that.adDefaultSelection.splice(index, 1); that.adDefaultSelection.splice(index, 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