diff --git a/src/components/repayment/index.vue b/src/components/repayment/index.vue index 784e86e..cbd1dfc 100644 --- a/src/components/repayment/index.vue +++ b/src/components/repayment/index.vue @@ -295,6 +295,8 @@ export default { this.$refs.rec.show(row); }, recData(v) { + console.log("🚀 ~ file: index.vue ~ line 298 ~ recData ~ v", v) + let form = JSON.parse(JSON.stringify(v)); this.list.splice(form.index, 1, form); this.sumList(); diff --git a/src/home/home.vue b/src/home/home.vue index e61cdff..7798920 100644 --- a/src/home/home.vue +++ b/src/home/home.vue @@ -207,6 +207,7 @@ export default { }, mounted() { console.log(12); + console.log("恭喜你发现了宝贝，版本号1.0.0") var that = this; setTimeout(() => { that.sessionStorageData = JSON.parse( diff --git a/src/layout/components/asider.vue b/src/layout/components/asider.vue index 1a14b36..24d3e32 100644 --- a/src/layout/components/asider.vue +++ b/src/layout/components/asider.vue @@ -167,6 +167,22 @@ export default { number: "400300", id:"3003004", }, + { + name: "服务反馈", + icon: "el-icon-suitcase", + route: "/feedback", + index: "feedback", + number: "400310", + id:"3003005", + }, + { + name: "消费评价", + icon: "el-icon-files", + route: "/evaluation", + index: "evaluation", + number: "400320", + id:"3003006", + }, ], }, @@ -217,6 +233,14 @@ export default { number: "4001100", id:"4004005", }, + { + name: "会员激活", + icon: "el-icon-info", + route: "/activationMember", + index: "activationMember", + number: "400710", + id:"4004006", + }, ], }, @@ -656,7 +680,7 @@ export default { icon: "el-icon-s-order", route: "/managers", index: "managers", - number: "4001200", + number: "6001200", id:"100010008", }, { @@ -664,7 +688,7 @@ export default { icon: "el-icon-s-order", route: "/admins", index: "admins", - number: "4001300", + number: "6001300", id:"100010009", }, @@ -673,7 +697,7 @@ export default { icon: "el-icon-s-finance", route: "/dept", index: "dept", - number: "4001400", + number: "6001400", id:"1000100010", }, // { @@ -684,7 +708,7 @@ export default { // number: "600600", // }, { - name: "员工业绩提成表", + name: "员工提成表", icon: "el-icon-warning-outline", route: "/staffBrokerage", index: "staffBrokerage", diff --git a/src/login/login.vue b/src/login/login.vue index 5ab84b8..58c3e4d 100644 --- a/src/login/login.vue +++ b/src/login/login.vue @@ -160,6 +160,7 @@ export default { .catch(() => {}); }, submitPassword() { + console.log("恭喜你发现了宝贝，版本号1.0.0") this.loading = true; setTimeout(() => { this.loading = false; diff --git a/src/pages/branch/openBranch/index.vue b/src/pages/branch/openBranch/index.vue index 6ab1b03..e65c7c0 100644 --- a/src/pages/branch/openBranch/index.vue +++ b/src/pages/branch/openBranch/index.vue @@ -121,6 +121,7 @@ export default { registrantSex: 1, passCode: null, name: "", + state:1 }, options: [ { diff --git a/src/pages/eashier/accountSet/accountSet.vue b/src/pages/eashier/accountSet/accountSet.vue index d316dee..5796b53 100644 --- a/src/pages/eashier/accountSet/accountSet.vue +++ b/src/pages/eashier/accountSet/accountSet.vue @@ -2,7 +2,7 @@
- + 会员账户修改
diff --git a/src/pages/eashier/collectionList/collectionList.vue b/src/pages/eashier/collectionList/collectionList.vue index 73d5fc1..004df1d 100644 --- a/src/pages/eashier/collectionList/collectionList.vue +++ b/src/pages/eashier/collectionList/collectionList.vue @@ -519,6 +519,7 @@ export default { }, openMoney() { this.$refs.repayment.show(this.vip); + console.log("🚀 ~ file: collectionList.vue ~ line 522 ~ openMoney ~ this.vip", this.vip) }, recChange(v) { if (v) { @@ -751,19 +752,6 @@ export default { //打开选择会员弹窗 openMember() { this.$refs.member.show(this.vip); - succsee().then((res) => { - if (res.code == "000000") { - this.$alert(res.message, "提示", { - confirmButtonText: "确定", - confirmButtonClass: "confirmbtnFalses", - type: "info", - center: true, - callback: (action) => {}, - }); - } else { - - } - }); }, diff --git a/src/pages/eashier/raiseReatment/components/index.vue b/src/pages/eashier/raiseReatment/components/index.vue index d19c9f3..040ffff 100644 --- a/src/pages/eashier/raiseReatment/components/index.vue +++ b/src/pages/eashier/raiseReatment/components/index.vue @@ -644,12 +644,14 @@ export default { this.sumMoney(); }, endEditTimes(row, index) { - // if (row.changeInTime < row.minumumTimes) { - // this.$message.info({ - // message: "最低不能少于" + row.minumumTimes + "次", - // }); - // row.changeInTime = row.minumumTimes; - // } + console.log("🚀 ~ file: index.vue ~ line 647 ~ endEditTimes ~ row", row) + + if (row.changeInTime < row.minumumTimes) { + this.$message.info({ + message: "最低不能少于" + row.minumumTimes + "次", + }); + row.changeInTime = row.minumumTimes; + } row.changeInMoney = (row.prices * row.changeInTime).toFixed(2) * 1; row.transactionMoney = row.changeInMoney; this.inNumberIndex = -1; diff --git a/src/pages/eashier/refundRecharge/service/course.vue b/src/pages/eashier/refundRecharge/service/course.vue new file mode 100644 index 0000000..424ad7e --- /dev/null +++ b/src/pages/eashier/refundRecharge/service/course.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/pages/eashier/refundRecharge/service/detail/detail.vue b/src/pages/eashier/refundRecharge/service/detail/detail.vue new file mode 100644 index 0000000..784538c --- /dev/null +++ b/src/pages/eashier/refundRecharge/service/detail/detail.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/pages/eashier/refundRecharge/service/detail/editform.vue b/src/pages/eashier/refundRecharge/service/detail/editform.vue new file mode 100644 index 0000000..1db1121 --- /dev/null +++ b/src/pages/eashier/refundRecharge/service/detail/editform.vue @@ -0,0 +1,615 @@ + + + + diff --git a/src/pages/eashier/refundRecharge/service/detail/printform.vue b/src/pages/eashier/refundRecharge/service/detail/printform.vue new file mode 100644 index 0000000..69e705e --- /dev/null +++ b/src/pages/eashier/refundRecharge/service/detail/printform.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/src/pages/eashier/refundRecharge/service/passcode.vue b/src/pages/eashier/refundRecharge/service/passcode.vue new file mode 100644 index 0000000..bf01194 --- /dev/null +++ b/src/pages/eashier/refundRecharge/service/passcode.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/src/pages/eashier/refundRecharge/service/payment.vue b/src/pages/eashier/refundRecharge/service/payment.vue new file mode 100644 index 0000000..9f39d6e --- /dev/null +++ b/src/pages/eashier/refundRecharge/service/payment.vue @@ -0,0 +1,129 @@ + + + + diff --git a/src/pages/eashier/refundRecharge/service/recash.vue b/src/pages/eashier/refundRecharge/service/recash.vue new file mode 100644 index 0000000..6af638a --- /dev/null +++ b/src/pages/eashier/refundRecharge/service/recash.vue @@ -0,0 +1,201 @@ + + + + diff --git a/src/pages/eashier/refundRecharge/service/reccard.vue b/src/pages/eashier/refundRecharge/service/reccard.vue new file mode 100644 index 0000000..a6f5181 --- /dev/null +++ b/src/pages/eashier/refundRecharge/service/reccard.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/pages/eashier/refundRecharge/service/service.vue b/src/pages/eashier/refundRecharge/service/service.vue new file mode 100644 index 0000000..ed6f03e --- /dev/null +++ b/src/pages/eashier/refundRecharge/service/service.vue @@ -0,0 +1,2443 @@ + + + + diff --git a/src/pages/eashier/refundRecharge/service/staffratio.vue b/src/pages/eashier/refundRecharge/service/staffratio.vue new file mode 100644 index 0000000..1e5cacf --- /dev/null +++ b/src/pages/eashier/refundRecharge/service/staffratio.vue @@ -0,0 +1,361 @@ + + + + + \ No newline at end of file diff --git a/src/pages/eashier/service/course.vue b/src/pages/eashier/service/course.vue index 7995af3..424ad7e 100644 --- a/src/pages/eashier/service/course.vue +++ b/src/pages/eashier/service/course.vue @@ -43,7 +43,7 @@ export default { methods: { //点击选中 rowClick(row) { - console.log(row); + if (row.courseConsumeCount > 0) { row.courseAccountId = row.id; if (row.courseConsumeCount == 1) { @@ -61,7 +61,7 @@ export default { }, //组件传值 show(form) { - console.log(form); + if (form) { this.form = { ...form }; this.getData(); diff --git a/src/pages/eashier/service/detail/editform.vue b/src/pages/eashier/service/detail/editform.vue index 1db1121..3dd666b 100644 --- a/src/pages/eashier/service/detail/editform.vue +++ b/src/pages/eashier/service/detail/editform.vue @@ -250,7 +250,12 @@ export default { this.list = []; this.form = { ...form }; this.list = form.projectList; + console.log("🚀 ~ file: editform.vue ~ line 253 ~ show ~ this.list", this.list) + this.list.forEach((item, index) => { + item.collectionAmount= item.collectionRechargeAmount*1+item.collectionCashAmount*1 + + item.rechargeConsumeList.forEach((items) => { items.cardOver = items.cardConsumeMoney; items.cardGiftOver = items.giftConsumeMoney; diff --git a/src/pages/eashier/service/detail/printform.vue b/src/pages/eashier/service/detail/printform.vue index 69e705e..1f3ec63 100644 --- a/src/pages/eashier/service/detail/printform.vue +++ b/src/pages/eashier/service/detail/printform.vue @@ -33,7 +33,7 @@
{{ item.projectName }}
-
{{ item.priceMember }}
+
{{ item.amount }}
{{ item.discountmoney }}
@@ -43,7 +43,8 @@
充值帐户
-
支付
+
充值支付
+
余额支付
剩余
@@ -51,6 +52,7 @@
{{ item.rechargeTypeName }}
{{ item.spendMoney }}
+
{{ item.accountGiftSpendMoney}}
{{ item.cardRestMoney }}
@@ -134,7 +136,7 @@ export default { recList = recList.concat(item.rechargeConsumeList); }); this.printForm.projectList.forEach((item) => { - item.discountmoney = ((item.collectionAmount * 1) + (item.collectionRechargeAmount * 1)).toFixed(2) * 1; + item.discountmoney = ((item.collectionCashAmount * 1) + (item.collectionRechargeAmount * 1)).toFixed(2) * 1; }) this.recList = recList; @@ -160,7 +162,7 @@ export default { } .printDiv { - width: 200px; + width: 330px; margin: 0 auto; } diff --git a/src/pages/eashier/service/passcode.vue b/src/pages/eashier/service/passcode.vue index 3ca1139..bf01194 100644 --- a/src/pages/eashier/service/passcode.vue +++ b/src/pages/eashier/service/passcode.vue @@ -55,7 +55,7 @@ export default { this.paymentform = {}; }, setPassword(val) { - console.log(val); + let reg = /[0-9a-zA-Z]/g; // 只允许输入字母和数字 let nDot = /[^●]/g; // 非圆点字符 let index = -1; // 新输入的字符位置 @@ -91,7 +91,7 @@ export default { // 将 pwdCover 替换成 ● this.pwdCover = val.replace(/\S/g, "●"); this.password = realArr.join(""); - console.log(this.password); + }, passKeydown(e) { @@ -133,7 +133,7 @@ export default { if (res.data == true) { this.$message.success({ message: "密码正确!" }); this.$emit("passcodeData", this.file); - console.log(this.file) + this.paymentcodeDialog = false; } else { this.$alert("密码错误", "提示", { diff --git a/src/pages/eashier/service/payment.vue b/src/pages/eashier/service/payment.vue index ef7184d..9f39d6e 100644 --- a/src/pages/eashier/service/payment.vue +++ b/src/pages/eashier/service/payment.vue @@ -38,7 +38,6 @@ export default { that.form = JSON.parse(JSON.stringify(form)); that.payLists = []; that.payLists = JSON.parse(JSON.stringify(list)); - console.log(that.payLists) }, //选择金额. editPay(row, index) { diff --git a/src/pages/eashier/service/recash.vue b/src/pages/eashier/service/recash.vue index 7d724ef..6af638a 100644 --- a/src/pages/eashier/service/recash.vue +++ b/src/pages/eashier/service/recash.vue @@ -54,9 +54,6 @@ export default { that.rechargeAccountList = []; that.payLists = that.recForm.payLists; that.rechargeAccountList = that.recForm.rechargeAccountList; - console.log("list", list); - console.log("form", form); - console.log("rechargeAccountList", form.rechargeAccountList); }, //修改卡付金额 @@ -103,7 +100,6 @@ export default { this.recIndex = -1; if (row.spendMoney * 1 < 0) { } else { - console.log(row); if (this.recForm.noDiscount == 0) { row.discoutMoney = ((row.spendMoney * 1) / ((row.discount * 1) / 100)).toFixed(2) * diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue index 18a2c43..c2f1974 100644 --- a/src/pages/eashier/service/service.vue +++ b/src/pages/eashier/service/service.vue @@ -3,189 +3,432 @@
- - + + - +
- +
- 男: - 女: + 男: + + 女: +
- +
{{ memberForm.integral }}
- +
{{ memberForm.debtMoney }} 去还款
- + 充值卡 - + 项目包
- +
- + - + - + - + - + - + - + - + - + - + - + - +
-
-
+
+
总付金额: - {{ form.cashAmount }} + + {{ total }}
现付金额: - {{ form.collectionCashAmounts }} + + {{ appearPrice }}
@@ -283,12 +625,26 @@
- 添加项目 - 收银列表 - {{ isAddition == 1 ? '收银' : '补单' }} - 清空页面 + 添加项目 + 收银列表 + {{ + isAddition == 1 ? "收银" : "补单" + }} + 清空页面
- 确认收银 + 确认收银
@@ -299,7 +655,7 @@
- + \ No newline at end of file + diff --git a/src/pages/eashier/service/staffratio.vue b/src/pages/eashier/service/staffratio.vue index e6063a9..1e5cacf 100644 --- a/src/pages/eashier/service/staffratio.vue +++ b/src/pages/eashier/service/staffratio.vue @@ -53,12 +53,12 @@ export default { }, methods: { handleClose() { - console.log(this.lists) + let forms = { text: this.staffTexts, list: this.lists }; - console.log(this.lists) + this.$emit("staffratioData", forms); this.dialogVisible = false; @@ -68,7 +68,7 @@ export default { this.changeStaff(); }, endEdit(row, index) { - console.log(row) + if (row.ratio * 1 > 100) { this.$alert("输入值不能大于100", "提示", { confirmButtonText: "确定", @@ -125,7 +125,7 @@ export default { } this.list[0].ratio = 100 - number; }) - console.log(this.list[0].ratio) + } let form = {}; this.openList.forEach((item) => { @@ -135,7 +135,7 @@ export default { }) form.ratio = row.ratio; this.list.splice(index, 1, form); - console.log(this.openList); + this.changeStaff(); }, editclick(index) { @@ -148,7 +148,7 @@ export default { } this.list[0].ratio = 100 - number; }) - console.log(this.list[0].ratio) + }, del() { let index = this.list.length - 1; @@ -327,7 +327,7 @@ export default { }, confirms() { let flag = this.isRepeat(this.list, "brandNumber"); - console.log(this.list) + this.list.forEach((item,index)=>{ if(item.label==""){ @@ -338,10 +338,10 @@ export default { text: this.staffText, list: this.list, }; - console.log(flag); + if (flag) { this.$emit("staffratioData", form); - console.log(form) + this.dialogVisible = false; } else { this.$alert("选择员工存在重复", "提示", { diff --git a/src/pages/promotion/group/index.vue b/src/pages/promotion/group/index.vue index 2bc7f63..40b6554 100644 --- a/src/pages/promotion/group/index.vue +++ b/src/pages/promotion/group/index.vue @@ -491,10 +491,20 @@ export default { baseGrouponCardPage(this.queryForm).then(res => { this.listLoading = false; if (res.code == "000000") { + var headOffice = sessionStorage.getItem("headOffice"); + var storeName = sessionStorage.getItem("storeName"); + if (headOffice == 0) { + res.pageInfo.list.forEach((item, index) => { + if (item.storeName != storeName) { + res.pageInfo.list = res.pageInfo.list.filter(item=>item.storeName == storeName) + } + }); + } this.list = res.pageInfo.list; - this.total = res.pageInfo.total; + console.log("🚀 ~ file: index.vue ~ line 504 ~ baseGrouponCardPage ~ this.list", this.list) + this.total = res.pageInfo.list.length; + console.log("🚀 ~ file: index.vue ~ line 505 ~ baseGrouponCardPage ~ this.total", this.total) this.list = this.list.reverse(); - console.log(this.list); } else { this.$alert(res.message, "提示", { confirmButtonText: "确定", diff --git a/src/pages/storeManage/dept/index.vue b/src/pages/storeManage/dept/index.vue index 3d3de2d..c70efef 100644 --- a/src/pages/storeManage/dept/index.vue +++ b/src/pages/storeManage/dept/index.vue @@ -2,16 +2,15 @@
选择日期 - +
- + - @@ -127,6 +126,9 @@ export default { .then((res) => { if (res.code == "000000") { this.list = res.rows; + this.list.forEach((item)=>{ + item.courseTotal=item.courseCash + }) } else { this.$alert(res.message, "提示", { confirmButtonText: "确定", diff --git a/src/pages/storeManage/evaluation/evaluation.vue b/src/pages/storeManage/evaluation/evaluation.vue new file mode 100644 index 0000000..f7f261f --- /dev/null +++ b/src/pages/storeManage/evaluation/evaluation.vue @@ -0,0 +1,876 @@ + + + + + diff --git a/src/pages/storeManage/feedback/feedback.vue b/src/pages/storeManage/feedback/feedback.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/storeManage/memberList/memberList.vue b/src/pages/storeManage/memberList/memberList.vue index 743ed39..68db06e 100644 --- a/src/pages/storeManage/memberList/memberList.vue +++ b/src/pages/storeManage/memberList/memberList.vue @@ -2,173 +2,526 @@
- 添加 + 添加
- + - 条件搜索 - 刷新 - 下载模板 - 导入 + 条件搜索 + 刷新 + 下载模板 + 导入 导出
- - - - - - - - + + + + - + - + - - + + - + - - + + - - + + - + - - - - + + + + - - + + - + - + - + - + - + -
+
- +
- - + + - {{form.mobilePhone}} + {{ form.mobilePhone }} - {{form.memberName}} + {{ form.memberName }}
- 取 消 - 确认启用 + 取 消 + 确认启用
- - + + - {{editPhoneForm.phone}} - {{editPhoneForm.phone | phone }} + {{ + editPhoneForm.phone + }} + {{ editPhoneForm.phone | phone }} - - + + - - + + 点击上传
上传图片附件
- 取 消 - 确 定 + 取 消 + 确 定
- +
- +
- +
- 已分派 - 未分派 + 已分派 + 未分派
- 取 消 - 确 定 + + 取 消 + 确 定 - - + + - - + + - {{phoneForm.registrantMobilePhone}} - 发送验证码 + {{ phoneForm.registrantMobilePhone }} + 发送验证码 - + - 取 消 - 确 定 + + 取 消 + 确 定
@@ -188,7 +541,7 @@ import { cashPasswordReset, passwordReset, authCode, - authCodes, + authCodes } from "@/api/storeManage.js"; import { getSmsCode } from "@/api/login"; import { partten } from "../../../../partten/index"; @@ -208,7 +561,7 @@ export default { phoneForm: {}, editPhoneForm: { //改号启用表单 - phone: null, + phone: null }, form: {}, //主对象 searchForm: { @@ -216,14 +569,14 @@ export default { assignState: null, state: null, mobilePhone: null, - memberName: null, + memberName: null }, stateForm: { // 启用表单 password: null, mobilePhone: null, phone: null, - code: null, + code: null }, phoneDialog: false, //导出填写验证码弹窗开关 input: "", @@ -233,7 +586,7 @@ export default { pageNum: 1, // 当前页码 pageSize: 10, // 每页的数据条数, total: 0, //分页总条数 - tableList: [], + tableList: [] }, loading: false, //提交动画 editForm: {}, //修改会员表单 @@ -242,15 +595,15 @@ export default { searchTrue: false, //搜索判断 fileData: null, //文件对象 state: 1, //标签页状态 - headOffice: sessionStorage.getItem("headOffice") * 1, //是否总店 + headOffice: sessionStorage.getItem("headOffice") * 1 //是否总店 }; }, methods: { //发送对应手机号短信 sendPhone() { authCodes({ - registrantMobilePhone: this.phoneForm.registrantMobilePhone, - }).then((res) => { + registrantMobilePhone: this.phoneForm.registrantMobilePhone + }).then(res => { if (res.code == "000000") { this.$message({ message: "发送成功!" }); var that = this; @@ -264,7 +617,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -273,7 +626,8 @@ export default { exits() { this.searchForm.isMessage = 1; this.searchForm.code = this.phoneForm.code; - storeMemberExport(this.searchForm).then((res) => { + storeMemberExport(this.searchForm).then(res => { + t; let blob = new Blob([res]); console.log(blob); var a = document.createElement("a"); @@ -293,10 +647,10 @@ export default { cancelButtonText: "取消", type: "warning", cancelButtonClass: "cancelbtnFalses", - confirmButtonClass: "confirmbtnFalses", + confirmButtonClass: "confirmbtnFalses" }).then(() => { if (number == 0) { - passwordReset(row).then((res) => { + passwordReset(row).then(res => { if (res.code == "000000") { this.$message.success({ message: res.message }); this.getData(); @@ -306,12 +660,12 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); } else { - cashPasswordReset(row).then((res) => { + cashPasswordReset(row).then(res => { if (res.code == "000000") { this.$message.success({ message: res.message }); this.getData(); @@ -321,7 +675,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -335,7 +689,7 @@ export default { }, //下载模板方法 download() { - storeMemberDownload().then((res) => { + storeMemberDownload().then(res => { let blob = new Blob([res]); console.log(blob); var a = document.createElement("a"); @@ -356,10 +710,10 @@ export default { cancelButtonText: "导出暗文", type: "warning", cancelButtonClass: "cancelbtnFalses", - confirmButtonClass: "confirmbtnFalses", + confirmButtonClass: "confirmbtnFalses" }) .then(() => { - authCode().then((res) => { + authCode().then(res => { if (res.code == "000000") { this.phoneForm.registrantMobilePhone = res.data.registrantMobilePhone; @@ -370,7 +724,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -378,7 +732,7 @@ export default { .catch(() => { this.searchForm.isMessage = 0; - storeMemberExport(that.searchForm).then((res) => { + storeMemberExport(that.searchForm).then(res => { let blob = new Blob([res]); console.log(blob); var a = document.createElement("a"); @@ -400,11 +754,11 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } else { fileData.append("multipartFile", v); - storeMemberImport(fileData).then((res) => { + storeMemberImport(fileData).then(res => { if (res.code == "000000") { this.$message.success({ message: res.message }); this.getData(); @@ -414,7 +768,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -448,7 +802,7 @@ export default { this.searchForm.pageNum = this.pageInfo.pageNum; this.searchForm.state = this.state; this.searchForm.storeId = sessionStorage.getItem("parentId"); - storeMemberpage(this.searchForm).then((res) => { + storeMemberpage(this.searchForm).then(res => { if (res.code == "000000") { this.searchTrue = true; res.pageInfo.tableList = res.pageInfo.list; @@ -464,7 +818,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -478,7 +832,7 @@ export default { //确定返回方法 confirm() { //console.log(this.editForm); - editmember(this.editForm).then((res) => { + editmember(this.editForm).then(res => { //console.log(res); if (res.code == "000000") { this.$message.success({ message: "修改成功!" }); @@ -489,7 +843,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -521,25 +875,36 @@ export default { pageSize: this.pageInfo.pageSize, pageNum: this.pageInfo.pageNum, state: this.state, - storeId: sessionStorage.getItem("parentId"), + storeId: sessionStorage.getItem("parentId") }; - storeMemberpage(page).then((res) => { + storeMemberpage(page).then(res => { if (res.code == "000000") { if (this.refreshtext == true) { this.searchTrue = false; this.$message.success({ message: "已刷新最新数据" }); this.refreshtext = false; } - + var headOffice = sessionStorage.getItem("headOffice"); + var storeName = sessionStorage.getItem("storeName"); + var storeId = sessionStorage.getItem("storeId"); + if (headOffice == 0) { + res.pageInfo.list.forEach((item, index) => { + if (item.storeName != storeName) { + res.pageInfo.list = res.pageInfo.list.filter(item=>item.storeName == storeName) + } + }); + } res.pageInfo.tableList = res.pageInfo.list; + console.log("🚀 ~ file: memberList.vue ~ line 902 ~ storeMemberpage ~ res.pageInfo.tableList", res.pageInfo.list) this.pageInfo = res.pageInfo; + console.log("🚀 ~ file: memberList.vue ~ line 899 ~ storeMemberpage ~ this.pageInfo", this.pageInfo) } else { this.$alert(res.message, "提示", { confirmButtonText: "确定", confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -556,10 +921,10 @@ export default { cancelButtonText: "取消", type: "warning", cancelButtonClass: "cancelbtnFalses", - confirmButtonClass: "confirmbtnFalses", + confirmButtonClass: "confirmbtnFalses" }) .then(() => { - storeMemberupdateState({ id: row.id, state: 0 }).then((res) => { + storeMemberupdateState({ id: row.id, state: 0 }).then(res => { //console.log(res); if (res.code == "000000") { this.$message.success({ message: res.message }); @@ -572,7 +937,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -599,18 +964,18 @@ export default { if (this.stateForm.mobilePhone == "") { this.$message({ message: "手机号码不能为空", - center: true, + center: true }); return; } if (!reg.test(this.stateForm.mobilePhone)) { this.$message({ message: "手机格式不正确 ！", - center: true, + center: true }); return; } else { - getSmsCode({ mobilePhone: this.stateForm.mobilePhone }).then((res) => { + getSmsCode({ mobilePhone: this.stateForm.mobilePhone }).then(res => { if (res.code == "000000") { this.$message.success({ message: "发送成功" }); this.time = 60; @@ -622,7 +987,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -653,7 +1018,7 @@ export default { this.fileData.append("memberName", this.editPhoneForm.memberName); this.fileData.append("mobilePhone", this.editPhoneForm.mobilePhone); if (partten.phoneNum.test(this.editPhoneForm.mobilePhone * 1)) { - changePhoneToUpdateState(this.fileData).then((res) => { + changePhoneToUpdateState(this.fileData).then(res => { if (res.code == "000000") { this.$message.success({ message: res.message }); this.editPhoneForm = {}; @@ -666,7 +1031,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }); @@ -676,7 +1041,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } }, @@ -694,21 +1059,21 @@ export default { id: this.stateForm.id, state: state, passCode: this.stateForm.code, - mobilePhone: this.stateForm.mobilePhone, + mobilePhone: this.stateForm.mobilePhone }; } else if (this.stateForm.password != null) { var ids = { id: this.stateForm.id, state: state, password: this.stateForm.password, - mobilePhone: this.stateForm.mobilePhone, + mobilePhone: this.stateForm.mobilePhone }; } else { this.$message.info({ message: "请输入会员密码或手机验证码！" }); } //console.log(ids); // storeMemberupdateState(ids).then((res) => { - storeMemberStart(ids).then((res) => { + storeMemberStart(ids).then(res => { if (res.code == "000000") { this.$message.success({ message: res.message }); this.getData(); @@ -719,7 +1084,7 @@ export default { cancelButtonText: "取消", cancelButtonClass: "cancelbtnFalses", confirmButtonClass: "confirmbtnFalses", - type: "warning", + type: "warning" }) .then(() => { this.editPhoneDialog = true; @@ -733,7 +1098,7 @@ export default { confirmButtonClass: "confirmbtnFalses", type: "warning", center: true, - callback: (action) => {}, + callback: action => {} }); } @@ -744,7 +1109,7 @@ export default { } } }); - }, + } }, created() { @@ -753,7 +1118,7 @@ export default { ); let list = JSON.parse(sessionStorage.getItem("list")); - list.forEach((item) => { + list.forEach(item => { if (item.id == 4007001) { this.getData(); } @@ -764,15 +1129,19 @@ export default { tableData() { var search = this.input.toString().toLowerCase(); //将用户输入的值变字符串并小写 if (search) { - return this.pageInfo.tableList.filter(function (dataNews) { - return Object.keys(dataNews).some(function (key) { - return String(dataNews[key]).toLowerCase().indexOf(search) > -1; + return this.pageInfo.tableList.filter(function(dataNews) { + return Object.keys(dataNews).some(function(key) { + return ( + String(dataNews[key]) + .toLowerCase() + .indexOf(search) > -1 + ); }); }); } return this.pageInfo.tableList; - }, - }, + } + } }; - diff --git a/src/pages/storeManage/trading/components/cash.vue b/src/pages/storeManage/trading/components/cash.vue index 259b74f..6ac31f2 100644 --- a/src/pages/storeManage/trading/components/cash.vue +++ b/src/pages/storeManage/trading/components/cash.vue @@ -43,6 +43,8 @@ + @@ -286,7 +288,11 @@ export default { } } }); + this.list.forEach((item)=>{ + item.tradeMoney=item.cashMoney+item.cardMoney + }) this.list = res.pageInfo.list; + this.total = res.pageInfo.total; } else { this.$alert(res.message, "查询会员疗程", { diff --git a/src/router/index.js b/src/router/index.js index 754e84f..6aefc02 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -88,6 +88,24 @@ const router = new VueRouter({ index: "staffWorks" } }, + { + path: "/feedback", + component: () => + import("../pages/storeManage/feedback/feedback.vue"), + meta: { + title: "服务反馈", + index: "feedback" + } + }, + { + path: "/evaluation", + component: () => + import("../pages/storeManage/evaluation/evaluation.vue"), + meta: { + title: "消费评价", + index: "evaluation" + } + }, //项目类别 { path: "/baseProjectType", @@ -620,7 +638,7 @@ const router = new VueRouter({ component: () => import("../pages/statistics/memberRanking/memberRanking.vue"), meta: { - title: "员工业绩提成表", + title: "会员排行榜", index: "memberRanking" } },