master
Wangxubin1999 3 years ago
commit d7623a1a17

22349
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -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",

@ -48,7 +48,9 @@
<el-table :data="outList" empty-text=' , ' max-height="200"
:header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee' }"
style="margin-top: 5px;">
<el-table-column type="expand">
<el-table-column type="expand">
<template slot-scope="scope">
<div class="flex justify-start align-center flex-wrap ">
<el-form inline class="margin-top-xs margin-left-xs">
@ -258,6 +260,7 @@ export default {
managerLists: [{ ratio: 100 }], //
adminList: [{ ratio: 100 }], //
payLists: [], //
Branch:null,
},
outList: [],
inList: [],
@ -547,7 +550,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: "确定",
@ -565,22 +568,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 {
@ -714,7 +716,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;
@ -735,7 +737,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({
@ -811,17 +813,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;
});

@ -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; //

@ -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() {

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

@ -31,7 +31,7 @@
<div class="text-left" style="width:25%">折后 </div>
</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: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>
@ -48,7 +48,7 @@
<div class="text-left" style="width:25%;padding-right:5px">剩余 </div>
</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>
<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>
<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-red text-price">{{ item.payMoney }}</span></div>
</div>
@ -162,7 +162,7 @@ export default {
}
.printDiv {
width: 330px;
width: 380px;
margin: 0 auto;
}

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

@ -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"
@ -635,6 +635,7 @@
<el-button size="samll" type="primary" plain @click="openList"
>收银列表</el-button
>
<el-button size="samll" type="primary" plain @click="goBack">{{
isAddition == 1 ? "收银" : "补单"
}}</el-button>
@ -680,6 +681,7 @@ import recash from "./recash";
import orders from "./detail/detail";
import { partten } from "@/utils/partten/index.js";
export default {
components: {
member,
reccard,
@ -1218,7 +1220,8 @@ export default {
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.collectionAmounts =spendMoney?spendMoney.toFixed(2) * 1:0;;
this.recForm.rechargeAmount = spendNumber.toFixed(2) * 1;
@ -1406,6 +1409,7 @@ export default {
this.$refs.repayment.show(this.memberForm);
},
inputMember() {
console.log('为什么会触发这么多次')
if (partten.phoneNum.test(this.memberForm.mobilePhone)) {
storeMemberOne({
mobilePhone: this.memberForm.mobilePhone,
@ -1857,7 +1861,8 @@ export default {
adminList: [],
payLists: this.payLists,
rechargeAccountList: [], //
collectionCashAmounts: 0
collectionCashAmounts: 0,
collectionAmounts:0,
};
this.projectMomey = 0;
this.recIndex = -1;

@ -314,7 +314,14 @@ export default {
this.form.staffLists = this.staffList;
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") {
this.$emit("editData");

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

@ -5,6 +5,11 @@
</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-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="brandNumber" 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 {
data() {
return {
typeArr:['收银单','充值单','疗程单','加价转疗程单','充值退款','疗程退款单','消费退','还款'],
dialogVisible: false, //
form: {}, //
list: [], //

@ -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>
</el-form-item>
<el-form-item label="有效期限(月)" prop="validTime" v-show="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-form-item label="有效期限(月)" v-if="sessionStorageData.allowValid == 1">
<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 label="到期日期" prop="unifiedDue">
<el-form-item label="到期日期">
<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>
</el-form-item>
</el-form>
@ -54,6 +54,10 @@
<script>
import { addrecType, editrecType } from "@/api/storeManage.js";
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() {
return {
rules: {

@ -15,7 +15,7 @@
</el-table-column>
<!-- <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 show-overflow-tooltip align="center" 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: [

@ -7,11 +7,13 @@
<div>
<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(2)" :disabled="radioRowValueList.state == undefined&&(radioRowValueList.state==1)" plain>回收</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(4)" :disabled="radioRowValueList.state == undefined&&(radioRowValueList.state==3)" plain>反审核</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(1)" :disabled="radioRowValueList.state == undefined||radioRowValueList.state==3||radioRowValueList.state==2||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(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>
<!-- 会员转卡列表 -->

Loading…
Cancel
Save