diff --git a/config/index.js b/config/index.js index eb173e0..0cca9a8 100644 --- a/config/index.js +++ b/config/index.js @@ -26,9 +26,9 @@ module.exports = { assetsPublicPath: "/", proxyTable: { "/api": { - target: "http://192.168.31.214:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地 + // target: "http://192.168.31.214:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地 //target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地 - // target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地 + target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地 // target: "http://139.9.185.131:8098/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式 // target: "http://139.9.58.205:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式华为云 // target: "http://139.9.185.131:9094/", //设置你调用的接口域名和端口号 别忘了加http 盛联 @@ -46,7 +46,7 @@ module.exports = { } }, // Various Dev Server settingsss - host: "192.168.31.193", // can be overwritten by process.env.HOST + host: "192.168.31.194", // can be overwritten by process.env.HOST port: 3000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/src/api/eashier.js b/src/api/eashier.js index 3ce0a63..02b4f4e 100644 --- a/src/api/eashier.js +++ b/src/api/eashier.js @@ -9,6 +9,33 @@ export function succsee() { }); } +// 充值短信重发 +export function rechargeReissue(data){ + return service({ + url:"/api"+'/demay/ssm/rec/retransmission', + data, + method: "post" + }) +} + +// 疗程短信重发 +export function courseReissue(data){ + return service({ + url:"/api" + '/demay/ssm/course/retransmission', + method: "post", + data + }) +} + +// 收银短信重发 +export function sms(data){ + return service({ + url:"/api"+'/demay/ssm/cash/retransmission', + method: "post", + data + }) +} + // 门店明细查询 平台端-门店管理-门店审核-门店明细查询 export function storeOne(params) { return service({ diff --git a/src/api/promotion.js b/src/api/promotion.js index 3a951f1..a452d51 100644 --- a/src/api/promotion.js +++ b/src/api/promotion.js @@ -149,6 +149,17 @@ export function editBaseZengka(params) { data: params }); } + +// 赠卡导出 +export function exportCard(params){ + return service({ + url:"/api" + '/demay/ssm/baseZengka/export', + method: "post", + data:params, + responseType: "blob", + }) +} + // 赠卡page export function baseZengkaPage(params) { return service({ @@ -205,6 +216,15 @@ export function stateBaseGrouponCard(params) { data: params }); } +// 导出团购卡 +export function Export(params){ + return service({ + url:"/api" + '/demay/ssm/baseGrouponCard/export', + method: "post", + data: params, + responseType: "blob", + }) +} // 添加团购人名单 export function addBaseGrouponList(params) { return service({ diff --git a/src/components/staffList/staffout/index.vue b/src/components/staffList/staffout/index.vue index cb7e4af..9afad78 100644 --- a/src/components/staffList/staffout/index.vue +++ b/src/components/staffList/staffout/index.vue @@ -199,15 +199,16 @@ export default { //组件传值 show(list, storeId) { this.staffLists = [...list]; + this.staffLists.forEach((item) => { if (item.id || item.saleStaffId) { + item.staffNames = item.brandNumber + "-" + item.staffName; } else { item.staffNames = ""; } }); - console.log("🚀 ~ file: index.vue ~ line 202 ~ show ~ this.staffLists", this.staffLists) if (storeId) { this.storeId = storeId; } diff --git a/src/components/staffList/staffout/员工转出占比选值 b/src/components/staffList/staffout/员工转出占比选值 new file mode 100644 index 0000000..e69de29 diff --git a/src/components/store/select/index.vue b/src/components/store/select/index.vue index c69b54c..f82d4b5 100644 --- a/src/components/store/select/index.vue +++ b/src/components/store/select/index.vue @@ -15,6 +15,9 @@ export default { storeIds: [], }; }, + created(){ + this.show() + }, methods: { getData() { console.log(this.storeIds); diff --git a/src/layout/components/asider.vue b/src/layout/components/asider.vue index 4c5a3fa..75a8a2b 100644 --- a/src/layout/components/asider.vue +++ b/src/layout/components/asider.vue @@ -13,10 +13,18 @@ {{item.name}} - - + {{items.name}} + + {{ items.name }} + + + + {{ite.name}} + + + @@ -387,6 +395,14 @@ export default { number: "500400", id:"8008006", }, + { + name: "充值内调单", + icon: "el-icon-sort", + route: "/within", + index: "within", + number: "500410", + id:"8008009", + }, { name: "加价转疗程", icon: "el-icon-connection", @@ -402,7 +418,7 @@ export default { index: "coursetorec", number: "500410", id:"8008008", - }, + }, { name: "疗程账户延期", icon: "el-icon-connection", @@ -419,14 +435,41 @@ export default { number: "5001800", id:"8008027", }, - { - name: "充值内调单", - icon: "el-icon-sort", - route: "/within", - index: "within", - number: "500410", - id:"8008009", - }, + // { + // level:true, + // name:"内调单", + // index:"/within", + // number:"500410", + // id:'99999999', + // route:"/within", + // icon: "el-icon-sort", + // children:[ + // { + // name: "充值内调单", + // icon: "el-icon-sort", + // route: "/within", + // index: "within", + // number: "500410", + // id:"8008009", + // }, + // { + // name: "加价转疗程", + // icon: "el-icon-connection", + // route: "/raiseReatment", + // index: "raiseReatment", + // number: "500410", + // id:"8008007", + // }, + // { + // name: "疗程转充值", + // icon: "el-icon-connection", + // route: "/coursetorec", + // index: "coursetorec", + // number: "500410", + // id:"8008008", + // }, + // ] + // }, { name: "会员转卡", icon: "el-icon-sort", @@ -1141,7 +1184,10 @@ export default { .el-menu { border: none; } - +*>>> .el-menu-item, .el-submenu__title{ + height: 0.175rem; + line-height: 0.175rem; +} /* .asider-icon{ } */ diff --git a/src/pages/eashier/accountSet/accountSet.vue b/src/pages/eashier/accountSet/accountSet.vue index 5796b53..334f336 100644 --- a/src/pages/eashier/accountSet/accountSet.vue +++ b/src/pages/eashier/accountSet/accountSet.vue @@ -156,42 +156,55 @@ + + +
取 消 @@ -300,10 +313,138 @@ export default { console.log("value", value); console.log("index", index); }, - changeInput(row, index) { - console.log(row); + changeInput(row,index){ + console.log(row) + // 0剩余金额 1可用金额 2赠送金额 3赠送可用金额 4剩余次数 5可用次数 + // courseRestCountModify剩余次数 courseConsumeCountModify可用次数 cardRestMoneyModify剩余金额 cardConsumeMoneyModify可用金额 cardGiftMoneyModify赠送剩余金额 giftConsumeMoneyModify赠送可用金额 + // courseRestCountNew新账户剩余次数 courseConsumeCountNew新账户可用次数 cardRestMoneyNew新账户剩余金额 cardConsumeMoneyNew新账户可用金额 cardGiftMoneyNew新账户赠送剩余金额 giftConsumeMoneyNew新账户赠送可用金额 + switch (index) { + case 0: + if(row.cardRestMoneyModify*1||row.cardRestMoneyModify*1===0){ + // 修改了剩余金额 + let total = row.cardRestMoneyModify*1 + // 剩余金额小于可用金额时 + if(total < row.cardConsumeMoneyModify*1){ + row.cardRestMoneyModify = 0 + this.accountList[2].cardRestMoneyNew = 0 + this.$alert("剩余金额不能小于可用金额", "提示", { + confirmButtonText: "确定", + confirmButtonClass: "confirmbtnFalses", + type: "warning", + center: true, + callback: (action) => {}, + }); + }else{ + this.$set(this.accountList[2],'cardRestMoneyNew',total) + // this.accountList[2].cardRestMoneyNew = total + } + } + break; + case 1: + if(row.cardConsumeMoneyModify*1||row.cardConsumeMoneyModify*1===0){ + // 修改了可用金额 + let total = row.cardConsumeMoneyModify*1 + // 输入的可用金额大于剩余金额时 + if( total>row.cardRestMoneyModify*1 ){ + row.cardConsumeMoneyModify = 0 + this.accountList[2].cardConsumeMoneyNew = 0 + this.$alert("可用金额不能大于剩余金额", "提示", { + confirmButtonText: "确定", + confirmButtonClass: "confirmbtnFalses", + type: "warning", + center: true, + callback: (action) => {}, + }); + }else{ + // this.accountList[2].cardConsumeMoneyNew = total + this.$set(this.accountList[2],'cardConsumeMoneyNew',total) + console.log(this.accountList[2]) + } + } + break; + case 2: + if(row.cardGiftMoneyModify*1||row.cardGiftMoneyModify*1===0){ + // 操作了赠送剩余金额 + let total = row.cardGiftMoneyModify*1 + // 赠送剩余金额小于赠送可用金额时 + if(total < row.giftConsumeMoneyModify*1){ + row.cardGiftMoneyModify = 0 + this.accountList[2].cardGiftMoneyNew = 0 + this.$alert("赠送剩余金额不能小于赠送可用金额", "提示", { + confirmButtonText: "确定", + confirmButtonClass: "confirmbtnFalses", + type: "warning", + center: true, + callback: (action) => {}, + }); + }else{ + this.accountList[2].cardGiftMoneyNew = total + } + } + break; + case 3: + if(row.giftConsumeMoneyModify*1||row.giftConsumeMoneyModify*1===0){ + // 操作了赠送可用金额 + let total = row.giftConsumeMoneyModify*1 + // 赠送可用金额大于赠送金额时 + if(total>row.cardGiftMoneyModify*1){ + row.giftConsumeMoneyModify = 0 + this.accountList[2].giftConsumeMoneyNew = 0 + this.$alert("赠送可用金额不能大于赠送剩余金额", "提示", { + confirmButtonText: "确定", + confirmButtonClass: "confirmbtnFalses", + type: "warning", + center: true, + callback: (action) => {}, + }); + }else{ + this.accountList[2].giftConsumeMoneyNew = total + } + } + break; + case 4: + if(row.courseRestCountModify*1||row.courseRestCountModify*1===0){ + // 修改了剩余次数 + let total = row.courseRestCountModify*1 + // 剩余次数小于可用次数时 + if(total {}, + }); + }else{ + this.accountList[2].courseRestCountNew = total + } + } + break; + case 5: + if(row.courseConsumeCountModify*1||row.courseConsumeCountModify*1===0){ + // 修改了可用次数 + let total = row.courseConsumeCountModify*1 + if(total > row.courseRestCountModify*1){ + row.courseConsumeCountModify = 0 + this.accountList[2].courseConsumeCountNew = 0 + this.$alert("可用次数不能大于剩余次数", "提示", { + confirmButtonText: "确定", + confirmButtonClass: "confirmbtnFalses", + type: "warning", + center: true, + callback: (action) => {}, + }); + }else{ + this.accountList[2].courseConsumeCountNew = total + } + } + break; + } + }, + changeInputActive(row, index) { let list = [...this.accountList]; - if (list[2].courseRestCountNew != undefined) { list[2].courseRestCountNew = list[0].courseRestCount + list[1].courseRestCountModify * 1; @@ -319,19 +460,20 @@ export default { center: true, callback: (action) => {}, }); + this.accountList[1].courseConsumeCountModify = 0 + this.changeInput(row) } } - if (list[2].cardRestMoneyNew != undefined) { + if (list[2].cardRestMoneyNew) { list[2].cardRestMoneyNew = list[0].cardRestMoney + list[1].cardRestMoneyModify * 1; } - if (list[2].cardGiftMoneyNew != undefined) { + if (list[2].cardGiftMoneyNew) { list[2].cardGiftMoneyNew = list[0].cardGiftMoney + list[1].cardGiftMoneyModify * 1; } - if (list[2].cardConsumeMoneyNew != undefined) { - list[2].cardConsumeMoneyNew = - list[0].cardConsumeMoney + list[1].cardConsumeMoneyModify * 1; + if (list[2].cardConsumeMoneyNew) { + list[2].cardConsumeMoneyNew = list[0].cardConsumeMoney + list[1].cardConsumeMoneyModify * 1; if (list[2].cardConsumeMoneyNew > list[2].cardRestMoneyNew) { this.$alert("可用金额不能大于剩余金额", "提示", { confirmButtonText: "确定", @@ -340,9 +482,11 @@ export default { center: true, callback: (action) => {}, }); + this.accountList[1].cardConsumeMoneyModify = 0 + this.changeInput(row) } } - if (list[2].giftConsumeMoneyNew != undefined) { + if (list[2].giftConsumeMoneyNew) { list[2].giftConsumeMoneyNew = list[0].giftConsumeMoney + list[1].giftConsumeMoneyModify * 1; if (list[2].giftConsumeMoneyNew > list[2].cardGiftMoneyNew) { @@ -353,13 +497,10 @@ export default { center: true, callback: (action) => {}, }); + this.accountList[1].giftConsumeMoneyModify = 0 + this.changeInput(row) } } - - console.log(list); - list.forEach((item) => { - console.log(item); - }); this.accountList = [...list]; }, //确定返回方法 diff --git a/src/pages/eashier/collectionList/components/detail.vue b/src/pages/eashier/collectionList/components/detail.vue index ffcb844..8ede784 100644 --- a/src/pages/eashier/collectionList/components/detail.vue +++ b/src/pages/eashier/collectionList/components/detail.vue @@ -116,6 +116,8 @@ 关闭 + + 短信重发 取 消 修 改 @@ -123,7 +125,7 @@ diff --git a/src/pages/eashier/coursetorec/components/staffratio.vue b/src/pages/eashier/coursetorec/components/staffratio.vue index dde1ca3..a96869e 100644 --- a/src/pages/eashier/coursetorec/components/staffratio.vue +++ b/src/pages/eashier/coursetorec/components/staffratio.vue @@ -280,8 +280,11 @@ export default { }; if (flag) { + this.$emit("staffratioData", form); - + + + this.dialogVisible = false; } else { this.$alert("选择员工存在重复", "提示", { diff --git a/src/pages/eashier/raiseReatment/components/detail.vue b/src/pages/eashier/raiseReatment/components/detail.vue index f2bb31a..423890c 100644 --- a/src/pages/eashier/raiseReatment/components/detail.vue +++ b/src/pages/eashier/raiseReatment/components/detail.vue @@ -32,9 +32,11 @@ - 员工业绩 -
- + + 员工 +
+ +
@@ -62,7 +64,7 @@
员工/门店管理层/高管业绩 -
+
@@ -96,6 +98,7 @@ export default { staffslesout, manager, admin, + staffslesout }, data() { return { @@ -133,11 +136,10 @@ export default { setStaffs() { var that = this; this.$nextTick(() => { - console.log(that.$refs.staffsles); that.$refs.staffslesout.show(that.form.staffListsout); }); }, - + //员工占比返回方法 staffslesData(v) { this.form.staffLists = [...v]; @@ -219,6 +221,7 @@ export default { this.form.managerList = managerList; this.form.adminList = adminList; this.setStaff(); + } else { this.$alert(res.message, "加载门店高管", { confirmButtonText: "确定", diff --git a/src/pages/eashier/raiseReatment/components/index.vue b/src/pages/eashier/raiseReatment/components/index.vue index aac3fc2..1b81ccd 100644 --- a/src/pages/eashier/raiseReatment/components/index.vue +++ b/src/pages/eashier/raiseReatment/components/index.vue @@ -48,7 +48,9 @@ + +