From 35b041584a522563a50e973113e4ae4bf92b6a08 Mon Sep 17 00:00:00 2001 From: Wangxubin1999 Date: Tue, 11 Oct 2022 14:21:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=91=E6=9C=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eashier.js | 19 +- src/api/storeManage.js | 9 +- src/components/project/index.vue | 28 +- src/layout/components/asider.vue | 16 +- .../Ireatmentdelay/components/pros.vue | 4 +- .../Rechargingdelay/components/edit.vue | 112 +++++++ .../Rechargingdelay/components/recdetail.vue | 275 ++++++++++++++++ .../Rechargingdelay/components/recs.vue | 103 ++++++ .../Rechargingdelay/rechargingdelay.vue | 164 ++++++++++ .../eashier/coursetorec/components/index.vue | 10 - .../raiseReatment/components/index.vue | 109 ++++++- .../raiseReatment/components/staffratio.vue | 301 ++++++++++++++++++ src/pages/eashier/service/detail/editform.vue | 12 +- src/pages/eashier/service/service.vue | 32 +- .../storeParameters/storeParameters.vue | 2 + .../storeManage/trading/components/cash.vue | 4 +- .../storeManage/trading/components/pros.vue | 4 +- .../storeManage/trading/components/recs.vue | 4 +- src/pages/storeManage/transferNew/index.vue | 15 +- src/router/index.js | 11 +- 20 files changed, 1181 insertions(+), 53 deletions(-) create mode 100644 src/pages/eashier/Rechargingdelay/components/edit.vue create mode 100644 src/pages/eashier/Rechargingdelay/components/recdetail.vue create mode 100644 src/pages/eashier/Rechargingdelay/components/recs.vue create mode 100644 src/pages/eashier/Rechargingdelay/rechargingdelay.vue create mode 100644 src/pages/eashier/raiseReatment/components/staffratio.vue 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/storeParameters/storeParameters.vue b/src/pages/storeManage/storeParameters/storeParameters.vue index 6110c4c..beee733 100644 --- a/src/pages/storeManage/storeParameters/storeParameters.vue +++ b/src/pages/storeManage/storeParameters/storeParameters.vue @@ -384,6 +384,7 @@ export default { pagesorganizationone(page).then((res) => { if (res.code == "000000") { this.toPar(res.rows); + console.log("🚀 ~ file: storeParameters.vue ~ line 387 ~ pagesorganizationone ~ res.rows", res.rows) if (res.rows.length > 0) { this.buttonShow = true; } @@ -394,6 +395,7 @@ export default { storeParaList(page).then((res) => { if (res.code == "000000") { this.toPar(res.rows); + console.log("🚀 ~ file: storeParameters.vue ~ line 398 ~ storeParaList ~ res.rows", res.rows) if (res.rows.length > 0) { this.buttonShow = true; } 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..427fc12 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", From 32a465888379e5cdc32a54f43040cdf6f30b99e9 Mon Sep 17 00:00:00 2001 From: Wangxubin Date: Tue, 11 Oct 2022 14:30:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4--?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- partten/partten.js | 2 +- src/api/eashier.js | 27 +++ src/api/promotion.js | 20 ++ src/components/store/select/index.vue | 3 + src/layout/components/asider.vue | 70 +++++-- src/pages/eashier/accountSet/accountSet.vue | 181 ++++++++++++++++-- .../collectionList/components/detail.vue | 20 +- .../eashier/reatment/components/detail.vue | 20 +- src/pages/eashier/reatment/reatment.vue | 5 +- src/pages/eashier/service/detail/detail.vue | 41 +++- src/pages/eashier/service/detail/editform.vue | 19 +- src/pages/eashier/setImport/setImport.vue | 74 ++++++- .../eashier/within/components/detail.vue | 12 +- src/pages/promotion/giftCards/index.vue | 16 +- src/pages/promotion/group/components/edit.vue | 17 +- src/pages/promotion/group/index.vue | 24 ++- .../rechargeType/components/edit.vue | 40 ++-- .../storeManage/rechargeType/rechargeType.vue | 6 +- .../storeManage/trading/components/cash.vue | 12 +- src/pages/storeManage/trading/index.vue | 4 +- .../transferNew/components/edit.vue | 4 +- .../transferNew/components/rec.vue | 25 ++- 22 files changed, 543 insertions(+), 99 deletions(-) diff --git a/partten/partten.js b/partten/partten.js index f466f51..86e352c 100644 --- a/partten/partten.js +++ b/partten/partten.js @@ -15,7 +15,7 @@ if (new Date().getMonth() + 1 < 10) { month = "0" + (new Date().getMonth() + 1); } else { month = new Date().getMonth() + 1; - dabao; + // dabao; } var day = ""; 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/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/components/staffList/staffout/员工转出占比选值 b/src/components/staffList/staffout/员工转出占比选值 new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/eashier/coursetorec/components/detail.vue b/src/pages/eashier/coursetorec/components/detail.vue index 5cd2990..b2b29d0 100644 --- a/src/pages/eashier/coursetorec/components/detail.vue +++ b/src/pages/eashier/coursetorec/components/detail.vue @@ -19,8 +19,8 @@ - - + + @@ -28,6 +28,10 @@ + 员工 +
+ +
@@ -44,7 +48,7 @@
员工 -
+
@@ -67,9 +71,11 @@ import { cardChangeOutPro, } from "@/api/eashier.js"; import staffsles from "@/components/staffList/staff/index"; +import staffslesout from "@/components/staffList/staffout/index"; export default { components: { staffsles, + staffslesout }, data() { return { @@ -99,6 +105,13 @@ export default { that.$refs.staffsles.show(that.form.staffLists); }); }, + setStaffs() { + var that = this; + this.$nextTick(() => { + console.log(that.form.staffListsout); + that.$refs.staffslesout.show(that.form.staffListsout); + }); + }, //员工占比返回方法 staffslesData(v) { this.form.staffLists = [...v]; @@ -130,7 +143,7 @@ export default { this.form = { ...item, }; - this.outList = this.form.coursePayLists; + this.outList = this.form.coursePayListRequests; this.inList = [ { rechargeTypeId: item.rechargeTypeId, @@ -141,6 +154,8 @@ export default { rechargeAfterMoney: item.rechargeAfterMoney, rechargeAccountId: item.rechargeAccountId, typeRatio: item.typeRatio, + cardConsumeMoney:item.cardConsumeMoney, + discount:item.discount }, ]; this.form.staffLists = this.form.entities; @@ -153,10 +168,16 @@ export default { this.form.staffLists.forEach((items) => { items.staffNames = items.brandNumber + "--" + items.staffName; }); + this.form.staffListsout = this.form.coursePayListRequests[0].staffLists; + this.form.staffListsout.forEach((items) => { + items.staffNames = items.brandNumber + "--" + items.staffName; + }); + if (this.form.staffLists.length == 0) { this.form.staffLists.push({ ratio: 100 }); } this.setStaff(); + this.setStaffs(); }, subStaffRatio() { editRechargeTurnCourse(this.form).then((res) => { diff --git a/src/pages/eashier/coursetorec/components/index.vue b/src/pages/eashier/coursetorec/components/index.vue index 9c2c058..0df5845 100644 --- a/src/pages/eashier/coursetorec/components/index.vue +++ b/src/pages/eashier/coursetorec/components/index.vue @@ -4,95 +4,343 @@
- - + +
- - + +
- {{proForm.memberName}} + {{ proForm.memberName }}
- +
- {{proForm.additionDate }} - + {{ proForm.additionDate }} + +
-
转出疗程 添加 +
+ 转出疗程 + 添加
-
总金额 : {{outMoneys}}
+
总金额 : {{ outMoneys }}
- - - - - - - -