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

部分bug修复

Browse Source
master
十七 4 years ago
parent 25748231ff
commit 17be547c16
21 changed files with 4543 additions and 4563 deletions
Show Stats Download Patch File Download Diff File

18
src/components/staff/index.vue
Unescape Escape View File

@ -10,23 +10,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" width="100" prop="brandNumber" label="水牌号"></el-table-column> <el-table-column align="center" width="100" prop="brandNumber" label="水牌号"></el-table-column>
<el-table-column align="center" min-width="120" prop="staffName" label="名字"></el-table-column> <el-table-column align="center" min-width="120" prop="staffName" label="名字"></el-table-column>
<el-table-column align="center" min-width="100" prop="jobName" label="工种"> <el-table-column align="center" min-width="100" prop="wordTypeName" label="工种"></el-table-column>
<template slot-scope="scope">
{{
scope.row.job == 1
? "美发师"
: scope.row.job == 2
? "技师"
: scope.row.job == 3
? "助理"
: scope.row.job == 4
? "收银员"
: scope.row.job == 5
? "美容师"
: "暂无"
}}
</template>
</el-table-column>
</el-table> </el-table>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="mini" type="primary" plain @click="dialogVisible = false">取 消</el-button> <el-button size="mini" type="primary" plain @click="dialogVisible = false">取 消</el-button>

4
src/components/staffList/admin/index.vue
Unescape Escape View File

