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

近期提交

Browse Source
master
曾嘉俊 2 years ago
parent 74d2be15bc
commit 5ab23beaad
30 changed files with 309 additions and 198 deletions
Show Stats Download Patch File Download Diff File

1
src/api/eashier.js
Unescape Escape View File

@ -724,7 +724,6 @@ export function refOrderPromotionPro(params) {
return service({
url: "/api" + "/demay/ssm/refOrder/promotionPro",
method: "post",
// data: params,
params: params
});
}

4
src/api/statistics.js
Unescape Escape View File

@ -97,7 +97,7 @@ export function dayStatistic(params) {
// 当日负卡金疗程记录查询
export function dayStatisticTreatment(params) {
return service({
url: "/api" + "/demay/ssm/negativeCard/CourseDayStatistics",
url: "/api" + "/demay/ssm/negativeCard/CourseDayStatisticsByDate",
method: "post",
data: params
});
@ -105,7 +105,7 @@ export function dayStatisticTreatment(params) {
//当日负卡金充值记录查询
export function dayStatisticRecharge(params) {
return service({
url: "/api" + "/demay/ssm/negativeCard/rechargeDayStatistics",
url: "/api" + "/demay/ssm/negativeCard/rechargeDayStatisticsByDate",
method: "post",
data: params
});

61
src/components/member/edit/index.vue
Unescape Escape View File

@ -36,14 +36,13 @@
</div>
<div slot="footer" class="dialog-footer">
<el-button size="mini" type="primary" plain @click="(dialogFormVisible = false)">取 消</el-button>
<el-button size="mini" type="primary" @click="confirm()">确 定</el-button>
<el-button size="mini" type="primary" @click="confirm()" :loading="confirmLoad">确 定</el-button>
</div>
</el-dialog>
</template>
<script>
import { partten } from "../../../../partten/index";
import { addstoreMember, storeMemberedit } from "@/api/eashier.js";
export default {
data() {
@ -67,6 +66,7 @@ export default {
}
};
return {
confirmLoad:false,
dialogFormVisible: false, //弹窗开关
form: {}, //主对象
title: "添加",
@ -149,30 +149,43 @@ export default {
this.$refs.form.validate(async (valid) => {
if (valid) {
// if (partten.phoneNum.test(this.form.mobilePhone)) {
// if (this.form.mobilePhone.length == 11) {
if (this.title == "添加") {
if (this.form.checkPass == this.form.cashPassword) {
this.form.storeId = sessionStorage.getItem("parentId");
this.form.storeName = sessionStorage.getItem("storeName");
addstoreMember(this.form).then((res) => {
if (res.code == "000000") {
this.$message.success({ message: "添加成功!" });
this.$emit("editData", this.form);
this.$emit('addUserConfirm',this.form.mobilePhone)
this.dialogFormVisible = false;
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {
},
});
}
if (this.form.mobilePhone.length == 11) {
if (this.form.checkPass == this.form.cashPassword) {
this.form.storeId = sessionStorage.getItem("parentId");
this.form.storeName = sessionStorage.getItem("storeName");
this.confirmLoad = true
addstoreMember(this.form).then((res) => {
this.confirmLoad = false
if (res.code == "000000") {
this.$message.success({ message: "添加成功!" });
this.$emit("editData", this.form);
this.$emit('addUserConfirm',this.form.mobilePhone)
this.dialogFormVisible = false;
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {
},
});
}
});
} else {
this.$message.error({ message: "两次输入密码不一致" });
}
}else{
this.$alert("请输入正确的11位手机号", "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
} else {
this.$message.error({ message: "两次输入密码不一致" });
}
}
} else {
storeMemberedit(this.form).then((res) => {
if (res.code == "000000") {

4
src/components/recharge/type/index.vue
Unescape Escape View File

@ -158,8 +158,6 @@ export default {
methods: {
//组件传值
show(number, list) {
console.log(number);
console.log(list);
if (list) {
this.selcetList = list;
}
@ -181,7 +179,7 @@ export default {
async getData() {
this.listLoading = true;
let form = {
rechargeTypeId:this.rechargeTypeId?this.rechargeTypeId:null,
// rechargeTypeId:this.rechargeTypeId?this.rechargeTypeId:null,
storeId: sessionStorage.getItem("parentId")
};
if (this.selectNumber != null) {

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

@ -36,7 +36,7 @@
export default {
data() {
return {
keepList:['services','collectionList','reatment','storeDaily','dept','staffBrokerage','storeSummary','storeTotalPerformance'], //reatment
keepList:['services','collectionList','reatment','storeDaily','dept','staffBrokerage','storeSummary','storeTotalPerformance','raiseReatment','refundRecharge','refundCourse','refund'],
cancelList:['首页','充值','疗程','直接收银'],
tagsList: [
{ path: "/home", title: "首页" },

2
src/pages/branch/subbranch/component/index.vue
Unescape Escape View File

@ -24,7 +24,7 @@
</el-select>
<!-- <el-button type="primary" size="mini" @click="handleStoreShow">
<i style="font-size:20px;" class="el-icon-plus"></i> -->
</el-button>
<!-- </el-button> -->
</el-form-item>
<el-form-item label="省：">
<el-input v-model="form.province" disabled></el-input>

5
src/pages/eashier/collectionList/components/detail.vue
Unescape Escape View File

@ -129,7 +129,7 @@
<!-- 补单才需要短信重发 -->
<el-button size="mini" type="primary" @click="handleReissue">短信重发</el-button>
<el-button size="mini" type="primary" plain @click="cancel()">取 消</el-button>
<el-button v-if="form.isCancel==0" size="mini" type="primary" @click="subStaffRatio()">修 改</el-button>
<el-button v-if="form.isCancel==0" size="mini" type="primary" @click="subStaffRatio()" :loading="butloadIng">修 改</el-button>
</span>
</el-dialog>
</template>
@ -147,6 +147,7 @@ export default {
},
data() {
return {
butloadIng:false,
detailDialog: false,
activeNames: "员工",
title: "", //弹窗标题
@ -365,7 +366,9 @@ export default {
})
};
form.salesmens = salesmens;
this.butloadIng = true
recEditStaff(form).then((res) => {
this.butloadIng = false
if (res.code == "000000") {
this.$message.success({
message: res.message,

2
src/pages/eashier/courseAdjust/components/detail.vue
Unescape Escape View File

@ -50,7 +50,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="管理员" align="center" min-width="150">
<el-table-column label="管理层" align="center" min-width="150">
<template slot-scope="scope">
<div class="flex align-center form-width-m">
<el-select

42
src/pages/eashier/coursetorec/components/index.vue
Unescape Escape View File

@ -63,6 +63,14 @@
</el-date-picker>
</div>
</el-form-item>
<!-- <el-form-item label="转入门店:" :label-width="labelWidth">
<div class="form-width-ms">
<el-select ref="select" filterable default-first-option v-model="storeId" placeholder="请选择门店">
<el-option v-for="(item,index) in options" :key="index" :label="item.label" :value="item.id">
</el-option>
</el-select>
</div>
</el-form-item> -->
<div class="raisetable bg-white margin-left-lg margin-bottom-xs">
<div class="raisetable-sum ">
<div>
@ -264,6 +272,10 @@
@click="openPro(0)"
>添加</el-button
>
<el-select v-if="proForm.memberName" ref="select" filterable default-first-option v-model="storeId" placeholder="请选择门店">
<el-option v-for="(item,index) in options" :key="index" :label="item.label" :value="item.id">
</el-option>
</el-select>
</div>
<div style="width: 150px;">总金额 : {{ inMoneys }}</div>
</div>
@ -399,7 +411,7 @@
</template>
<script>
import { propage } from "@/api/storeManage.js";
import { propage ,organizations} from "@/api/storeManage.js";
import {
storeMemberOne,
addRechargeTurnCourse,
@ -464,7 +476,9 @@ export default {
TransactionNum: 0,
StoreIds:"",
label:"",
staff:[]
staff:[],
storeId:sessionStorage.getItem("parentId"),
options:[]
};
},
methods: {
@ -527,7 +541,8 @@ export default {
this.proForm.coursePayListRequests = this.outList;
this.proForm.staffLists;
this.proForm = Object.assign(this.proForm, this.inList[0]);
this.inList[0];
this.proForm.storeId = this.storeId
this.proForm.storeName = this.options.filter(item=>item.id == this.storeId)[0].storeName
if (this.isAddition == 1) {
if (this.proForm.additionDate) {
this.addRechargeTurnCourse();
@ -860,10 +875,29 @@ export default {
sessionStorage.getItem("sessionStorageData")
);
this.proForm.additionDate = this.formatTime(new Date(), "YYYY-MM-DD");
}
},
async getData() {
organizations({ pageSize: 999 }).then((res) => {
if (res.code == "000000") {
res.rows.forEach((item) => {
item.label = item.storeNum + "-" + item.storeName;
});
this.options=res.rows;
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}
});
},
},
created() {
this.setPage();
this.getData()
}
};
</script>

1
src/pages/eashier/raiseReatment/raiseReatment.vue
Unescape Escape View File

@ -8,6 +8,7 @@
import raise from "./components/index.vue";
import raiseList from "./components/raiseList.vue";
export default {
name:"raiseReatment",
components: {
raise,
raiseList,

5
src/pages/eashier/reatment/components/detail.vue
Unescape Escape View File

@ -76,7 +76,7 @@
<!-- 补单才需要短信重发 -->
<el-button size="mini" type="primary" @click="handleReissue">短信重发</el-button>
<el-button size="mini" type="primary" plain @click="cancel()">取 消</el-button>
<el-button v-if="form.isCancel==0" size="mini" type="primary" @click="subStaffRatio()">修 改</el-button>
<el-button v-if="form.isCancel==0" size="mini" type="primary" @click="subStaffRatio()" :loading="butloading">修 改</el-button>
</span>
<errorOrder ref="detail"></errorOrder>
</el-dialog>
@ -107,6 +107,7 @@ export default {
},
data() {
return {
butloading:false,
detailDialog: false,
activeNames: "员工",
rowfromWidth: "80px",
@ -366,7 +367,9 @@ export default {
}
});
form.salesmens = salesmens;
this.butloading = true
courseEditStaff(form).then((res) => {
this.butloading = false
if (res.code == "000000") {
this.$message.success({
message: res.message,

1
src/pages/eashier/refund/refund.vue
Unescape Escape View File

@ -631,6 +631,7 @@ import staffratio from "./components/staffratio";
import selec from "@/components/store/select/index";
import dateExport from './components/dateExport.vue'
export default {
name:"refund",
components: {
member,
repayment,

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

@ -496,6 +496,7 @@ import staffsles from "@/components/staffList/staff/index";
import selec from "@/components/store/select/index";
import dateExport from './components/dateExport.vue'
export default {
name:"refundCourse",
components: {
staffsles,
manager,

5
src/pages/eashier/refundRecharge/components/detail.vue
Unescape Escape View File

@ -60,7 +60,7 @@
</el-form-item>
<el-form-item prop="give" label="赠送退款:">
<div class="form-width-ms">
{{form.refundGiftMoney}}
{{form.refundGiftMoneys}}
<el-button size="mini" type="text" @click="handleStoreDeductions" v-if="isTrue">扣款详情</el-button>
</div>
</el-form-item>
@ -263,6 +263,9 @@ export default {
});
} else {
this.form = res.pageInfo.list[0];
if(this.form.refundRechargeList){
this.form.refundGiftMoneys = (eval(this.form.refundRechargeList.map(item=>item.refundGiftMoney?item.refundGiftMoney*1:0).join("+"))).toFixed(2)*1
}
this.form.rechargeAccountGiveList = ( this.form.refundRechargeList || [])
console.log('form--->',this.form)
this.form.refundMoneys = this.form.recRefundMoney;

2
src/pages/eashier/refundRecharge/components/storeChargeDetails.vue
Unescape Escape View File

@ -14,7 +14,7 @@
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button size="mini" type="primary" plain @click="detailDialog = false">取 消</el-button>
<el-button size="mini" type="primary" plain @click="handleConfirm(detailDialog=false)">取 消</el-button>
<el-button size="mini" type="primary" @click="handleConfirm(detailDialog=false)">确定</el-button>
</span>
</el-dialog>

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

@ -149,32 +149,6 @@
</div>
</el-form-item>
<br />
<!-- <el-form-item label="帐户操作:">
<div class="form-width-ms">
<el-button
style="display:inline-block;"
size="mini"
:disabled="refund.rechargeTypeNum == ''"
@click="sumRefundMoney"
v-if="sessionStorageData.refundCard"
>计算退款</el-button
>
<el-button
style="display:inline-block;"
size="mini"
:disabled="refund.rechargeTypeNum == ''"
@click="recQuery((recDialog = true))"
>单据</el-button
>
<el-button
style="display:inline-block;"
size="mini"
:disabled="refund.rechargeTypeNum == ''"
@click="(recMonthCashDialog = true), (month = new Date())"
>消费记录</el-button
>
</div>
</el-form-item> -->
<el-form-item label="收款银行:">
<div class="form-width-ms">
<div
@ -679,30 +653,6 @@
></el-input>
</div>
</el-form-item>
<!-- <br /> -->
<!-- <el-form-item label="帐户操作:" v-if="title == '修改'">
<div>
<el-button
style="display:inline-block;"
size="mini"
@click="sumRefundMoney"
v-show="sessionStorageData.refundCard"
>计算退款</el-button
>
<el-button
style="display:inline-block;"
size="mini"
@click="recQuery((recDialog = true))"
>单据</el-button
>
<el-button
style="display:inline-block;"
size="mini"
@click="recCashQuery((recCashDialog = true))"
>消费记录</el-button
>
</div>
</el-form-item> -->
<el-form-item label="收款银行:">
<div class="form-width-ms">
<div v-if="title == '明细'">{{ refundType }}</div>
@ -1166,6 +1116,7 @@ import selec from "@/components/store/select/index";
import rec from "@/components/recharge/index";
import dateExport from './components/dateExport.vue'
export default {
name:'refundRecharge',
components: {
staffsles,
manager,
@ -1340,10 +1291,9 @@ export default {
})
},
storeConfirm(list){
if(this.formDialog){
this.refund.refundRechargeList = list
this.refund.refundGiftMoney = (eval(this.refund.refundRechargeList.map(item=>item.refundGiftMoney?item.refundGiftMoney*1:0).join("+"))).toFixed(2)*1
}
console.log(list)
this.refund.refundRechargeList = list
this.refund.refundGiftMoney = (eval(this.refund.refundRechargeList.map(item=>item.refundGiftMoney?item.refundGiftMoney*1:0).join("+"))).toFixed(2)*1
this.refund.rechargeAccountGiveList = list
},
handleStoreDeductions(){
@ -1643,7 +1593,7 @@ export default {
delete this.refund.lastConsumeTime;
this.refund.staffLists = staffLists;
this.refund.recRefundMoney = this.refund.refundMoney;
this.refund.refundGiftMoney=this.refund.refundGiftMoney?this.refund.refundGiftMoney:0
this.refund.refundGiftMoney=0
this.fileData.append("type", 0);
this.fileData.append("memberId", this.refund.memberId);
this.fileData.append("memberName", this.refund.memberName);
@ -1656,6 +1606,7 @@ export default {
this.fileData.append("payee", this.payee);
this.fileData.append("refundReason", this.refundReason);
this.fileData.append("rechargeRequest", JSON.stringify(this.refund));
console.log(this.fileData)
addRefOrder(this.fileData).then(res => {
this.loading = false;
if (res.code == "000000") {
@ -2047,6 +1998,7 @@ export default {
this.fileData.append("refundAccount", this.refundAccount);
this.fileData.append("payee", this.payee);
this.fileData.append("refundReason", this.refundReason);
this.refund.refundGiftMoney = 0
this.fileData.append("rechargeRequest", JSON.stringify(this.refund));
this.fileData.append("id", this.radiorefValueList.id);
editRefOrder(this.fileData).then(res => {

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

@ -883,7 +883,6 @@ import {
selectListType,
storeMemberOne,
ctlist,
couAccountList,
proOne,
addCash,
cashListByStore,
@ -2499,11 +2498,12 @@ export default {
}
this.list.splice(this.proIndex,1,[])
this.numberTimes = v.addNum*1
this.setProOne({...v});
this.setProOne({...v});
this.updataCollection()
},
// cashAmount courseProjectId courseAccountId
setProOne(row) {
// transactionPrice
if (row.courseAccountId == null) {
row.courseMoney = 0;
} else {

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

@ -96,7 +96,7 @@ export default {
number += item.ratio * 1;
}
});
this.list[0].ratio = 100 - number;
this.list[0].ratio = (100 - number).toFixed(2)*1;
if (this.list[0].ratio < 0) {
this.$alert("第一个人员占比过低", "提示", {
confirmButtonText: "确定",
@ -105,7 +105,7 @@ export default {
center: true,
callback: (action) => { },
});
this.list[0].ratio = this.list[0].ratio + row.ratio
this.list[0].ratio = (this.list[0].ratio + row.ratio).toFixed(2)*1
row.ratio = 0;
}
this.changeStaff();
@ -121,7 +121,7 @@ export default {
if (index != 0) {
number += item.ratio * 1;
}
this.list[0].ratio = 100 - number;
this.list[0].ratio = (100 - number).toFixed(2)*1;
})
}
@ -144,7 +144,7 @@ export default {
if (index != 0) {
number += item.ratio * 1;
}
this.list[0].ratio = 100 - number;
this.list[0].ratio = (100 - number).toFixed(2)*1;
})
},

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

@ -76,7 +76,6 @@
import rec from "@/components/recharge/index";
import rectype from "@/components/recharge/type/index";
import staffsles from "@/components/staffList/staff/index";
import {
addRechargeCardTransition,
updateRechargeCardTransition,
@ -218,7 +217,15 @@ export default {
if (number == 0) {
this.$refs.rec.show(this.memberForm);
} else {
this.$refs.rectype.show(this.form.outType);
this.$confirm('请选择卡类型', '选择类型', {
distinguishCancelAndClose: true,
confirmButtonText: '折扣卡',
cancelButtonText: '活动卡'
}).then(()=>{
this.$refs.rectype.show(1);
}).catch(()=>{
this.$refs.rectype.show(2);
})
}
},
endEdit(row, index) {

9
src/pages/promotion/components/suit.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template>
<div>
<el-dialog :close-on-click-modal="false" append-to-body v-dialogDrag :title="title" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
<div style="text-align: center">
<div style="text-align: center" class="box">
<el-transfer style="text-align: left; display: inline-block" v-model="dataList" filterable :left-default-audited="leftData" :left-default-checked='leftArr' :right-default-audited="rightData" :render-content="renderFunc" :titles="['门店列表', '适用门店']" :button-texts="['移除', '添加']" :format="{
noAudited: '${total}',
hasAudited: '${audited}/${total}'
@ -94,7 +94,6 @@ export default {
},
//适用对象 - 会员列表
handleChange(value, direction, movedKeys) {
console.log(value);
let arr = [];
if (value.length > 0) {
this.data.forEach((item) => {
@ -152,6 +151,12 @@ export default {
</script>
<style scoped>
/deep/ .box .el-transfer__buttons{
width: 140px;
}
/deep/ .box .el-button+.el-button, .el-checkbox.is-bordered+.el-checkbox.is-bordered{
margin-left: 0;
}
.transferFooter {
position: relative;
display: flex;

3
src/pages/promotion/group/components/edit.vue
Unescape Escape View File

@ -48,8 +48,7 @@
<el-table v-if="title=='修改'|| type" class="margin-top-xs" border v-loading="listLoading" :data="form.baseGrouponListList" :element-loading-text="elementLoadingText" max-height="400" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}">
<el-table-column type="index" width="40" align="center"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="100" prop="memberName" label="会员名称"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="100" prop="mobilePhone" label="手机号码">
</el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="100" prop="mobilePhone" label="手机号码"></el-table-column>
</el-table>
</el-form>
<rec ref="rec" @recTypeData="recData"></rec>

90
src/pages/promotion/group/index.vue
Unescape Escape View File

@ -72,7 +72,7 @@
<el-button
size="mini"
type="primary"
@click="edit(3)"
@click="edit(3,3)"
:disabled="
radioRowValueList.state == undefined ||
radioRowValueList.state == 0 ||
@ -80,6 +80,7 @@
radioRowValueList.state == 2 ||
radioRowValueList.state == 4
"
:loading="suditLoad"
>
审核</el-button
>
@ -305,6 +306,7 @@ export default {
components: { edit, detail, excel },
data() {
return {
suditLoad:false,
form: {}, //主对象
listLoading: false, //list加载提示开启动画
elementLoadingText: "加载中...", //list加载提示文字
@ -378,7 +380,11 @@ export default {
},
// 导出模板
Export(){
Export(this.queryForm).then(res=>{
let params = {...this.queryForm}
if(this.radioRowValue){
params.id = this.radioRowValue
}
Export(params).then(res=>{
let blob = new Blob([res]);
var a = document.createElement("a");
var url = window.URL.createObjectURL(blob);
@ -410,30 +416,76 @@ export default {
this.radioRowValue = row.id;
this.radioRowValueList = row;
},
edit(number) {
edit(number,isNum) {
if (number == -1) {
this.$refs.edit.show("添加");
} else if (number == 0) {
this.$refs.edit.show(this.radioRowValueList);
} else {
let form = { id: this.radioRowValueList.id, state: number };
stateBaseGrouponCard(form).then(res => {
if (res.code == "000000") {
this.radioRowValueList.state = number;
this.$message.success({
message: "操作成功!"
if(isNum){
this.$confirm('是否发送短信?', '短信', {
distinguishCancelAndClose: true,
confirmButtonText: '是',
cancelButtonText: '否'
}).then(()=>{
let form = { id: this.radioRowValueList.id, state: number,isSendSms:1};
stateBaseGrouponCard(form).then(res => {
if (res.code == "000000") {
this.radioRowValueList.state = number;
this.$message.success({
message: "操作成功!"
});
this.getData();
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: action => {}
});
}
});
this.getData();
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: action => {}
}).catch(()=>{
let form = { id: this.radioRowValueList.id, state: number,isSendSms:0};
stateBaseGrouponCard(form).then(res => {
if (res.code == "000000") {
this.radioRowValueList.state = number;
this.$message.success({
message: "操作成功!"
});
this.getData();
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: action => {}
});
}
});
}
});
})
}else{
let form = { id: this.radioRowValueList.id, state: number};
stateBaseGrouponCard(form).then(res => {
if (res.code == "000000") {
this.radioRowValueList.state = number;
this.$message.success({
message: "操作成功!"
});
this.getData();
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: action => {}
});
}
});
}
}
},
//明细方法

93
src/pages/statistics/negativeCard/negativeCard.vue
Unescape Escape View File

@ -5,6 +5,16 @@
<el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.storeId">
</el-option>
</el-select>
<el-date-picker
v-model="Time"
placeholder="选择日期"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="截止日期"
@change="handlegetData"
>
</el-date-picker>
<div>
<el-button size="mini" type="primary" @click="refresh" style="margin-left: 95%;">刷新</el-button>
</div>
@ -13,25 +23,32 @@
<!-- 充值表格 -->
<div>
<el-table :data="tableDate"
:header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee' }" style="margin-bottom: 10%;width: 90%;
margin-left: 5%;">
:header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee' }" style="margin-bottom: 10%;width: 90%; margin-left: 5%;">
<el-table-column align="center" label="充值">
<el-table-column align="center" prop="openning" label="期初"></el-table-column>
<el-table-column align="center" prop="storeName" label="门店"></el-table-column>
<el-table-column align="center" label="收入">
<el-table-column align="center" prop="rechargeMoney" label="充值开卡" min-width="50"></el-table-column>
<el-table-column align="center" prop="rechargeRepay" label="充值还款" min-width="50"></el-table-column>
<el-table-column align="center" prop="courseTurnRecharge" label="疗程转充值" min-width="50"></el-table-column>
<el-table-column align="center" prop="cashRefund" label="消费退" min-width="50"></el-table-column>
<el-table-column align="center" prop="groupPurchase" label="团购卡" min-width="50"></el-table-column>
<el-table-column align="center" prop="init" label="初始化" min-width="50"></el-table-column>
<el-table-column align="center" prop="rechargeMoney" label="充值开卡" min-width="70"></el-table-column>
<el-table-column align="center" prop="rechargeRepay" label="充值还款" min-width="70"></el-table-column>
<el-table-column align="center" prop="rechargeGifMoney" label="充值赠送金额" min-width="95"></el-table-column>
<el-table-column align="center" prop="repayRechargeGifMoney" label="还款到账赠送金额" min-width="120"></el-table-column>
<el-table-column align="center" prop="turnInStoreGifMoney" label="赠送转入门店" min-width="95"></el-table-column>
<el-table-column align="center" prop="courseTurnRecharge" label="疗程转充值" min-width="80"></el-table-column>
<el-table-column align="center" prop="cashRefund" label="消费退" min-width="60"></el-table-column>
<el-table-column align="center" prop="refundCashGifMoney" label="消费退" min-width="60"></el-table-column>
<el-table-column align="center" prop="groupPurchase" label="团购卡" min-width="60"></el-table-column>
<el-table-column align="center" prop="init" label="初始化" min-width="60"></el-table-column>
</el-table-column>
<el-table-column align="center" label="支出">
<el-table-column align="center" prop="courseMoney" label="疗程开卡" min-width="50"></el-table-column>
<el-table-column align="center" prop="rechargeRepayMoney" label="充值还款" min-width="50"></el-table-column>
<el-table-column align="center" prop="cashMoney" label="收银" min-width="50"></el-table-column>
<el-table-column align="center" prop="coursePromotion" label="疗程促销" min-width="50"></el-table-column>
<el-table-column align="center" prop="rechargeRefundMoney" label="充值退" min-width="50"></el-table-column>
<el-table-column align="center" prop="courseMoney" label="疗程开卡" min-width="80"></el-table-column>
<el-table-column align="center" prop="rechargeRepayMoney" label="充值还款" min-width="80"></el-table-column>
<el-table-column align="center" prop="cashMoney" label="收银" min-width="80"></el-table-column>
<el-table-column align="center" prop="coursePromotion" label="疗程促销" min-width="80"></el-table-column>
<el-table-column align="center" prop="rechargeRefundMoney" label="充值退" min-width="80"></el-table-column>
<el-table-column align="center" prop="cashRechargeGifMoney" label="收银使用赠送金" min-width="100"></el-table-column>
<el-table-column align="center" prop="refundGifMoney" label="退款赠送金额" min-width="80"></el-table-column>
<el-table-column align="center" prop="turnOutStoreGifMoney" label="赠送转出门店" min-width="80"></el-table-column>
<el-table-column align="center" prop="rechargeRefundMoney" label="充值退" min-width="80"></el-table-column>
</el-table-column>
<el-table-column align="center" prop="balance" label="结存" min-width="50"></el-table-column>
</el-table-column>
@ -66,24 +83,8 @@
</el-table-column>
</el-table>
</div>
<!-- <div style="width: 48%; margin-left: 2%;">
<el-table :data="tableDate1" show-summary
:header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee' }"
style="margin-bottom: 10%;">
<el-table-column align="center" label="疗程">
<el-table-column align="center" prop="type" label="类别"></el-table-column>
<el-table-column align="center" prop="beginning" label="期初" min-width="50"></el-table-column>
<el-table-column align="center" prop="earnings" label="收入" min-width="50"></el-table-column>
<el-table-column align="center" prop="expenditure" label="支出" min-width="50"></el-table-column>
<el-table-column align="center" prop="balance" label="结存" min-width="50"></el-table-column>
</el-table-column>
</el-table>
</div> -->
</div>
</div>
</template>
<script>
@ -98,7 +99,8 @@ export default {
tableDate1: [],
storeIds:[],
options:[],
storeId:''
storeId:'',
Time:[new Date(),new Date()]
};
},
methods: {
@ -123,6 +125,10 @@ export default {
}
});
},
handlegetData(){
this.dayStatisticRecharge()
this.dayStatisticTreatment()
},
getData(ids){
if(ids){
this.storeIds = ids
@ -137,10 +143,12 @@ export default {
date: partten.dayStatisticDate,
storeIdl:this.storeIds
}
if(this.Time!=null){
params.startTime = this.formatTime(this.Time[0], "YYYY-MM-DD 00:00:00");
params.endTime = this.formatTime(this.Time[1], "YYYY-MM-DD 23:59:59");
}
dayStatisticRecharge(params).then((res) => {
if (res.code == "000000") {
// var arr=[];
// arr.push(res.rows)
this.tableDate = res.rows;
} else {
this.$alert(res.message, "提示", {
@ -158,10 +166,12 @@ export default {
date: partten.dayStatisticDate,
storeIdl:this.storeIds
}
if(this.Time!=null){
params.startTime = this.formatTime(this.Time[0], "YYYY-MM-DD 00:00:00");
params.endTime = this.formatTime(this.Time[1], "YYYY-MM-DD 23:59:59");
}
dayStatisticTreatment(params).then((res) => {
if (res.code == "000000") {
// var arr=[];
// arr.push(res.rows)
this.tableDate1 = res.rows;
} else {
this.$alert(res.message, "提示", {
@ -175,21 +185,6 @@ export default {
});
},
refresh() {
// dayStatistic({ date: partten.dayStatisticDate }).then((res) => {
// console.log(res);
// if (res.code == "000000") {
// this.tableDate = res.rows;
// this.$message.success({ message: "已刷新最新数据 !" });
// } else {
// this.$alert(res.message, "提示", {
// confirmButtonText: "确定",
// confirmButtonClass: "confirmbtnFalses",
// type: "warning",
// center: true,
// callback: (action) => { },
// });
// }
// });
this.dayStatisticTreatment();
this.dayStatisticRecharge();
},

21
src/pages/statistics/storeDaily/detail/other.vue
Unescape Escape View File

@ -12,17 +12,20 @@
<el-form-item label="充值业绩:" prop="rechargeMoneys">
<span>{{ form.rechargeMoneys }}</span>
</el-form-item>
<el-form-item label="疗程总业绩:" prop="coursexMoneys">
<!-- <el-form-item label="疗程总业绩:" prop="coursexMoneys">
<span>{{ form.coursexMoney + form.coursekMoney + form.cooperateMoneys}}</span>
</el-form-item> -->
<el-form-item label="疗程总业绩:" prop="coursexMoneys">
<span>{{ (form.coursexMoney+form.cooperateMoneys).toFixed(2) }}</span>
</el-form-item>
<el-form-item label="疗程实业绩:" prop="coursexMoneys">
<span>{{ form.coursexMoney }}</span>
<span>{{ form.coursexMoney.toFixed(2) }}</span>
</el-form-item>
<el-form-item label="充值卡扣疗程:" prop="coursekMoney">
<span>{{ form.coursekMoney }}</span>
</el-form-item>
<el-form-item label="合作方业绩:" prop="cooperateMoneys">
<span>{{ form.cooperateMoneys }}</span>
<span>{{ form.cooperateMoneys.toFixed(2) }}</span>
</el-form-item>
<el-form-item label="服务现付:" prop="cashierCashMoney">
<span>{{ form.cashierCashMoney }}</span>
@ -40,23 +43,23 @@
</div>
<div class="center">
<el-form :model="form" label-width="80px" label-position="left">
<el-form-item label="客单数:" prop="date">
<span>{{ form.rechargeOrderNum + form.courseOrderNum }}</span>
</el-form-item>
<el-form-item label="充值客单数:" prop="rechargeOrderNum">
<span>{{ form.rechargeOrderNum }}</span>
</el-form-item>
<el-form-item label="疗程客单数:" prop="courseOrderNum">
<span>{{ form.courseOrderNum }}</span>
</el-form-item>
<el-form-item label="客单数:" prop="date" style="font-weight:900">
<span>{{ form.rechargeOrderNum + form.courseOrderNum }}</span>
</el-form-item>
<el-form-item label="服务男客:" prop="cashManNum">
<span>{{ form.cashManNum }}</span>
</el-form-item>
<el-form-item label="服务女客:" prop="cashWomanNum">
<span>{{ form.cashWomanNum }}</span>
</el-form-item>
<el-form-item label="服务总客数:" prop="cashPeopleNum">
<span>{{ form.cashPeopleNum }}</span>
<el-form-item label="服务总客数:" prop="cashPeopleNum" style="font-weight:900">
<span class="font-w">{{ form.cashPeopleNum }}</span>
</el-form-item>
<el-form-item label="项目男客:" prop="man">
<span>{{ form.man }}</span>
@ -64,7 +67,7 @@
<el-form-item label="项目女客:" prop="woman">
<span>{{ form.woman }}</span>
</el-form-item>
<el-form-item label="项目总客数:" prop="refundMoney">
<el-form-item label="项目总客数:" prop="refundMoney" style="font-weight:900">
<span>{{ form.man + form.woman }}</span>
</el-form-item>
</el-form>

5
src/pages/statistics/storeTotalPerformance/index.vue
Unescape Escape View File

@ -38,9 +38,10 @@
<el-table-column align="center" label="疗程">
<el-table-column align="center" min-width="85" prop="allCourseAmount" label="总金额"></el-table-column>
<el-table-column align="center" min-width="85" prop="courseCashAmount" label="实收金额"></el-table-column>
<el-table-column align="center" min-width="100" prop="courseRechargeAmount" label="疗程充值卡付"></el-table-column>
<el-table-column align="center" min-width="85" prop="courseRepayAmount" label="还款金额"></el-table-column>
<el-table-column align="center" min-width="85" prop="courseDebtAmount" label="下欠金额"></el-table-column>
<el-table-column align="center" min-width="85" prop="courseCardAmount" label="卡付金额"></el-table-column>
<el-table-column align="center" min-width="100" prop="courseCardAmount" label="收银疗程卡付"></el-table-column>
</el-table-column>
<el-table-column align="center" label="充值">
@ -48,7 +49,7 @@
<el-table-column align="center" min-width="75" prop="allRechargeAmount" label="实收金额"></el-table-column>
<el-table-column align="center" min-width="75" prop="rechargeRepayAmount" label="还款金额"></el-table-column>
<el-table-column align="center" min-width="75" prop="rechargeDebtAmount" label="下欠金额"></el-table-column>
<el-table-column align="center" min-width="75" prop="rechargeCashAmount" label="卡付金额"></el-table-column>
<el-table-column align="center" min-width="75" prop="rechargeCashAmount" label="收银充值卡付"></el-table-column>
</el-table-column>
<el-table-column align="center" min-width="85" prop="cashAmount" label="收银实收金额"></el-table-column>

42
src/pages/storeManage/baseProject/components/allot.vue
Unescape Escape View File

@ -25,9 +25,7 @@
<el-form-item label="卡付打折：" v-if="form.directConsumption==1&&form.isCardPay==0" prop="noDiscount">
<div class="form-width-xs">{{form.isCardPay==0?'是':'否'}}</div>
</el-form-item>
<el-form-item label="有效期限：" prop="validTime" v-if="
sessionStorageData.allowValid == 1 && !form.directConsumption==1
">
<el-form-item label="有效期限：" prop="validTime" v-if="sessionStorageData.allowValid == 1 && !form.directConsumption==1 ">
<div class="form-width-xs">{{form.validTime}}</div>
</el-form-item>
<el-form-item label="散客标价：" v-if="form.directConsumption==1" prop="price">
@ -49,10 +47,19 @@
<div class="form-width-xs">{{form.minumumPriceMember}}</div>
</el-form-item>
</el-form>
<el-select v-model="form.description" filterable clearable @change="optChange" @clear="optClear">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-table class="margin-top-xs" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color: '#eeeeee'}" border v-loading="listLoading" :data="list" ref="list" :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 align="center" prop="storeNum" label="门店编码" min-width="100"></el-table-column>
<el-table-column align="center" prop="storeName" label="门店名称" :show-overflow-tooltip="true" min-width="120"></el-table-column>
<el-table-column align="center" prop="description" label="归属" :show-overflow-tooltip="true" min-width="120"></el-table-column>
<el-table-column align="center" prop="province" label="省" min-width="80" :show-overflow-tooltip="true"></el-table-column>
<el-table-column align="center" prop="city" label="市" min-width="80" :show-overflow-tooltip="true"></el-table-column>
<el-table-column align="center" prop="county" label="区/县" min-width="80" :show-overflow-tooltip="true"></el-table-column>
@ -69,7 +76,7 @@
</template>
<script>
import { storeLists } from "@/api/login.js";
import { storeLists,selectDescription } from "@/api/login.js";
import { assignProject } from "@/api/storeManage.js";
export default {
data() {
@ -82,11 +89,33 @@ export default {
sessionStorage.getItem("sessionStorageData")
),
list: [], //主数组
copyList:[],
form: {},
selection: [],
options:[],
};
},
methods: {
optClear(){
this.list = this.copyList
},
optChange(value){
if(value){
this.list = this.copyList.filter(item=>item.description == value)
}
},
getAscription(){
selectDescription().then(res=>{
if(res.code == "000000"){
this.options = res.data.map(item=>{
return {
label:item,
value:item
}
})
}
})
},
show(form) {
console.log(123);
this.form = form;
@ -102,6 +131,7 @@ export default {
if (res.code == "000000") {
this.list = [...res.rows];
this.copyList = [...res.rows]
} else {
this.$alert(res.message, "获取门店信息", {
confirmButtonText: "确定",
@ -151,7 +181,9 @@ export default {
});
},
},
created: function () {},
created: function () {
this.getAscription()
},
};
</script>

4
src/pages/storeManage/managers/detail/index.vue
Unescape Escape View File

@ -20,8 +20,8 @@
{{scope.row.type==0?"服务":scope.row.type==1?"充值":scope.row.type==2?"疗程":scope.row.type==3?"加价转疗程":scope.row.type==4?"充值退":scope.row.type==5?"疗程退":scope.row.type==6?"消费退":scope.row.type==7?"还款":scope.row.type==8?"促销单":'无'}}
</template>
</el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="90" prop="chia" label="需业绩"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="90" prop="cooperationAchi" label="实业绩"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="90" prop="chia" label="实业绩"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="90" prop="cooperationAchi" label="虚业绩"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="90" prop="money" label="总业绩"></el-table-column>
</el-table>
<div class="block margin-top-xs">

6
src/pages/storeManage/memberList/memberList.vue
Unescape Escape View File

@ -514,7 +514,7 @@
>
取 消</el-button
>
<el-button type="primary" size="mini" @click="exits()">确 定</el-button>
<el-button type="primary" size="mini" @click="exits()" :loading="butLoad">确 定</el-button>
</span>
</el-dialog>
</div>
@ -544,6 +544,7 @@ export default {
components: { excel, edit, member, tostore },
data() {
return {
butLoad:false,
infoDialog: false, //上传文件弹窗开关
editPhoneDialog: false, //改号启用弹窗
searchDialog: false, //搜索弹窗开关
@ -623,8 +624,9 @@ export default {
exits() {
this.searchForm.isMessage = 1;
this.searchForm.code = this.phoneForm.code;
this.butLoad = true
storeMemberExport(this.searchForm).then(res => {
t;
this.butLoad = false
let blob = new Blob([res]);
console.log(blob);
var a = document.createElement("a");

9
src/pages/storeManage/rechargeType/components/detail.vue
Unescape Escape View File

@ -76,6 +76,15 @@ export default {
openRec(number) {
this.number = this.form.type;
this.$refs.rectype.show(this.number, this.form);
// this.$confirm('请选择卡类型', '选择类型', {
// distinguishCancelAndClose: true,
// confirmButtonText: '折扣卡',
// cancelButtonText: '活动卡'
// }).then(()=>{
// this.$refs.rectype.show(1, this.form);
// }).catch(()=>{
// this.$refs.rectype.show(2, this.form);
// })
},
//充值类别单选返回方法
recTypeData(v) {

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

@ -415,8 +415,6 @@ const router = new VueRouter({
index: "rece"
}
},
//充值退 refundRecharge
{
path: "/refundRecharge",
component: () =>

Write Preview
Loading…
Cancel
Save