Skip to content

H
haoban-3
Commit c293b5c8 by 无尘
Options

fix: 修改分页

parent 77b7667c
Showing with 77 additions and 17 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.28.css><link href=./static/css/app.13d430435daa54ff144b09a1525e27be.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 src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.174296556d13979efdd9.js></script><script type=text/javascript src=./static/js/vendor.62ac2d475dfcb7888aad.js></script><script type=text/javascript src=./static/js/app.41cf9f0f06f76da99a8c.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.28.css><link href=./static/css/app.3c63748defb4ccb9771776a3cae9725d.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 src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.5ab0a7d1ba148e543d71.js></script><script type=text/javascript src=./static/js/vendor.62ac2d475dfcb7888aad.js></script><script type=text/javascript src=./static/js/app.41cf9f0f06f76da99a8c.js></script></body></html>
\ No newline at end of file
dist/static/js/4.47be307c48a44fe257da.js → dist/static/js/4.4b672e9fb59ad501d0e9.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.8655ae3d01f83bea5a9a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.bd247401155491e85f6d.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/manifest.174296556d13979efdd9.js → dist/static/js/manifest.5ab0a7d1ba148e543d71.js
!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={80: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:"cbedb09f8527f7df9eb0",1:"954a8a70c5f1171933ac",2:"a280cacc2b4b43a244e1",3:"00e1cab932674e11a7ac",4:"47be307c48a44fe257da",5:"3c335bf1dd72ca957262",6:"987ab930d70320e9de11",7:"e2471fa3903291b9c591",8:"bd247401155491e85f6d",9:"893877b035c3b35f556e",10:"72fccf60a68381f76d55",11:"e50caf7e54aeba14012b",12:"3a716cdc462dbec28cf8",13:"3d730de7c60fa8d18ccb",14:"e11f31e60dab3db1f2ea",15:"6f6e42df3e657913869b",16:"b692b43283275c0bc6b9",17:"62255cf03bb549956c58",18:"7ffc38554bc63393a91e",19:"35726f60c578a23e9017",20:"ba2e2bd0823422a4de6c",21:"2073753ae49abdc23a5e",22:"41ffd63f72a1ec6e59b8",23:"e0c916556828fa70af60",24:"7a57624e89e34e420a52",25:"b33652a002af7a00f907",26:"9cbcbc21da1497c3c88d",27:"7b3dd90cfa2c0d5203d2",28:"53e6616ed021ab731d6c",29:"44433e90d6affacc76f8",30:"196dbd7ed8dc5dac2699",31:"18ef42ac5cec84cc247e",32:"5c7e44cdd6fbfea3e17b",33:"9081ead4ff7da6bbcc09",34:"5ddc08b92106aa050122",35:"813f9fa7bd98fbca9dd8",36:"cf85d431bf885b5e642d",37:"47cbd1ef2f65ae69c2d6",38:"778a114acece521cbeb2",39:"3b0a409728d724b82c12",40:"9b42df34317bf72a31fd",41:"d897544ef0e120fa5e4e",42:"bce71b4227f6a89e1f0e",43:"6dbdea53d2130ebc0609",44:"3cb0ad37cd3b652bf968",45:"2c6b2a0c1ecdf5dbf3c8",46:"9dad3123f2fc347c9f46",47:"a7bb6a30ce7426c8424b",48:"e7d2534c955cec793d9d",49:"27afa66e95971d59227a",50:"adff1b1ecb27fb4bfcad",51:"f693420dcf48a7d94ae8",52:"4c730b50f978ad037ef1",53:"10ff6c8961898574121c",54:"057590a3480a333bd474",55:"3295563b7fbab7d7c92f",56:"392c874cbb83e68ba9b0",57:"0e458cb17af2cd84e871",58:"1606f8fed39bf289ed0e",59:"cb5a57c61337260a25ea",60:"e10d02ed3d3fd3f20f60",61:"ad09f0a95c5679ad6552",62:"7e6e0052d51c7547d70a",63:"0f8d3111b2b4e4f8c57b",64:"ce82fb945a44f47f1c1f",65:"52304eb24aada488c91f",66:"806271562f576dd0122c",67:"371a3d9f0e8c7aa3be9b",68:"5b0ebf4833498e06a8ed",69:"a76ca6ffb3668870b792",70:"da7c2a6096a1f44d78c1",71:"1730b154501db72324c2",72:"c3f9e8708ab92c13ba82",73:"54639ebdb8b503e723e0",74:"ddf9ccf79dcddaf6526e",75:"cf01c9adbf3c4e3828c7",76:"e98d846979e8bfbcf0dd",77:"57945ae646bb44434010"}[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
!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={80: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:"cbedb09f8527f7df9eb0",1:"954a8a70c5f1171933ac",2:"a280cacc2b4b43a244e1",3:"00e1cab932674e11a7ac",4:"4b672e9fb59ad501d0e9",5:"3c335bf1dd72ca957262",6:"987ab930d70320e9de11",7:"e2471fa3903291b9c591",8:"8655ae3d01f83bea5a9a",9:"893877b035c3b35f556e",10:"72fccf60a68381f76d55",11:"e50caf7e54aeba14012b",12:"3a716cdc462dbec28cf8",13:"3d730de7c60fa8d18ccb",14:"e11f31e60dab3db1f2ea",15:"6f6e42df3e657913869b",16:"b692b43283275c0bc6b9",17:"62255cf03bb549956c58",18:"7ffc38554bc63393a91e",19:"35726f60c578a23e9017",20:"ba2e2bd0823422a4de6c",21:"2073753ae49abdc23a5e",22:"41ffd63f72a1ec6e59b8",23:"e0c916556828fa70af60",24:"7a57624e89e34e420a52",25:"b33652a002af7a00f907",26:"9cbcbc21da1497c3c88d",27:"7b3dd90cfa2c0d5203d2",28:"53e6616ed021ab731d6c",29:"44433e90d6affacc76f8",30:"196dbd7ed8dc5dac2699",31:"18ef42ac5cec84cc247e",32:"5c7e44cdd6fbfea3e17b",33:"9081ead4ff7da6bbcc09",34:"5ddc08b92106aa050122",35:"813f9fa7bd98fbca9dd8",36:"cf85d431bf885b5e642d",37:"47cbd1ef2f65ae69c2d6",38:"778a114acece521cbeb2",39:"3b0a409728d724b82c12",40:"9b42df34317bf72a31fd",41:"d897544ef0e120fa5e4e",42:"bce71b4227f6a89e1f0e",43:"6dbdea53d2130ebc0609",44:"3cb0ad37cd3b652bf968",45:"2c6b2a0c1ecdf5dbf3c8",46:"9dad3123f2fc347c9f46",47:"a7bb6a30ce7426c8424b",48:"e7d2534c955cec793d9d",49:"27afa66e95971d59227a",50:"adff1b1ecb27fb4bfcad",51:"f693420dcf48a7d94ae8",52:"4c730b50f978ad037ef1",53:"10ff6c8961898574121c",54:"057590a3480a333bd474",55:"3295563b7fbab7d7c92f",56:"392c874cbb83e68ba9b0",57:"0e458cb17af2cd84e871",58:"1606f8fed39bf289ed0e",59:"cb5a57c61337260a25ea",60:"e10d02ed3d3fd3f20f60",61:"ad09f0a95c5679ad6552",62:"7e6e0052d51c7547d70a",63:"0f8d3111b2b4e4f8c57b",64:"ce82fb945a44f47f1c1f",65:"52304eb24aada488c91f",66:"806271562f576dd0122c",67:"371a3d9f0e8c7aa3be9b",68:"5b0ebf4833498e06a8ed",69:"a76ca6ffb3668870b792",70:"da7c2a6096a1f44d78c1",71:"1730b154501db72324c2",72:"c3f9e8708ab92c13ba82",73:"54639ebdb8b503e723e0",74:"ddf9ccf79dcddaf6526e",75:"cf01c9adbf3c4e3828c7",76:"e98d846979e8bfbcf0dd",77:"57945ae646bb44434010"}[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/org-tree.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-08-14 16:51:07
* @LastEditors: 无尘
* @LastEditTime: 2020-06-17 14:47:26
* @LastEditTime: 2020-06-19 10:12:07
-->
<!--
<org-tree v-if="item.children.length" :itemData="item.children" ></org-tree>
......@@ -16,7 +16,7 @@ import orgTree from './org-tree.vue';
<!--<draggable :list="itemData" class="org-component" :options="leftOption" :move="onMove" @start="isDragging = true" @end="itemMoveEnd">
-->
<li v-for="(item, index) in itemData" :key="index + 'gic'">
<div :class="['li-cell cursor-pointer', departObj.departmentId == item.departmentId ? 'li-cell-active' : '']">
<div :class="['li-cell cursor-pointer', departObj.storeGroupId == item.storeGroupId ? 'li-cell-active' : '']">
<div :style="{ 'margin-left': (item.level + 1) * 20 + 'px' }" :class="['li-cell-inner border-box cursor-pointer']" @click="toggleExpand(item)">
<span :class="['font-12 color-606266', item.isStore == 1 || !item.hasSonNode ? 'color-fff' : '', item.expand ? 'el-icon-caret-bottom' : 'el-icon-caret-right']"></span><span v-if="item.loading" class="el-tree-node__loading-icon el-icon-loading"></span><span class="font-14 color-606266 p-l-10">{{ item.label }}</span>
</div>
......@@ -109,11 +109,11 @@ export default {
// console.log(item);
item.expand = item.expand ? false : true;
// 点击的时候，如果非门店且子级是空的需要请求获取子级
if (item.isStore == 0 && !item.children.length && !item.loaded && item.hasSonNode == true) {
/* if (item.isStore == 0 && !item.children.length && !item.loaded && item.hasSonNode == true) {
item.loading = true;
item.children = await that.getChildData(item);
item.loading = false;
}
} */
that.$emit('getSelectData', item);
},
/**
......
src/views/apps/customerApp/myCustomerList.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-06-18 13:36:23
* @LastEditTime: 2020-06-19 10:19:59
-->
<template>
<div class="app-detail-wrap">
......@@ -130,6 +130,34 @@ export default {
},
methods: {
/**
* 是否在分配中
*/
async assignStatus() {
const that = this;
return new Promise((resolve, reject) => {
let para = {
storeId: that.departObj.departmentId
};
getRequest('/haoban-app-customer-web/app-distribute-status', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
resolve(resData.result);
return;
}
errMsg.errorMsg(resData);
resolve(false);
})
.catch(function(error) {
resolve(false);
that.$message.error({
duration: 1000,
message: error.message
});
});
});
},
/**
* 关闭分配
*/
closeText() {
......@@ -205,8 +233,16 @@ export default {
/**
* 分配
*/
toAssignMember(index, row) {
async toAssignMember(index, row) {
const that = this;
const flag = await that.assignStatus();
if (flag) {
that.$message.error({
duration: 1000,
message: '会员正在分配中，请稍后再试'
});
return false;
}
that.editRow = row;
// 如果选中一个分配，就要把批量已选的全部置空
that.selectRadio = 0;
......@@ -217,9 +253,17 @@ export default {
/**
* 批量分配
*/
toAssign() {
async toAssign() {
const that = this;
that.editRow = {};
const flag = await that.assignStatus();
if (flag) {
that.$message.error({
duration: 1000,
message: '会员正在分配中，请稍后再试'
});
return false;
}
if (!that.multipleSelection.length) {
that.$message.error({
duration: 1000,
......@@ -229,7 +273,25 @@ export default {
}
that.assignShow = true;
},
/**
* 简单数组-->父子数组对象
*/
async treeData(data) {
// const that = this;
let tree = data.filter(father => {
//循环所有项
let branchArr = data.filter(child => {
return father.storeGroupId == child.parentGroupId; //返回每一项的子级数组
});
if (branchArr.length > 0) {
father.children = branchArr; //如果存在子级，则给父级添加一个children属性，并赋值
} else {
father.children = [];
}
return father.parentGroupId == 0; //返回第一层
});
return tree;
},
/**
* 获取 gic 数据
*/
......@@ -240,7 +302,7 @@ export default {
wxEnterpriseRelatedId: that.wxEnterpriseRelatedId
};
getRequest('/haoban-app-customer-web/gic-department-list', para)
.then(res => {
.then(async res => {
let resData = res.data;
if (resData.errorCode == 1) {
if (resData.result.length) {
......@@ -248,12 +310,10 @@ export default {
ele.loading = false;
ele.expand = false;
ele.children = [];
ele.level = 0;
ele.gicBind = true;
ele.label = ele.departmentName;
ele.label = ele.storeGroupName;
});
that.gicData = await that.treeData(resData.result);
}
that.gicData = resData.result || [];
return false;
}
errMsg.errorMsg(resData);
......
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