@ -40,7 +40,9 @@ export default {
methods: { methods: {
//删除当前选择 //删除当前选择
clear() { clear() {
this.staffLists = [{ ratio: 100 }]; this.staffLists = [
{ staffNames: "", brandNumber: "", staffName: "", ratio: 100 },
];
this.changeStaff(); this.changeStaff();
this.confirm(); this.confirm();
}, },

2
src/components/staffList/manager/index.vue
Unescape Escape View File

@ -39,7 +39,7 @@ export default {
methods: { methods: {
//删除当前选择 //删除当前选择
clear() { clear() {
this.staffLists = [{ ratio: 100 }]; this.staffLists = [{ brandNumber: "", staffName: "", ratio: 100 }];
this.changeStaff(); this.changeStaff();
this.confirm(); this.confirm();
}, },

2
src/components/staffList/staff/index.vue
Unescape Escape View File

@ -53,7 +53,7 @@ export default {
}, },
//删除当前选择 //删除当前选择
clear() { clear() {
this.staffLists = [{ ratio: 100 }]; this.staffLists = [{ brandNumber: "", staffName: "", ratio: 100 }];
this.changeStaff(); this.changeStaff();
this.confirm(); this.confirm();
}, },

175
src/home/components/bottom_left.vue
Unescape Escape View File

@ -1,99 +1,97 @@
<template> <template>
<!-- 门店日报 --> <!-- 门店日报 -->
<div> <div class="bottom-right flex justify-center flex-wrap padding-bottom">
<div class="bottom-right flex justify-center flex-wrap padding-bottom"> <el-tooltip effect="dark" :content="'今日客单总数为 ' + form.cashPeopleNum " placement="top">
<el-tooltip effect="dark" :content="'今日客单总数为 ' + form.cashPeopleNum " placement="top"> <div class="bottom-right-item text-center">
<div class="bottom-right-item"> <div style="width:100%;" class="text-center">
<i class="el-icon-user i"></i> <i class="el-icon-user i"></i>
<br>
<span>客单数</span>
<div class="bottom-right-item-number">{{form.cashPeopleNum}}</div>
</div> </div>
</el-tooltip> <span>客单数</span>
<el-tooltip effect="dark" :content="'今日总充值金额 ' + form.rechargeMoney +' , 总共充值人数为 ' +form.rechargeOrderNum" placement="top"> <div class="bottom-right-item-number">{{form.cashPeopleNum?form.cashPeopleNum:0}}</div>
<div class="bottom-right-item"> </div>
<i class="el-icon-s-management i"></i> </el-tooltip>
<br> <el-tooltip effect="dark" :content="'今日总充值金额 ' + form.rechargeMoney +' , 总共充值人数为 ' +form.rechargeOrderNum" placement="top">
<span>充值金额</span> <div class="bottom-right-item">
<i class="el-icon-s-management i"></i>
<br>
<span>充值金额</span>
<div>
<div class="text-red text-price">{{form.rechargeMoney | money}}</div>
<div> <div>
<div class="text-red text-price">{{form.rechargeMoney | money}}</div> <i class=" text-blue el-icon-user-solid bottom-right-item-icon"></i>
<div> <div class=" bottom-right-item-icon-number">{{form.rechargeOrderNum}}</div>
<i class=" text-blue el-icon-user-solid bottom-right-item-icon"></i>
<div class=" bottom-right-item-icon-number">{{form.rechargeOrderNum}}</div>
</div>
</div> </div>
</div> </div>
</el-tooltip> </div>
<el-tooltip effect="dark" :content="'今日总服务金额 ' + form.cashMoney +' , 男客 ' +form.man+'女客'+form.woman" placement="top"> </el-tooltip>
<div class="bottom-right-item"> <el-tooltip effect="dark" :content="'今日总服务金额 ' + form.cashMoney +' , 男客 ' +form.man+'女客'+form.woman" placement="top">
<i class="el-icon-s-finance i"></i> <div class="bottom-right-item">
<br> <i class="el-icon-s-finance i"></i>
<span>服务金额</span> <br>
<span>服务金额</span>
<div>
<div class="text-red text-price">{{form.cashMoney | money}}</div>
<div> <div>
<div class="text-red text-price">{{form.cashMoney | money}}</div> <i class=" text-blue el-icon-user-solid bottom-right-item-icon"></i>
<div> <div class="text-blue bottom-right-item-icon-number">{{form.man}}</div>
<i class=" text-blue el-icon-user-solid bottom-right-item-icon"></i> <i class="text-red el-icon-user-solid bottom-right-item-icon"></i>
<div class="text-blue bottom-right-item-icon-number">{{form.man}}</div> <div class="text-red bottom-right-item-icon-number">{{form.woman}}</div>
<i class="text-red el-icon-user-solid bottom-right-item-icon"></i>
<div class="text-red bottom-right-item-icon-number">{{form.woman}}</div>
</div>
</div> </div>
</div> </div>
</el-tooltip> </div>
<el-tooltip effect="dark" :content="'今日总还款金额 ' + form.repayMoney" placement="top"> </el-tooltip>
<div class="bottom-right-item"> <el-tooltip effect="dark" :content="'今日总还款金额 ' + form.repayMoney" placement="top">
<i class="el-icon-s-ticket i"></i> <div class="bottom-right-item">
<br> <i class="el-icon-s-ticket i"></i>
<span>还款金额</span> <br>
<div class="text-red text-price">{{form.repayMoney | money}}</div> <span>还款金额</span>
</div> <div class="text-red text-price">{{form.repayMoney | money}}</div>
</el-tooltip> </div>
<el-tooltip effect="dark" :content="'今日总退款金额 ' + form.refundMoney" placement="top"> </el-tooltip>
<div class="bottom-right-item"> <el-tooltip effect="dark" :content="'今日总退款金额 ' + form.refundMoney" placement="top">
<i class="el-icon-s-release i"></i> <div class="bottom-right-item">
<br> <i class="el-icon-s-release i"></i>
<span>退款金额</span> <br>
<div class="text-red text-price">{{form.refundMoney | money}}</div> <span>退款金额</span>
<div class="text-red text-price">{{form.refundMoney | money}}</div>
</div>
</el-tooltip>
<el-tooltip effect="dark" :content="'今日新增会员 ' + form.newMemberNum" placement="top">
<div class="bottom-right-item">
<i class="el-icon-s-marketing i"></i>
<br>
<span>新增会员</span>
<div>
<i class="text-blue el-icon-user-solid bottom-right-item-icon"></i>
<div class=" bottom-right-item-icon-number">{{form.newMemberNum}}</div>
</div> </div>
</el-tooltip> </div>
<el-tooltip effect="dark" :content="'今日新增会员 ' + form.newMemberNum" placement="top"> </el-tooltip>
<div class="bottom-right-item"> <el-tooltip effect="dark" :content="'总使用中的会员数为 ' + form.startMemberNum" placement="top">
<i class="el-icon-s-marketing i"></i> <div class="bottom-right-item">
<br> <i class="el-icon-loading i"></i>
<span>新增会员</span> <br>
<div> <span>启用会员</span>
<i class="text-blue el-icon-user-solid bottom-right-item-icon"></i> <div>
<div class=" bottom-right-item-icon-number">{{form.newMemberNum}}</div> <i class=" text-blue el-icon-user-solid bottom-right-item-icon"></i>
</div> <div class=" bottom-right-item-icon-number">{{form.startMemberNum}}</div>
</div> </div>
</el-tooltip> </div>
<el-tooltip effect="dark" :content="'总使用中的会员数为 ' + form.startMemberNum" placement="top"> </el-tooltip>
<div class="bottom-right-item"> <el-tooltip effect="dark" :content="'门店会员总数为 ' + form.memberNum" placement="top">
<i class="el-icon-loading i"></i>
<br>
<span>启用会员</span>
<div>
<i class=" text-blue el-icon-user-solid bottom-right-item-icon"></i>
<div class=" bottom-right-item-icon-number">{{form.startMemberNum}}</div>
</div>
</div>
</el-tooltip>
<el-tooltip effect="dark" :content="'门店会员总数为 ' + form.memberNum" placement="top">
<div class="bottom-right-item"> <div class="bottom-right-item">
<i class="el-icon-s-data i"></i> <i class="el-icon-s-data i"></i>
<br> <br>
<span>会员总数</span> <span>会员总数</span>
<div> <div>
<i class="text-blue el-icon-user-solid bottom-right-item-icon"></i> <i class="text-blue el-icon-user-solid bottom-right-item-icon"></i>
<div class=" bottom-right-item-icon-number">{{form.memberNum}}</div> <div class=" bottom-right-item-icon-number">{{form.memberNum}}</div>
</div>
</div> </div>
</el-tooltip> </div>
</div> </el-tooltip>
</div> </div>
</template> </template>
<script> <script>
@ -136,15 +134,20 @@ export default {
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; */ flex-wrap: wrap; */
max-height: 40vh; max-height: 40vh;
height: 100%;
overflow: auto; overflow: auto;
padding: 2%;
} }
.bottom-right-item { .bottom-right-item {
height: 80px; overflow: hidden;
width: 130px; height: 40%;
/* border: 1px solid #333; */ width: 20%;
text-align: center; text-align: center;
padding: 25px 50px; margin-right: 2%;
border: 1px solid rgba(255, 184, 184, 0.7);
padding-top: 2%;
padding-bottom: 1%;
border-radius: 10%;
} }
.bottom-right-item .i { .bottom-right-item .i {
font-size: 42px; font-size: 42px;

6
src/home/components/bottom_right.vue
Unescape Escape View File

@ -2,8 +2,8 @@
<!-- 员工业绩和提成 --> <!-- 员工业绩和提成 -->
<div class="month"> <div class="month">
<div class="month_header"> <div class="month_header">
<div style="padding:0 20px;font-size:14px;color:#999">员工业绩和提成</div> <div class="padding-left-xs" style="font-size:14px;color:#999">员工业绩和提成</div>
<el-input clearable prefix-icon="el-icon-search" size="mini" style="width:150px;margin-right:50px" v-model="input"></el-input> <el-input clearable prefix-icon="el-icon-search" size="samll" style="width:150px;margin-right:20px" v-model="input"></el-input>
</div> </div>
<br> <br>
<el-table :data="tableData" max-height="280" @row-dblclick="confirm" border :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}"> <el-table :data="tableData" max-height="280" @row-dblclick="confirm" border :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}">
@ -62,7 +62,7 @@ export default {
.month { .month {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-top: 10px; padding-top: 2px;
} }
.month_header { .month_header {
display: flex; display: flex;

71
src/home/home.vue
Unescape Escape View File

@ -1,20 +1,32 @@
<template> <template>
<div class="home-body" v-if="isShow"> <div class="home-body" v-if="isShow">
<div class="home_head flex justify-center flex-wrap"> <div class="home_head ">
<div class="home_head_left divhover"> <el-row :gutter="20">
<top-left v-if="isShow" ref="topleft"></top-left> <el-col :span="16">
</div> <div class="home_head_left divhover">
<div class="home_head_right divhover"> <top-left v-if="isShow" ref="topleft"></top-left>
<top-right v-if="isShow" ref="topright"></top-right> </div>
</div> </el-col>
<el-col :span="8">
<div class="home_head_right divhover">
<top-right v-if="isShow" ref="topright"></top-right>
</div>
</el-col>
</el-row>
</div> </div>
<div class="home_footer flex justify-center flex-wrap"> <div class="home_footer">
<div class="home_footer_left divhover "> <el-row :gutter="20">
<bottom-left v-if="isShow" ref="bottomleft"></bottom-left> <el-col :span="16">
</div> <div class="home_footer_left divhover ">
<div class="home_footer_right divhover "> <bottom-left v-if="isShow" ref="bottomleft"></bottom-left>
<bottom-right v-if="isShow" ref="bottomright"></bottom-right> </div>
</div> </el-col>
<el-col :span="8">
<div class="home_footer_right divhover">
<bottom-right v-if="isShow" ref="bottomright"></bottom-right>
</div>
</el-col>
</el-row>
</div> </div>
<el-dialog title="开店流程" :visible.sync="infoDialog" :close-on-click-modal='false' width="80%" v-dialogDrag> <el-dialog title="开店流程" :visible.sync="infoDialog" :close-on-click-modal='false' width="80%" v-dialogDrag>
<div class="openStore"> <div class="openStore">
@ -283,7 +295,6 @@ export default {
} }
.stepIndex { .stepIndex {
width: 100%; width: 100%;
padding: 50px 100px; padding: 50px 100px;
} }
.stepIndex .el-button { .stepIndex .el-button {
@ -292,25 +303,25 @@ export default {
.home-body { .home-body {
background: white; background: white;
overflow-x: hidden; overflow-x: hidden;
height: -webkit-calc(100vh - 80px); height: -webkit-calc(100vh - 106px);
height: -moz-calc(100vh - 80px); height: -moz-calc(100vh - 106px);
height: calc(100vh - 80px); height: calc(100vh - 106px);
padding-bottom: 20px; padding-bottom: 20px;
} }
.home_head { .home_head {
width: 100%; width: 100%;
margin-bottom: 20px; margin-bottom: 2vh;
/* height: 38vh; */ height: 40vh;
} }
.home_head_left { .home_head_left {
width: 62%; width: 100%;
height: 100%;
padding: 10px; padding: 10px;
box-shadow: 5px 5px 5px rgb(221, 221, 221); box-shadow: 5px 5px 5px rgb(221, 221, 221);
border: 1px solid rgb(233, 233, 233); border: 1px solid rgb(233, 233, 233);
margin-right: 10px;
} }
.home_head_right { .home_head_right {
width: 30%; width: 100%;
border: 1px solid rgb(233, 233, 233); border: 1px solid rgb(233, 233, 233);
padding: 10px; padding: 10px;
box-shadow: 5px 5px 5px rgb(221, 221, 221); box-shadow: 5px 5px 5px rgb(221, 221, 221);
@ -322,24 +333,20 @@ export default {
padding-bottom: 10px; padding-bottom: 10px;
} }
.home_footer_left { .home_footer_left {
height: 40vh;
width: 100%;
border: 1px solid rgb(233, 233, 233); border: 1px solid rgb(233, 233, 233);
padding: 10px; padding: 10px;
box-shadow: 5px 5px 5px rgb(221, 221, 221); box-shadow: 5px 5px 5px rgb(221, 221, 221);
width: 62%;
margin-right: 10px;
} }
.home_footer_right { .home_footer_right {
width: 30%; height: 40vh;
width: 100%;
border: 1px solid rgb(233, 233, 233); border: 1px solid rgb(233, 233, 233);
padding: 20px 10px;
box-shadow: 5px 5px 5px rgb(221, 221, 221); box-shadow: 5px 5px 5px rgb(221, 221, 221);
display: flex; padding: 1%;
justify-content: space-between;
flex-wrap: wrap;
} }
.home_footer_right .el-button { .home_footer_right .el-button {
margin: 20px 5px 10px 20px;
padding: 10px 15px;
font-weight: 700; font-weight: 700;
font-size: 14px; font-size: 14px;
} }

48
src/layout/components/Emain.vue
Unescape Escape View File

@ -73,6 +73,16 @@ export default {
}, },
// 设置标签 // 设置标签
setTags(route) { setTags(route) {
if (route.meta.title == "服务单-收银") {
this.tagsList.forEach((item, index) => {
if (item.title == "服务单-收银") {
this.tagsList.splice(index, 1, {
title: route.meta.title,
path: route.path,
});
}
});
}
this.isShow = false; this.isShow = false;
const isExist = this.tagsList.some((item) => { const isExist = this.tagsList.some((item) => {
return item.title === route.meta.title; return item.title === route.meta.title;
@ -95,24 +105,25 @@ export default {
this.copyList = JSON.parse(JSON.stringify(this.tagsList)); this.copyList = JSON.parse(JSON.stringify(this.tagsList));
this.isShow = true; this.isShow = true;
// if (route.meta.title != "促销购买") { if (route.meta.title != "促销购买") {
// this.tagsList.forEach((item, index) => { this.tagsList.forEach((item, index) => {
// if (item.title == "促销购买") { if (item.title == "促销购买") {
// console.log(index); console.log(index);
// this.tagsList.splice(index, 1); this.tagsList.splice(index, 1);
// } }
// }); });
// } }
// if (!sessionStorage.getItem("list") && route.path != "/login") {
// this.$message.error({ if (!sessionStorage.getItem("list") && route.path != "/login") {
// message: "没有操作权限!", this.$message.error({
// }); message: "没有操作权限!",
// setTimeout(() => { });
// this.$router.push("/"); setTimeout(() => {
// sessionStorage.clear(); this.$router.push("/");
// localStorage.clear(); sessionStorage.clear();
// }, 2000); localStorage.clear();
// } }, 2000);
}
}, },
handleTags(command) { handleTags(command) {
command === "other" ? this.closeOther() : this.closeAll(); command === "other" ? this.closeOther() : this.closeAll();
@ -127,6 +138,7 @@ export default {
}, 100); }, 100);
}, },
}, },
created() { created() {
this.setTags(this.$route); this.setTags(this.$route);
// 监听关闭当前页面的标签页 // 监听关闭当前页面的标签页

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

@ -1143,8 +1143,14 @@ export default {
} }
} }
} }
setTimeout(() => {
this.saveloading = false;
}, 3000);
}, },
addrec() { addrec() {
setTimeout(() => {
this.saveloading = false;
}, 3000);
if (this.liftType == 0) { if (this.liftType == 0) {
addrec(this.form).then((res) => { addrec(this.form).then((res) => {
this.saveloading = false; this.saveloading = false;

45
src/pages/eashier/proceeds/components/edit.vue
Unescape Escape View File

@ -189,7 +189,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column show-overflow-tooltip min-width="150" align="center" label="项目选项"> <el-table-column show-overflow-tooltip min-width="140" align="center" label="项目选项">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="flex justify-between align-center" @click.stop=""> <div class="flex justify-between align-center" @click.stop="">
<el-input v-model="scope.row.projectNum" placeholder="编码" @blur="proBlur(scope.row,proIndex=scope.$index)" @change="proBlur(scope.row,proIndex=scope.$index)"> <el-input v-model="scope.row.projectNum" placeholder="编码" @blur="proBlur(scope.row,proIndex=scope.$index)" @change="proBlur(scope.row,proIndex=scope.$index)">
@ -198,8 +198,8 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column show-overflow-tooltip min-width="160" align="center" prop="projectName" label="项目名称"></el-table-column> <el-table-column show-overflow-tooltip min-width="120" align="center" prop="projectName" label="项目名称"></el-table-column>
<el-table-column align="center" prop="noDiscount" label="卡付打折" width="80"> <el-table-column align="center" prop="noDiscount" label="卡付打折" width="50">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.noDiscount == 0 ? "是" : scope.row.noDiscount == 1?'否':"未设" scope.row.noDiscount == 0 ? "是" : scope.row.noDiscount == 1?'否':"未设"
}}</template> }}</template>
@ -260,7 +260,7 @@
<div v-else>不允许卡付</div> <div v-else>不允许卡付</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionAmount" label="实付金额金额"></el-table-column> <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionAmount" label="实付金额"></el-table-column>
<el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionRechargeAmount" label="卡付金额"></el-table-column> <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionRechargeAmount" label="卡付金额"></el-table-column>
<el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionCashAmount" label="现付金额"></el-table-column> <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionCashAmount" label="现付金额"></el-table-column>
<el-table-column show-overflow-tooltip width="75" align="center" prop="sex" label="性别"> <el-table-column show-overflow-tooltip width="75" align="center" prop="sex" label="性别">
@ -288,7 +288,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div style="width: 280px" class="border-radius-10 border margin-left-xs bg-white padding-xs"> <div class="border-radius-10 border margin-left-xs bg-white padding-xs" style="margin-right:2%">
<div class="flex justify-center align-center text-bold padding-bottom-xs"> <div class="flex justify-center align-center text-bold padding-bottom-xs">
<div class="form-width-m "> <div class="form-width-m ">
<span class=" ">现付金额:</span> <span class=" ">现付金额:</span>
@ -1513,7 +1513,7 @@ export default {
goBack() { goBack() {
this.$router.push({ query: {} }); this.$router.push({ query: {} });
this.$router.push({ path: "/service" }); this.$router.push({ path: "/shareBill" });
this.notData(); this.notData();
}, },
getRecCard() { getRecCard() {
@ -1750,29 +1750,32 @@ export default {
this.setPage(); this.setPage();
}, },
setPage() { setPage() {
let list = JSON.parse(this.$route.query.list); if (this.$route.query.list) {
if (list.length != 0 || list === 0) { let list = JSON.parse(this.$route.query.list);
if (list == 0 || list == 1) { if (list.length != 0 || list === 0) {
this.newOrder = true; if (list == 0 || list == 1) {
this.orderNumber = list; this.newOrder = true;
this.isAddition = list; this.orderNumber = list;
this.additionDate = this.formatTime(new Date(), "YYYY-MM-DD"); this.isAddition = list;
this.additionDate = this.formatTime(new Date(), "YYYY-MM-DD");
} else {
this.list = [...list];
this.dialogFormVisible = true;
console.log(this.list);
this.getData();
this.newOrder = false;
}
} else { } else {
this.list = [...list]; this.goBack();
this.dialogFormVisible = true;
console.log(this.list);
this.getData();
this.newOrder = false;
} }
} else {
this.goBack();
} }
this.getDetail(); this.getDetail();
}, },
}, },
created() { activated() {
this.setPage(); this.setPage();
}, },
created() {},
}; };
</script> </script>

8
src/pages/eashier/proceeds/components/payment.vue
Unescape Escape View File

@ -1,9 +1,9 @@
<template> <template>
<div class="flex"> <div class="flex">
<div style="width:280px"> <div style="width:100%">
<el-table :data="payLists" class='border ' :summary-method="getSummariesPay" show-summary :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}"> <el-table :data="payLists" style="width:280px" class='border' :summary-method="getSummariesPay" show-summary :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}">
<el-table-column align="center" prop="payName" min-width="150" label="支付方式"></el-table-column> <el-table-column align="center" prop="payName" min-width="100" label="支付方式"></el-table-column>
<el-table-column align="center" prop="payMoney" width="120" label="本次支付 "> <el-table-column align="center" prop="payMoney" min-width="80" label="本次支付 ">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="payIndex != scope.$index" @click="editPay(scope.row,scope.$index)"> <div v-if="payIndex != scope.$index" @click="editPay(scope.row,scope.$index)">
{{ scope.row.payMoney }} {{ scope.row.payMoney }}

14
src/pages/eashier/proceeds/detail/editform.vue
Unescape Escape View File

@ -103,15 +103,15 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column show-overflow-tooltip min-width="150" align="center" prop="projectNum" label="项目编码"></el-table-column> <el-table-column show-overflow-tooltip min-width="100" align="center" prop="projectNum" label="项目编码"></el-table-column>
<el-table-column show-overflow-tooltip min-width="150" align="center" prop="projectName" label="项目名称"></el-table-column> <el-table-column show-overflow-tooltip min-width="120" align="center" prop="projectName" label="项目名称"></el-table-column>
<el-table-column show-overflow-tooltip min-width="100" align="center" prop="transactionPrice" label="项目金额"></el-table-column> <el-table-column show-overflow-tooltip min-width="100" align="center" prop="transactionPrice" label="项目金额"></el-table-column>
<el-table-column show-overflow-tooltip min-width="100" align="center" prop="" label="支付类型"> <el-table-column show-overflow-tooltip min-width="100" align="center" prop="" label="支付类型">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip v-if="scope.row.courseAccountId!=null" class="item" effect="dark" content="疗程付" placement="top"> <el-tooltip v-if="scope.row.courseAccountId!=null" class="item" effect="dark" content="疗程付" placement="top">
<div>{{scope.row.courseAccountId!=null?'疗程付':'卡付/现付'}}</div> <div>{{scope.row.courseAccountId!=null?'疗程付':'卡付/现付'}}</div>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="scope.row.rechargeConsumeLists" placement="top" v-if="scope.row.rechargeConsumeList.length!=0"> <el-tooltip class="item" effect="dark" :content="scope.row.rechargeConsumeLists" placement="top" v-else-if="scope.row.rechargeConsumeList.length!=0">
<span>卡付</span> <span>卡付</span>
</el-tooltip> </el-tooltip>
<div v-else>现付</div> <div v-else>现付</div>
@ -120,7 +120,7 @@
<el-table-column show-overflow-tooltip min-width="100" align="center" prop="collectionAmount" label="实付金额金额"></el-table-column> <el-table-column show-overflow-tooltip min-width="100" align="center" prop="collectionAmount" label="实付金额金额"></el-table-column>
<el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionRechargeAmount" label="卡付金额"></el-table-column> <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionRechargeAmount" label="卡付金额"></el-table-column>
<el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionCashAmount" label="现付金额"></el-table-column> <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionCashAmount" label="现付金额"></el-table-column>
<el-table-column show-overflow-tooltip min-width="100" align="center" prop="collectionAmount" label="性别"> <el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionAmount" label="性别">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{scope.row.sex*1==0?'男':'女'}}</div> <div>{{scope.row.sex*1==0?'男':'女'}}</div>
</template> </template>
@ -129,10 +129,10 @@
</el-table> </el-table>
</div> </div>
<div class='border padding-left-xs' style="width:300px" v-if="list.length!=0"> <div class=' border-radius-10 border margin-left-xs bg-white padding-xs' style="width:280px" v-if="list.length!=0">
<el-table :data="form.payLists" :summary-method="getSummaries" show-summary> <el-table :data="form.payLists" :summary-method="getSummaries" show-summary>
<el-table-column align="center" prop="payName" width="140" label="支付方式"></el-table-column> <el-table-column align="center" prop="payName" min-width="100" label="支付方式"></el-table-column>
<el-table-column align="center" prop="payMoney" width="140" label="本次支付 "></el-table-column> <el-table-column align="center" prop="payMoney" min-width="80" label="本次支付"></el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>

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

@ -1196,33 +1196,35 @@ export default {
} }
}, },
empty() { empty() {
this.form = { // this.form = {
mobilePhone: null, // mobilePhone: null,
integralCheckbox: false, // integralCheckbox: false,
description: "", // description: "",
salesPrice: "", // salesPrice: "",
numberTimes: "", // numberTimes: "",
menberShow: false, // menberShow: false,
courseReatmentAmount: 0, // courseReatmentAmount: 0,
isDebt: false, // isDebt: false,
collectionRechargeAmount: 0, // collectionRechargeAmount: 0,
collectionCashAmount: 0, // collectionCashAmount: 0,
collectionIntegralAmount: 0, // collectionIntegralAmount: 0,
integral: 0, // integral: 0,
integralMoney: 0, // integralMoney: 0,
consumeIntegral: 0, // consumeIntegral: 0,
debtMoney: 0, // debtMoney: 0,
}; // };
this.debtMoneys = 0; // this.debtMoneys = 0;
this.staffLists = [{ brandNumber: "", staffName: "", ratio: 100 }]; // this.staffLists = [{ brandNumber: "", staffName: "", ratio: 100 }];
this.rechargeAccountList = []; // this.rechargeAccountList = [];
this.rechargeAccountLis = []; // this.rechargeAccountLis = [];
this.payLists = []; // this.payLists = [];
this.managerLists = [{ ratio: 100 }]; // this.managerLists = [{ ratio: 100 }];
this.adminList = [{ ratio: 100 }]; // this.adminList = [{ ratio: 100 }];
this.activeName = "现付"; // this.activeName = "现付";
this.ctlist(); // this.ctlist();
this.setStaffRatio(); // this.setStaffRatio();
Object.assign(this.$data, this.$options.data.call(this));
this.setPage();
}, },
//保存确定方法 //保存确定方法
@ -1339,9 +1341,16 @@ export default {
that.addCourse(); that.addCourse();
that.loading = false; that.loading = false;
} }
setTimeout(() => {
this.loading = false;
}, 3000);
}, },
addCourse() { addCourse() {
setTimeout(() => {
this.loading = false;
}, 3000);
addcourse(this.form).then((res) => { addcourse(this.form).then((res) => {
this.loading = false;
if (res.code == "000000") { if (res.code == "000000") {
this.empty(); this.empty();
this.$message.success({ this.$message.success({
@ -1693,13 +1702,16 @@ export default {
}); });
return sums; return sums;
}, },
setPage() {
this.ctlist();
this.setStaffRatio();
this.sessionStorageData = JSON.parse(
sessionStorage.getItem("sessionStorageData")
);
},
}, },
created() { created() {
this.ctlist(); this.setPage();
this.setStaffRatio();
this.sessionStorageData = JSON.parse(
sessionStorage.getItem("sessionStorageData")
);
}, },
}; };
</script> </script>

72
src/pages/eashier/refundCourse/refundCourse.vue
Unescape Escape View File

@ -75,7 +75,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item prop="summation" label="退款金额:"> <el-form-item prop="summation" label="退款金额:">
<div class="form-width-ms"> <div class="form-width-ms">
<el-input :disabled="refundCourseNum==0" oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,2})\d*/,'$1$2$3')" pattern="[0-9]*\.?[0-9]{0,2}" @change="endRefundMoney" @blur="endRefundMoney" v-model="refund.courseRefundMoney"></el-input> <el-input oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,2})\d*/,'$1$2$3')" pattern="[0-9]*\.?[0-9]{0,2}" @change="endRefundMoney" @blur="endRefundMoney" v-model="refund.courseRefundMoney"></el-input>
</div> </div>
</el-form-item> </el-form-item>
<br /> <br />
@ -509,7 +509,6 @@ export default {
inject: ["reload"], inject: ["reload"],
data() { data() {
return { return {
refundCourseNum: null,
headOffice: sessionStorage.getItem("headOffice") * 1, headOffice: sessionStorage.getItem("headOffice") * 1,
printDialogVisible: false, //打印弹窗开关 printDialogVisible: false, //打印弹窗开关
openAccountDialog: false, openAccountDialog: false,
@ -666,80 +665,15 @@ export default {
} }
}, },
endNum() { endNum() {
console.log();
this.refund.refundNumber = this.refund.refundNumber =
(this.refund.courseRefundMoney / this.refund.price).toFixed(2) * 1; (this.refund.courseRefundMoney / this.refund.price).toFixed(2) * 1;
this.refund.refundNumber = parseInt(this.refund.refundNumber); this.refund.refundNumber = parseInt(this.refund.refundNumber);
this.upNum = this.refund.refundNumber; this.upNum = this.refund.refundNumber;
if (this.refundCourseNum == 0) {
if (this.refund.refundNumber * 1 > this.refund.courseConsumeCount) {
this.$alert(
"退款次数不能大于: " + this.refund.courseConsumeCount,
"提示",
{
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
}
);
this.refund.refundNumber = this.refund.courseConsumeCount;
} else {
this.refund.courseRefundMoney =
(this.refund.price * this.refund.refundNumber).toFixed(2) * 1;
let form = { ...this.refund };
this.refund = JSON.parse(JSON.stringify(form));
console.log(this.refund.courseRefundMoney);
}
} else {
console.log(this.upNum);
console.log(this.refund.refundNumber);
if (
this.refund.refundNumber == this.upNum ||
this.refund.refundNUmber == this.upNum + 1
) {
} else {
this.$alert(
"当前退款金额只能退 " +
this.upNum +
" 次或者 " +
(this.upNum + 1) +
" 次",
"提示",
{
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
}
);
this.refund.refundNumber = this.upNum;
}
}
}, },
endMoney() { endMoney() {
let money = let money =
(this.refund.courseConsumeCount * this.refund.price).toFixed(2) * 1; (this.refund.courseConsumeCount * this.refund.price).toFixed(2) * 1;
if (this.refund.courseRefundMoney * 1 > money) {
this.$alert("退款金额不能高于: " + money, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
this.refund.courseRefundMoney = money;
} else {
this.refund.refundNumber =
(this.refund.courseRefundMoney / this.refund.price).Math.floor() * 1;
let form = { ...this.refund };
this.refund = JSON.parse(JSON.stringify(form));
console.log(this.refund.courseRefundMoney);
}
}, },
close() { close() {
this.refDialogVisible = false; this.refDialogVisible = false;
this.openCollNumber = 0; this.openCollNumber = 0;
@ -1584,10 +1518,6 @@ export default {
this.sessionStorageData = JSON.parse( this.sessionStorageData = JSON.parse(
sessionStorage.getItem("sessionStorageData") sessionStorage.getItem("sessionStorageData")
); );
this.refundCourseNum = JSON.parse(
sessionStorage.getItem("sessionStorageData")
).refundCourseNum;
console.log(this.refundCourseNum);
}, },
watch: { watch: {
refDialogVisible(val, oldVal) { refDialogVisible(val, oldVal) {

16
src/pages/eashier/repayment/repayment.vue
Unescape Escape View File

@ -30,11 +30,19 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" align="center" label="操作" width="240"> <el-table-column fixed="right" align="center" label="明细" width="76">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" plain @click="detail(scope.row,detailDialogVisible=true)">明 细</el-button> <el-button size="mini" type="primary" plain @click="detail(scope.row,detailDialogVisible=true)">明细</el-button>
<el-button size="mini" type="primary" :disabled="scope.row.isCancel==1" @click="cancel(scope.row)" v-role='5008002'>作 废</el-button> </template>
<el-button size="mini" type="success" :disabled="scope.row.isCancel==1" @click="print(scope.row,printDialogVisible=true) " v-role='5008003'>打 印</el-button> </el-table-column>
<el-table-column fixed="right" align="center" label="作废" width="76">
<template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="scope.row.isCancel==1" @click="cancel(scope.row)" v-role='5008002'>作废</el-button>
</template>
</el-table-column>
<el-table-column fixed="right" align="center" label="打印" width="76">
<template slot-scope="scope">
<el-button size="mini" type="success" :disabled="scope.row.isCancel==1" @click="print(scope.row,printDialogVisible=true) " v-role='5008003'>打印</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

30
src/pages/storeManage/baseStaff/components/edit.vue
Unescape Escape View File

@ -64,7 +64,10 @@
<el-cascader :disabled="title=='查看'" class="form-width" v-model="form.grade" :options="grade" :emitPath="false" :show-all-levels="false" @change="gradechange"></el-cascader> <el-cascader :disabled="title=='查看'" class="form-width" v-model="form.grade" :options="grade" :emitPath="false" :show-all-levels="false" @change="gradechange"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="工种"> <el-form-item label="工种">
<el-cascader :disabled="title=='查看'" class="form-width" v-model="form.job" :options="job" :emitPath="false" :show-all-levels="false" @change="jobchange"></el-cascader> <el-select :disabled="title=='查看'" v-model="form.wordTypeName" placeholder="请选择" @change="jobchange">
<el-option v-for="item in jobList" :key="item.id" :label="item.wordTypeName" :value="item.id">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="部门"> <el-form-item label="部门">
<el-select :disabled="title=='查看'" v-model="form.deptName" placeholder="请选择"> <el-select :disabled="title=='查看'" v-model="form.deptName" placeholder="请选择">
@ -146,6 +149,7 @@ import {
rolepage, rolepage,
editStaff, editStaff,
pageBasePost, pageBasePost,
pageBaseWorkType,
} from "@/api/storeManage.js"; } from "@/api/storeManage.js";
export default { export default {
data() { data() {
@ -162,6 +166,7 @@ export default {
{ value: 1, label: "美容部" }, { value: 1, label: "美容部" },
{ value: 2, label: "其他部" }, { value: 2, label: "其他部" },
], ],
jobList: [],
rule: {}, rule: {},
rules: { rules: {
staffName: { staffName: {
@ -367,6 +372,13 @@ export default {
}); });
this.gradeList = res.pageInfo.list; this.gradeList = res.pageInfo.list;
}); });
pageBaseWorkType({}).then((res) => {
res.data.forEach((item) => {
item.value = item.wordTypeNum;
item.label = item.wordTypeName;
});
this.jobList = res.data;
});
}, },
//选择角色改变时的方法 //选择角色改变时的方法
changeRole(v) { changeRole(v) {
@ -405,12 +417,16 @@ export default {
} }
}, },
//工种改变方法 //工种改变方法
jobchange(row) { jobchange(e) {
if (row) { console.log(e);
row.forEach((item) => { this.jobList.forEach((item) => {
this.form.job = item; if (item.id == e) {
}); this.form.wordTypeNum = item.wordTypeNum;
} this.form.wordTypeName = item.wordTypeName;
this.form.wordTypeId = item.id;
console.log(this.form);
}
});
}, },
//确定返回方法 //确定返回方法
confirm() { confirm() {

2
src/pages/storeManage/baseStaff/components/onJob.vue
Unescape Escape View File

@ -18,7 +18,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" prop="mobilePhone" label="手机号码" sortable min-width="130"></el-table-column> <el-table-column align="center" prop="mobilePhone" label="手机号码" sortable min-width="130"></el-table-column>
<el-table-column align="center" prop="joinedDate" label="入职日期" sortable min-width="120"></el-table-column> <el-table-column align="center" prop="joinedDate" label="入职日期" sortable min-width="120"></el-table-column>
<el-table-column align="center" prop="jobName" label="工种" sortable min-width="80"></el-table-column> <el-table-column align="center" prop="wordTypeName" label="工种" sortable min-width="80"></el-table-column>
<el-table-column align="center" prop="gradeName" label="用户身份" sortable min-width="100"></el-table-column> <el-table-column align="center" prop="gradeName" label="用户身份" sortable min-width="100"></el-table-column>
<el-table-column align="center" prop="postName" label="职务" sortable min-width="100"></el-table-column> <el-table-column align="center" prop="postName" label="职务" sortable min-width="100"></el-table-column>
<el-table-column align="center" prop="type" label="员工类型" sortable min-width="100"> <el-table-column align="center" prop="type" label="员工类型" sortable min-width="100">

2
src/pages/storeManage/baseStaff/components/tostore/edit.vue
Unescape Escape View File

@ -26,7 +26,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" prop="mobilePhone" label="手机号码" sortable min-width="120"></el-table-column> <el-table-column align="center" prop="mobilePhone" label="手机号码" sortable min-width="120"></el-table-column>
<el-table-column align="center" prop="joinedDate" label="入职日期" sortable min-width="110"></el-table-column> <el-table-column align="center" prop="joinedDate" label="入职日期" sortable min-width="110"></el-table-column>
<el-table-column align="center" prop="jobName" label="工种" sortable min-width="80"></el-table-column> <el-table-column align="center" prop="wordTypeName" label="工种" sortable min-width="80"></el-table-column>
<el-table-column align="center" prop="postName" label="职务" sortable min-width="80"></el-table-column> <el-table-column align="center" prop="postName" label="职务" sortable min-width="80"></el-table-column>
<el-table-column align="center" prop="type" label="员工类型" sortable min-width="80"> <el-table-column align="center" prop="type" label="员工类型" sortable min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">

2
src/pages/storeManage/staffVipSum/staffVipSum.vue
Unescape Escape View File

@ -16,7 +16,7 @@
<el-table-column align="center" prop="brandNumber" label="水牌号" min-width="110"></el-table-column> <el-table-column align="center" prop="brandNumber" label="水牌号" min-width="110"></el-table-column>
<el-table-column align="center" prop="staffName" label="名字" min-width="100"></el-table-column> <el-table-column align="center" prop="staffName" label="名字" min-width="100"></el-table-column>
<el-table-column align="center" prop="postName" label="职务" min-width="100"></el-table-column> <el-table-column align="center" prop="postName" label="职务" min-width="100"></el-table-column>
<el-table-column align="center" prop="jobName" label="工种" min-width="100"></el-table-column> <el-table-column align="center" prop="wordTypeName" label="工种" min-width="100"></el-table-column>
<el-table-column align="center" prop="joinedDate" sortable label="入职时间" min-width="180"></el-table-column> <el-table-column align="center" prop="joinedDate" sortable label="入职时间" min-width="180"></el-table-column>
<el-table-column align="center" prop="count" sortable label="会员数(个)" min-width="110"></el-table-column> <el-table-column align="center" prop="count" sortable label="会员数(个)" min-width="110"></el-table-column>
<el-table-column fixed="right" align="center" label="操作" width="80"> <el-table-column fixed="right" align="center" label="操作" width="80">

9
src/router/index.js
Unescape Escape View File

@ -257,8 +257,7 @@ const router = new VueRouter({
import("../pages/eashier/proceeds/components/edit.vue"), import("../pages/eashier/proceeds/components/edit.vue"),
meta: { meta: {
title: "服务单-收银", title: "服务单-收银",
index: "proceeds-edit", index: "proceeds-edit"
keepAlive: true
} }
}, },
//充值 shareBill //充值 shareBill
@ -268,8 +267,7 @@ const router = new VueRouter({
import("../pages/eashier/collectionList/collectionList.vue"), import("../pages/eashier/collectionList/collectionList.vue"),
meta: { meta: {
title: "充值", title: "充值",
index: "collectionList", index: "collectionList"
keepAlive: true
} }
}, },
//疗程 reatment //疗程 reatment
@ -278,8 +276,7 @@ const router = new VueRouter({
component: () => import("../pages/eashier/reatment/reatment.vue"), component: () => import("../pages/eashier/reatment/reatment.vue"),
meta: { meta: {
title: "疗程", title: "疗程",
index: "reatment", index: "reatment"
keepAlive: true
} }
}, },
//加价转疗程 raiseReatment //加价转疗程 raiseReatment

6
src/style/ele.css
Unescape Escape View File

@ -12,9 +12,9 @@
} }
.into-table-width { .into-table-width {
width: -webkit-calc(100% - 360px); width: -webkit-calc(100% - 450px);
width: -moz-calc(100% - 360px); width: -moz-calc(100% - 450px);
width: calc(100% - 360px); width: calc(100% - 450px);
} }
.text-out { .text-out {

Write Preview
Loading…
Cancel
Save