menjin
/
renli-pc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部分bug修改

Browse Source
master
Wangxubin 3 years ago
parent b123386cb2
commit fcf6885e6d
8 changed files with 496 additions and 21999 deletions
Show Stats Download Patch File Download Diff File

22349
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
package.json
Unescape Escape View File

@ -36,6 +36,7 @@
"vue-axios": "^2.1.5",
"vue-baidu-map": "^0.21.22",
"vue-esign": "^1.0.5",
"vue-flop-draw": "^0.1.9",
"vue-print-nb": "^1.6.0",
"vue-router": "^3.0.1",
"vuex": "^3.5.1",

1
src/components/project/index.vue
Unescape Escape View File

@ -95,6 +95,7 @@ export default {
methods: {
//组件传值
show(form, id) {
console.log('打开的参数---',form,id)
this.courseProjectId = id;
this.coureList = [];
this.list = [];

22
src/pages/eashier/raiseReatment/components/index.vue
Unescape Escape View File

@ -393,7 +393,7 @@ export default {
row.index = rowIndex;
},
projectData(form) {
console.log(form)
// console.log(form)
form.memberId = this.proForm.memberId;
form.memberName = this.proForm.memberName;
form.mobilePhone = this.proForm.mobilePhone;
@ -460,7 +460,7 @@ export default {
row.memberIdentityCard = res.data.identityCard;
this.proForm = {};
this.proForm = row;
console.log(this.proForm);
// console.log(this.proForm);
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
@ -478,22 +478,21 @@ export default {
//选择金额.
editPay(row, index) {
console.log(row)
// console.log(row)
var form = {
...row,
};
console.log()
// console.log()
var payLists = [...this.proForm.payLists];
payLists[index] = form;
form.isShow = true;
this.proForm.payLists = [];
this.proForm.payLists = payLists;
console.log(this.proForm.payLists)
// console.log(this.proForm.payLists)
this.sumMoney()
// }
},
endEdit(row) {
if (row.payMoney && row.payMoney <= this.debtMoney) {
row.payMoney = row.payMoney * 1;
} else {
@ -527,7 +526,7 @@ export default {
}
if (num == 1) {
this.$refs.project.show(this.proForm);
console.log(this.inList)
// console.log(this.inList)
}
},
delOldPro(index) {
@ -623,7 +622,7 @@ export default {
this.outList.splice(index, 1, form);
},
endOutMoney(row) {
console.log(row);
// console.log(row);
let money = row.changeOutTime * row.price;
if (row.changeOutMoney) {
row.changeOutMoney = row.changeOutMoney * 1;
@ -644,7 +643,7 @@ export default {
this.sumMoney();
},
endEditTimes(row, index) {
console.log("🚀 ~ file: index.vue ~ line 647 ~ endEditTimes ~ row", row)
// console.log("🚀 ~ file: index.vue ~ line 647 ~ endEditTimes ~ row", row)
if (row.changeInTime < row.minumumTimes) {
this.$message.info({
@ -720,17 +719,22 @@ export default {
}
},
sumMoney() {
// debtMoney
console.log('this.inList',this.inList,'this.outList',this.outList,'this.proForm.payLists',this.proForm.payLists)
let inMoneys = 0;
let outMoneys = 0;
let payMoneys = 0;
let debtMoney = 0;
// 转入疗程数组
this.inList.forEach((item) => {
inMoneys += item.transactionMoney * 1;
debtMoney = item.debtMoney * 1;
});
// 转出疗程数组
this.outList.forEach((item) => {
outMoneys += item.changeOutMoney * 1;
});
// 现金支付
this.proForm.payLists.forEach((item) => {
payMoneys += item.payMoney * 1;
});

83
src/pages/eashier/reatment/reatment.vue
Unescape Escape View File

@ -151,7 +151,7 @@
</div>
</div>
<div style="width:280px" class="border-radius-10 border margin-right-xs bg-white padding-xs">
<el-table :data="payLists" :summary-method="getSummaries" show-summary>
<el-table :data="payLists" :summary-method="getSummaries" show-summary row-key="payId">
<el-table-column align="center" prop="collectionTypeName" label="支付方式" min-width="100"></el-table-column>
<el-table-column align="center" prop="payMoney" fixed="right" label="本次支付 ( ¥ )" width="120">
<template slot-scope="scope">
@ -425,6 +425,46 @@ export default {
},
data() {
return {
list:[ {
name: "66矿石",
img:
"https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/32ed6a7619934144882d841761b63d3c~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
},
{
name: "随机限量徽章",
img:
"https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/71c68de6368548bd9bd6c8888542f911~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
},
{
name: "掘金新款T恤",
img:
"https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/5bf91038a6384fc3927dee294a38006b~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
},
{
name: "Bug",
img:
"https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/0a4ce25d48b8405cbf5444b6195928d4~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
},
{
name: "乐高海洋巨轮",
img:
"https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/aabe49b0d5c741fa8d92ff94cd17cb90~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
},
{
name: "掘金马克杯",
img:
"https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/ab31c183950541d4a0731c0b8765b173~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
},
{
name: "Yoyo抱枕",
img:
"https://p1-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/33f4d465a6a9462f9b1b19b3104c8f91~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
},
{
name: "Switch",
img:
"https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/4decbd721b2b48098a1ecf879cfca677~tplv-k3u1fbpfcp-no-mark:0:0:0:0.awebp",
},],
input: null,
printDialogVisible: false, //打印弹窗开关
listDialogVisible: false,
@ -999,6 +1039,7 @@ export default {
},
//选择金额.
openpay(row, $index) {
console.log('---',this.payLists)
if (this.form.projectName) {
if (row.payMoney) {
row.payMoney = row.payMoney * 1;
@ -1254,9 +1295,9 @@ export default {
//保存确定方法
save() {
// -- 之前的人写的臭的飞起,没有用到这个字段,保存的时候重新赋值金额（待付/实付）
this.form.courseReatmentAmount = this.paidAmount
this.form.debtMoney = this.treatAmount
// this.payLists
this.form.courseReatmentAmount = parseInt(this.paidAmount)
this.form.debtMoney = parseInt(this.treatAmount)
// ----
this.form.isAddition = this.isAddition;
var staffLists = [];
@ -1266,19 +1307,27 @@ export default {
staffLists.push(item);
}
});
var payLists = [];
var rechargeAccountList = [];
for (let i in this.payLists) {
this.payLists[i].payId = this.payLists[i].id;
this.payLists[i].payName = this.payLists[i].collectionTypeName;
delete this.payLists[i].isShow;
delete this.payLists[i].state;
delete this.payLists[i].collectionType;
delete this.payLists[i].id;
delete this.payLists[i].collectionTypeName;
// 用作删除数组
const auxiliaryArr = ['isShow','state','collectionType','id','collectionTypeName']
for (let i =0;i<this.payLists.length;i++) {
let params = {...this.payLists[i]}
params.payId = this.payLists[i].id;
params.payName = this.payLists[i].collectionTypeName;
auxiliaryArr.forEach(item=>{
delete params[item]
})
// this.payLists[i].payId = this.payLists[i].id;
// this.payLists[i].payName = this.payLists[i].collectionTypeName;
// delete this.payLists[i].isShow;
// delete this.payLists[i].state;
// delete this.payLists[i].collectionType;
// delete this.payLists[i].id;
// delete this.payLists[i].collectionTypeName;
if (this.payLists[i].payMoney * 1 > 0) {
payLists.push(this.payLists[i]);
// payLists.push(this.payLists[i]);
payLists.push(params);
}
}
for (let i in this.rechargeAccountList) {
@ -1365,6 +1414,8 @@ export default {
type: "warning",
}).then(() => {
that.addCourse();
}).catch(()=>{
this.saveloading = false
});
} else {
that.addCourse();
@ -1577,8 +1628,8 @@ export default {
}
},
cardnum() {
var spendMoney = 0;
var discoutMoney = 0;
let spendMoney = 0;
let discoutMoney = 0;
this.rechargeAccountList.forEach((item) => {
spendMoney += item.spendMoney * 1; //实付金额
discoutMoney += item.discoutMoney * 1; //抵扣

13
src/pages/eashier/refundRecharge/refundRecharge.vue
Unescape Escape View File

@ -1299,12 +1299,22 @@ export default {
},
methods: {
openRec() {
if(this.refund.memberName == '')return this.$alert("会员ID不能为空 " , "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
this.$refs.rec.show(this.refund);
},
recData(v) {
delete v.card;
delete v.state;
//console.log(v);
console.log(v);
if(this.sessionStorageData.refundRechargeType != 1 && v.giftConsumeMoney){
this.refund.refundGiftMoney = v.giftConsumeMoney
}
v = JSON.parse(JSON.stringify(v).replace(/id/g, "recAccountId"));
if (this.sessionStorageData.refundCard) {
v.refundMoneys = 0;
@ -2170,6 +2180,7 @@ export default {
this.sessionStorageData = JSON.parse(
sessionStorage.getItem("sessionStorageData")
);
console.log('sessionStorageData',this.sessionStorageData)
}
},
created() {

3
src/pages/eashier/service/service.vue
Unescape Escape View File

@ -3,11 +3,11 @@
<el-form inline lable-width="100px" :modal="memberForm">
<el-form-item label="手机号码:">
<div class="form-width text-cyan flex justify-start align-center">
<!-- @blur="inputMember" -->
<el-input
maxlength="11"
v-model="memberForm.mobilePhone"
@change="inputMember"
@blur="inputMember"
>
<el-button
size="mini"
@ -1350,6 +1350,7 @@ export default {
this.$refs.repayment.show(this.memberForm);
},
inputMember() {
console.log('为什么会触发这么多次')
if (partten.phoneNum.test(this.memberForm.mobilePhone)) {
storeMemberOne({
mobilePhone: this.memberForm.mobilePhone,

23
src/pages/storeManage/trading/components/cash.vue
Unescape Escape View File

@ -13,11 +13,11 @@
</el-tag>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="100" label="支付方式">
<!-- <el-table-column show-overflow-tooltip align="center" min-width="100" label="支付方式">
<template slot-scope="scope">
<span>{{ scope.row.rechargeConsumeList.length?'卡付':'现金' }}</span>
<span>{{ paymentMethods(scope.row) }}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column show-overflow-tooltip align="center" label="单据">
<el-table-column show-overflow-tooltip align="center" min-width="100" prop="docNum" label="单据号"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="115" prop="inputDate" label="时间">
@ -86,6 +86,23 @@ import { listByMembers } from "@/api/eashier";
import orderdetail from "@/components/order/detail.vue";
export default {
components: { orderdetail },
// computed:{
// paymentMethods(){
// return (row)=>{
// if(row.rechargeConsumeList.length&&row.payLists.length){
// // 现金跟卡付
// return '现金/卡付'
// }
// if(row.rechargeConsumeList.length){
// // 卡付
// return '卡付'
// }else{
// // 现金
// return '现金'
// }
// }
// }
// },
data() {
return {
itemList: [

Write Preview
Loading…
Cancel
Save