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 00c11a6..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 5a448e5..bba1e4e 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, @@ -520,13 +607,17 @@ 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(this.inList) + console.log("🚀 ~ file: index.vue ~ line 530 ~ openPro ~ this.proForm", this.proForm) + console.log(this.inList) } }, delOldPro(index) { 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/repayment/components/index.vue b/src/pages/eashier/repayment/components/index.vue index 18561e2..e3ed124 100644 --- a/src/pages/eashier/repayment/components/index.vue +++ b/src/pages/eashier/repayment/components/index.vue @@ -116,7 +116,7 @@ export default { handleClose() { this.form = Object.assign({}); this.detailDialogVisible = false; - this.$emit("detailData"); + // this.$emit("detailData"); }, rowClassName({ row, rowIndex }) { row.index = rowIndex; @@ -144,8 +144,6 @@ export default { this.title = "修改"; } this.form = form; - console.log(form); - if (form.repayTradeLists.length == 1) { this.rowIndex = 0; form.repayTradeLists.forEach((item, index) => { @@ -160,7 +158,6 @@ export default { this.detailDialogVisible = true; }, rowClick(row) { - console.log(row); this.rowIndex = row.index; row.entities.forEach((item) => { item.staffName = item.saleStaffName; @@ -169,6 +166,7 @@ export default { item.ratio = item.saleRatio; item.staffNames = item.brandNumber + "--" + item.staffName; }); + console.log('----执行到了这里'); selectOne({ type: 7, orderId: row.id }).then((res) => { if (res.code == "000000") { let managerList = []; 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/detail/printform.vue b/src/pages/eashier/service/detail/printform.vue index 1f3ec63..c293631 100644 --- a/src/pages/eashier/service/detail/printform.vue +++ b/src/pages/eashier/service/detail/printform.vue @@ -31,7 +31,7 @@
折后
-