bug修复

master
Wangxubin 3 years ago
parent 3a84547ca0
commit bbe690f5ed

@ -30,7 +30,7 @@ module.exports = {
//target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地 //target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
// target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地 // target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
// target: "http://139.9.185.131:8098/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式 // target: "http://139.9.185.131:8098/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式
// target: "http://139.9.58.205:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式华为云 // target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式华为云
// target: "http://139.9.185.131:9094/", //设置你调用的接口域名和端口号 别忘了加http 盛联 // target: "http://139.9.185.131:9094/", //设置你调用的接口域名和端口号 别忘了加http 盛联
// target: "http://139.9.185.131:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式 // target: "http://139.9.185.131:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式
// target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达线上 // target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达线上

@ -4,7 +4,7 @@ import { localPath } from "./api.js";
// 门店员工获取手机短信验证码接口 // 门店员工获取手机短信验证码接口
export function getSmsCode(params) { export function getSmsCode(params) {
return service({ return service({
url: "/api" + "/demay/ssm/staffLogin/getSmsCode", url: "/api" + "/demay/ssm/staffLogin/getCode",
method: "post", method: "post",
data: params data: params
}); });

@ -274,12 +274,21 @@ export function propageNew(params) {
} }
//查询开疗程时人员 //查询开疗程时人员
export function selectRatioInfo(params) { export function selectRatioInfo(params) {
return service({
url: "/api" + "/demay/ssm/staff/selectRatioInfo",
method: "post",
data: params
});
}
export function selectRatioInfo1(params) {
return service({ return service({
url: "/api" + "/demay/ssm/pro/copyProject", url: "/api" + "/demay/ssm/pro/copyProject",
method: "post", method: "post",
data: params data: params
}); });
} }
//项目删除 //项目删除
export function delpro(params) { export function delpro(params) {
return service({ return service({

@ -1,9 +1,10 @@
<template> <template>
<el-dialog :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="dialogVisible" width="70%" append-to-body> <el-dialog :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="dialogVisible" width="70%" append-to-body>
<div class="flex justify-end padding-bottom-xs" v-if="!form.memberName"> <div class="flex justify-end padding-bottom-xs" v-if="!form.memberName">
<el-input class="form-width-m " size="small" v-model="queryForm.id" clearable placeholder="项目编码搜索"></el-input> <el-input class="form-width-m " size="small" v-model="queryForm.price" clearable placeholder="项目价格搜索" style="margin-right:10px"></el-input>
<el-input class="form-width-m " size="small" v-model="queryForm.projectNum" clearable placeholder="项目编码搜索"></el-input>
<el-input class="form-width-m margin-left-xs" size="small" v-model="queryForm.projectName" clearable placeholder="项目名称搜索"></el-input> <el-input class="form-width-m margin-left-xs" size="small" v-model="queryForm.projectName" clearable placeholder="项目名称搜索"></el-input>
<el-button class="margin-left-xs" size="mini" type="primary" @click="getData"></el-button> <el-button class="margin-left-xs" size="mini" type="primary" @click="getData" style="height:0.16rem">搜索</el-button>
</div> </div>
<div v-if="!form.memberName"> <div v-if="!form.memberName">
<el-table @row-dblclick="confirms" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" :data="list" @row-click="rowClick" max-height="600" v-loading="listLoading" :element-loading-text="elementLoadingText"> <el-table @row-dblclick="confirms" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" :data="list" @row-click="rowClick" max-height="600" v-loading="listLoading" :element-loading-text="elementLoadingText">
@ -121,7 +122,7 @@ export default {
this.radio = row.id; this.radio = row.id;
this.radioForm = row; this.radioForm = row;
}, },
// //coureList
handleSizeChange(val) { handleSizeChange(val) {
// //console.log(` ${val} `); // //console.log(` ${val} `);
this.queryForm.pageSize = val; this.queryForm.pageSize = val;

@ -1,5 +1,10 @@
<template> <template>
<el-dialog title="项目列表" :visible.sync="dialogFormVisible" append-to-body width="60%" @close="close"> <el-dialog title="项目列表" :visible.sync="dialogFormVisible" append-to-body width="60%" @close="close">
<div class="flex justify-end padding-bottom-xs" >
<el-input class="form-width-m " size="small" v-model="queryForm.projectNum" clearable placeholder="项目编码搜索"></el-input>
<el-input class="form-width-m margin-left-xs" size="small" v-model="queryForm.projectName" clearable placeholder="项目名称搜索"></el-input>
<el-button class="margin-left-xs" size="mini" type="primary" @click="fetchData"></el-button>
</div>
<el-table border :data="list" max-height="600" ref="list" v-loading="listLoading" :element-loading-text="elementLoadingText" @row-click="getCurrentRow" :row-class-name="rowName" @selection-change="handleSelectionChange"> <el-table border :data="list" max-height="600" ref="list" v-loading="listLoading" :element-loading-text="elementLoadingText" @row-click="getCurrentRow" :row-class-name="rowName" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="projectNum" label="项目编码" min-width="100"></el-table-column> <el-table-column :show-overflow-tooltip="true" align="center" prop="projectNum" label="项目编码" min-width="100"></el-table-column>

@ -30,7 +30,7 @@
</el-form> </el-form>
</div> </div>
<div v-if="showLogin==1"> <div v-if="showLogin==1">
<h2>手机号登录</h2> <h2 style="cl">手机号登录</h2>
<el-form :model="form" status-icon ref="user" label-width="100px" class="demo-user" @submit.native.prevent> <el-form :model="form" status-icon ref="user" label-width="100px" class="demo-user" @submit.native.prevent>
<el-form-item label="手机号码:" prop="mobilePhone"> <el-form-item label="手机号码:" prop="mobilePhone">
<el-input @blur="staffOne" v-model="form.mobilePhone" placeholder="请输入手机号" maxlength="11"></el-input> <el-input @blur="staffOne" v-model="form.mobilePhone" placeholder="请输入手机号" maxlength="11"></el-input>
@ -1060,7 +1060,7 @@ export default {
#login { #login {
/* height: 100%; /* height: 100%;
width: 100%; */ width: 100%; */
background-image: url(../../image/HomeBackground.png); background-image: url(../../image/HomeBackground1.jpg);
background-size: 100%; background-size: 100%;
background-position: 50% 50%; background-position: 50% 50%;
background-repeat: no-repeat; background-repeat: no-repeat;

@ -4,10 +4,10 @@
<el-form :model="form" :inline="true" label-width="80px"> <el-form :model="form" :inline="true" label-width="80px">
<el-form-item label="手机号码:"> <el-form-item label="手机号码:">
<div class="form-width-ms flex"> <div class="form-width-ms flex">
<el-input style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query"> <el-input oninput="this.value=this.value.replace(/\D/g,'')" style="height:100%" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query">
<el-button size="mini" slot="append" icon="el-icon-search" @click="openMember"></el-button> <el-button size="mini" slot="append" icon="el-icon-search" @click="openMember"></el-button>
</el-input> </el-input>
<el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember"></el-button> <el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember" ></el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="会员名称:"> <el-form-item label="会员名称:">
@ -1469,7 +1469,10 @@ export default {
}, },
}; };
</script> </script>
<style> <style scoped>
::v-deep .el-input__inner{
height: 38px;
}
.collection { .collection {
background: white; background: white;
margin-left: 25px; margin-left: 25px;

@ -24,7 +24,7 @@
</el-form-item> </el-form-item>
<el-form-item label="待付金额:" :label-width="labelWidth"> <el-form-item label="待付金额:" :label-width="labelWidth">
<div class="form-width-ms"> <div class="form-width-ms">
{{ debtMoney < 0 ? '超出 ' + (debtMoney * -1) : debtMoney }} </div> {{ (0>debtMoney)? '超出 ' + (debtMoney * -1) : debtMoney }} </div>
</el-form-item> </el-form-item>
<el-form-item label="业务时间:" :label-width="labelWidth" v-show="isAddition == 1"> <el-form-item label="业务时间:" :label-width="labelWidth" v-show="isAddition == 1">
<div class="form-width-ms"> <div class="form-width-ms">
@ -298,6 +298,7 @@ export default {
localStorage.setItem("text", text); localStorage.setItem("text", text);
}, },
staffratioData(v) { staffratioData(v) {
console.log('v--->',v)
let form = this.outList[this.editIndex]; let form = this.outList[this.editIndex];
form.rows = v.list; form.rows = v.list;
form.staffLists=v.list form.staffLists=v.list
@ -485,15 +486,12 @@ export default {
row.index = rowIndex; row.index = rowIndex;
}, },
projectData(form,rows) { projectData(form,rows) {
console.log("🚀 ~ file: index.vue ~ line 478 ~ projectData ~ rows", rows)
console.log("🚀 ~ file: index.vue ~ line 474 ~ projectData ~ form", form)
form.memberId = this.proForm.memberId; form.memberId = this.proForm.memberId;
form.memberName = this.proForm.memberName; form.memberName = this.proForm.memberName;
form.mobilePhone = this.proForm.mobilePhone; form.mobilePhone = this.proForm.mobilePhone;
form.storeId = this.proForm.storeId; form.storeId = this.proForm.storeId;
form.storeName = this.proForm.storeName; form.storeName = this.proForm.storeName;
form.memberIdentityCard = this.proForm.identityCard; form.memberIdentityCard = this.proForm.identityCard;
if (this.openProText == 0) { if (this.openProText == 0) {
(form.priceMember * form.minumumTimes).toFixed(2) * 1; (form.priceMember * form.minumumTimes).toFixed(2) * 1;
form.prices = form.priceMember form.prices = form.priceMember
@ -528,7 +526,6 @@ export default {
form.accountId = form.id; form.accountId = form.id;
console.log("🚀 ~ file: index.vue ~ line 520 ~ projectData ~ rows", rows) console.log("🚀 ~ file: index.vue ~ line 520 ~ projectData ~ rows", rows)
form.staffLists=rows form.staffLists=rows
form.cardAchievementAmount=rows[0].cardAchievementAmount form.cardAchievementAmount=rows[0].cardAchievementAmount
form.cardCommissionAmount=rows[0].cardCommissionAmount form.cardCommissionAmount=rows[0].cardCommissionAmount
form.cardSalesAchievement=rows[0].cardSalesAchievement form.cardSalesAchievement=rows[0].cardSalesAchievement

@ -4,7 +4,7 @@
<el-form :model="form" :inline="true" :label-width="formLabelwidth"> <el-form :model="form" :inline="true" :label-width="formLabelwidth">
<el-form-item label="手机号码:"> <el-form-item label="手机号码:">
<div class="form-width-ms flex"> <div class="form-width-ms flex">
<el-input style="padding-left:0px;width:123px " ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query"> <el-input style="padding-left:0px;width:123px;height:100%" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="form.mobilePhone" @blur="query" @change="query">
<el-button size="mini" slot="append" icon="el-icon-search" @click="openMember"></el-button> <el-button size="mini" slot="append" icon="el-icon-search" @click="openMember"></el-button>
</el-input> </el-input>
<el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember"></el-button> <el-button icon="el-icon-circle-plus-outline" type="text" @click="openAddMember"></el-button>

@ -78,7 +78,6 @@ export default {
if (res.code == "000000") { if (res.code == "000000") {
this.list = res.rows; this.list = res.rows;
var storeId=sessionStorage.getItem("storeId") var storeId=sessionStorage.getItem("storeId")
console.log('shopname--->',shopname)
this.lists =this.list.filter(item=>item.storeId != storeId) this.lists =this.list.filter(item=>item.storeId != storeId)
this.list = this.list.filter(item=>item.storeId == storeId) this.list = this.list.filter(item=>item.storeId == storeId)
} else { } else {

@ -8,6 +8,7 @@
maxlength="11" maxlength="11"
v-model="memberForm.mobilePhone" v-model="memberForm.mobilePhone"
@change="inputMember" @change="inputMember"
style="height:100%;"
> >
<el-button <el-button
size="mini" size="mini"
@ -15,19 +16,22 @@
maxlength="11" maxlength="11"
icon="el-icon-search" icon="el-icon-search"
@click="openMember" @click="openMember"
style="height: 100%;"
></el-button> ></el-button>
</el-input> </el-input>
<el-button <el-button
icon="el-icon-circle-plus-outline" icon="el-icon-circle-plus-outline"
type="text" type="text"
@click="openAddMember" @click="openAddMember"
style="height: 100%;"
></el-button> ></el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item :label="cashNumber == 1 ? '会员名字' : '散客名字'"> <el-form-item :label="cashNumber == 1 ? '会员名字' : '散客名字'">
<div class="form-width-sm text-cyan"> <div class="form-width-sm text-cyan">
<el-input v-model="memberForm.memberName"> <el-input v-model="memberForm.memberName" style="height: 100%;">
<el-button <el-button
style="height: 100%;"
title="切换" title="切换"
size="mini" size="mini"
slot="append" slot="append"
@ -38,15 +42,17 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="性别"> <el-form-item label="性别">
<div class="text-bold flex justify-start align-center text-xss"> <div class="text-bold flex justify-start align-center text-xss" style="height: 100%;">
: :
<el-input <el-input
style="height:100%;"
class="form-width-xss" class="form-width-xss"
v-model="memberForm.man" v-model="memberForm.man"
type="number" type="number"
></el-input> ></el-input>
: :
<el-input <el-input
style="height:100%;"
class="form-width-xss" class="form-width-xss"
v-model="memberForm.woman" v-model="memberForm.woman"
type="number" type="number"
@ -77,7 +83,7 @@
v-if="cashNumber == 1" v-if="cashNumber == 1"
> >
<reccard ref="reccard" @reccardData="reccardData"></reccard> <reccard ref="reccard" @reccardData="reccardData"></reccard>
<el-button slot="reference">充值卡</el-button> <el-button slot="reference" style="height: 0.2rem;">充值卡</el-button>
</el-popover> </el-popover>
<el-popover <el-popover
placement="bottom" placement="bottom"
@ -86,9 +92,9 @@
v-if="cashNumber == 1" v-if="cashNumber == 1"
> >
<course ref="course" @courseData="courseData"></course> <course ref="course" @courseData="courseData"></course>
<el-button slot="reference">项目包</el-button> <el-button slot="reference" style="height: 0.2rem;">项目包</el-button>
</el-popover> </el-popover>
<el-button v-if="cashNumber ===1 " @click="updataPassword"></el-button> <el-button v-if="cashNumber ===1 " @click="updataPassword" style="height: 0.2rem;"></el-button>
<el-form-item label="补单日期:" v-if="isAddition == 1"> <el-form-item label="补单日期:" v-if="isAddition == 1">
<div class="activeFormDiv"> <div class="activeFormDiv">
<el-date-picker <el-date-picker
@ -120,189 +126,6 @@
color: '#eeeeee' color: '#eeeeee'
}" }"
> >
<!-- <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">
<el-form-item label="美发师">
<div class="flex align-center form-width-m">
<el-select
filterable
default-first-option
clearable
@clear="clear(scope.row, 'zhonggongList')"
v-model="scope.row.zhonggongLists"
placeholder="请选择"
@change="
handleChange($event, scope.row, 'zhonggongList')
"
>
<el-option
v-for="(item, index) in options"
:key="index"
:label="item.label"
:value="item.id"
>
</el-option>
</el-select>
<div
class="el-icon-edit-outline text-xs text-cyan"
@click.stop="
openStaffRatio(
scope.row,
scope.$index,
'zhonggongList'
)
"
></div>
</div>
</el-form-item>
<el-form-item label="美容师">
<div class="flex align-center form-width-m">
<el-select
filterable
default-first-option
clearable
@clear="clear(scope.row, 'largeList')"
v-model="scope.row.largeLists"
placeholder="请选择"
@change="handleChange($event, scope.row, 'largeList')"
>
<el-option
v-for="(item, index) in options"
:key="index"
:label="item.label"
:value="item.id"
>
</el-option>
</el-select>
<div
class="el-icon-edit-outline text-xs text-cyan"
@click.stop="
openStaffRatio(scope.row, scope.$index, 'largeList')
"
></div>
</div>
</el-form-item>
<el-form-item label="技师">
<div class="flex align-center form-width-m">
<el-select
filterable
default-first-option
clearable
@clear="clear(scope.row, 'technicianLists')"
v-model="scope.row.technicianLists"
placeholder="请选择"
@change="
handleChange($event, scope.row, 'technicianList')
"
>
<el-option
v-for="(item, index) in options"
:key="index"
:label="item.label"
:value="item.id"
>
</el-option>
</el-select>
<div
class="el-icon-edit-outline text-xs text-cyan"
@click.stop="
openStaffRatio(
scope.row,
scope.$index,
'technicianList'
)
"
></div>
</div>
</el-form-item>
<el-form-item label="助理">
<div class="flex align-center form-width-m">
<el-select
filterable
default-first-option
clearable
@clear="clear(scope.row, 'smallLists')"
v-model="scope.row.smallLists"
placeholder="请选择"
@change="handleChange($event, scope.row, 'smallList')"
>
<el-option
v-for="(item, index) in options"
:key="index"
:label="item.label"
:value="item.id"
>
</el-option>
</el-select>
<div
class="el-icon-edit-outline text-xs text-cyan"
@click.stop="
openStaffRatio(scope.row, scope.$index, 'smallList')
"
></div>
</div>
</el-form-item>
<el-form-item label="高管">
<div class="flex align-center form-width-m">
<el-select
filterable
default-first-option
clearable
@clear="clear(scope.row, 'managerLists')"
v-model="scope.row.managerLists"
placeholder="请选择"
@change="handleChange($event, scope.row, 'managerList')"
>
<el-option
v-for="(item, index) in managerOptions"
:key="index"
:label="item.label"
:value="item.id"
>
</el-option>
</el-select>
<div
class="el-icon-edit-outline text-xs text-cyan"
@click.stop="
openStaffRatio(scope.row, scope.$index, 'managerList')
"
></div>
</div>
</el-form-item>
<el-form-item label="管理层">
<div class="flex align-center form-width-m">
<el-select
filterable
default-first-option
clearable
@clear="clear(scope.row, 'adminLists')"
v-model="scope.row.adminLists"
placeholder="请选择"
@change="handleChange($event, scope.row, 'adminList')"
>
<el-option
v-for="(item, index) in adminOptions"
:key="index"
:label="item.label"
:value="item.id"
>
</el-option>
</el-select>
<div
class="el-icon-edit-outline text-xs text-cyan"
@click.stop="
openStaffRatio(scope.row, scope.$index, 'adminList')
"
></div>
</div>
</el-form-item>
<br />
</el-form>
</div>
</template>
</el-table-column> -->
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
min-width="150" min-width="150"
@ -314,7 +137,6 @@
<el-input <el-input
v-model="scope.row.projectNum" v-model="scope.row.projectNum"
placeholder="编码" placeholder="编码"
@blur="proBlur(scope.row, (proIndex = scope.$index))"
@change="proBlur(scope.row, (proIndex = scope.$index))" @change="proBlur(scope.row, (proIndex = scope.$index))"
> >
<el-button <el-button
@ -350,6 +172,29 @@
: "未设" : "未设"
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column
show-overflow-tooltip
min-width="170"
align="center"
prop=""
label="支付类型"
>
<template slot-scope="scope">
<div v-if="scope.row.courseAccountId">
疗程付
</div>
<div v-else>
<div v-if="cashNumber ==1">
<div v-if=" scope.row.transactionPrice!=0">
<el-radio v-model="scope.row.radio" label="1" @input="radioInput(scope.row)"></el-radio>
<el-radio v-model="scope.row.radio" label="2" @input="radioInput(scope.row)"></el-radio>
</div>
<div v-else></div>
</div>
<div v-else></div>
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
min-width="120" min-width="120"
@ -373,19 +218,6 @@
<div v-else>{{ scope.row.transactionPrice }}</div> <div v-else>{{ scope.row.transactionPrice }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
show-overflow-tooltip
min-width="120"
align="center"
prop=""
label="支付类型"
>
<template slot-scope="scope">
<div>
{{ scope.row.courseAccountId != null ? "疗程付" : "卡付/现付" }}
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
min-width="120" min-width="120"
@ -394,10 +226,11 @@
label="充值卡付" label="充值卡付"
> >
<template slot-scope="props"> <template slot-scope="props">
<div <div v-if="props.row.isCardPay == 0">
@click.stop="projectindex(props.$index)" <div
v-if="props.row.isCardPay == 0" @click.stop="projectindex(props.$index)"
> v-if="props.row.radio == 2"
>
<el-popover <el-popover
placement="bottom" placement="bottom"
width="900" width="900"
@ -425,8 +258,6 @@
label="卡付名称" label="卡付名称"
width="110" width="110"
></el-table-column> ></el-table-column>
<!-- cardConsumeMoney cardOver -->
<!-- --- -->
<el-table-column align="center" label="类别" width="60"> <el-table-column align="center" label="类别" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.type == 1"></span> <span v-if="scope.row.type == 1"></span>
@ -441,7 +272,6 @@
prop="discount" prop="discount"
label="折扣(%)" label="折扣(%)"
></el-table-column> ></el-table-column>
<!-- <el-table-column align="center" prop="offsetMoney" label="可抵扣额" width="100"></el-table-column> -->
<el-table-column <el-table-column
align="center" align="center"
prop="spendMoney" prop="spendMoney"
@ -469,8 +299,6 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" prop="discoutMoney" label="抵扣支付" width="100"></el-table-column> -->
<!-- cardOversActive cardOvers-->
<el-table-column <el-table-column
align="center" align="center"
prop="cardOvers" prop="cardOvers"
@ -506,33 +334,6 @@
label="赠送剩余" label="赠送剩余"
width="70" width="70"
></el-table-column> ></el-table-column>
<!-- <el-table-column
align="center"
prop="cardConsumeMoney"
label="可用金额"
width="50"
></el-table-column>
<el-table-column
align="center"
prop="CardCurrentUse"
show-overflow-tooltip
label="当前行可用"
width="50"
>
<template slot-scope="scope">
{{ scope.row.CardCurrentUse?scope.row.CardCurrentUse:scope.row.cardOvers }}
</template>
</el-table-column>
<el-table-column
align="center"
prop="cardSum"
show-overflow-tooltip
label="本单使用"
width="50"
>
<template slot-scope="scope">
{{ scope.row.cardSum?scope.row.cardSum:0 }}
</template></el-table-column> -->
<el-table-column <el-table-column
align="center" align="center"
prop="storeName" prop="storeName"
@ -543,9 +344,12 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- <recash ref="recash" @recashData="recashData"></recash> -->
<el-button slot="reference">充值卡</el-button> <el-button slot="reference">充值卡</el-button>
</el-popover> </el-popover>
</div>
<div v-else>
不允许卡付
</div>
</div> </div>
<div v-else></div> <div v-else></div>
</template> </template>
@ -823,29 +627,6 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- 提交恢复--- -->
<!-- <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="form-width-m ">
<span class=" ">总付金额:</span>
<span class="text-red text-price">
{{ total }}
</span>
</div>
<div class="form-width-m">
<span class=" ">现付金额:</span>
<span class="text-red text-price">
{{ appearPrices }}
</span>
</div>
</div>
<payment ref="payment" @paymentData="paymentData" :form='form' :payLists='payLists'></payment>
</div> -->
</div> </div>
<div class="box-flex"> <div class="box-flex">
<div class="flexA"> <div class="flexA">
@ -854,6 +635,7 @@
style="margin-top:3px;width:100%" style="margin-top:3px;width:100%"
:data="cardList" :data="cardList"
:row-key="getRowKeys" :row-key="getRowKeys"
show-summary
:header-cell-style="{ :header-cell-style="{
background: 'linear-gradient(#6cb3ff, #1873d4)', background: 'linear-gradient(#6cb3ff, #1873d4)',
color: '#eeeeee' color: '#eeeeee'
@ -873,8 +655,10 @@
min-width="80px" min-width="80px"
align="center" align="center"
label="折扣" label="折扣"
prop="discount"
> >
<template slot-scope="scope">
{{ scope.row.discount+'' }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="用前金额" align="center"> <el-table-column label="用前金额" align="center">
<el-table-column <el-table-column
@ -882,21 +666,19 @@
align="center" align="center"
label="充值" label="充值"
min-width="110" min-width="110"
prop="cardRestMoney"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.cardRestMoney?scope.row.cardRestMoney:0 }} {{ scope.row.cardRestMoney?scope.row.cardRestMoney+'':0 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
prop="giftConsumeMoney"
label="赠送" label="赠送"
min-width="110" min-width="110"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.giftConsumeMoney?scope.row.giftConsumeMoney:0 }} {{ scope.row.giftConsumeMoney?scope.row.giftConsumeMoney+'':0 }}
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -928,30 +710,28 @@
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
align="center" align="center"
prop="numRemainder"
min-width="110" min-width="110"
label="充值" label="充值"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.numRemainder }} {{ scope.row.numRemainder+'' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltipprojectData show-overflow-tooltipprojectData
align="center" align="center"
min-width="110" min-width="110"
prop="giveRemainder"
label="赠送" label="赠送"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.giveRemainder }} {{ scope.row.giveRemainder+'' }}
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="right"> <!-- <div class="right">
<el-form ref="form" label-width="65px"> <el-form ref="form" label-width="65px">
<el-form-item label="结算金额:"> <el-form-item label="结算金额:">
<span>{{numlist[0].settlementNum}}</span> <span>{{numlist[0].settlementNum}}</span>
@ -960,8 +740,7 @@
<span>{{numlist[0].payNum}}</span> <span>{{numlist[0].payNum}}</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <div id="Charts" style="width:100%;height:200px"></div> --> </div> -->
</div>
<div class="left" style="margin-right:15px"> <div class="left" style="margin-right:15px">
<div <div
class="border-radius-10 border margin-left-xs bg-white padding-xs" class="border-radius-10 border margin-left-xs bg-white padding-xs"
@ -1214,6 +993,47 @@ export default {
} }
}, },
methods: { methods: {
// /
radioInput(row){
if(row.radio==1){
//
row.transactionPrice = row.price
//
this.$refs.payment.payLists.forEach(item=>item.payMoney = 0)
if(row.rechargeAccountList.length){ //
//
row.rechargeAccountList.forEach(item=>{
item.spendMoney?item.spendMoney*1:0
item.giftSpendMoney?item.giftSpendMoney*1:0
item.cardOvers = (item.cardOvers + item.spendMoney).toFixed(2)*1 //
item.spendMoney = 0
item.cardGiftOvers = (item.cardGiftOvers + item.giftSpendMoney).toFixed(2)*1
item.giftSpendMoney =0
})
this.updataList()
}
}else{
//
row.transactionPrice = row.priceMember
console.log('点击了卡付--',row)
//
this.$refs.payment.payLists.forEach(item=>item.payMoney = 0)
if(row.rechargeAccountList.length){ //
//
row.rechargeAccountList.forEach(item=>{
item.spendMoney?item.spendMoney*1:0
item.giftSpendMoney?item.giftSpendMoney*1:0
item.cardOvers = (item.cardOvers + item.spendMoney).toFixed(2)*1 //
item.spendMoney = 0
item.cardGiftOvers = (item.cardGiftOvers + item.giftSpendMoney).toFixed(2)*1
item.giftSpendMoney =0
})
}
}
this.list.push({})
this.list.pop()
this.updataList()
},
// //
handleNewPassword(val){ handleNewPassword(val){
let params = { let params = {
@ -1249,8 +1069,16 @@ export default {
mobilePhone:this.memberForm.mobilePhone mobilePhone:this.memberForm.mobilePhone
} }
getSmsCode(params).then(res=>{ getSmsCode(params).then(res=>{
if(res.code == '000000'){ if(res.code == '200007'){
this.$message.success({ message: "验证码已发送,注意查看手机" }); this.$message.success({ message: "验证码已发送,注意查看手机" });
}else{
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
} }
}) })
}, },
@ -1414,13 +1242,12 @@ export default {
// //
console.log('当前剩余金额-->',appearPrice,'折扣是多少-->',row.discount) console.log('当前剩余金额-->',appearPrice,'折扣是多少-->',row.discount)
row.spendMoney = (appearPrice*(row.discount*1/100)).toFixed(2)*1 row.spendMoney = (appearPrice*(row.discount*1/100)).toFixed(2)*1
// this.updataList()
} }
}else{ }else{
// //
let total = (row.cardOvers/(row.discount*1)*100 + ( row.cardGiftOvers/( (row.discountFreeAmount?row.discountFreeAmount:100)*1 )*100 )).toFixed(2)*1 let total = (row.cardOvers/(row.discount*1)*100 + ( row.cardGiftOvers/( (row.discountFreeAmount?row.discountFreeAmount:100)*1 )*100 )).toFixed(2)*1
let balanceProportion = (row.cardConsumeMoney*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) // let balanceProportion = (row.cardOvers*1)/(row.cardOvers*1 + row.cardGiftOvers*1) //
let giveProportion = (row.cardGiftOvers*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) // let giveProportion = (row.cardGiftOvers*1)/(row.cardOvers*1 + row.cardGiftOvers*1) //
let balanceConverted = balanceProportion/(row.discount?(row.discount*1/100):1) // () let balanceConverted = balanceProportion/(row.discount?(row.discount*1/100):1) // ()
let giveConverted = giveProportion/(row.discountFreeAmount?(row.discountFreeAmount*1/100):1) // let giveConverted = giveProportion/(row.discountFreeAmount?(row.discountFreeAmount*1/100):1) //
let convertedNum = appearPrice/(balanceConverted+giveConverted) // let convertedNum = appearPrice/(balanceConverted+giveConverted) //
@ -1431,14 +1258,12 @@ export default {
row.giftSpendMoney = (convertedNum*giveProportion).toFixed(2)*1 row.giftSpendMoney = (convertedNum*giveProportion).toFixed(2)*1
row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
console.log('剩了多少--->',row.cardGiftOvers) console.log('剩了多少--->',row.cardGiftOvers)
// this.updataList()
}else{ }else{
// , // ,
console.log('我不够扣',total) console.log('我不够扣',total)
row.spendMoney = row.cardConsumeMoney row.spendMoney = (row.cardOvers).toFixed(2)*1
row.giftSpendMoney = row.cardGiftOvers row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1
row.cardGiftOvers = 0 row.cardGiftOvers = 0
// this.updataList()
} }
} }
@ -1448,16 +1273,12 @@ export default {
console.log('还需支付多少--->',appearPrice) console.log('还需支付多少--->',appearPrice)
if(total>appearPrice){ // if(total>appearPrice){ //
// //
let balanceProportion = (row.cardConsumeMoney*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //
let giveProportion = (row.cardGiftOvers*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //
// row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1
// row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1
row.spendMoney = (appearPrice*row.cardOvers/( row.cardGiftOvers+row.cardOvers )).toFixed(2)*1 row.spendMoney = (appearPrice*row.cardOvers/( row.cardGiftOvers+row.cardOvers )).toFixed(2)*1
row.giftSpendMoney = (appearPrice*row.cardGiftOvers/( row.cardGiftOvers+row.cardOvers )).toFixed(2)*1 row.giftSpendMoney = (appearPrice*row.cardGiftOvers/( row.cardGiftOvers+row.cardOvers )).toFixed(2)*1
row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
}else{ }else{
row.spendMoney = row.cardOvers row.spendMoney = (row.cardOvers).toFixed(2)*1
row.giftSpendMoney = row.cardGiftOvers row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1
row.cardGiftOvers = 0 row.cardGiftOvers = 0
// this.updataList() // this.updataList()
} }
@ -1475,11 +1296,11 @@ export default {
this.$message.warning({ message: "当前卡付余额为0,将自动扣除赠送金额" }); this.$message.warning({ message: "当前卡付余额为0,将自动扣除赠送金额" });
if(total>appearPrice){ // if(total>appearPrice){ //
row.giftSpendMoney = (appearPrice*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1)).toFixed(2)*1 row.giftSpendMoney = (appearPrice*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1)).toFixed(2)*1
row.spendMoney = row.giftSpendMoney row.spendMoney = (row.giftSpendMoney).toFixed(2)*1
row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
}else{ // }else{ //
row.spendMoney = row.cardGiftOvers row.spendMoney = (row.cardGiftOvers).toFixed(2)*1
row.giftSpendMoney = row.cardGiftOvers row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1
row.cardGiftOvers = 0 row.cardGiftOvers = 0
} }
return return
@ -1488,15 +1309,15 @@ export default {
if( (row.cardOvers/(row.discount?(row.discount*1)/100:1)) > appearPrice ){ //, if( (row.cardOvers/(row.discount?(row.discount*1)/100:1)) > appearPrice ){ //,
row.spendMoney = (appearPrice*(row.discount?(row.discount*1)/100:1)).toFixed(2)*1 row.spendMoney = (appearPrice*(row.discount?(row.discount*1)/100:1)).toFixed(2)*1
}else{ //, }else{ //,
row.spendMoney = row.cardOvers row.spendMoney = (row.cardOvers).toFixed(2)*1
let remainderCsee = appearPrice - ((row.spendMoney/row.discount)*100) // let remainderCsee = appearPrice - ((row.spendMoney/row.discount)*100) //
console.log('还需要支付多少--->',remainderCsee) console.log('还需要支付多少--->',remainderCsee)
row.giftSpendMoney = remainderCsee*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1) // row.giftSpendMoney =( remainderCsee*(row.discountFreeAmount?(row.discountFreeAmount*1)/100:1)).toFixed(2)*1 //
row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
} }
}else{ //, }else{ //,
row.spendMoney = row.cardOvers // row.spendMoney = (row.cardOvers).toFixed(2)*1 //
row.giftSpendMoney = row.cardGiftOvers //-- row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1 //--
row.cardGiftOvers = 0 // row.cardGiftOvers = 0 //
} }
}else{ // }else{ //
@ -1506,10 +1327,10 @@ export default {
if( total>appearPrice ){ // if( total>appearPrice ){ //
row.spendMoney = appearPrice row.spendMoney = appearPrice
row.giftSpendMoney = appearPrice row.giftSpendMoney = appearPrice
row.cardGiftOvers = row.cardGiftOvers - appearPrice row.cardGiftOvers = (row.cardGiftOvers - appearPrice).toFixed(2)*1
}else{ // }else{ //
row.spendMoney = row.cardGiftOvers row.spendMoney = (row.cardGiftOvers).toFixed(2)*1
row.giftSpendMoney = row.cardGiftOvers row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1
row.cardGiftOvers = 0 row.cardGiftOvers = 0
} }
return return
@ -1519,13 +1340,13 @@ export default {
row.spendMoney = appearPrice row.spendMoney = appearPrice
}else{ // }else{ //
let remainderCsee = appearPrice - row.cardOvers // let remainderCsee = appearPrice - row.cardOvers //
row.spendMoney = row.cardOvers row.spendMoney = (row.cardOvers).toFixed(2)*1
row.giftSpendMoney = remainderCsee row.giftSpendMoney = (remainderCsee).toFixed(2)*1
row.cardGiftOvers = row.cardGiftOvers - remainderCsee row.cardGiftOvers = (row.cardGiftOvers - remainderCsee).toFixed(2)*1
} }
}else{ // }else{ //
row.spendMoney = row.cardOvers row.spendMoney = (row.cardOvers).toFixed(2)*1
row.giftSpendMoney = row.cardGiftOvers row.giftSpendMoney = (row.cardGiftOvers).toFixed(2)*1
row.cardGiftOvers = 0 row.cardGiftOvers = 0
} }
} }
@ -2196,29 +2017,34 @@ export default {
}, },
endEditMoney(row) { endEditMoney(row) {
// transactionPrice
let form = { ...row }; let form = { ...row };
if (this.cashNumber == 1) { //
if (this.cashNumber == 1) { if(row.radio == 2){
if ( if (form.topPriceMember < form.transactionPrice * 1 ||form.transactionPrice * 1 < form.minumumPriceMember){
form.topPriceMember < form.transactionPrice * 1 || this.$message.error({
form.transactionPrice * 1 < form.minumumPriceMember message:
) { "价格不能低于" +
this.$message.error({ form.minumumPriceMember +
message: "高于" +
"价格不能低于" + form.topPriceMember
form.minumumPriceMember + });
"高于" + form.transactionPrice = this.transactionPrice;
form.topPriceMember } else {
}); form.amount = row.transactionPrice;
form.transactionPrice = this.transactionPrice; }
} else { }else{
form.amount = row.transactionPrice; if (form.topPrice < form.transactionPrice * 1 ||form.transactionPrice * 1 < form.minumumPrice){
this.$message.error({
message: "价格不能低于" + form.minumumPrice + "高于" + form.topPrice
});
form.transactionPrice = this.transactionPrice;
} else {
form.amount = row.transactionPrice;
}
} }
} else { } else { //
if ( if (form.topPrice < form.transactionPrice * 1 ||form.transactionPrice * 1 < form.minumumPrice) {
form.topPrice < form.transactionPrice * 1 ||
form.transactionPrice * 1 < form.minumumPrice
) {
this.$message.error({ this.$message.error({
message: "价格不能低于" + form.minumumPrice + "高于" + form.topPrice message: "价格不能低于" + form.minumumPrice + "高于" + form.topPrice
}); });
@ -2424,15 +2250,16 @@ export default {
projectId: res.data.id, projectId: res.data.id,
storeId: res.data.storeId, storeId: res.data.storeId,
storeName: res.data.storeName, storeName: res.data.storeName,
price: res.data.price, price: res.data.price, //
topPrice: res.data.topPrice, topPrice: res.data.topPrice, //
topPriceMember: res.data.topPriceMember, topPriceMember: res.data.topPriceMember, //
priceMember: res.data.priceMember, priceMember: res.data.priceMember, //
minumumPrice: res.data.minumumPrice, minumumPrice: res.data.minumumPrice, //
minumumPriceMember: res.data.minumumPriceMember, minumumPriceMember: res.data.minumumPriceMember, //
cashNumber: this.cashNumber, cashNumber: this.cashNumber,
numberTimes: 1, numberTimes: 1,
minumumTimes: res.data.minumumTimes minumumTimes: res.data.minumumTimes,
radio:'2' //
}; };
this.setRecList(form); this.setRecList(form);
if (this.cashNumber == 1) { if (this.cashNumber == 1) {
@ -2660,7 +2487,6 @@ export default {
rechargeAccountList.push(item); rechargeAccountList.push(item);
} }
}); });
// item.rechargeAccountListCopy = item.rechargeAccountList;
item.rechargeAccountList = rechargeAccountList; item.rechargeAccountList = rechargeAccountList;
if (item.courseAccountId != null) { if (item.courseAccountId != null) {
item.collectionAmount = item.amount; item.collectionAmount = item.amount;

@ -1,15 +1,12 @@
<template> <template>
<div>
<div class="box"> <div class="box">
<div class="left"> <div class="left">
<el-table v-loading="loading" :data="tableDate" :header-cell-style="{ <el-table v-loading="loading" v-if="$route.path !=='/storeDaily'" :data="tableDate" :header-cell-style="{
background: 'linear-gradient(#6cb3ff, #1873d4)', background: 'linear-gradient(#6cb3ff, #1873d4)',
color: '#eeeeee', color: '#eeeeee',
}" show-summary border max-height="600"> }" show-summary border max-height="600">
<el-table-column align="center" min-width="75" prop="date" label="日期"></el-table-column> <el-table-column align="center" min-width="75" prop="date" label="日期"></el-table-column>
<!-- <el-table-column align="center" label="总营业额"></el-table-column>
<el-table-column align="center" label="充值业绩"></el-table-column>
<el-table-column align="center" label="疗程业绩"></el-table-column>
<el-table-column align="center" label="充值卡购买疗程" min-width="100"></el-table-column> -->
<el-table-column align="center" label="服务"> <el-table-column align="center" label="服务">
<el-table-column align="center" prop="cashMoney" label="总金额"> <el-table-column align="center" prop="cashMoney" label="总金额">
</el-table-column> </el-table-column>
@ -53,11 +50,45 @@
<!-- <el-table-column align="center" min-width="60" prop="memberNum" label="总数" v-if="headOffice==1"></el-table-column> --> <!-- <el-table-column align="center" min-width="60" prop="memberNum" label="总数" v-if="headOffice==1"></el-table-column> -->
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table v-loading="loading" v-else :data="tableDate" :header-cell-style="{
background: 'linear-gradient(#6cb3ff, #1873d4)',
color: '#eeeeee',
}" show-summary border max-height="600">
<el-table-column align="center" min-width="75" prop="date" label="日期"></el-table-column>
<el-table-column align="center" label="总营业额" prop="numAmount">
</el-table-column>
<el-table-column align="center" label="充值业绩" prop="rechargeMoneys"></el-table-column>
<el-table-column align="center" label="疗程业绩" prop="coursexMoneys"></el-table-column>
<el-table-column align="center" label="充值卡购买疗程" min-width="100" prop="coursekMoney"></el-table-column>
<el-table-column align="center" label="服务">
<el-table-column align="center" prop="cashierCashMoney" label="现付">
</el-table-column>
<el-table-column align="center" prop="cashierCardMoney" label="卡付">
</el-table-column>
</el-table-column>
<el-table-column align="center" label="客单数">
<el-table-column align="center" min-width="60" prop="rechargeOrderNum" label="充值">
</el-table-column>
<el-table-column align="center" min-width="60" prop="courseOrderNum" label="疗程">
</el-table-column>
<el-table-column align="center" min-width="60" prop="cashPeopleNum" label="服务">
</el-table-column>
</el-table-column>
<el-table-column align="center" label="项目男女客数">
<el-table-column align="center" min-width="60" prop="man" label="男客">
</el-table-column>
<el-table-column align="center" min-width="60" prop="woman" label="女客">
</el-table-column>
</el-table-column>
<el-table-column align="center" min-width="60" prop="refundMoney" label="退款金额"></el-table-column>
<el-table-column align="center" min-width="60" prop="refundMoney" label="消费退"></el-table-column>
</el-table>
</div> </div>
<div class="right"> <div class="right">
<payment style="width:100%" ref="payment" :payLists='payLists' :pay='pay'/> <payment style="width:100%" ref="payment" :payLists='payLists' :pay='pay'/>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
@ -79,6 +110,12 @@ export default {
handler(arr){ handler(arr){
if(arr){ if(arr){
this.tableDate = arr this.tableDate = arr
this.tableDate = this.tableDate.map(item=>{
return{
...item,
numAmount:(item.rechargeMoneys?item.rechargeMoneys*1:0)+(item.coursexMoneys?item.coursexMoneys*1:0)+(item.coursekMoney?item.coursekMoney*1:0)
}
})
}else{ }else{
this.tableDate = [] this.tableDate = []
} }
@ -123,13 +160,14 @@ export default {
state: 1 state: 1
}).then(res=>{ }).then(res=>{
if(res.code === '000000'){ if(res.code === '000000'){
this.payLists = res.rows this.payLists = res.rows
} }
}) })
}, },
}, },
created(){ created(){
this.initpay() this.initpay()
console.log(this.$route.path ==='/storeDaily')
}, },
} }
</script> </script>
@ -139,6 +177,7 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
margin-bottom: 30px;
} }
.left{ .left{
/* flex: 1; */ /* flex: 1; */

@ -1015,7 +1015,7 @@ import wage from "./wage/wage";
import excel from "../../../components/excel"; import excel from "../../../components/excel";
import detail from "./components/detail.vue"; import detail from "./components/detail.vue";
import edit from "./components/edit.vue"; import edit from "./components/edit.vue";
import project from "@/components/project/index"; import project from "./project.vue";
import selectpro from "@/components/project/selection/index"; import selectpro from "@/components/project/selection/index";
import { import {
delpro, delpro,
@ -1531,13 +1531,13 @@ export default {
console.log(this.format); console.log(this.format);
res.pageInfo.list.forEach(item => { // res.pageInfo.list.forEach(item => {
if (item.unifiedDue < this.format) { // if (item.unifiedDue < this.format) {
item.state = 0; // item.state = 0;
}else{ // }else{
item.state = 1; // item.state = 1;
} // }
}); // });
console.log( console.log(
"🚀 ~ file: chargeType.vue ~ line 730 ~ TypePage ~ res.pageInfo.tableList", "🚀 ~ file: chargeType.vue ~ line 730 ~ TypePage ~ res.pageInfo.tableList",
res.pageInfo.tableList res.pageInfo.tableList

@ -0,0 +1,219 @@
<template>
<el-dialog :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="dialogVisible" width="70%" append-to-body>
<div class="flex justify-end padding-bottom-xs" v-if="!form.memberName">
<el-input class="form-width-m " size="small" v-model="queryForm.projectNum" clearable placeholder="项目编码搜索"></el-input>
<el-input class="form-width-m margin-left-xs" size="small" v-model="queryForm.projectName" clearable placeholder="项目名称搜索"></el-input>
<el-button class="margin-left-xs" size="mini" type="primary" @click="getData"></el-button>
</div>
<div v-if="!form.memberName">
<el-table @row-dblclick="confirms" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" :data="list" @row-click="rowClick" max-height="600" v-loading="listLoading" :element-loading-text="elementLoadingText">
<el-table-column label="选择" width="45">
<template slot-scope="scope">
<el-radio v-model="radio" :label="scope.row.id" @change.native="scope.row">
{{ "" }}
</el-radio>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="projectNum" label="项目编码" min-width="100"></el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="projectName" label="项目名称" min-width="120"></el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="minumumTimes" label="最低销售次数" min-width="60"></el-table-column>
<el-table-column align="center" label="散客">
<el-table-column align="center" min-width="75" prop="price" label="标价"></el-table-column>
<el-table-column align="center" min-width="80" prop="topPrice" label="最高价"></el-table-column>
<el-table-column align="center" min-width="80" prop="minumumPrice" label="最低价"></el-table-column>
</el-table-column>
<el-table-column align="center" label="会员">
<el-table-column align="center" min-width="75" prop="priceMember" label="标价"></el-table-column>
<el-table-column align="center" min-width="80" prop="topPriceMember" label="最高价"></el-table-column>
<el-table-column align="center" min-width="80" prop="minumumPriceMember" label="最低价"></el-table-column>
</el-table-column>
<el-table-column align="center" prop="isCardPay" label="允许卡付" min-width="80" v-if="queryForm.directConsumption==1">
<template slot-scope="scope">{{
scope.row.isCardPay == 0 ? "是" : scope.row.isCardPay == 1?'否':"未设"
}}</template>
</el-table-column>
<el-table-column align="center" prop="noDiscount" label="卡付打折" min-width="80" v-if="queryForm.directConsumption==1">
<template slot-scope="scope">{{
scope.row.noDiscount == 0 ? "是" : scope.row.noDiscount == 1?'否':"未设"
}}</template>
</el-table-column>
</el-table>
</div>
<el-table @row-dblclick="confirms" v-else :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" :data="coureList" @row-click="rowClick" max-height="600" v-loading="listLoading" :element-loading-text="elementLoadingText">
<el-table-column label="选择" width="45">
<template slot-scope="scope">
<el-radio v-model="radio" :label="scope.row.id" @change.native="scope.row">
{{ "" }}
</el-radio>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip min-width="100" align="left" prop="courseProjectNum" label="项目编码"></el-table-column>
<el-table-column show-overflow-tooltip min-width="120" align="left" prop="courseProjectName" label="项目名称"></el-table-column>
<el-table-column show-overflow-tooltip min-width="70" align="center" prop="price" label="项目单价"></el-table-column>
<el-table-column show-overflow-tooltip min-width="70" align="center" prop="courseRestCount" label="剩余次数"></el-table-column>
<el-table-column show-overflow-tooltip min-width="70" align="center" prop="courseRestPrice" label="剩余金额"></el-table-column>
<el-table-column show-overflow-tooltip min-width="70" align="center" prop="courseConsumeCount" label="可用次数"></el-table-column>
<el-table-column show-overflow-tooltip min-width="105" align="center" prop="endTime" label="到期日期"></el-table-column>
<el-table-column show-overflow-tooltip min-width="120" align="center" prop="storeName" label="所属门店"></el-table-column>
</el-table>
<!-- 分页组件 -->
<el-pagination v-if="!form.memberName" align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
<span slot="footer" class="dialog-footer">
<el-button size="mini" type="primary" plain @click="dialogVisible = false"> </el-button>
<el-button size="mini" type="primary" @click="confirms()">
</el-button>
</span>
</el-dialog>
</template>
<script>
import { propageNew,selectRatioInfo1 } from "@/api/storeManage.js";
import { couAccountList } from "@/api/eashier.js";
export default {
data() {
return {
radio: null, //
radioForm: {}, //
list: [], //
coureList: [],
dialogVisible: false, //
listLoading: false, //list
elementLoadingText: "数据加载中...", //list
title: "选择门店项目", //
total: 0, //
form: {}, //
queryForm: {
//
pageNum: 1,
pageSize: 10,
state: 1,
projectName: "",
},
courseProjectId: "", //,
isform:"",
projectId:"",
rows:[]
};
},
methods: {
//
show(form, id) {
this.isform=form
this.courseProjectId = id;
this.coureList = [];
this.list = [];
this.form = {};
if (form == 1 || form == 0 || form == 3) {
if (form != 3) {
this.queryForm.directConsumption = form;
}
} else {
this.form = { ...form };
}
this.radio = null;
this.radioForm = {};
this.list = [];
this.dialogVisible = true;
this.getData();
},
//
rowClick(row) {
this.radio = row.id;
this.radioForm = row;
},
//
handleSizeChange(val) {
// //console.log(` ${val} `);
this.queryForm.pageSize = val;
this.getData();
},
handleCurrentChange(val) {
// //console.log(`: ${val}`);
this.queryForm.pageNum = val;
this.getData();
},
//
async getData() {
this.listLoading = true;
if (this.form.memberName) {
this.title = "选择会员卡包疗程";
var memberIds = {
memberId: this.form.id,
storeId:this.form.storeId
};
if (this.courseProjectId) {
memberIds.courseProjectId = this.courseProjectId;
}
// courseAccountId
couAccountList(memberIds).then((res) => {
this.listLoading = false;
if (res.code == "000000") {
res.rows.forEach((item) => {
item.courseAccountId = item.id;
});
this.coureList = res.rows;
} else {
this.$alert(res.message, "查询会员疗程", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}
});
} else {
this.title = "选择门店项目";
propageNew(this.queryForm).then((res) => {
this.listLoading = false;
if (res.code == "000000") {
this.total = res.pageInfo.total;
this.list = res.pageInfo.list;
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}
});
}
},
confirms() {
console.log("🚀 ~ file: index.vue ~ line 186 ~ confirms ~ this.isform", this.isform)
if (this.isform == 1 || this.isform == 0 || this.isform == 3) {
this.$emit("projectData", this.radioForm);
} else {
let froms = {}
froms.id=this.radio,
froms.storeId=this.form.storeId
console.log("🚀 ~ file: index.vue ~ line 186 ~ confirms ~ froms", froms)
selectRatioInfo1(froms).then((res)=>{
if (res.code == "000000") {
this.rows=res.rows
// this.radioForm.rows=res.rows
this.$emit("projectData", this.radioForm,this.rows);
this.$message.success({ message: "操作成功" });
}else{
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}
})
}
this.dialogVisible = false;
},
},
};
</script>
<style>
</style>

@ -41,7 +41,6 @@
<orderdetail ref="orderdetail"></orderdetail> <orderdetail ref="orderdetail"></orderdetail>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="mini" type="primary" @click="dialogVisible = false">关闭</el-button> <el-button size="mini" type="primary" @click="dialogVisible = false">关闭</el-button>
</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
@ -101,6 +100,10 @@ export default {
docType: "promotion", docType: "promotion",
docTypeName: "促销活动", docTypeName: "促销活动",
}, },
{
docType: "recharge_groupon",
docTypeName: "团购卡",
},
], ],
}; };
}, },

Loading…
Cancel
Save