diff --git a/src/components/Branch/index.vue b/src/components/Branch/index.vue new file mode 100644 index 0000000..7917181 --- /dev/null +++ b/src/components/Branch/index.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file diff --git a/src/components/project/index.vue b/src/components/project/index.vue index d689afc..194593d 100644 --- a/src/components/project/index.vue +++ b/src/components/project/index.vue @@ -136,6 +136,7 @@ export default { this.title = "选择会员卡包疗程"; var memberIds = { memberId: this.form.id, + storeId:this.form.storeId }; if (this.courseProjectId) { memberIds.courseProjectId = this.courseProjectId; diff --git a/src/components/recharge/index.vue b/src/components/recharge/index.vue index a295567..d48a340 100644 --- a/src/components/recharge/index.vue +++ b/src/components/recharge/index.vue @@ -21,7 +21,7 @@ - + 取 消 @@ -60,7 +60,7 @@ export default { //获取数据 async getData() { this.listLoading = true; - recAccountList({ memberId: this.form.memberId }).then((res) => { + recAccountList({ memberId: this.form.memberId}).then((res) => { this.listLoading = false; if (res.code === "000000") { this.listLoading = false; diff --git a/src/components/staffList/staff/index.vue b/src/components/staffList/staff/index.vue index ac821f7..6087819 100644 --- a/src/components/staffList/staff/index.vue +++ b/src/components/staffList/staff/index.vue @@ -264,7 +264,7 @@ export default { //获取员工数据 //获取数据 async getData() { - let form = { id: "" }; + let form = { id: this.storeId }; if (this.storeId) { form.storeId = this.storeId; } diff --git a/src/components/staffList/staffratio/index.vue b/src/components/staffList/staffratio/index.vue index 08996a7..7ed2fe3 100644 --- a/src/components/staffList/staffratio/index.vue +++ b/src/components/staffList/staffratio/index.vue @@ -88,7 +88,8 @@ export default { this.changeStaff(); }, show(form, text) { - console.log(form); + console.log("🚀 ~ file: index.vue ~ line 91 ~ show ~ form", form) + setTimeout(() => { this.$nextTick(() => { this.list = JSON.parse(JSON.stringify([])); diff --git a/src/layout/components/asider.vue b/src/layout/components/asider.vue index 24d3e32..85f9124 100644 --- a/src/layout/components/asider.vue +++ b/src/layout/components/asider.vue @@ -403,6 +403,14 @@ export default { number: "500410", id:"8008008", }, + { + name: "疗程账户延期", + icon: "el-icon-connection", + route: "/ireatmentdelay", + index: "ireatmentdelay", + number: "5001600", + id:"8008026", + }, { name: "充值内调单", icon: "el-icon-sort", @@ -417,13 +425,15 @@ export default { route: "/transfer", index: "transfer", number: "4001500", + id:"8008024", }, { name: "疗程转门店", icon: "el-icon-sort", route: "/transferstore", index: "transferstore", - number: "4001600", + number: "4001700", + id:"8008025", }, // { // name: "收款", diff --git a/src/pages/eashier/Ireatmentdelay/components/edit.vue b/src/pages/eashier/Ireatmentdelay/components/edit.vue new file mode 100644 index 0000000..1c9e7f6 --- /dev/null +++ b/src/pages/eashier/Ireatmentdelay/components/edit.vue @@ -0,0 +1,112 @@ + + + + diff --git a/src/pages/eashier/Ireatmentdelay/components/prodetail.vue b/src/pages/eashier/Ireatmentdelay/components/prodetail.vue new file mode 100644 index 0000000..fe83e32 --- /dev/null +++ b/src/pages/eashier/Ireatmentdelay/components/prodetail.vue @@ -0,0 +1,280 @@ + + + + + diff --git a/src/pages/eashier/Ireatmentdelay/components/pros.vue b/src/pages/eashier/Ireatmentdelay/components/pros.vue new file mode 100644 index 0000000..10dbe51 --- /dev/null +++ b/src/pages/eashier/Ireatmentdelay/components/pros.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/src/pages/eashier/Ireatmentdelay/ireatmentdelay.vue b/src/pages/eashier/Ireatmentdelay/ireatmentdelay.vue new file mode 100644 index 0000000..4b50d92 --- /dev/null +++ b/src/pages/eashier/Ireatmentdelay/ireatmentdelay.vue @@ -0,0 +1,164 @@ + + + + + + \ No newline at end of file diff --git a/src/pages/eashier/collectionList/collectionList.vue b/src/pages/eashier/collectionList/collectionList.vue index 004df1d..8f7e756 100644 --- a/src/pages/eashier/collectionList/collectionList.vue +++ b/src/pages/eashier/collectionList/collectionList.vue @@ -19,10 +19,10 @@ - +
{{ debtMoneys }} - 去还款 + 去还款
@@ -457,6 +457,7 @@ export default { adminList: [{ brandNumber: "", staffName: "", ratio: 100 }], staffList: [], managerList: [], + arrears:false, form: { mobilePhone: null, memberName: null, @@ -518,6 +519,7 @@ export default { this.adminList = [...v]; }, openMoney() { + delete this.vip.docType this.$refs.repayment.show(this.vip); console.log("🚀 ~ file: collectionList.vue ~ line 522 ~ openMoney ~ this.vip", this.vip) }, @@ -573,7 +575,7 @@ export default { this.form.rechargeTypeName="" } - if(this.sessionStorageData.recDebt&&this.debtMoneys){ + if(this.sessionStorageData.recDebt&&this.arrears){ this.$alert("存在欠款不允许升降级", "提示", { confirmButtonText: "确定", confirmButtonClass: "confirmbtnFalses", @@ -758,6 +760,18 @@ export default { //选中会员返回方法 memberData(v) { this.form.mobilePhone = v.mobilePhone; + console.log("🚀 ~ file: collectionList.vue ~ line 764 ~ memberData ~ v.docType", v.docType) + // if(v.docType[0]=="card_use"||v.docType[1]=="card_use"||v.docType.length==0){ + + // this.arrears=false + // console.log("🚀 ~ file: collectionList.vue ~ line 766 ~ memberData ~ this.arrears", this.arrears) + // } + v.docType.forEach((item)=>{ + if(item=="card_recharge"){ + this.arrears=true + } + }) + console.log("🚀 ~ file: collectionList.vue ~ line 766 ~ memberData ~ this.arrears", this.arrears) this.query(); }, //上传文件方法 @@ -831,7 +845,7 @@ export default { query() { var number = partten.phoneNum; var mobilePhone = this.form.mobilePhone; - this.empty(); + // this.empty();为什么要执行清空??????、 if (!number.test(mobilePhone)) { this.$message.info({ message: "请输入正确的手机号 ! ", @@ -938,7 +952,13 @@ export default { console.log("a") }, memberAdd(v) { + console.log("🚀 ~ file: collectionList.vue ~ line 941 ~ memberAdd ~ (v", v) + this.form.mobilePhone = v.mobilePhone; + + // if(){ + + // } this.query(); }, //选择金额.` diff --git a/src/pages/eashier/coursetorec/components/index.vue b/src/pages/eashier/coursetorec/components/index.vue index 29ec0a6..651ac00 100644 --- a/src/pages/eashier/coursetorec/components/index.vue +++ b/src/pages/eashier/coursetorec/components/index.vue @@ -2,6 +2,13 @@
+ +
+ + + +
+
@@ -70,7 +77,7 @@
总金额 : {{inMoneys}}
- + @@ -103,6 +110,7 @@
+ @@ -116,6 +124,7 @@ import { recAccountOne, } from "@/api/eashier.js"; import member from "@/components/member/index"; +import Branch from "@/components/Branch/index"; import project from "@/components/project/index"; import recType from "@/components/recharge/type/index"; import admin from "@/components/staffList/admin/index"; @@ -129,6 +138,7 @@ export default { member, project, recType, + Branch }, data() { return { @@ -145,8 +155,8 @@ export default { additionDate: null, manageStaffName: null, mobilePhone: null, + Branch:null, staffLists: [{ ratio: 100 }], - payLists: [], }, outList: [], @@ -167,13 +177,21 @@ export default { sessionStorageList: null, isAddition: 0, loading: false, + StoreIds:"", + label:"" }; }, methods: { setStaffRatio() { var that = this; setTimeout(() => { - that.$refs.staffsles.show(that.proForm.staffLists); + if(this.StoreIds){ + that.$refs.staffsles.show(that.proForm.staffLists,that.StoreIds); + }else{ + that.$refs.staffsles.show(that.proForm.staffLists); + } + + console.log("🚀 ~ file: index.vue ~ line 189 ~ setTimeout ~ that.proForm.staffLists", that.proForm.staffLists) }, 800); }, staffslesData(v) { @@ -182,9 +200,26 @@ export default { openMember() { this.$refs.member.show(); }, + openBranch(){ + + this.$refs.Branch.show(); + }, memberData(v) { this.proForm.mobilePhone = v.mobilePhone; + this.memberOne(); + + }, + 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; @@ -312,9 +347,19 @@ export default { this.outMoneys = 0; this.inMoneys = 0; var mobilePhone = this.proForm.mobilePhone; - this.empty(); + // this.empty(); let row = { ...this.proForm }; + let form = { + mobilePhone: mobilePhone, + storeId: sessionStorage.getItem("parentId"), + }; 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"), @@ -354,7 +399,13 @@ export default { this.$refs.recType.show(); } if (num == 1) { - this.$refs.project.show(this.proForm); + if(this.StoreIds){ + this.proForm.storeId=this.StoreIds + + }else{ + this.proForm.storeId="" + } + this.$refs.project.show(this.proForm) } }, delOldPro(index) { diff --git a/src/pages/eashier/service/course.vue b/src/pages/eashier/service/course.vue index 424ad7e..83cbb4a 100644 --- a/src/pages/eashier/service/course.vue +++ b/src/pages/eashier/service/course.vue @@ -77,6 +77,10 @@ export default { couAccountList(ids).then((res) => { if (res.code == "000000") { this.list = res.rows; + var shopname=sessionStorage.getItem("storeName") + this.lists =this.list.filter(item=>item.storeName != shopname) + this.list = this.list.filter(item=>item.storeName == shopname) + } else { this.$alert(res.message, "查询会员疗程", { confirmButtonText: "确定", @@ -87,19 +91,7 @@ export default { }); } }); - couAccountListDisable(ids).then((res) => { - if (res.code == "000000") { - this.lists = res.rows; - } else { - this.$alert(res.message, "查询会员疗程", { - confirmButtonText: "确定", - confirmButtonClass: "confirmbtnFalses", - type: "warning", - center: true, - callback: (action) => {}, - }); - } - }); + }, }, }; diff --git a/src/pages/storeManage/dept/components/index.vue b/src/pages/storeManage/dept/components/index.vue index c2d6ee1..e8b2c1b 100644 --- a/src/pages/storeManage/dept/components/index.vue +++ b/src/pages/storeManage/dept/components/index.vue @@ -4,7 +4,7 @@ + }" show-summary border max-height="700"> @@ -45,7 +45,7 @@ 关闭 - + @@ -78,6 +78,7 @@ export default { endDate: this.form.endDate, startDate: this.form.startDate, }; + console.log("🚀 ~ file: index.vue ~ line 81 ~ getData ~ form", form) departmentPerformance2(form).then((res) => { if (res.code == "000000") { this.tableDate = res.rows; @@ -94,56 +95,57 @@ export default { }, //双击行方法 confirm(row) { + this.$refs.detail.show(row); }, //指定列求和 //数组按对应字段合计返回方法 - getSummaries(param) { - const { columns, data } = param; - const sums = []; - columns.forEach((column, index) => { - if (index === 0) { - sums[index] = "合计"; - return; - } + // getSummaries(param) { + // const { columns, data } = param; + // const sums = []; + // columns.forEach((column, index) => { + // if (index === 0) { + // sums[index] = "合计"; + // return; + // } - const values = data.map((item) => Number(item[column.property])); - if (column.property == "baseSalary") { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr); - if (!isNaN(value)) { - return (prev + curr).toFixed(2) * 1; - } else { - sums[index] = "--"; - } - }, 0); - sums[index] += " "; - } else if (column.property == "achievementAmount") { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr); - if (!isNaN(value)) { - return (prev + curr).toFixed(2) * 1; - } else { - sums[index] = "--"; - } - }, 0); - sums[index] += " "; - } else if (column.property == "commissionAmount") { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr); - if (!isNaN(value)) { - return (prev + curr).toFixed(2) * 1; - } else { - sums[index] = "--"; - } - }, 0); - sums[index] += " "; - } else { - sums[index] = "--"; - } - }); - return sums; - }, + // const values = data.map((item) => Number(item[column.property])); + // if (column.property == "baseSalary") { + // sums[index] = values.reduce((prev, curr) => { + // const value = Number(curr); + // if (!isNaN(value)) { + // return (prev + curr).toFixed(2) * 1; + // } else { + // sums[index] = "--"; + // } + // }, 0); + // sums[index] += " "; + // } else if (column.property == "achievementAmount") { + // sums[index] = values.reduce((prev, curr) => { + // const value = Number(curr); + // if (!isNaN(value)) { + // return (prev + curr).toFixed(2) * 1; + // } else { + // sums[index] = "--"; + // } + // }, 0); + // sums[index] += " "; + // } else if (column.property == "commissionAmount") { + // sums[index] = values.reduce((prev, curr) => { + // const value = Number(curr); + // if (!isNaN(value)) { + // return (prev + curr).toFixed(2) * 1; + // } else { + // sums[index] = "--"; + // } + // }, 0); + // sums[index] += " "; + // } else { + // sums[index] = "--"; + // } + // }); + // return sums; + // }, }, created() { let sDate = this.formatTime(new Date(), "YYYY-MM-DD 00:00:00"); diff --git a/src/pages/storeManage/dept/index.vue b/src/pages/storeManage/dept/index.vue index c70efef..2bf441a 100644 --- a/src/pages/storeManage/dept/index.vue +++ b/src/pages/storeManage/dept/index.vue @@ -106,6 +106,8 @@ export default { }, //双击行方法 confirm(row) { + console.log("🚀 ~ file: index.vue ~ line 109 ~ confirm ~ row", row) + row.endDate=this.formatTime(this.days[1], "YYYY-MM-DD 23:59:59") this.$refs.detail.show(row); }, //分页方法 diff --git a/src/router/index.js b/src/router/index.js index 6aefc02..43deba9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -326,6 +326,15 @@ const router = new VueRouter({ index: "coursetorec" } }, + //疗程账户延期 ireatmentdelay + { + path: "/ireatmentdelay", + component: () => import("../pages/eashier/Ireatmentdelay/ireatmentdelay.vue"), + meta: { + title: "疗程转充值", + index: "ireatmentdelay" + } + }, //充值内调单 within { path: "/within",