From df135edb0b11c8f5fedcfb19ee1de96f91243d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=81=E4=B8=83?= <2390744110@qq.com> Date: Fri, 12 Aug 2022 10:39:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- partten/partten.js | 146 +++---- src/api/storeManage.js | 2 +- src/components/repayment/components/pro.vue | 25 +- src/components/repayment/components/rec.vue | 13 +- src/components/repayment/index.vue | 55 +-- src/pages/eashier/service/service.vue | 1 + src/pages/eashier/within/within.vue | 9 +- src/pages/promotion/buyandgive/buyandgive.vue | 26 +- .../promotion/handpick/components/edit.vue | 2 +- src/pages/promotion/packing/packing.vue | 2 +- .../menmberAllot/components/notAllot.vue | 370 +++++++++--------- 11 files changed, 338 insertions(+), 313 deletions(-) diff --git a/partten/partten.js b/partten/partten.js index 66acf24..3da4f4a 100644 --- a/partten/partten.js +++ b/partten/partten.js @@ -1,73 +1,73 @@ -export const phoneNum = /^((1)|(\\+861)|(861))[0-9]{10}$/; - -export const email = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/; - -// export const http = "https://www.decaisoft.com:443/"; -// export const https = "https://www.decaisoft.com:443/img"; - -export const http = "http://139.9.58.205:21/img/"; -export const https = "http://139.9.58.205:8077/tydFile/"; - -var month = ""; -if (new Date().getMonth() + 1 < 10) { - month = "0" + (new Date().getMonth() + 1); -} else { - month = new Date().getMonth() + 1; - dabao; -} - -var day = ""; -if (new Date().getDate() < 10) { - day = "0" + new Date().getDate(); -} else { - day = new Date().getDate(); -} - -var hours = ""; -if (new Date().getHours() < 10) { - hours = "0" + new Date().getHours(); -} else { - hours = new Date().getHours(); -} - -var Min = null; -if (new Date().getMinutes() < 10) { - Min = "0" + new Date().getMinutes(); -} else { - Min = new Date().getMinutes(); -} -var seconds = null; -if (new Date().getSeconds() < 10) { - seconds = "0" + new Date().getSeconds(); -} else { - seconds = new Date().getSeconds(); -} - -export const date = - new Date().getFullYear() + - "" + - month + - "" + - day + - "" + - hours + - "" + - Min + - "" + - seconds; -export const dates = - new Date().getFullYear() + - "/" + - month + - "/" + - day + - " " + - hours + - ":" + - Min + - ":" + - seconds; - -export const dayStatisticDate = - new Date().getFullYear() + "-" + month + "-" + new Date().getDate(); -export const months = new Date().getFullYear() + "-" + month + ""; +export const phoneNum = /^((1)|(\\+861)|(861))[0-9]{10}$/; + +export const email = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/; + +// export const http = "https://www.decaisoft.com:443/"; +// export const https = "https://www.decaisoft.com:443/img"; + +export const http = "http://139.9.58.205:21/img/"; +export const https = "http://139.9.58.205:8077/tydFile/"; + +var month = ""; +if (new Date().getMonth() + 1 < 10) { + month = "0" + (new Date().getMonth() + 1); +} else { + month = new Date().getMonth() + 1; + dabao; +} + +var day = ""; +if (new Date().getDate() < 10) { + day = "0" + new Date().getDate(); +} else { + day = new Date().getDate(); +} + +var hours = ""; +if (new Date().getHours() < 10) { + hours = "0" + new Date().getHours(); +} else { + hours = new Date().getHours(); +} + +var Min = null; +if (new Date().getMinutes() < 10) { + Min = "0" + new Date().getMinutes(); +} else { + Min = new Date().getMinutes(); +} +var seconds = null; +if (new Date().getSeconds() < 10) { + seconds = "0" + new Date().getSeconds(); +} else { + seconds = new Date().getSeconds(); +} + +export const date = + new Date().getFullYear() + + "" + + month + + "" + + day + + "" + + hours + + "" + + Min + + "" + + seconds; +export const dates = + new Date().getFullYear() + + "/" + + month + + "/" + + day + + " " + + hours + + ":" + + Min + + ":" + + seconds; + +export const dayStatisticDate = + new Date().getFullYear() + "-" + month + "-" + new Date().getDate(); +export const months = new Date().getFullYear() + "-" + month + ""; diff --git a/src/api/storeManage.js b/src/api/storeManage.js index d28ab2b..9da4b6c 100644 --- a/src/api/storeManage.js +++ b/src/api/storeManage.js @@ -1107,7 +1107,7 @@ export function pageMemberClass(params) { // 修改等级 export function editMemberClass(params) { return service({ - url: "/api" + "/demay/ssm/StoreMemberClass/update", + url: "/api" + "/demay/ssm/StoreMemberClass/updates", method: "post", data: params }); diff --git a/src/components/repayment/components/pro.vue b/src/components/repayment/components/pro.vue index fae1a18..8aba63e 100644 --- a/src/components/repayment/components/pro.vue +++ b/src/components/repayment/components/pro.vue @@ -10,7 +10,7 @@ {{ scope.row.payNumber }} - + @@ -47,24 +47,25 @@ export default { } else { row.payNumber = 0; } - let form = { ...row }; + row.payMoney = (row.payNumber * row.price).toFixed(2) * 1; + this.list.splice(index, 1, row); + console.log(this.list); this.proIndex = -1; - form.payMoney = (form.payNumber * form.price).toFixed(2) * 1; - this.list.splice(index, 1, form); - this.list.forEach((item) => {}); this.sumPay(); }, //计算现付列表/当前行内的疗程付列表/充值付列表 sumPay() { + let form = JSON.parse(JSON.stringify(this.form)); var courseMoney = 0; + console.log(this.list); this.list.forEach((item) => { courseMoney += item.payMoney; }); - this.form.courseMoney = courseMoney; - this.form.repayMoney = - (this.form.paymentMoney - courseMoney - this.form.recMoney).toFixed(2) * - 1; - this.form.proList = [...this.list]; + form.courseMoney = courseMoney; + form.repayMoney = + (form.paymentMoney - courseMoney - form.recMoney).toFixed(2) * 1; + form.proList = Array.from(this.list); + this.form = JSON.parse(JSON.stringify(form)); }, handleCloseCancel() { this.form = {}; @@ -84,7 +85,9 @@ export default { }, confirm() { this.dialogVisible = false; - this.form.proList = [...this.list]; + this.form.proList = this.list; + console.log(this.list); + console.log(this.form); this.$emit("proData", this.form); }, getSummaries(param) { diff --git a/src/components/repayment/components/rec.vue b/src/components/repayment/components/rec.vue index cfbde7a..62200d6 100644 --- a/src/components/repayment/components/rec.vue +++ b/src/components/repayment/components/rec.vue @@ -41,13 +41,12 @@ export default { }, //充值付列表>关闭支付金额输入框 endPayMoney(row, index) { - console.log(row.payMoney); - if (row.payMoney) { - row.payMoney = row.payMoney * 1; + let form = { ...row }; + if (form.payMoney) { + form.payMoney = form.payMoney * 1; } else { - row.payMoney = 0; + form.payMoney = 0; } - let form = { ...row }; form.cardOver = (form.cardRestMoney - form.payMoney).toFixed(2) * 1; this.recIndex = -1; this.list.splice(index, 1, form); @@ -78,11 +77,13 @@ export default { Object.assign(this.$data, this.$options.data.call(this)); this.form = { ...form }; this.list = [...form.recList]; + this.dialogVisible = true; }, confirm() { this.dialogVisible = false; - this.form.recList = [...this.list]; + this.form.recList = Array.from(this.list); + console.log(this.list); this.$emit("recData", this.form); }, getSummaries(param) { diff --git a/src/components/repayment/index.vue b/src/components/repayment/index.vue index 82ec5f6..9c86d5d 100644 --- a/src/components/repayment/index.vue +++ b/src/components/repayment/index.vue @@ -224,7 +224,12 @@ export default { this.$refs.staffratio.show(row, text); }, staffratioData(v) { - this.list.splice(v.index, 1, v); + console.log(v); + this.list.forEach((item, index) => { + if (index == v.index) { + item[text] = v.list; + } + }); }, clear(row, text) { let form = { ...row }; @@ -247,16 +252,26 @@ export default { this.$refs.pro.show(row); }, proData(v) { - if (v.courseMoney > 0) { + console.log(v); + let form = JSON.parse(JSON.stringify(v)); + console.log(form); + this.list.splice(form.index, 1, form); + console.log(this.list); + this.sumList(); + this.restList(form); + }, + restList(form) { + if (form.courseMoney > 0) { var list = []; - v.proList.forEach((item) => { + var listCopy = []; + form.proList.forEach((item) => { item.courseConsumeCount = item.courseConsumeCount - item.payNumber; item.courseRestCount = item.courseRestCount - item.payNumber; list.push(item); }); this.list.forEach((item) => { let proList = []; - if (item.index != v.index) { + if (item.index != form.index) { item.proList.forEach((items, indexs) => { if (items.payNumber == 0) { list[indexs].payNumber = 0; @@ -265,27 +280,30 @@ export default { } proList.push(items); }); + item.proList = proList; } - item.proList = proList; + listCopy.push(item); }); + this.list = listCopy; + console.log(this.list); } - this.list.splice(v.index, 1, v); - this.sumList(); }, openRec(row) { this.$refs.rec.show(row); }, recData(v) { - if (v.recMoney > 0) { + let form = JSON.parse(JSON.stringify(v)); + console.log(form); + if (form.recMoney > 0) { var list = []; - v.recList.forEach((item) => { + form.recList.forEach((item) => { item.cardRestMoney = item.cardRestMoney - item.payMoney; item.cardConsumeMoney = item.cardConsumeMoney - item.payMoney; list.push(item); }); this.list.forEach((item) => { let recList = []; - if (item.index != v.index) { + if (item.index != form.index) { item.recList.forEach((items, indexs) => { if (items.payMoney == 0) { list[indexs].payMoney = 0; @@ -294,11 +312,11 @@ export default { recList.push(items); console.log(recList); }); + item.recList = recList; } - item.recList = recList; }); } - this.list.splice(v.index, 1, v); + this.list.splice(form.index, 1, form); this.sumList(); }, //关闭弹窗前的回调方法 @@ -322,18 +340,7 @@ export default { delete row.adminList; this.$refs.cancel.show(row); }, - //员工占比返回方法 - staffslesData(v) { - this.list[this.rowIndex].entities = [...v]; - }, - //高管占比返回方法 - managerData(v) { - this.list[this.rowIndex].managerList = [...v]; - }, - //管理员占比返回方法 - adminData(v) { - this.list[this.rowIndex].adminList = [...v]; - }, + //组件传值 show(form) { Object.assign(this.$data, this.$options.data.call(this)); diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue index 6ec41aa..6eb7e27 100644 --- a/src/pages/eashier/service/service.vue +++ b/src/pages/eashier/service/service.vue @@ -998,6 +998,7 @@ export default { // flag = false; // } }); + if ( this.balance <= (this.form.collectionCashAmount - sumMoney).toFixed(2) * 1 || diff --git a/src/pages/eashier/within/within.vue b/src/pages/eashier/within/within.vue index 9d15785..cd4841b 100644 --- a/src/pages/eashier/within/within.vue +++ b/src/pages/eashier/within/within.vue @@ -4,7 +4,6 @@
添加转卡 -
明细 @@ -51,19 +50,17 @@ - - + - + - @@ -78,7 +75,6 @@
- - + + + +