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

冲突

Browse Source
master
Wangxubin1999 3 years ago
parent 35b041584a be4baf6eb6
commit d7623a1a17
15 changed files with 544 additions and 22019 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-axios": "^2.1.5",
"vue-baidu-map": "^0.21.22", "vue-baidu-map": "^0.21.22",
"vue-esign": "^1.0.5", "vue-esign": "^1.0.5",
"vue-flop-draw": "^0.1.9",
"vue-print-nb": "^1.6.0", "vue-print-nb": "^1.6.0",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vuex": "^3.5.1", "vuex": "^3.5.1",

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

@ -48,7 +48,9 @@
<el-table :data="outList" empty-text='暂无数据 , 点击添加疗程' max-height="200" <el-table :data="outList" empty-text='暂无数据 , 点击添加疗程' max-height="200"
:header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee' }" :header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee' }"
style="margin-top: 5px;"> style="margin-top: 5px;">
<el-table-column type="expand"> <el-table-column type="expand">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="flex justify-start align-center flex-wrap "> <div class="flex justify-start align-center flex-wrap ">
<el-form inline class="margin-top-xs margin-left-xs"> <el-form inline class="margin-top-xs margin-left-xs">
@ -258,6 +260,7 @@ export default {
managerLists: [{ ratio: 100 }], //员工占比初始化 managerLists: [{ ratio: 100 }], //员工占比初始化
adminList: [{ ratio: 100 }], //员工占比初始化 adminList: [{ ratio: 100 }], //员工占比初始化
payLists: [], //现付列表 payLists: [], //现付列表
Branch:null,
}, },
outList: [], outList: [],
inList: [], inList: [],
@ -547,7 +550,7 @@ export default {
row.memberIdentityCard = res.data.identityCard; row.memberIdentityCard = res.data.identityCard;
this.proForm = {}; this.proForm = {};
this.proForm = row; this.proForm = row;
console.log(this.proForm); // console.log(this.proForm);
} else { } else {
this.$alert(res.message, "提示", { this.$alert(res.message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -565,22 +568,21 @@ export default {
//选择金额. //选择金额.
editPay(row, index) { editPay(row, index) {
console.log(row) // console.log(row)
var form = { var form = {
...row, ...row,
}; };
console.log() // console.log()
var payLists = [...this.proForm.payLists]; var payLists = [...this.proForm.payLists];
payLists[index] = form; payLists[index] = form;
form.isShow = true; form.isShow = true;
this.proForm.payLists = []; this.proForm.payLists = [];
this.proForm.payLists = payLists; this.proForm.payLists = payLists;
console.log(this.proForm.payLists) // console.log(this.proForm.payLists)
this.sumMoney() this.sumMoney()
// } // }
}, },
endEdit(row) { endEdit(row) {
if (row.payMoney && row.payMoney <= this.debtMoney) { if (row.payMoney && row.payMoney <= this.debtMoney) {
row.payMoney = row.payMoney * 1; row.payMoney = row.payMoney * 1;
} else { } else {
@ -714,7 +716,7 @@ export default {
this.outList.splice(index, 1, form); this.outList.splice(index, 1, form);
}, },
endOutMoney(row) { endOutMoney(row) {
console.log(row); // console.log(row);
let money = row.changeOutTime * row.price; let money = row.changeOutTime * row.price;
if (row.changeOutMoney) { if (row.changeOutMoney) {
row.changeOutMoney = row.changeOutMoney * 1; row.changeOutMoney = row.changeOutMoney * 1;
@ -735,7 +737,7 @@ export default {
this.sumMoney(); this.sumMoney();
}, },
endEditTimes(row, index) { 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) { if (row.changeInTime < row.minumumTimes) {
this.$message.info({ this.$message.info({
@ -811,17 +813,22 @@ export default {
} }
}, },
sumMoney() { sumMoney() {
// debtMoney
console.log('this.inList',this.inList,'this.outList',this.outList,'this.proForm.payLists',this.proForm.payLists)
let inMoneys = 0; let inMoneys = 0;
let outMoneys = 0; let outMoneys = 0;
let payMoneys = 0; let payMoneys = 0;
let debtMoney = 0; let debtMoney = 0;
// 转入疗程数组
this.inList.forEach((item) => { this.inList.forEach((item) => {
inMoneys += item.transactionMoney * 1; inMoneys += item.transactionMoney * 1;
debtMoney = item.debtMoney * 1; debtMoney = item.debtMoney * 1;
}); });
// 转出疗程数组
this.outList.forEach((item) => { this.outList.forEach((item) => {
outMoneys += item.changeOutMoney * 1; outMoneys += item.changeOutMoney * 1;
}); });
// 现金支付
this.proForm.payLists.forEach((item) => { this.proForm.payLists.forEach((item) => {
payMoneys += item.payMoney * 1; payMoneys += item.payMoney * 1;
}); });

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

@ -151,7 +151,7 @@
</div> </div>
</div> </div>
<div style="width:280px" class="border-radius-10 border margin-right-xs bg-white padding-xs"> <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="collectionTypeName" label="支付方式" min-width="100"></el-table-column>
<el-table-column align="center" prop="payMoney" fixed="right" label="本次支付 ( ¥ )" width="120"> <el-table-column align="center" prop="payMoney" fixed="right" label="本次支付 ( ¥ )" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
@ -425,6 +425,46 @@ export default {
}, },
data() { data() {
return { 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, input: null,
printDialogVisible: false, //打印弹窗开关 printDialogVisible: false, //打印弹窗开关
listDialogVisible: false, listDialogVisible: false,
@ -999,6 +1039,7 @@ export default {
}, },
//选择金额. //选择金额.
openpay(row, $index) { openpay(row, $index) {
console.log('---',this.payLists)
if (this.form.projectName) { if (this.form.projectName) {
if (row.payMoney) { if (row.payMoney) {
row.payMoney = row.payMoney * 1; row.payMoney = row.payMoney * 1;
@ -1254,9 +1295,9 @@ export default {
//保存确定方法 //保存确定方法
save() { save() {
// -- 之前的人写的臭的飞起,没有用到这个字段,保存的时候重新赋值金额（待付/实付） // this.payLists
this.form.courseReatmentAmount = this.paidAmount this.form.courseReatmentAmount = parseInt(this.paidAmount)
this.form.debtMoney = this.treatAmount this.form.debtMoney = parseInt(this.treatAmount)
// ---- // ----
this.form.isAddition = this.isAddition; this.form.isAddition = this.isAddition;
var staffLists = []; var staffLists = [];
@ -1266,19 +1307,27 @@ export default {
staffLists.push(item); staffLists.push(item);
} }
}); });
var payLists = []; var payLists = [];
var rechargeAccountList = []; var rechargeAccountList = [];
for (let i in this.payLists) { // 用作删除数组
this.payLists[i].payId = this.payLists[i].id; const auxiliaryArr = ['isShow','state','collectionType','id','collectionTypeName']
this.payLists[i].payName = this.payLists[i].collectionTypeName; for (let i =0;i<this.payLists.length;i++) {
delete this.payLists[i].isShow; let params = {...this.payLists[i]}
delete this.payLists[i].state; params.payId = this.payLists[i].id;
delete this.payLists[i].collectionType; params.payName = this.payLists[i].collectionTypeName;
delete this.payLists[i].id; auxiliaryArr.forEach(item=>{
delete this.payLists[i].collectionTypeName; 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) { 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) { for (let i in this.rechargeAccountList) {
@ -1365,6 +1414,8 @@ export default {
type: "warning", type: "warning",
}).then(() => { }).then(() => {
that.addCourse(); that.addCourse();
}).catch(()=>{
this.saveloading = false
}); });
} else { } else {
that.addCourse(); that.addCourse();
@ -1577,8 +1628,8 @@ export default {
} }
}, },
cardnum() { cardnum() {
var spendMoney = 0; let spendMoney = 0;
var discoutMoney = 0; let discoutMoney = 0;
this.rechargeAccountList.forEach((item) => { this.rechargeAccountList.forEach((item) => {
spendMoney += item.spendMoney * 1; //实付金额 spendMoney += item.spendMoney * 1; //实付金额
discoutMoney += item.discoutMoney * 1; //抵扣 discoutMoney += item.discoutMoney * 1; //抵扣

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

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

6
src/pages/eashier/repayment/components/index.vue
Unescape Escape View File

@ -116,7 +116,7 @@ export default {
handleClose() { handleClose() {
this.form = Object.assign({}); this.form = Object.assign({});
this.detailDialogVisible = false; this.detailDialogVisible = false;
this.$emit("detailData"); // this.$emit("detailData");
}, },
rowClassName({ row, rowIndex }) { rowClassName({ row, rowIndex }) {
row.index = rowIndex; row.index = rowIndex;
@ -144,8 +144,6 @@ export default {
this.title = "修改"; this.title = "修改";
} }
this.form = form; this.form = form;
console.log(form);
if (form.repayTradeLists.length == 1) { if (form.repayTradeLists.length == 1) {
this.rowIndex = 0; this.rowIndex = 0;
form.repayTradeLists.forEach((item, index) => { form.repayTradeLists.forEach((item, index) => {
@ -160,7 +158,6 @@ export default {
this.detailDialogVisible = true; this.detailDialogVisible = true;
}, },
rowClick(row) { rowClick(row) {
console.log(row);
this.rowIndex = row.index; this.rowIndex = row.index;
row.entities.forEach((item) => { row.entities.forEach((item) => {
item.staffName = item.saleStaffName; item.staffName = item.saleStaffName;
@ -169,6 +166,7 @@ export default {
item.ratio = item.saleRatio; item.ratio = item.saleRatio;
item.staffNames = item.brandNumber + "--" + item.staffName; item.staffNames = item.brandNumber + "--" + item.staffName;
}); });
console.log('----执行到了这里');
selectOne({ type: 7, orderId: row.id }).then((res) => { selectOne({ type: 7, orderId: row.id }).then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
let managerList = []; let managerList = [];

8
src/pages/eashier/service/detail/printform.vue
Unescape Escape View File

@ -31,7 +31,7 @@
<div class="text-left" style="width:25%">折后 </div> <div class="text-left" style="width:25%">折后 </div>
</div> </div>
<div style="height:15px"></div> <div style="height:15px"></div>
<div class="print-table flex justify-center align-center" v-for="(item, index) in printForm.projectList"> <div class="print-table flex justify-center align-center" v-for="(item, index) in printForm.projectList" :key="index">
<div class="text-left" style="width:50%"> <span class="text-cyan text-out">{{ item.projectName }}</span></div> <div class="text-left" style="width:50%"> <span class="text-cyan text-out">{{ item.projectName }}</span></div>
<div class="text-left" style="width:25%"> <span class="text-red text-price">{{ item.amount }}</span></div> <div class="text-left" style="width:25%"> <span class="text-red text-price">{{ item.amount }}</span></div>
<div class="text-left" style="width:25%"> <span class="text-red text-price">{{ item.discountmoney }}</span> <div class="text-left" style="width:25%"> <span class="text-red text-price">{{ item.discountmoney }}</span>
@ -48,7 +48,7 @@
<div class="text-left" style="width:25%;padding-right:5px">剩余 </div> <div class="text-left" style="width:25%;padding-right:5px">剩余 </div>
</div> </div>
<div style="height:15px"></div> <div style="height:15px"></div>
<div class="print-table flex justify-center align-center" v-for="(item, index) in recList"> <div class="print-table flex justify-center align-center" v-for="(item, index) in recList" :key="index">
<div class="text-left" style="width:50%"> <span class="text-cyan text-out">{{ item.rechargeTypeName }}</span> <div class="text-left" style="width:50%"> <span class="text-cyan text-out">{{ item.rechargeTypeName }}</span>
</div> </div>
<div class="text-left" style="width:25%"> <span class="text-red text-price">{{ item.spendMoney }}</span></div> <div class="text-left" style="width:25%"> <span class="text-red text-price">{{ item.spendMoney }}</span></div>
@ -63,7 +63,7 @@
<div class="text-left" style="width:50%;">支付 </div> <div class="text-left" style="width:50%;">支付 </div>
</div> </div>
<div style="height:15px"></div> <div style="height:15px"></div>
<div class="print-table flex justify-center align-center" v-for="(item, index) in printForm.payLists"> <div class="print-table flex justify-center align-center" v-for="(item, index) in printForm.payLists" :key="index">
<div class="text-left" style="width:50%"> <span class="text-cyan text-out">{{ item.payName }}</span></div> <div class="text-left" style="width:50%"> <span class="text-cyan text-out">{{ item.payName }}</span></div>
<div class="text-left" style="width:50%"> <span class="text-red text-price">{{ item.payMoney }}</span></div> <div class="text-left" style="width:50%"> <span class="text-red text-price">{{ item.payMoney }}</span></div>
</div> </div>
@ -162,7 +162,7 @@ export default {
} }
.printDiv { .printDiv {
width: 330px; width: 380px;
margin: 0 auto; margin: 0 auto;
} }

5
src/pages/eashier/service/passcode.vue
Unescape Escape View File

@ -53,6 +53,7 @@ export default {
this.imgvalue = null; this.imgvalue = null;
this.file = null; this.file = null;
this.paymentform = {}; this.paymentform = {};
this.$refs.signature.handleReset()
}, },
setPassword(val) { setPassword(val) {
@ -133,8 +134,8 @@ export default {
if (res.data == true) { if (res.data == true) {
this.$message.success({ message: "密码正确!" }); this.$message.success({ message: "密码正确!" });
this.$emit("passcodeData", this.file); this.$emit("passcodeData", this.file);
this.handleClose()
this.paymentcodeDialog = false; // this.paymentcodeDialog = false;
} else { } else {
this.$alert("密码错误", "提示", { this.$alert("密码错误", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",

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

@ -3,11 +3,11 @@
<el-form inline lable-width="100px" :modal="memberForm"> <el-form inline lable-width="100px" :modal="memberForm">
<el-form-item label="手机号码:"> <el-form-item label="手机号码:">
<div class="form-width text-cyan flex justify-start align-center"> <div class="form-width text-cyan flex justify-start align-center">
<!-- @blur="inputMember" -->
<el-input <el-input
maxlength="11" maxlength="11"
v-model="memberForm.mobilePhone" v-model="memberForm.mobilePhone"
@change="inputMember" @change="inputMember"
@blur="inputMember"
> >
<el-button <el-button
size="mini" size="mini"
@ -635,6 +635,7 @@
<el-button size="samll" type="primary" plain @click="openList" <el-button size="samll" type="primary" plain @click="openList"
>收银列表</el-button >收银列表</el-button
> >
<el-button size="samll" type="primary" plain @click="goBack">{{ <el-button size="samll" type="primary" plain @click="goBack">{{
isAddition == 1 ? "收银" : "补单" isAddition == 1 ? "收银" : "补单"
}}</el-button> }}</el-button>
@ -680,6 +681,7 @@ import recash from "./recash";
import orders from "./detail/detail"; import orders from "./detail/detail";
import { partten } from "@/utils/partten/index.js"; import { partten } from "@/utils/partten/index.js";
export default { export default {
components: { components: {
member, member,
reccard, reccard,
@ -1218,7 +1220,8 @@ export default {
this.recForm.collectionIntegralAmount this.recForm.collectionIntegralAmount
).toFixed(2) * 1; ).toFixed(2) * 1;
console.log("🚀 ~ file: service.vue ~ line 1213 ~ sumNum ~ this.recForm", this.recForm) console.log("🚀 ~ file: service.vue ~ line 1213 ~ sumNum ~ this.recForm", this.recForm)
this.recForm.collectionAmounts = spendMoney.toFixed(2) * 1; this.recForm.collectionAmounts =spendMoney?spendMoney.toFixed(2) * 1:0;;
this.recForm.rechargeAmount = spendNumber.toFixed(2) * 1; this.recForm.rechargeAmount = spendNumber.toFixed(2) * 1;
@ -1406,6 +1409,7 @@ export default {
this.$refs.repayment.show(this.memberForm); this.$refs.repayment.show(this.memberForm);
}, },
inputMember() { inputMember() {
console.log('为什么会触发这么多次')
if (partten.phoneNum.test(this.memberForm.mobilePhone)) { if (partten.phoneNum.test(this.memberForm.mobilePhone)) {
storeMemberOne({ storeMemberOne({
mobilePhone: this.memberForm.mobilePhone, mobilePhone: this.memberForm.mobilePhone,
@ -1857,7 +1861,8 @@ export default {
adminList: [], adminList: [],
payLists: this.payLists, payLists: this.payLists,
rechargeAccountList: [], //卡付列表 rechargeAccountList: [], //卡付列表
collectionCashAmounts: 0 collectionCashAmounts: 0,
collectionAmounts:0,
}; };
this.projectMomey = 0; this.projectMomey = 0;
this.recIndex = -1; this.recIndex = -1;

9
src/pages/eashier/within/components/edit.vue
Unescape Escape View File

@ -314,7 +314,14 @@ export default {
this.form.staffLists = this.staffList; this.form.staffLists = this.staffList;
console.log("🚀 ~ file: edit.vue ~ line 316 ~ updateRechargeCardTransition ~ this.form", this.form) console.log("🚀 ~ file: edit.vue ~ line 316 ~ updateRechargeCardTransition ~ this.form", this.form)
updateRechargeCardTransition(this.form).then((res) => { let params = {...this.form}
//过滤掉员工名称
for(let key in params){
if((key.substring(0,4)==='sale' && key.substring(key.length-4,key.length)==='Name') || (key.substring(0,4)==='sale' && key.substring(key.length-7,key.length)==='StaffId')){
delete params[key]
}
}
updateRechargeCardTransition(params).then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
this.$emit("editData"); this.$emit("editData");

6
src/pages/eashier/within/within.vue
Unescape Escape View File

@ -108,6 +108,7 @@ export default {
rowClick(row) { rowClick(row) {
this.radioRowValue = row.id; this.radioRowValue = row.id;
this.radioRowValueList = row; this.radioRowValueList = row;
console.log('row----',row)
}, },
add(type) { add(type) {
this.$refs.edit.show("添加", type); this.$refs.edit.show("添加", type);
@ -117,6 +118,7 @@ export default {
this.$refs.edit.show("添加"); this.$refs.edit.show("添加");
} else if (number == 0) { } else if (number == 0) {
this.$refs.edit.show(this.radioRowValueList); this.$refs.edit.show(this.radioRowValueList);
console.log('radioRowValueList---',this.radioRowValueList)
} else { } else {
let form = { id: this.radioRowValueList.id, state: number }; let form = { id: this.radioRowValueList.id, state: number };
updateStateRechargeCardTransition(form).then((res) => { updateStateRechargeCardTransition(form).then((res) => {
@ -144,8 +146,10 @@ export default {
}, },
//修改返回方法 //修改返回方法
editData(v) { editData(v) {
this.radioRowValueList=v
this.getData(); this.getData();
// 重置
this.radioRowValue = ''
this.radioRowValueList = {}
}, },
//明细返回方法 //明细返回方法
detailData(v) { detailData(v) {

6
src/pages/storeManage/admins/detail/index.vue
Unescape Escape View File

@ -5,6 +5,11 @@
</div> </div>
<el-table border v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText" @row-dblclick="rowdbClick" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}"> <el-table border v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText" @row-dblclick="rowdbClick" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}">
<el-table-column show-overflow-tooltip align="center" min-width="90" prop="storeNum" label="门店编码"></el-table-column> <el-table-column show-overflow-tooltip align="center" min-width="90" prop="storeNum" label="门店编码"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="90" prop="orderType" label="单据类型">
<template slot-scope="scope">
<span>{{ typeArr[scope.row.orderType] }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="90" prop="storeName" label="门店名称"></el-table-column> <el-table-column show-overflow-tooltip align="center" min-width="90" prop="storeName" label="门店名称"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="90" prop="brandNumber" label="水牌号"></el-table-column> <el-table-column show-overflow-tooltip align="center" min-width="90" prop="brandNumber" label="水牌号"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="90" prop="staffName" label="员工名称"></el-table-column> <el-table-column show-overflow-tooltip align="center" min-width="90" prop="staffName" label="员工名称"></el-table-column>
@ -37,6 +42,7 @@ import { salesmanMxs, exportachiMXs } from "@/api/storeManage.js";
export default { export default {
data() { data() {
return { return {
typeArr:['收银单','充值单','疗程单','加价转疗程单','充值退款','疗程退款单','消费退','还款'],
dialogVisible: false, //弹窗开关 dialogVisible: false, //弹窗开关
form: {}, //主对象 form: {}, //主对象
list: [], //主数组 list: [], //主数组

12
src/pages/storeManage/rechargeType/components/edit.vue
Unescape Escape View File

@ -35,12 +35,12 @@
<el-input type="number" :placeholder="form.donateType==0?'固定金额':form.donateType==1?'比例赠送(%)':''" class="form-width" v-model="form.giftMoney" autocomplete="on" :disabled="form.type === 1"> <el-input type="number" :placeholder="form.donateType==0?'固定金额':form.donateType==1?'比例赠送(%)':''" class="form-width" v-model="form.giftMoney" autocomplete="on" :disabled="form.type === 1">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="有效期限(月)：" prop="validTime" v-show="sessionStorageData.allowValid == 1"> <el-form-item label="有效期限(月)：" v-if="sessionStorageData.allowValid == 1">
<el-input class="form-width" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" v-model="form.validTime" autocomplete="on"></el-input> <el-input class="form-width" :disabled='unifiedDue' oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" v-model="form.validTime" autocomplete="on"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="到期日期：" prop="unifiedDue"> <el-form-item label="到期日期">
<div class="block" style="min-width:50px"> <div class="block" style="min-width:50px">
<el-date-picker style="min-width:50px" v-model="form.unifiedDue" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择卡包统一到期日期"></el-date-picker> <el-date-picker style="min-width:50px" :disabled='validTime' v-model="form.unifiedDue" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择卡包统一到期日期"></el-date-picker>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -54,6 +54,10 @@
<script> <script>
import { addrecType, editrecType } from "@/api/storeManage.js"; import { addrecType, editrecType } from "@/api/storeManage.js";
export default { export default {
computed:{
validTime(){try{if(this.form.validTime.length){return true}else return false}catch(err){return false}},
unifiedDue(){try{if(this.form.unifiedDue.length){return true}else return false}catch(err){return false}}
},
data() { data() {
return { return {
rules: { rules: {

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

@ -15,7 +15,7 @@
</el-table-column> </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"> <template slot-scope="scope">
<span>{{ scope.row.rechargeConsumeList.length?'卡付':'现金' }}</span> <span>{{ paymentMethods(scope.row) }}</span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column show-overflow-tooltip align="center" label="单据"> <el-table-column show-overflow-tooltip align="center" label="单据">
@ -86,6 +86,23 @@ import { listByMembers } from "@/api/eashier";
import orderdetail from "@/components/order/detail.vue"; import orderdetail from "@/components/order/detail.vue";
export default { export default {
components: { orderdetail }, components: { orderdetail },
// computed:{
// paymentMethods(){
// return (row)=>{
// if(row.rechargeConsumeList.length&&row.payLists.length){
// // 现金跟卡付
// return '现金/卡付'
// }
// if(row.rechargeConsumeList.length){
// // 卡付
// return '卡付'
// }else{
// // 现金
// return '现金'
// }
// }
// }
// },
data() { data() {
return { return {
itemList: [ itemList: [

12
src/pages/storeManage/transferNew/index.vue
Unescape Escape View File

@ -7,11 +7,13 @@
<div> <div>
<el-button size="mini" :disabled="radioRowValueList.state == undefined" type="" @click="detail" >明细</el-button> <el-button size="mini" :disabled="radioRowValueList.state == undefined" type="" @click="detail" >明细</el-button>
<el-button size="mini" type="primary" @click="edit(0)" :disabled="radioRowValueList.state == undefined&&(radioRowValueList.state==0||radioRowValueList.state==2||radioRowValueList.state==4)" plain>修改</el-button>
<el-button size="mini" type="primary" @click="edit(1)" :disabled="radioRowValueList.state == undefined&&(radioRowValueList.state==0||radioRowValueList.state==2||radioRowValueList.state==4)">送审</el-button> <el-button size="mini" type="primary" @click="edit(0)" :disabled="radioRowValueList.state == undefined||radioRowValueList.state==3||radioRowValueList.state==2||radioRowValueList.state==1" plain>修改</el-button>
<el-button size="mini" type="primary" @click="edit(2)" :disabled="radioRowValueList.state == undefined&&(radioRowValueList.state==1)" plain>回收</el-button> <el-button size="mini" type="primary" @click="edit(1)" :disabled="radioRowValueList.state == undefined||radioRowValueList.state==3||radioRowValueList.state==2||radioRowValueList.state==1">送审</el-button>
<el-button size="mini" type="primary" @click="edit(3)" :disabled="radioRowValueList.state == undefined&&(radioRowValueList.state==1)">审核</el-button> <el-button size="mini" type="primary" @click="edit(2)" :disabled="radioRowValueList.state == undefined||radioRowValueList.state==2" plain>回收</el-button>
<el-button size="mini" type="primary" @click="edit(4)" :disabled="radioRowValueList.state == undefined&&(radioRowValueList.state==3)" plain>反审核</el-button> <el-button size="mini" type="primary" @click="edit(3)" :disabled="radioRowValueList.state == undefined||radioRowValueList.state==3||radioRowValueList.state==2||radioRowValueList.state==0">审核</el-button>
<el-button size="mini" type="primary" @click="edit(4)" :disabled="radioRowValueList.state == undefined||radioRowValueList.state==0||radioRowValueList.state==1||radioRowValueList.state==2||radioRowValueList.state==4" plain>反审核</el-button>
</div> </div>
</div> </div>
<!-- 会员转卡列表 --> <!-- 会员转卡列表 -->

Write Preview
Loading…
Cancel
Save