diff --git a/src/pages/eashier/collectionList/collectionList.vue b/src/pages/eashier/collectionList/collectionList.vue index 8f7e756..d7095b4 100644 --- a/src/pages/eashier/collectionList/collectionList.vue +++ b/src/pages/eashier/collectionList/collectionList.vue @@ -19,10 +19,10 @@ - +
{{ debtMoneys }} - 去还款 + 去还款
@@ -378,6 +378,7 @@ import { storeOne, recAccountList, recTypeOne, + debtPage, selectOne, succsee, } from "@/api/eashier.js"; @@ -388,7 +389,7 @@ import staffsles from "@/components/staffList/staff/index"; import member from "@/components/member/index"; import selec from "@/components/store/select/index"; import Template from "../../discount-coupon/issue/components/template.vue"; - + export default { components: { member, @@ -457,7 +458,6 @@ export default { adminList: [{ brandNumber: "", staffName: "", ratio: 100 }], staffList: [], managerList: [], - arrears:false, form: { mobilePhone: null, memberName: null, @@ -494,7 +494,7 @@ export default { }; }, methods: { - + close() { this.listDialogVisible = false; @@ -519,9 +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) }, recChange(v) { if (v) { @@ -571,22 +569,13 @@ export default { if (v != 0) { this.getRecList(); } + if(this.form.rechargeTypeName){ this.form.rechargeTypeName="" } - - if(this.sessionStorageData.recDebt&&this.arrears){ - this.$alert("存在欠款不允许升降级", "提示", { - confirmButtonText: "确定", - confirmButtonClass: "confirmbtnFalses", - type: "warning", - center: true, - callback: (action) => {}, - }); - this.liftType=0 - } - + + }, openRec(number) { console.log(number); @@ -598,7 +587,7 @@ export default { this.$refs.updo.show(form, number); } }, - + recTypeData(v, number) { this.form.liftType = this.liftType; if (v.rawCardId) { @@ -680,7 +669,7 @@ export default { } this.form.afterMoney = this.form.rechargeAmount + this.form.beforeMoney; - + if (!v.giftMoney) { v.giftMoney = 0; if (!this.form.giftBeforeMoney) { @@ -760,18 +749,6 @@ 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(); }, //上传文件方法 @@ -805,7 +782,7 @@ export default { let list = JSON.parse( sessionStorage.getItem("sessionStorageData") ).excIntegralByMoney.split(":"); - + if (row == true) { if (this.integralMoney >= this.form.debtMoney) { this.integralMoney = this.form.debtMoney; @@ -839,13 +816,13 @@ export default { this.num(); } }, - + //输入手机号是查询 //查询方法 query() { var number = partten.phoneNum; var mobilePhone = this.form.mobilePhone; - // this.empty();为什么要执行清空??????、 + this.empty(); if (!number.test(mobilePhone)) { this.$message.info({ message: "请输入正确的手机号 ! ", @@ -952,13 +929,7 @@ 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(); }, //选择金额.` @@ -1026,7 +997,7 @@ export default { }); } }, - + empty() { Object.assign(this.$data, this.$options.data.call(this)); this.setPage(); @@ -1039,7 +1010,7 @@ export default { that.$refs.admin.show(that.adminList); }, 500); }, - + //提交 //保存确定方法 save() { @@ -1269,7 +1240,7 @@ export default { detailData() { this.getList(); }, - + openPostpone(row) { selectById({ id: row.rechargeAccountId, @@ -1320,7 +1291,7 @@ export default { }).then(() => { delete row.payLists; delete row.entities; - + row.isCancel = 1; recCancel(row).then((res) => { //console.log(res); @@ -1380,10 +1351,33 @@ export default { if (this.form.memberId) { recAccountList({ memberId: this.form.memberId, - + }).then((res) => { if (res.code == "000000") { this.recList = res.rows; + let form = { + pageSize: 99, + memberId: this.form.memberId, + state: 0, + storeId: sessionStorage.getItem("storeId"), + }; + //获取欠款列表 + debtPage(form).then((res) => { + if (res.code == "000000") { + var klist=res.pageInfo.list + klist.forEach((item)=>{ + this.recList.forEach((items,index)=>{ + if(item.tradeName==items.rechargeTypeName){ + this.recList.splice(index,1) + + } + }) + }) + console.log("🚀 ~ file: collectionList.vue ~ line 586 ~ this.recList.forEach ~ this.recList", this.recList) + }else{ + + } + }) } else { this.$alert("查询会员充值卡: " + res.message, "提示", { confirmButtonText: "确定", @@ -1478,36 +1472,36 @@ export default { background: white; margin-left: 25px; } - + .collectioncenter { margin-top: 15px; padding-left: 40px; } - + .collectioncenter table { margin: 10px auto; } - + .collectioncenter th:nth-child(1) { min-width: 78px; } - + .collectioncenter td { height: 25px; min-width: 68px; text-align: center; padding: 10px; } - + .collection .span { width: 100px; display: inline-block; } - + .type .el-radio__label { display: none; } - + /* .collection .el-input { width: 100px; } */ @@ -1519,26 +1513,26 @@ export default { font-size: 14px; line-height: 35px; } - + .colljisuan span:nth-child(1) { position: absolute; left: 35px; } - + .colljisuan span:nth-child(2) { position: absolute; left: 235px; } - + .colle { padding: 10px 0px 10px 30px; } - + .colle .el-collapse-item, .colle-but { max-width: 1100px; } - + .colle .el-collapse-item__header { border-bottom: 1px solid #999999; } @@ -1546,15 +1540,15 @@ export default { .colle-but { max-width: 1100px; } - + .collection > .el-date-picker__time-header { display: none !important; } - + .printDiv .el-form-item { margin-bottom: 0px; } - + .printDiv .el-form-item__label, .el-form-item__content { font-size: 12px; @@ -1572,7 +1566,7 @@ export default { margin: 0mm; /* this affects the margin in the printer settings */ padding: 0; } - + html { background-color: #ffffff; margin: 0; /* this affects the margin on the html before sending to printer */ @@ -1588,6 +1582,6 @@ html { padding: 0; } } - + /*去除页眉页脚*/ - + \ No newline at end of file