diff --git a/src/api/eashier.js b/src/api/eashier.js index 3b617a7..3ce0a63 100644 --- a/src/api/eashier.js +++ b/src/api/eashier.js @@ -208,7 +208,7 @@ export function listdeal(params) { data: params }); } -//历史 +//历史(全都都有) export function listdeals(params) { return service({ url: "/api" + "/demay/ssm/couAccount/listdealsalls", @@ -216,7 +216,14 @@ export function listdeals(params) { data: params }); } - +//历史(只有过期) +export function listdeales(params) { + return service({ + url: "/api" + "/demay/ssm/couAccount/delay", + method: "post", + data: params + }); +} //不可用 export function couAccountListDisable(params) { return service({ @@ -681,6 +688,14 @@ export function cashListall(params) { }); } +export function cashListalls(params) { + return service({ + url: "/api" + "/demay/ssm/recAccount/delay", + method: "post", + data: params + }); +} + // 疗程退页面疗程账户查询 (门店端-疗程退-疗程退页面疗程账户查询) export function couAccountRefundList(params) { return service({ diff --git a/src/api/storeManage.js b/src/api/storeManage.js index 405267b..ec08dd8 100644 --- a/src/api/storeManage.js +++ b/src/api/storeManage.js @@ -229,7 +229,14 @@ export function propageNew(params) { data: params }); } - +//查询开疗程时人员 +export function selectRatioInfo(params) { + return service({ + url: "/api" + "/demay/ssm/staff/selectRatioInfo", + method: "post", + data: params + }); +} //项目删除 export function delpro(params) { return service({ diff --git a/src/components/project/index.vue b/src/components/project/index.vue index 194593d..fa180a3 100644 --- a/src/components/project/index.vue +++ b/src/components/project/index.vue @@ -67,7 +67,7 @@ + + diff --git a/src/pages/eashier/Rechargingdelay/components/recdetail.vue b/src/pages/eashier/Rechargingdelay/components/recdetail.vue new file mode 100644 index 0000000..a42d2b6 --- /dev/null +++ b/src/pages/eashier/Rechargingdelay/components/recdetail.vue @@ -0,0 +1,275 @@ + + + + + diff --git a/src/pages/eashier/Rechargingdelay/components/recs.vue b/src/pages/eashier/Rechargingdelay/components/recs.vue new file mode 100644 index 0000000..4dc1a79 --- /dev/null +++ b/src/pages/eashier/Rechargingdelay/components/recs.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/src/pages/eashier/Rechargingdelay/rechargingdelay.vue b/src/pages/eashier/Rechargingdelay/rechargingdelay.vue new file mode 100644 index 0000000..5b24133 --- /dev/null +++ b/src/pages/eashier/Rechargingdelay/rechargingdelay.vue @@ -0,0 +1,164 @@ + + + + + + \ No newline at end of file diff --git a/src/pages/eashier/coursetorec/components/index.vue b/src/pages/eashier/coursetorec/components/index.vue index 651ac00..9c2c058 100644 --- a/src/pages/eashier/coursetorec/components/index.vue +++ b/src/pages/eashier/coursetorec/components/index.vue @@ -211,15 +211,10 @@ export default { }, BranchData(v) { - this.StoreIds=v.id this.label=v.label this.setStaffRatio(); console.log("🚀 ~ file: index.vue ~ line 217 ~ BranchData ~ " , 'aaaa') - - - - }, submit() { this.proForm.rechargeInMoney = this.inMoneys; @@ -355,11 +350,6 @@ export default { }; if (mobilePhone) { console.log("🚀 ~ file: index.vue ~ line 347 ~ memberOne ~ this.StoreIds", this.StoreIds) - // if(this.StoreIds){ - - // form.storeId=this.StoreIds - // console.log("aaaaaaaaaaaaa") - // } let form = { mobilePhone: mobilePhone, storeId: sessionStorage.getItem("parentId"), diff --git a/src/pages/eashier/raiseReatment/components/index.vue b/src/pages/eashier/raiseReatment/components/index.vue index 040ffff..a14cfd7 100644 --- a/src/pages/eashier/raiseReatment/components/index.vue +++ b/src/pages/eashier/raiseReatment/components/index.vue @@ -2,6 +2,13 @@
+ +
+ + + +
+
+ + + @@ -169,7 +204,8 @@ - + +
@@ -182,7 +218,9 @@ import { couAccountList, addCardChange, } from "@/api/eashier.js"; +import staffratio from "./staffratio"; import member from "@/components/member/index"; +import Branch from "@/components/Branch/index"; import project from "@/components/project/index"; import admin from "@/components/staffList/admin/index"; import manager from "@/components/staffList/manager/index"; @@ -194,6 +232,8 @@ export default { admin, member, project, + Branch, + staffratio }, data() { return { @@ -240,16 +280,54 @@ export default { debtMoney: 0, isAddition: 0, loading: false, - TransactionNum: 0 + TransactionNum: 0, + StoreIds:"", + label:"", + staff:[] }; }, methods: { + openStaffRatio(row, index, text) { + this.editIndex = index + this.$refs.staffratio.show(row); + this.$refs.staffratio.showdetele(); + localStorage.setItem("row", JSON.stringify(row)); + localStorage.setItem("text", text); + }, + staffratioData(v) { + let form = this.outList[this.editIndex]; + form.rows = v.list; + form.staffLists=v.list + form.cardAchievementAmount=v.list[0].cardAchievementAmount + form.cardCommissionAmount=v.list[0].cardCommissionAmount + form.cardSalesAchievement=v.list[0].cardSalesAchievement + form.cardSalesCommission=v.list[0].cardSalesCommission + console.log("🚀 ~ file: index.vue ~ line 302 ~ staffratioData ~ form", form) + this.outList.splice(this.editIndex, 1, form); + }, + BranchData(v) { + this.StoreIds=v.id + this.label=v.label + this.setStaffRatio(); + console.log("🚀 ~ file: index.vue ~ line 217 ~ BranchData ~ " , 'aaaa') + }, + openBranch(){ + this.$refs.Branch.show(); + }, setStaffRatio() { var that = this; setTimeout(() => { - that.$refs.staffsles.show(that.proForm.staffLists); - that.$refs.manager.show(that.proForm.managerLists); + if(this.StoreIds){ + that.$refs.staffsles.show(that.proForm.staffLists,that.StoreIds); + that.$refs.manager.show(that.proForm.managerLists,that.StoreIds); + that.$refs.admin.show(that.proForm.adminList,that.StoreIds); + }else{ + that.$refs.staffsles.show(that.proForm.staffLists); + that.$refs.manager.show(that.proForm.managerLists); that.$refs.admin.show(that.proForm.adminList); + } + + }, 800); }, //员工占比返回方法 @@ -392,8 +470,9 @@ export default { tableRowClassName({ row, rowIndex }) { row.index = rowIndex; }, - projectData(form) { - console.log(form) + projectData(form,rows) { + console.log("🚀 ~ file: index.vue ~ line 478 ~ projectData ~ rows", rows) + console.log("🚀 ~ file: index.vue ~ line 474 ~ projectData ~ form", form) form.memberId = this.proForm.memberId; form.memberName = this.proForm.memberName; form.mobilePhone = this.proForm.mobilePhone; @@ -433,7 +512,15 @@ export default { form.changeOutTime = 0; form.changeOutTimeShow = false; form.accountId = form.id; + console.log("🚀 ~ file: index.vue ~ line 520 ~ projectData ~ rows", rows) + form.staffLists=rows + + form.cardAchievementAmount=rows[0].cardAchievementAmount + form.cardCommissionAmount=rows[0].cardCommissionAmount + form.cardSalesAchievement=rows[0].cardSalesAchievement + form.cardSalesCommission=rows[0].cardSalesCommission this.outList.push(form); + console.log("🚀 ~ file: index.vue ~ line 520 ~ projectData ~ this.outList", this.outList) this.sumMoney(); } // @@ -442,7 +529,7 @@ export default { memberOne() { let row = { ...this.proForm }; var mobilePhone = this.proForm.mobilePhone; - this.empty(); + // this.empty(); if (mobilePhone) { let form = { mobilePhone: mobilePhone, @@ -521,12 +608,16 @@ export default { this.openProText = num; if (num == 0) { this.$refs.project.show(0); - this.TransactionNum = this.inList.transactionMoney; - } if (num == 1) { + if(this.StoreIds){ + this.proForm.storeId=this.StoreIds + }else{ + this.proForm.storeId="" + } this.$refs.project.show(this.proForm); + console.log("🚀 ~ file: index.vue ~ line 530 ~ openPro ~ this.proForm", this.proForm) console.log(this.inList) } }, diff --git a/src/pages/eashier/raiseReatment/components/staffratio.vue b/src/pages/eashier/raiseReatment/components/staffratio.vue new file mode 100644 index 0000000..dde1ca3 --- /dev/null +++ b/src/pages/eashier/raiseReatment/components/staffratio.vue @@ -0,0 +1,301 @@ + + + + + \ No newline at end of file diff --git a/src/pages/eashier/service/detail/editform.vue b/src/pages/eashier/service/detail/editform.vue index 3dd666b..556540d 100644 --- a/src/pages/eashier/service/detail/editform.vue +++ b/src/pages/eashier/service/detail/editform.vue @@ -117,7 +117,17 @@
现付
- + + + + diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue index 8c61514..9a38cef 100644 --- a/src/pages/eashier/service/service.vue +++ b/src/pages/eashier/service/service.vue @@ -764,12 +764,16 @@ export default {       */ let num = this.list.reduce((pre, item) => { + console.log("🚀 ~ file: service.vue ~ line 804 ~ num ~ item.courseAccountId", item.collectionAmounts) item.transactionPrice = item.transactionPrice ?(item.transactionPrice*1).toFixed(2) * 1 : 0; // 抵扣金额存在,项目金额存在 - + if(item.courseAccountId == null){ + item.collectionAmounts = (item.collectionAmounts*1).toFixed(2) * 1; + }else{ + item.collectionAmounts =(item.transactionPrice*1).toFixed(2) * 1; + } if (item.collectionAmounts) { - item.collectionAmounts = (item.collectionAmounts*1).toFixed(2) * 1; return pre + (item.transactionPrice - item.collectionAmounts); } // 抵扣金额不存在,项目金额存在 else if (!item.collectionAmounts && item.transactionPrice) { @@ -787,14 +791,19 @@ export default {       */ let num = this.list.reduce((pre, item) => { + console.log("🚀 ~ file: service.vue ~ line 804 ~ num ~ item.courseAccountId", item) item.transactionPrice = item.transactionPrice ?(item.transactionPrice*1).toFixed(2) * 1 : 0; // 抵扣金额存在,项目金额存在 if(item.isCardPay !== 0){ return pre } + if(item.courseAccountId == null){ + item.collectionAmounts = (item.collectionAmounts*1).toFixed(2) * 1; + }else{ + item.collectionAmounts =(item.transactionPrice*1).toFixed(2) * 1; + } if (item.collectionAmounts) { - item.collectionAmounts = (item.collectionAmounts*1).toFixed(2) * 1; return pre + (item.transactionPrice - item.collectionAmounts); } // 抵扣金额不存在,项目金额存在 else if (!item.collectionAmounts && item.transactionPrice) { @@ -1208,7 +1217,9 @@ export default { this.recForm.collectionCashAmount + this.recForm.collectionIntegralAmount ).toFixed(2) * 1; + console.log("🚀 ~ file: service.vue ~ line 1213 ~ sumNum ~ this.recForm", this.recForm) this.recForm.collectionAmounts = spendMoney.toFixed(2) * 1; + this.recForm.rechargeAmount = spendNumber.toFixed(2) * 1; this.list.splice(this.recForm.index, 1, this.recForm); @@ -1462,6 +1473,10 @@ export default { row.courseMoney = 0; } else { row.courseMoney = row.courseConsumePrice; + // row.collectionAmounts=row.transactionPrice + console.log("🚀 ~ file: service.vue ~ line 1466 ~ setProOne ~ row.transactionPrice", row) + + } let form = {}; proOne({ @@ -1636,6 +1651,7 @@ export default { let sumMoney = 0; this.list.forEach((item, index) => { + if (item.courseAccountId == null) { sumMoney += ( @@ -1643,10 +1659,15 @@ export default { item.collRecAmonnt - item.collectionIntegralAmount ).toFixed(2) * 1; + }else{ + item.transactionPrice*1; + console.log("🚀 ~ file: service.vue ~ line 1649 ~ this.list.forEach ~ item.transactionPrice", item.transactionPrice) + console.log("🚀 ~ file: service.vue ~ line 1649 ~ this.list.forEach ~ this.appearPrices", this.appearPrices) + } }); - //console.log("🚀 ~ file: service.vue ~ line 1695 ~ confirm ~ sumMoney", sumMoney) - //console.log("🚀 ~ file: service.vue ~ line 1695 ~ confirm ~ this.form.collectionCashAmounts", this.appearPrices) + console.log("🚀 ~ file: service.vue ~ line 1695 ~ confirm ~ sumMoney", sumMoney) + console.log("🚀 ~ file: service.vue ~ line 1695 ~ confirm ~ this.form.collectionCashAmounts", this.appearPrices) if ( this.balance <= @@ -1813,7 +1834,6 @@ export default { }, openStaffRatio(row, index, text) { this.editIndex = index; - this.$refs.staffratio.show(row, text); this.$refs.staffratio.showdetele(); localStorage.setItem("row", JSON.stringify(row)); diff --git a/src/pages/storeManage/trading/components/cash.vue b/src/pages/storeManage/trading/components/cash.vue index 4fceb3a..019d5f6 100644 --- a/src/pages/storeManage/trading/components/cash.vue +++ b/src/pages/storeManage/trading/components/cash.vue @@ -13,11 +13,11 @@ - + diff --git a/src/pages/storeManage/trading/components/pros.vue b/src/pages/storeManage/trading/components/pros.vue index fbce3dd..af3c076 100644 --- a/src/pages/storeManage/trading/components/pros.vue +++ b/src/pages/storeManage/trading/components/pros.vue @@ -18,11 +18,11 @@ - + diff --git a/src/pages/storeManage/trading/components/recs.vue b/src/pages/storeManage/trading/components/recs.vue index aebc2a2..9b69bf0 100644 --- a/src/pages/storeManage/trading/components/recs.vue +++ b/src/pages/storeManage/trading/components/recs.vue @@ -18,11 +18,11 @@ - + diff --git a/src/pages/storeManage/transferNew/index.vue b/src/pages/storeManage/transferNew/index.vue index 84da16b..9d49c70 100644 --- a/src/pages/storeManage/transferNew/index.vue +++ b/src/pages/storeManage/transferNew/index.vue @@ -2,15 +2,16 @@
- 转卡 + 转卡
- 明细 - 修改 - 送审 - 回收 - 审核 - 反审核 + + 明细 + 修改 + 送审 + 回收 + 审核 + 反审核
diff --git a/src/router/index.js b/src/router/index.js index f55c3d7..2ffa175 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -331,10 +331,19 @@ const router = new VueRouter({ path: "/ireatmentdelay", component: () => import("../pages/eashier/Ireatmentdelay/ireatmentdelay.vue"), meta: { - title: "疗程转充值", + title: "疗程账户延期", index: "ireatmentdelay" } }, + //充值账户延期 rechargingdelay + { + path: "/rechargingdelay", + component: () => import("../pages/eashier/Rechargingdelay/rechargingdelay.vue"), + meta: { + title: "充值账户延期", + index: "rechargingdelay" + } + }, //充值内调单 within { path: "/within",