Skip to content

H
haoban-4
Commit 1ed2f13a by 无尘
Options

fix: 修改分配会员

parent d1cab50f
Showing with 428 additions and 242 deletions
src/api/merchant-auth.js
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-07-24 12:19:48
* @LastEditors: 无尘
* @LastEditTime: 2020-09-08 11:09:52
* @LastEditTime: 2020-09-09 14:18:39
*/
import getFetch from './get-fetch.js';
......@@ -20,7 +20,7 @@ let api = {
useFormData: true,
useIntercept: false
},
checkName: '/', // 校验名字
checkName: '/gic-name-validate', // 校验名字
getAuditLogDetail: '/enterprise-auth-audit-range-detail', // 获取审核日志变更详情
getEnterprise: '/enterprise-search', // 获取商户(新增授权第一步)
getGicAdmin: '/gic-manage-list', // 切换商户 获取审核员列表
......
src/common/js/error.js
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-10-10 14:44:45
* @LastEditors: 无尘
* @LastEditTime: 2020-08-14 15:37:08
* @LastEditTime: 2020-09-09 15:35:12
*/
/* 后台返回消息提示 */
import { Message } from 'element-ui';
......@@ -21,10 +21,6 @@ export default {
window.location.href = local + '/haoban-4/#/login';
return false;
}
if (response.code == 10) {
window.location.href = local + '/haoban-4/#/index';
return false;
}
Message.error({
duration: 1000,
message: response.message || '接口异常'
......
src/common/js/public.js
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-12-05 09:56:10
* @LastEditors: 无尘
* @LastEditTime: 2020-09-04 17:28:42
* @LastEditTime: 2020-09-09 15:36:11
*/
/**
......@@ -59,9 +59,10 @@ export function _throttle(fn, intervals) {
}
/**
* 手机号格式化
* @description: 手机号格式化
* @param {String} phone
* @returns {String}
* @author: 无尘
*/
export function formatPhone(phone) {
phone = phone.toString();
......@@ -69,8 +70,9 @@ export function formatPhone(phone) {
}
/**
* 时间戳格式化
* @description: 时间戳格式化
* @param {Number} num
* @author: 无尘
*/
function formatDig(num) {
......@@ -89,9 +91,10 @@ export function formatDate(time) {
}
/**
* 千位分割
* @description: 千位分割
* @param {Number} num
* @returns {String}
* @author: 无尘
*/
export function formatNum(num) {
let number = num.toString().split('.'); // 分隔小数点
......@@ -108,8 +111,9 @@ export function formatNum(num) {
}
/**
* 表情过滤
* @description: 表情过滤
* @param {String} str
* @author: 无尘
*/
// eslint-disable-next-line
export function emojiToStr(str) {
......
src/common/js/strlen.js
......@@ -4,14 +4,15 @@
* @Author: 无尘
* @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘
* @LastEditTime: 2020-08-17 17:16:41
* @LastEditTime: 2020-09-09 15:38:27
*/
export default {
/**
* 一个汉字算两个字符,一个英文字母或数字算一个字符
* @description: 一个汉字算两个字符, 一个英文字母或数字算一个字符
* @param {String} val
* @returns {Number}
* @author: 无尘
*/
getByteLen: function(val) {
let valStr = val == '' || val == null ? '' : val;
......@@ -27,9 +28,10 @@ export default {
return len;
},
/**
* 一个汉字算一个字,一个英文字母或数字算半个字
* @description: 一个汉字算一个字, 一个英文字母或数字算半个字
* @param {String} val
* @returns {Number}
* @author: 无尘
*/
getZhLen: function(val) {
let valStr = val == '' || val == null ? '' : val;
......@@ -47,11 +49,12 @@ export default {
/**
*
* 暂无用
* @description: 暂无用
* @param {String} str
* @param {Number} len
* @param {Number} type
* @returns {String}
* @author: 无尘
*/
cutStr: function(str, len, type) {
let charLength = 0;
......@@ -71,10 +74,11 @@ export default {
},
/**
* 限制字数用, 一个汉字算一个字,两个英文/字母算一个字
* @description: 限制字数用, 一个汉字算一个字, 两个英文 / 字母算一个字
* @param {String} val
* @param {Number} max
* @returns {String}
* @author: 无尘
*/
getByteVal: function(val, max) {
let valStr = val == '' || val == null ? '' : val;
......@@ -90,10 +94,11 @@ export default {
},
/**
* 限制字符数用, 一个汉字算两个字符,一个英文/字母算一个字符
* @description: 限制字符数用, 一个汉字算两个字符, 一个英文 / 字母算一个字符
* @param {String} val
* @param {Number} max
* @returns {String}
* @author: 无尘
*/
getCharVal: function(val, max) {
let valStr = val == '' || val == null ? '' : val;
......@@ -109,9 +114,10 @@ export default {
},
/**
* 正则校验,校验非负数字
* @description: 正则校验, 校验非负数字
* @param {String} v
* @returns {Boolean}
* @author: 无尘
*/
regPos: function(v) {
let regTest = /^\d+(\.\d+)?$/;
......
src/components/app/my-customer/customer-assign.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-04-14 09:50:16
* @LastEditors: 无尘
* @LastEditTime: 2020-09-08 10:52:11
* @LastEditTime: 2020-09-09 15:01:23
-->
<!--
<customer-assign v-if="assignShow" :brand-id="brandId" :customer-assign-total="customerAssignTotal" :clerk-id="clerkId" :search-params="searchInput" :choose-all="selectRadio" :depart-obj="departObj" :multiple-data="multipleSelection" @closeText="closeText" @submitText="submitText"></customer-assign>
......@@ -150,6 +150,7 @@ export default {
* @description: 单个值改变
* @param {Boolean} e
* @param {Object} item
* @author: 无尘
*/
changeCell(e, item) {
const that = this;
......@@ -174,6 +175,7 @@ export default {
/**
* @description: 手动分配选择
* @param {Boolean} e
* @author: 无尘
*/
async changeHand(e) {
const that = this;
......@@ -187,6 +189,7 @@ export default {
},
/**
* @description: 手动值改变，计算总数
* @author: 无尘
*/
handleChange() {
const that = this;
......@@ -196,6 +199,7 @@ export default {
* @description: 手动值改变，计算总数
* @param {Object} e
* @param {Object} item
* @author: 无尘
*/
blurNum(e, item) {
const that = this;
......@@ -217,6 +221,7 @@ export default {
/**
* @description: 单选
* @param {Array} value
* @author: 无尘
*/
async handleCheckedChange(value) {
const that = this;
......@@ -235,6 +240,7 @@ export default {
/**
* @description: 全选
* @param {Array} value
* @author: 无尘
*/
async handleCheckAllChange(value) {
const that = this;
......@@ -273,6 +279,7 @@ export default {
},
/**
* @description: 获取导购
* @author: 无尘
*/
getClerkData() {
const that = this;
......@@ -301,7 +308,8 @@ export default {
});
},
/**
* @description: 获取会员数量
* @description: 获取会员数量（暂无用）
* @author: 无尘
*/
getMemberData() {
const that = this;
......@@ -324,6 +332,10 @@ export default {
});
},
/**
* @description: 关闭弹窗，重置数据
* @author: 无尘
*/
resetData() {
const that = this;
that.checkedClerks = [];
......@@ -342,7 +354,8 @@ export default {
that.$emit('closeText');
},
/**
* @description: 保存
* @description: 保存分配
* @author: 无尘
*/
submitForm: _debounce(function() {
const that = this;
......@@ -381,13 +394,14 @@ export default {
},
/**
* @description: 设置人数和获取数量判断
* @author: 无尘
*/
setNum() {
const that = this;
if (Object.keys(that.editRow).length) {
that.assignPeople = 1;
} else {
that.chooseAll == 0 ? (that.assignPeople = that.multipleData.length) : that.customerAssignTotal; // that.getMemberData();
that.chooseAll == 0 ? (that.assignPeople = that.multipleData.length) : that.assignPeople = that.customerAssignTotal; // that.getMemberData();
}
}
},
......
src/components/app/my-customer/org-tree.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-08-14 16:51:07
* @LastEditors: 无尘
* @LastEditTime: 2020-09-03 11:19:46
* @LastEditTime: 2020-09-09 15:25:18
-->
<!--
<org-tree v-if="item.children.length" :item-data="item.children" @getSelectData="getSelectData"></org-tree>
......@@ -89,6 +89,7 @@ export default {
/**
* @description: 获取选中部门/门店数据
* @param {Object} obj
* @author: 无尘
*/
getSelectData(obj) {
const that = this;
......@@ -98,6 +99,7 @@ export default {
/**
* @description: 展开或者关闭下级
* @param {Object} item
* @author: 无尘
*/
async toggleExpand(item) {
const that = this;
......
src/components/app/my-customer/store-list.vue
......@@ -3,7 +3,7 @@
* @Author : 无尘
* @Date : 2020-08-13 14:02:22
* @LastEditors: 无尘
* @LastEditTime: 2020-09-08 15:11:11
* @LastEditTime: 2020-09-09 14:03:12
* @FilePath : haoban-4\src\components\app\my-customer\store-list.vue
-->
<!--
......@@ -16,7 +16,10 @@
<div class="font-14 color-303133">门店 {{ total }} 家</div>
<div class="flex flex-space-between m-t-20">
<div>
<el-input placeholder="请输入门店名称/代码" maxlength="50" prefix-icon="el-icon-search" v-model="searchInput" class="w-274" @keyup.native="value => toInput(value, searchInput)" clearable @clear="clearInput"></el-input>
<el-input placeholder="请输入门店名称/代码" maxlength="50" prefix-icon="el-icon-search" v-model="searchInput" class="w-274" @keyup.native="value => toInput(value, searchInput)" clearable @clear="clearInput"></el-input><el-select class="w-168" v-model="storeTypeId" placeholder="" @change="changeCondition">
<el-option label="所有门店类型" value=""></el-option>
<el-option v-for="item in storeTypeOptions" :key="item.id" :label="item.name" :value="item.id"> </el-option>
</el-select>
</div>
<div class="to-log flex m-t-20"></div>
</div>
......@@ -55,7 +58,7 @@
import { _debounce } from '@/common/js/public';
import fetch from '@/api/my-customer-app.js';
const { getStoreList } = fetch;
import errMsg from '@/common/js/error';
// import errMsg from '@/common/js/error';
// import showMsg from '@/common/js/showmsg';
export default {
name: 'StoreList',
......@@ -88,6 +91,29 @@ export default {
nameVisible: false,
departmentName: this.departObj.departmentName || '',
searchInput: '',
storeTypeId: '',
storeTypeOptions: [
{
id: '0',
name: '自营',
},
{
id: '1',
name: '联营',
},
{
id: '2',
name: '代理(加盟)',
},
{
id: '3',
name: '代销',
},
{
id: '4',
name: '托管',
}
],
storeType: {
'0': '自营',
'1': '联营',
......@@ -137,7 +163,15 @@ export default {
that.currentPage = 1;
that.getTableList();
},
/**
* @description: 选择门店类型
* @author: 无尘
*/
changeCondition() {
const that = this;
that.currentPage = 1;
that.getTableList();
},
/**
* @description:分页---页码变化
* @param {Number} val
......@@ -171,24 +205,17 @@ export default {
storeGroupId: that.departObj.storeGroupId,
enterpriseId: that.brandId,
searchName: that.searchInput || '', // 搜索字段
storeTypeId: that.storeTypeId,
pageNum: that.currentPage, // 当前页
pageSize: that.pageSize // 一页显示个数
};
getStoreList( para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
that.tableData = resData.result.list || [];
that.total = resData.result.total;
return false;
}
errMsg.errorMsg(resData);
that.tableData = res.result.list || [];
that.total = res.result.total;
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
}
},
......@@ -204,6 +231,7 @@ export default {
const that = this;
if (newData) {
that.searchInput = '';
that.storeTypeId = '';
}
}
}
......
src/components/app/my-customer/tag-classify-dialog.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-09-01 13:53:59
* @LastEditors: 无尘
* @LastEditTime: 2020-09-07 16:03:02
* @LastEditTime: 2020-09-09 15:25:55
-->
<!--
......@@ -84,6 +84,7 @@ export default {
methods: {
/**
* @description: 关闭
* @author: 无尘
*/
cancel() {
const that = this;
......@@ -98,6 +99,7 @@ export default {
* @description: 确定保存
* @param {String} formName
* @returns {Boolean}
* @author: 无尘
*/
submit: _debounce(function(formName) {
const that = this;
......
src/components/common/country-mobile.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-07-03 18:50:33
* @LastEditors: 无尘
* @LastEditTime: 2020-08-28 16:12:50
* @LastEditTime: 2020-09-09 15:27:40
-->
<!--
限制输入框组件
......@@ -78,14 +78,19 @@ export default {
},
methods: {
/**
* 选择国际码
* @description: 选择国际码
* @author: 无尘
*/
changeCode() {
const that = this;
that.$emit('update:nationCode', that.selCode);
that.$emit('input', that.itemValue);
},
// 输入
/**
* @description: 输入
* @param {Object} e
* @author: 无尘
*/
toInput: function(e) {
const that = this;
that.itemValue = e.target.value.replace(/[^0-9]/gi, '');
......@@ -95,6 +100,10 @@ export default {
const that = this;
that.$emit('input', that.itemValue);
},
/**
* @description: 获取国家码
* @author: 无尘
*/
getNationalData() {
let that = this;
getNationCode({})
......
src/components/common/gic-select-group-mult.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-02-08 10:27:21
* @LastEditors: 无尘
* @LastEditTime: 2020-08-28 16:12:58
* @LastEditTime: 2020-09-09 15:30:37
-->
<!--
选择门店分组组件：
......@@ -23,7 +23,7 @@
<template>
<el-popover placement="bottom" style="min-width: 357px" v-model="departmentVisible">
<div class="select-search">
<el-input placeholder="请输入内容" v-model="searchSelect" style="width: 100%;" @keyup.native="value => toInput(value, searchSelect)" @clear="clearSearch"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
<el-input placeholder="请输入内容" maxlength="50" v-model="searchSelect" style="width: 100%;" @keyup.native="value => toInput(value, searchSelect)" @clear="clearSearch"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
</div>
<div class="select-tree-wrap m-t-10">
<!--:load="loadNode"-->
......@@ -117,10 +117,11 @@ export default {
return data.label.indexOf(value) !== -1;
},
/**
* 加载更多
* @description: 加载更多
* @param {Object} node
* @param {Function} resolve
* @returns {Function}
* @author: 无尘
*/
async loadNode(node, resolve) {
// console.log(node, resolve);
......@@ -132,10 +133,11 @@ export default {
}
},
/**
* 输入
* @description: 输入
* @param {Object} e
* @param {String} value
* @returns {Boolean}
* @author: 无尘
*/
toInput: _debounce(function(e, value) {
const that = this;
......@@ -145,7 +147,8 @@ export default {
}
}, 500),
/**
* 清空
* @description: 清空
* @author: 无尘
*/
clearSearch() {
const that = this;
......@@ -153,9 +156,10 @@ export default {
},
/**
* 删除
* @description: 删除
* @param {Number} index
* @param {Array} arr
* @author: 无尘
*/
delDepart(index, arr) {
const that = this;
......@@ -165,7 +169,8 @@ export default {
},
/**
* 选择 tree 节点,获取选择节点信息
* @description: 选择 tree 节点,获取选择节点信息
* @author: 无尘
*/
checkGroup: function() {
const that = this;
......@@ -173,8 +178,9 @@ export default {
that.$emit('checkGroupIds', that.$refs.groupTree.getCheckedNodes());
},
/**
* 设置 tree
* @description: 设置 tree
* @param {Array} keys
* @author: 无尘
*/
setCheckedKeys(keys) {
const that = this;
......@@ -183,8 +189,9 @@ export default {
},
/**
* 处理排序
* @description: 处理排序
* @param {Object} item
* @author: 无尘
*/
async handleSort(item) {
const that = this;
......@@ -199,8 +206,9 @@ export default {
},
/**
* 简单数组-->父子数组对象
* @description: 简单数组-->父子数组对象
* @param {Array} data
* @author: 无尘
*/
async treeData(data) {
// const that = this;
......@@ -236,7 +244,8 @@ export default {
},
/**
* 获取门店分组
* @description: 获取门店分组
* @author: 无尘
*/
async getGroup() {
const that = this;
......
src/components/common/gic-select-group.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-02-08 10:27:21
* @LastEditors: 无尘
* @LastEditTime: 2020-08-28 16:13:06
* @LastEditTime: 2020-09-09 15:32:05
-->
<!--
选择门店分组组件：
......@@ -117,10 +117,11 @@ export default {
return data.label.indexOf(value) !== -1;
},
/**
* 加载更多
* @description: 加载更多
* @param {Object} node
* @param {Function} resolve
* @returns {Function}
* @author: 无尘
*/
async loadNode(node, resolve) {
// console.log(node, resolve);
......@@ -132,10 +133,11 @@ export default {
}
},
/**
* 输入
* @description: 输入
* @param {Object} e
* @param {String} value
* @returns {Boolean}
* @author: 无尘
*/
toInput: _debounce(function(e, value) {
const that = this;
......@@ -145,7 +147,8 @@ export default {
}
}, 500),
/**
* 清空
* @description: 清空
* @author: 无尘
*/
clearSearch() {
const that = this;
......@@ -153,9 +156,10 @@ export default {
},
/**
* 删除
* @description: 删除
* @param {Number} index
* @param {Array} arr
* @author: 无尘
*/
delDepart(index, arr) {
const that = this;
......@@ -165,7 +169,8 @@ export default {
},
/**
* 选择 tree 节点,获取选择节点信息
* @description: 选择 tree 节点,获取选择节点信息
* @author: 无尘
*/
checkGroup: function() {
const that = this;
......@@ -173,8 +178,9 @@ export default {
that.$emit('checkGroupIds', that.$refs.groupTree.getCheckedNodes());
},
/**
* 设置 tree
* @description: 设置 tree
* @param {Array} keys
* @author: 无尘
*/
setCheckedKeys(keys) {
const that = this;
......@@ -183,8 +189,9 @@ export default {
},
/**
* 处理排序
* @description: 处理排序
* @param {Object} item
* @author: 无尘
*/
async handleSort(item) {
const that = this;
......@@ -199,8 +206,9 @@ export default {
},
/**
* 简单数组-->父子数组对象
* @description: 简单数组-->父子数组对象
* @param {Array} data
* @author: 无尘
*/
async treeData(data) {
// const that = this;
......@@ -236,7 +244,8 @@ export default {
},
/**
* 获取门店分组
* @description: 获取门店分组
* @author: 无尘
*/
async getGroup() {
const that = this;
......
src/components/common/gic-select-store.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-02-08 10:27:21
* @LastEditors: 无尘
* @LastEditTime: 2020-08-31 10:47:39
* @LastEditTime: 2020-09-09 15:32:45
-->
<!--
选择门店分组组件：
......@@ -109,8 +109,9 @@ export default {
},
methods: {
/**
* 全选
* @description: 全选
* @param {Array} val
* @author: 无尘
*/
handleCheckAllChange(val) {
const that = this;
......@@ -127,9 +128,10 @@ export default {
},
/**
* 输入
* @description: 输入
* @param {Object} e
* @param {String} value
* @author: 无尘
*/
toInput: _debounce(function(e, value) {
const that = this;
......@@ -141,8 +143,9 @@ export default {
}, 500),
/**
* 选择门店
* @description: 选择门店
* @param {Object} item
* @author: 无尘
*/
checkStore(item) {
const that = this;
......@@ -162,7 +165,8 @@ export default {
},
/**
* 清空
* @description: 清空
* @author: 无尘
*/
clearSearch() {
const that = this;
......@@ -173,7 +177,8 @@ export default {
},
/**
* 获取门店
* @description: 获取门店
* @author: 无尘
*/
getStoreData() {
let that = this;
......
src/components/company/new-depart-member.vue
<!--
* @Descripttion : 当前组件信息
* @Author : 无尘
* @Date : 2020-02-13 14:02:40
* @Descripttion: 当前组件信息
* @version: 1.0.0
* @Author: 无尘
* @Date: 2020-08-27 09:14:54
* @LastEditors: 无尘
* @LastEditTime: 2020-09-08 15:29:25
* @FilePath : \Hapi-demoj:\公司\haoban-3\src\components\company\new-depart-member.vue
-->
* @LastEditTime: 2020-09-09 15:46:36
-->
<!--
部门成员
<new-depart-member :depart-obj="departObj"></new-depart-member>
......@@ -161,6 +161,10 @@ export default {
}
},
methods: {
/**
* @description: 跳转变更日志
* @author: 无尘
*/
toLog() {
window.open('/haoban-4/#/syncLog');
},
......@@ -182,11 +186,14 @@ export default {
const that = this;
that.tipShow = true;
},
/**
* @description: 关闭提示
* @author: 无尘
*/
toCloseTip() {
const that = this;
that.tipShow = false;
},
/**
* @description: 关联详情
* @param {Object} row
......@@ -209,7 +216,6 @@ export default {
}
that.$emit('changeDepart', item);
},
/**
* @description: 可选设置
* @param {Object} row
......@@ -224,7 +230,6 @@ export default {
return true; // 可勾选
}
},
/**
* @description: 输入
* @param {Object} e
......@@ -236,19 +241,24 @@ export default {
that.currentPage = 1;
that.getTableList();
}, 500),
// 搜索清除
/**
* @description: 搜索清除
* @author: 无尘
*/
clearInput() {
const that = this;
that.currentPage = 1;
that.getTableList();
},
// 选择状态
/**
* @description: 选择状态
* @author: 无尘
*/
changeStatus() {
const that = this;
that.currentPage = 1;
that.getTableList();
},
/**
* @description: 显示详情弹窗
* @param {Object} item
......@@ -259,7 +269,6 @@ export default {
that.memberObj = item;
that.memberVisible = true;
},
/**
* @description: 确认新建后刷新
* @param {String} res
......@@ -276,7 +285,6 @@ export default {
that.currentPage = 1;
that.getTableList();
},
/**
* @description: 勾选
* @param {Array} val
......@@ -285,7 +293,6 @@ export default {
handleSelectionChange(val) {
this.multipleSelection = val;
},
/**
* @description: 分页---页码变化
* @param {Number} val
......@@ -297,7 +304,6 @@ export default {
that.pageSize = val;
that.getTableList();
},
/**
* @description: 分页---当前页变化
* @param {Number} val
......
src/components/company/related-table.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-08-27 09:14:54
* @LastEditors: 无尘
* @LastEditTime: 2020-08-31 11:12:00
* @LastEditTime: 2020-09-09 15:47:35
-->
<!--
......@@ -116,17 +116,18 @@ export default {
const that = this;
that.$emit('closeTable', 'close');
},
/**
* 添加绑定
* @description: 添加绑定
* @author: 无尘
*/
toAddRelate() {
const that = this;
that.addShow = true;
},
/**
* 解绑
* @description: 解绑
* @param {Object} row
* @author: 无尘
*/
toUnbind(row) {
const that = this;
......@@ -169,16 +170,18 @@ export default {
that.$emit('closeTable');
},
/**
* 路由跳转
* @description: 路由跳转
* @param {String} path
* @author: 无尘
*/
changeRoute(path) {
this.$router.push(path);
},
/**
* 分页---页码变化
* @description: 分页---页码变化
* @param {Number} val
* @author: 无尘
*/
handleSizeChange(val) {
const that = this;
......@@ -188,8 +191,9 @@ export default {
},
/**
* 分页---当前页变化
* @description: 分页---当前页变化
* @param {Number} val
* @author: 无尘
*/
handleCurrentChange(val) {
const that = this;
......@@ -197,7 +201,8 @@ export default {
that.getTableList();
},
/**
* 获取列表数据
* @description: 获取列表数据
* @author: 无尘
*/
getTableList() {
const that = this;
......
src/components/company/store-auth-detail.vue
<!--
* @Descripttion: 当前组件信息
* @version: 1.0.0
* @Author: 无尘
* @Date: 2020-08-27 09:14:54
* @LastEditors: 无尘
* @LastEditTime: 2020-09-09 15:49:11
-->
<!--
绑定详情-变更
<store-auth-detail :store-range-auditId="storeRangeAuditId" @closeLog="closeLog"></store-auth-detail>
import storeAuthDetail from '@/components/company/store-auth-detail.vue';
......@@ -78,7 +86,8 @@ export default {
},
methods: {
/**
* 改变 tab
* @description: 改变 tab
* @author: 无尘
*/
handleClick() {
const that = this;
......@@ -88,7 +97,8 @@ export default {
};
},
/**
* 关闭
* @description: 关闭
* @author: 无尘
*/
handleClose() {
const that = this;
......@@ -96,15 +106,16 @@ export default {
that.$emit('closeLog');
},
/**
* 路由跳转
* @param {String} path
* @description: 路由跳转
* @param {String} path
* @author: 无尘
*/
changeRoute(path) {
this.$router.push(path);
},
/**
* 获取列表数据
* @description: 获取列表数据
* @author: 无尘
*/
getTableList() {
const that = this;
......
src/components/company/store-auth-dialog.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-07-21 10:10:57
* @LastEditors: 无尘
* @LastEditTime: 2020-08-28 16:17:09
* @LastEditTime: 2020-09-09 15:50:06
-->
<!--
授权选择门店绑定弹窗
......@@ -89,8 +89,9 @@ export default {
},
methods: {
/**
* 改变选择范围
* @description: 改变选择范围
* @param {String} e
* @author: 无尘
*/
changeRange(e) {
const that = this;
......@@ -98,8 +99,9 @@ export default {
that.formData.selectList = [];
},
/**
* 关闭弹窗
* @description: 关闭弹窗
* @param {Function} done
* @author: 无尘
*/
handleClose(done) {
const that = this;
......@@ -114,10 +116,10 @@ export default {
that.selectGroupData = [];
that.selectStoreData = [];
},
/**
* 每次选择分组
* @description: 每次选择分组
* @param {Array} nodes
* @author: 无尘
*/
checkGroupIds: function(nodes) {
const that = this;
......@@ -125,8 +127,9 @@ export default {
that.formData.selectList = JSON.parse(JSON.stringify(nodes));
},
/**
* 每次选择门店
* @description: 每次选择门店
* @param {Array} nodes
* @author: 无尘
*/
checkStoreIds: function(nodes) {
const that = this;
......@@ -134,8 +137,9 @@ export default {
that.formData.selectList = JSON.parse(JSON.stringify(nodes));
},
/**
* 确定
* @description: 确定
* @returns {Boolean}
* @author: 无尘
*/
submitForm() {
const that = this;
......@@ -166,7 +170,6 @@ export default {
};
</script>
<style lang="less" scoped>
.select-tree-wrap {
height: 445px;
overflow-y: auto;
......
src/components/company/store-auth-group.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-07-21 10:10:57
* @LastEditors: 无尘
* @LastEditTime: 2020-08-28 16:17:30
* @LastEditTime: 2020-09-09 15:51:24
-->
<!--
门店绑定-选择分组
......@@ -76,10 +76,11 @@ export default {
},
methods: {
/**
* 判断提示
* @description: 判断提示
* @param {Object} node
* @param {Object} data
* @returns {Boolean}
* @author: 无尘
*/
toShowMsg(node, data) {
if (data.auditFlag == 1) {
......@@ -91,20 +92,22 @@ export default {
}
},
/**
* 过滤搜索
* @description: 过滤搜索
* @param {String} value
* @param {Object} data
* @returns {Boolean}
* @author: 无尘
*/
filterNode(value, data) {
if (!value || !data.label) return true;
return data.label.indexOf(value) !== -1;
},
/**
* 输入
* @description: 输入
* @param {Object} e
* @param {String} value
* @returns {Boolean}
* @author: 无尘
*/
toInput: _debounce(function(e, value) {
const that = this;
......@@ -113,8 +116,9 @@ export default {
}
}, 200),
/**
* 清空
* @description: 清空
* @returns {Boolean}
* @author: 无尘
*/
clearSearch() {
// const that = this;
......@@ -122,9 +126,10 @@ export default {
// that.groupData = JSON.parse(JSON.stringify(that.groupDataCopy));
},
/**
* 选择 tree 节点,获取选择节点信息
* @description: 选择 tree 节点,获取选择节点信息
* @param {Object} e
* @param {Array} checkedKeys
* @author: 无尘
*/
checkGroup: function(e, checkedKeys) {
const that = this;
......@@ -192,9 +197,10 @@ export default {
});
},
/**
* checkchild
* @description: checkchild
* @param {Array} arr
* @param {Boolean} checkFlag
* @author: 无尘
*/
checkChild(arr, checkFlag) {
const that = this;
......@@ -230,7 +236,8 @@ export default {
},
/**
* 设置回显数据
* @description: 设置回显数据
* @author: 无尘
*/
setSelectCheck() {
const that = this;
......@@ -247,9 +254,10 @@ export default {
});
},
/**
* disableChild
* @description: disableChild
* @param {Array} arr
* @param {Array} ids
* @author: 无尘
*/
disableChild(arr, ids) {
const that = this;
......@@ -265,7 +273,8 @@ export default {
});
},
/**
* 获取门店分组
* @description: 获取门店分组
* @author: 无尘
*/
getGroup() {
const that = this;
......
src/components/company/store-auth-store.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-07-21 10:10:57
* @LastEditors: 无尘
* @LastEditTime: 2020-08-31 10:47:46
* @LastEditTime: 2020-09-09 15:52:05
-->
<!--
门店绑定-选择门店(限制50个)
......@@ -89,9 +89,10 @@ export default {
},
methods: {
/**
* 判断提示
* @description: 判断提示
* @param {Object} data
* @returns {Boolean}
* @author: 无尘
*/
toShowMsg(data) {
if (data.auditFlag == 1) {
......@@ -103,8 +104,9 @@ export default {
}
},
/**
* 选择改变
* @description: 选择改变
* @param {Array} value
* @author: 无尘
*/
handleStoresChange(value) {
const that = this;
......@@ -117,9 +119,10 @@ export default {
that.$emit('checkStoreIds', JSON.parse(JSON.stringify(arr)));
},
/**
* 输入
* @description: 输入
* @param {Object} e
* @param {String} value
* @author: 无尘
*/
toInput: _debounce(function(e, value) {
const that = this;
......@@ -131,7 +134,8 @@ export default {
}, 500),
/**
* 清空
* @description: 清空
* @author: 无尘
*/
clearSearch() {
const that = this;
......@@ -142,7 +146,8 @@ export default {
},
/**
* 获取门店
* @description: 获取门店
* @author: 无尘
*/
getStoreData() {
let that = this;
......
src/components/nav/nav-app.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘
* @LastEditTime: 2020-09-03 09:58:17
* @LastEditTime: 2020-09-09 15:53:27
-->
<template>
<div class="nav-wrap border-box flex flex-space-between">
......@@ -60,9 +60,10 @@ export default {
},
methods: {
/**
* 路由跳转
* @description: 路由跳转
* @param {String} path
* @param {String} relocation
* @author: 无尘
*/
changeRoute(path, relocation) {
const that = this;
......@@ -73,8 +74,9 @@ export default {
}
},
/**
* 选择品牌
* @description: 选择品牌
* @param {String} val
* @author: 无尘
*/
changeSelect(val) {
const that = this;
......@@ -88,7 +90,8 @@ export default {
},
/**
* 获取品牌
* @description: 获取品牌
* @author: 无尘
*/
getBrandData() {
const that = this;
......
src/components/set/add-self-app.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-04-14 09:50:16
* @LastEditors: 无尘
* @LastEditTime: 2020-08-28 16:19:03
* @LastEditTime: 2020-09-09 15:55:03
-->
<!--
<add-self-app :edit-row="editRow" @closeText="closeText" @submitText="submitText"></add-self-app>
......@@ -81,7 +81,10 @@ export default {
}
},
methods: {
/**
* @description: 关闭弹窗
* @author: 无尘
*/
toCancel() {
const that = this;
that.$emit('closeText');
......@@ -92,6 +95,11 @@ export default {
that.$emit('closeText');
that.$refs['ruleForm'].resetFields();
},
/**
* @description: 保存
* @param {String} formName
* @author: 无尘
*/
submitForm: _debounce(function(formName) {
const that = this;
that.$refs[formName].validate(valid => {
......
src/components/set/select-admin-store.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-07-21 10:10:57
* @LastEditors: 无尘
* @LastEditTime: 2020-08-28 16:19:35
* @LastEditTime: 2020-09-09 16:01:23
-->
<!--
授权选择门店绑定弹窗
......@@ -136,7 +136,8 @@ export default {
},
methods: {
/**
* 获取编辑数据
* @description: 获取编辑数据
* @author: 无尘
*/
getData() {
const that = this;
......@@ -163,7 +164,7 @@ export default {
});
},
/**
* 改变选择范围
* @description: 改变选择范围
* @param {String} e
* @author: 无尘
*/
......@@ -173,7 +174,8 @@ export default {
that.formData.selectList = [];
},
/**
* 关闭弹窗
* @description: 关闭弹窗
* @author: 无尘
*/
handleClose() {
const that = this;
......@@ -188,8 +190,9 @@ export default {
that.selectStoreData = [];
},
/**
* 每次选择分组
* @description: 每次选择分组
* @param {Array} nodes
* @author: 无尘
*/
checkGroupIds: function(nodes) {
const that = this;
......@@ -197,8 +200,9 @@ export default {
that.formData.selectList = JSON.parse(JSON.stringify(nodes));
},
/**
* 每次选择门店
* @description: 每次选择门店
* @param {Array} nodes
* @author: 无尘
*/
checkStoreIds: function(nodes) {
const that = this;
......@@ -206,8 +210,9 @@ export default {
that.formData.selectList = JSON.parse(JSON.stringify(nodes));
},
/**
* 确定
* @description: 确定
* @returns {Boolean}
* @author: 无尘
*/
submitForm() {
const that = this;
......
src/components/set/select-admin.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-07-21 10:10:57
* @LastEditors: 无尘
* @LastEditTime: 2020-08-31 14:47:40
* @LastEditTime: 2020-09-09 16:00:22
-->
<!--
选择管理员
......@@ -95,9 +95,10 @@ export default {
},
methods: {
/**
* 单个选择
* @description: 单个选择
* @param {String} val
* @param {Object} item
* @author: 无尘
*/
async changeItem(val, item) {
const that = this;
......@@ -111,7 +112,6 @@ export default {
// 每次选择或者不选的时候，合并搜索和树中选择数据，即使如果不选中，数据已经加载了，
that.totalIds = [ ...new Set([ ...that.checkedList, ...that.checkedPeople.map(ele => ele.levelId) ]) ] || [];
that.checkedList = [ ...new Set([ ...that.checkedList, ...that.checkedPeople.map(ele => ele.levelId) ]) ] || [];
// 最后记得过滤重复
let arr = JSON.parse(JSON.stringify(that.totalArr));
arr = arr.concat(that.checkedPeople);
......@@ -128,8 +128,9 @@ export default {
that.totalNum = that.totalArr.length;
},
/**
* 数组对象去重
* @description: 数组对象去重
* @param {Array} arr
* @author: 无尘
*/
delDubbleData(arr) {
const that = this;
......@@ -142,8 +143,9 @@ export default {
that.totalArr = JSON.parse(JSON.stringify(arr));
},
/**
* 关闭弹窗
* @description: 关闭弹窗
* @param {Function} done
* @author: 无尘
*/
handleClose(done) {
const that = this;
......@@ -155,7 +157,8 @@ export default {
that.$emit('checkAdmins', 'close');
},
/**
* 确定
* @description: 确定
* @author: 无尘
*/
async submitForm() {
const that = this;
......@@ -165,12 +168,12 @@ export default {
}
// 只选择了搜索数据，可是搜索数据中,树中数据未加载
// 选择了搜索数据，也选择了树中已有数据，可是搜索数据中有树中未加载完全数据
that.$emit('checkAdmins', JSON.parse(JSON.stringify(that.totalArr)));
},
/**
* 搜索选择的变化
* @description: 搜索选择的变化
* @param {Array} value
* @author: 无尘
*/
async handleStoresChange(value) {
const that = this;
......@@ -202,7 +205,6 @@ export default {
that.checkedPeople = [];
await that.getCheckData();
// 还需要设置已有的数据选择上
// 还需要未加载的数据选择上
},
async setChildCheck(obj, value) {
......@@ -220,7 +222,8 @@ export default {
}
},
/**
* 获取已选择的人员
* @description: 获取已选择的人员
* @author: 无尘
*/
async getCheckData() {
const that = this;
......@@ -247,9 +250,10 @@ export default {
}
},
/**
* 加载更多
* @description: 加载更多
* @param {Object} node
* @param {functional} resolve
* @author: 无尘
*/
async loadNode(node, resolve) {
// console.log(node, resolve);
......@@ -265,8 +269,9 @@ export default {
}
},
/**
* 搜索获取人员
* @description: 搜索获取人员
* @param {String} data
* @author: 无尘
*/
getSearchData(data) {
const that = this;
......@@ -290,9 +295,10 @@ export default {
});
},
/**
* 输入
* @description: 输入
* @param {Object} e
* @param {String} value
* @author: 无尘
*/
toInput: _debounce(function(e, value) {
const that = this;
......@@ -302,17 +308,19 @@ export default {
that.getSearchData(that.searchSelect);
}, 200),
/**
* 清空
* @description: 清空
* @returns {Boolean}
* @author: 无尘
*/
clearSearch() {
return false;
},
/**
* 获取人
* @description: 获取人
* @param {Object} node
* @param {Object} data
* @param {Function} resolve
* @author: 无尘
*/
getStaff(node, data, resolve) {
const that = this;
......@@ -350,8 +358,9 @@ export default {
});
},
/**
* 回显设置树形数据中的人员选中和不选中
* @description: 回显设置树形数据中的人员选中和不选中
* @param {String} value
* @author: 无尘
*/
async setSelectData(value) {
const that = this;
......
src/components/set/store-auth-group.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-07-21 10:10:57
* @LastEditors: 无尘
* @LastEditTime: 2020-08-28 16:20:05
* @LastEditTime: 2020-09-09 15:57:35
-->
<!--
门店绑定-选择分组(仅展示)
......@@ -76,20 +76,22 @@ export default {
},
methods: {
/**
* 过滤搜索
* @param {String} value
* @param {Object} data
* @returns {Boolean}
* @description: 过滤搜索
* @param {String} value
* @param {Object} data
* @returns {Boolean}
* @author: 无尘
*/
filterNode(value, data) {
if (!value || !data.label) return true;
return data.label.indexOf(value) !== -1;
},
/**
* 输入
* @param {Object} e
* @param {String} value
* @returns {Boolean}
* @description: 输入
* @param {Object} e
* @param {String} value
* @returns {Boolean}
* @author: 无尘
*/
toInput: _debounce(function(e, value) {
const that = this;
......@@ -98,19 +100,20 @@ export default {
}
}, 200),
/**
* 清空
* @returns {Boolean}
* @description: 清空
* @returns {Boolean}
* @author: 无尘
*/
clearSearch() {
// const that = this;
return false;
// that.groupData = JSON.parse(JSON.stringify(that.groupDataCopy));
},
/**
* checkchild
* @description: checkchild
* @param {Array} arr
* @param {Boolean} checkFlag
* @author: 无尘
*/
checkChild(arr, checkFlag) {
const that = this;
......@@ -140,9 +143,9 @@ export default {
});
return tree;
},
/**
* 设置回显数据
* @description: 设置回显数据
* @author: 无尘
*/
setSelectCheck() {
const that = this;
......@@ -160,9 +163,10 @@ export default {
});
},
/**
* disableChild
* @description: disableChild
* @param {Object} arr
* @param {Array} ids
* @author: 无尘
*/
disableChild(arr, ids) {
const that = this;
......@@ -178,9 +182,9 @@ export default {
}
});
},
/**
* 获取门店分组
* @description: 获取门店分组
* @author: 无尘
*/
getGroup() {
const that = this;
......@@ -188,7 +192,6 @@ export default {
type: that.storeType,
enterpriseId: that.companyId
};
getGroupList(para)
.then(async res => {
if (!!res.result && res.result.length) {
......
src/components/set/store-auth-store.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-07-21 10:10:57
* @LastEditors: 无尘
* @LastEditTime: 2020-08-28 16:20:18
* @LastEditTime: 2020-09-09 15:58:27
-->
<!--
门店绑定-选择门店(仅展示)
......@@ -88,8 +88,9 @@ export default {
},
methods: {
/**
* 判断提示
* @description: 判断提示
* @param {Object} data
* @author: 无尘
*/
toShowMsg(data) {
if (data.bindFlag == 1) {
......@@ -97,8 +98,9 @@ export default {
}
},
/**
* 选择改变
* @description: 选择改变
* @param {Array} value
* @author: 无尘
*/
handleStoresChange(value) {
const that = this;
......@@ -111,9 +113,10 @@ export default {
that.$emit('checkStoreIds', JSON.parse(JSON.stringify(arr)));
},
/**
* 输入
* @description: 输入
* @param {Object} e
* @param {String} value
* @author: 无尘
*/
toInput: _debounce(function(e, value) {
const that = this;
......@@ -123,9 +126,9 @@ export default {
that.getStoreData();
}
}, 500),
/**
* 清空
* @description: 清空
* @author: 无尘
*/
clearSearch() {
const that = this;
......@@ -134,9 +137,9 @@ export default {
that.getStoreData();
// that.stores = JSON.parse(JSON.stringify(that.storesCopy));
},
/**
* 获取门店
* @description: 获取门店
* @author: 无尘
*/
getStoreData() {
let that = this;
......
src/filters/index.js
......@@ -4,12 +4,14 @@
* @Author: 无尘
* @Date: 2019-09-11 18:18:32
* @LastEditors: 无尘
* @LastEditTime: 2020-08-17 17:07:04
* @LastEditTime: 2020-09-09 15:40:48
*/
/**
* @description: 格式化时间
* @param {Number} timeSpan
* @param {String} format
* @return {String}
* @author: 无尘
*/
/* 全局过滤器 */
......@@ -39,9 +41,10 @@ const dateFormat = function(timeSpan, format) {
};
/**
* 时间戳---> 年-月-日 时:分:秒
* @description: 时间戳-- - > 年 - 月 - 日 时: 分: 秒
* @param {Number} data
* @return {String}
* @author: 无尘
*/
const formatTimeStamp = function(data) {
if (!data) {
......@@ -58,9 +61,10 @@ const formatTimeStamp = function(data) {
};
/**
* 时间戳---> 年.月.日 时:分:秒
* @description: 时间戳-- - > 年.月.日 时: 分: 秒
* @param {Number} data
* @return {String}
* @author: 无尘
*/
const formatTimeYmdHms = function(data) {
if (!data) {
......@@ -77,9 +81,10 @@ const formatTimeYmdHms = function(data) {
};
/**
* 时间戳---> 年-月
* @description: 时间戳-- - > 年 - 月
* @param {Number} data
* @return {String}
* @author: 无尘
*/
const timeStampToYm = function(data) {
if (!data) {
......@@ -92,9 +97,10 @@ const timeStampToYm = function(data) {
};
/**
* 时间戳---> 年-月-日
* @description: 时间戳-- - > 年 - 月 - 日
* @param {Number} data
* @return {String}
* @author: 无尘
*/
const timeStampToYmd = function(data) {
if (!data) {
......@@ -108,9 +114,10 @@ const timeStampToYmd = function(data) {
};
/**
* 时间戳---> 时:分:秒
* @description: 时间戳-- - > 时: 分: 秒
* @param {Number} data
* @return {String}
* @author: 无尘
*/
const timeStampToHms = function(data) {
if (!data) {
......@@ -124,9 +131,10 @@ const timeStampToHms = function(data) {
};
/**
* 时间戳---> *天*小时*分
* @description: 时间戳-- - > * 天 * 小时 * 分
* @param {String} date
* @return {String}
* @author: 无尘
*/
const timeStampSpace = function(date) {
if (!date) {
......@@ -152,9 +160,10 @@ const timeStampSpace = function(date) {
};
/**
* 手机号格式化
* @description: 手机号格式化
* @param {String} phone
* @return {String}
* @author: 无尘
*/
const formatPhoneNum = function(phone) {
if (!phone) {
......@@ -165,9 +174,10 @@ const formatPhoneNum = function(phone) {
};
/**
* 姓名格式化
* @description: 姓名格式化
* @param {String} name
* @return {String}
* @author: 无尘
*/
const formatName = function(name) {
if (!name) {
......@@ -177,9 +187,10 @@ const formatName = function(name) {
return '**' + name.substr(name.length - 1, name.length);
};
/**
* 限制显示字数
* @description: 限制显示字数
* @param {String} name
* @return {String}
* @author: 无尘
*/
const formatWord = function(name) {
if (!name) {
......@@ -190,24 +201,20 @@ const formatWord = function(name) {
};
/**
* 毫秒---> *时*分*秒
* @description: 毫秒-- - > * 时 * 分 * 秒
* @param {Number} msTime
* @return {String}
* @author: 无尘
*/
const formatTime = function(msTime) {
if (!msTime) {
return '00:00:00';
}
let time = msTime / 1000;
let day = Math.floor(time / 60 / 60 / 24);
let hour = day * 24 + (Math.floor(time / 60 / 60) % 24) < 10 ? '0' + (day * 24 + (Math.floor(time / 60 / 60) % 24)) : day * 24 + (Math.floor(time / 60 / 60) % 24);
let minute = Math.floor(time / 60) % 60 < 10 ? '0' + (Math.floor(time / 60) % 60) : Math.floor(time / 60) % 60;
let second = Math.floor(time) % 60 < 10 ? '0' + (Math.floor(time) % 60) : Math.floor(time) % 60;
return `${hour}:${minute}:${second}`;
};
......
src/views/apps/customer-app/customer-assign.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-08-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-09-09 10:28:56
* @LastEditTime: 2020-09-09 14:37:34
-->
<template>
<div class="customer-assign-wrap">
......@@ -61,13 +61,21 @@
</template>
</el-table-column>
<el-table-column label="会员姓名" width="120" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.memberName || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="会员等级">
<template slot-scope="scope">{{ scope.row.gradeName || '--' }}</template>
<template slot-scope="scope">
<div class="flex common-table-user">
<div class="flex flex-align-center flex-pack-center common-table-photo">
<img v-if="scope.row.headUrl" :src="scope.row.headUrl" alt="img" />
<img v-else src="../../../assets/member.png" alt="img" />
</div>
<div class="common-table-text">
<div class="font-14 color-606266 hide-ellipsis">{{ scope.row.memberName || '--' }}</div>
<div class="font-12 color-909399 hide-ellipsis">{{ scope.row.memberPhone || '--' }}</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="" label="消费总额" sortable show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.costFee }} {{ scope.row.costFee == null && scope.row.costFee != 0 ? '--' : '' }}</template>
<template slot-scope="scope">¥ {{ scope.row.costFee }} {{ scope.row.costFee == null && scope.row.costFee != 0 ? '--' : '' }}</template>
</el-table-column>
<el-table-column prop="" label="消费次数" sortable>
<template slot-scope="scope">{{ scope.row.consumeTimes || '0' }}</template>
......@@ -78,9 +86,6 @@
<div class="line-h-18">{{ scope.row.lastConsume | timeStampToHms }} {{ !scope.row.lastConsume ? '--' : '' }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="生日" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.birthday || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="所属导购" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.clerkName || '--' }}
......@@ -721,6 +726,31 @@ export default {
padding-left: 25px;
}
.common-table-user {
.common-table-photo {
width: 40px;
max-width: 40px;
max-height: 40px;
border-radius: 2px;
box-sizing: border-box;
img {
width: 100%;
max-width: 40px;
max-height: 40px;
border-radius: 2px;
}
}
.common-table-text {
padding-left: 10px;
box-sizing: border-box;
.hide-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
.customer-assign-wrap {
height: 100%;
background: #fff;
......
src/views/business/audit-log.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-09-08 15:20:08
* @LastEditTime: 2020-09-09 16:05:29
-->
<template>
<div class="my-customer-wrap common-set-wrap">
......@@ -200,7 +200,6 @@ export default {
}).then(() => {
that.postCancel(item.storeRangeAuditId);
});
},
postCancel(storeRangeAuditId) {
const that = this;
......@@ -253,7 +252,6 @@ export default {
changeRoute(path) {
this.$router.push(path);
},
/**
* @description: 分页---页码变化
* @param {Number} val
......@@ -265,7 +263,6 @@ export default {
that.pageSize = val;
that.getTableList();
},
/**
* @description: 分页---当前页变化
* @param {Number} val
......@@ -276,7 +273,6 @@ export default {
that.currentPage = val;
that.getTableList();
},
/**
* @description: 获取列表数据
* @author: 无尘
......
src/views/business/auth-merchant.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-09-08 15:20:55
* @LastEditTime: 2020-09-09 16:05:02
-->
<template>
<div class="my-customer-wrap common-set-wrap">
......@@ -182,7 +182,6 @@ export default {
changeRoute(path) {
this.$router.push(path);
},
/**
* @description: 分页---页码变化
* @param {Number} val
......@@ -194,7 +193,6 @@ export default {
that.pageSize = val;
that.getTableList();
},
/**
* @description: 分页---当前页变化
* @param {Number} val
......
src/views/business/contacts.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-09-07 16:57:51
* @LastEditTime: 2020-09-09 16:04:50
-->
<template>
<div class="contacts-wrap common-set-wrap">
......@@ -187,7 +187,6 @@ export default {
const that = this;
that.departObj = data;
},
async setParent(obj, copyData) {
const that = this;
for (let i = 0; i < copyData.length; i++) {
......@@ -199,7 +198,6 @@ export default {
}
}
},
/**
* @description: 点击子部门触发
* @param {Object} obj
......@@ -223,7 +221,6 @@ export default {
that.wxData = await that.treeData(JSON.parse(JSON.stringify(copyData)));
that.wxData[0].expand = true;
},
/**
* @description: 修改部门名称触发
* @param {String} name
......@@ -234,7 +231,6 @@ export default {
that.selectData.departmentName = name;
that.departObj.departmentName = name;
},
/**
* @description: 组织架构管理
* @author: 无尘
......
src/views/business/new-auth-merchant.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-09-08 15:15:50
* @LastEditTime: 2020-09-09 16:05:58
-->
<template>
<div class="my-customer-wrap common-set-wrap">
......@@ -321,7 +321,6 @@ export default {
that.authForm.shareStoreMode = !that.authForm.shareRange.length && that.authForm.shareStoreMode > 0 ? '' : String(that.authForm.shareStoreMode); // 0 全部 1部分分组 2 部分门店
that.authForm.bindStoreMode = !that.authForm.bindRange.length && that.authForm.bindStoreMode > 0 ? '' : String(that.authForm.bindStoreMode);
},
/**
* @description: 选择商户，获取审核管理员
* @param {Object} item
......@@ -345,7 +344,6 @@ export default {
});
that.getAdminList(item.enterpriseId);
},
getAdminList(val) {
const that = this;
getGicAdmin({ enterpriseId: val })
......@@ -358,7 +356,6 @@ export default {
});
},
/**
* @description: 改变步骤
* @param {String} auditReason
......@@ -400,7 +397,6 @@ export default {
changeRoute(path) {
this.$router.push(path);
},
/**
* @description: 获取商户是否选择所有信息
* @author: 无尘
......@@ -415,7 +411,6 @@ export default {
});
},
/**
* @description: 获取编辑数据
* @author: 无尘
......
src/views/business/sync-log.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-08-20 14:04:22
* @LastEditTime: 2020-09-09 16:04:18
-->
<template>
<div class="my-customer-wrap common-set-wrap">
......@@ -201,7 +201,8 @@ export default {
},
methods: {
/**
* 搜索标签清空
* @description: 搜索标签清空
* @author: 无尘
*/
clearInput() {
const that = this;
......@@ -215,8 +216,9 @@ export default {
},
/**
* 搜索标签
* @param {String} e
* @description: 搜索标签
* @param {String} e
* @author: 无尘
*/
toInput: _debounce(function(e) {
const that = this;
......@@ -224,8 +226,9 @@ export default {
that.getBindList();
}, 200),
/**
* 切换tab
* @param {Object} tab
* @description: 切换tab
* @param {Object} tab
* @author: 无尘
*/
handleClick(tab) {
const that = this;
......@@ -241,9 +244,10 @@ export default {
}
},
/**
* 查看失败日志
* @param {Number} index
* @param {Object} item
* @description: 查看失败日志
* @param {Number} index
* @param {Object} item
* @author: 无尘
*/
toShowLog(index, item) {
const that = this;
......@@ -256,16 +260,18 @@ export default {
that.logShow = false;
},
/**
* 路由跳转
* @param {String} path
* @description: 路由跳转
* @param {String} path
* @author: 无尘
*/
changeRoute(path) {
this.$router.push(path);
},
/**
* 分页---页码变化
* @param {Number} val
* @description: 分页---页码变化
* @param {Number} val
* @author: 无尘
*/
handleSizeChange(val) {
const that = this;
......@@ -279,8 +285,9 @@ export default {
},
/**
* 分页---当前页变化
* @param {Number} val
* @description: 分页---当前页变化
* @param {Number} val
* @author: 无尘
*/
handleCurrentChange(val) {
const that = this;
......@@ -292,7 +299,8 @@ export default {
}
},
/**
* 获取商户
* @description: 获取商户
* @author: 无尘
*/
getBrandData() {
const that = this;
......@@ -307,7 +315,8 @@ export default {
});
},
/**
* 获取绑定数据
* @description: 获取绑定数据
* @author: 无尘
*/
getBindList() {
const that = this;
......@@ -329,7 +338,8 @@ export default {
});
},
/**
* 获取刷新数据
* @description: 获取刷新数据
* @author: 无尘
*/
getTableList() {
const that = this;
......
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