Commit d47b5527 by liqiang

fix: fix

parent f16d5285
...@@ -86,8 +86,10 @@ ...@@ -86,8 +86,10 @@
"postcss-url": "^7.2.1", "postcss-url": "^7.2.1",
"prettier": "^1.16.4", "prettier": "^1.16.4",
"rimraf": "^2.6.0", "rimraf": "^2.6.0",
"sass": "^1.26.11", "sass": "^1.50.0",
"node-sass": "^4.13.1",
"sass-loader": "^7.3.1", "sass-loader": "^7.3.1",
"mini-css-extract-plugin": "^0.9.0",
"semver": "^5.3.0", "semver": "^5.3.0",
"shelljs": "^0.7.6", "shelljs": "^0.7.6",
"uglifyjs-webpack-plugin": "^1.1.1", "uglifyjs-webpack-plugin": "^1.1.1",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<el-dialog title="领取记录" :visible.sync="dialogVisible" width="864px" :before-close="handleClose"> <el-dialog title="领取记录" :visible.sync="dialogVisible" width="864px" :before-close="handleClose">
<div class="table-condition flex flex-space-between m-b-20"> <div class="table-condition flex flex-space-between m-b-20">
<div class="table-condition-left"> <div class="table-condition-left">
<el-input :placeholder="conditionObj.searchType == 2 ? '请输入会员手机号/卡号 ' : '请输入导购姓名/手机号/code'" maxlength="50" v-model="conditionObj.searchInput" class="w-336" @keyup.native="(value) => toInput(value, conditionObj.searchInput)" clearable @clear="clearInput"> <el-input :placeholder="conditionObj.searchType == 2 ? '请输入会员手机号/卡号 ' : '请输入导购姓名/手机号/code'" maxlength="50" v-model="conditionObj.searchInput" class="w-336" @keyup.native="value => toInput(value, conditionObj.searchInput)" clearable @clear="clearInput">
<el-select class="w-103" v-model="conditionObj.searchType" slot="prepend" placeholder="请选择"> <el-select class="w-103" v-model="conditionObj.searchType" slot="prepend" placeholder="请选择">
<el-option label="按导购" value="1"> </el-option> <el-option label="按导购" value="1"> </el-option>
<!-- <el-option label="按会员" value="2"></el-option> --> <!-- <el-option label="按会员" value="2"></el-option> -->
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
this.choiceDateCopy = []; this.choiceDateCopy = [];
} }
}, },
disabledDate: (time) => { disabledDate: time => {
if (this.choiceDateCopy.length) { if (this.choiceDateCopy.length) {
const one = 365 * 24 * 3600 * 1000; const one = 365 * 24 * 3600 * 1000;
const minTime = this.choiceDateCopy[0] - one; const minTime = this.choiceDateCopy[0] - one;
...@@ -133,7 +133,7 @@ export default { ...@@ -133,7 +133,7 @@ export default {
/** /**
* 导出 * 导出
*/ */
exportExcel: _debounce(function () { exportExcel: _debounce(function() {
const that = this; const that = this;
that.loadingBtn = true; that.loadingBtn = true;
if (!that.conditionObj.dateRange) { if (!that.conditionObj.dateRange) {
...@@ -151,7 +151,7 @@ export default { ...@@ -151,7 +151,7 @@ export default {
postExcel(para) { postExcel(para) {
const that = this; const that = this;
postRequest('/haoban-app-customer-web/cardCoupon/export-consume-card', para) postRequest('/haoban-app-customer-web/cardCoupon/export-consume-card', para)
.then((res) => { .then(res => {
let resData = res.data; let resData = res.data;
that.loadingBtn = false; that.loadingBtn = false;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
...@@ -174,7 +174,7 @@ export default { ...@@ -174,7 +174,7 @@ export default {
} }
errMsg.errorMsg(resData); errMsg.errorMsg(resData);
}) })
.catch(function (error) { .catch(function(error) {
that.loadingBtn = false; that.loadingBtn = false;
that.$message.error({ that.$message.error({
duration: 1000, duration: 1000,
...@@ -189,7 +189,7 @@ export default { ...@@ -189,7 +189,7 @@ export default {
/** /**
* 输入 * 输入
*/ */
toInput: _debounce(function (e, value) { toInput: _debounce(function(e, value) {
const that = this; const that = this;
that.currentPage = 1; that.currentPage = 1;
that.getTableList(); that.getTableList();
...@@ -241,7 +241,7 @@ export default { ...@@ -241,7 +241,7 @@ export default {
let storeGroups = []; let storeGroups = [];
let filterStoreIds = []; let filterStoreIds = [];
let clerkIds = []; let clerkIds = [];
that.conditionObj.storeGroup.forEach((ele) => { that.conditionObj.storeGroup.forEach(ele => {
if (ele.type == 1) { if (ele.type == 1) {
clerkIds.push(ele.employeeClerkId); clerkIds.push(ele.employeeClerkId);
} }
...@@ -270,7 +270,7 @@ export default { ...@@ -270,7 +270,7 @@ export default {
// taskType: 1 //0不良评价,1话务任务 // taskType: 1 //0不良评价,1话务任务
}; };
postRequest('/haoban-app-customer-web/cardCoupon/find-receive-card-page', para) postRequest('/haoban-app-customer-web/cardCoupon/find-receive-card-page', para)
.then((res) => { .then(res => {
let resData = res.data; let resData = res.data;
that.loading = false; that.loading = false;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
...@@ -280,7 +280,7 @@ export default { ...@@ -280,7 +280,7 @@ export default {
} }
errMsg.errorMsg(resData); errMsg.errorMsg(resData);
}) })
.catch(function (error) { .catch(function(error) {
that.loading = false; that.loading = false;
that.$message.error({ that.$message.error({
duration: 1000, duration: 1000,
...@@ -290,14 +290,14 @@ export default { ...@@ -290,14 +290,14 @@ export default {
} }
}, },
watch: { watch: {
brandId: function (newData, oldData) { brandId: function(newData, oldData) {
const that = this; const that = this;
if (!!newData) { if (!!newData) {
that.activeBrand = newData; that.activeBrand = newData;
that.getTableList(); that.getTableList();
} }
}, },
coupCardId: function (newData, oldData) { coupCardId: function(newData, oldData) {
const that = this; const that = this;
if (!!newData) { if (!!newData) {
that.getTableList(); that.getTableList();
......
...@@ -627,6 +627,7 @@ export default { ...@@ -627,6 +627,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import './shared/style/index.scss';
.color-f5222d { .color-f5222d {
color: #f5222d; color: #f5222d;
} }
...@@ -694,6 +695,7 @@ export default { ...@@ -694,6 +695,7 @@ export default {
#index { #index {
.content { .content {
@include one-center;
padding-top: 46px; padding-top: 46px;
box-sizing: border-box; box-sizing: border-box;
/*overflow: auto;*/ /*overflow: auto;*/
......
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