fixbug:近期修改

master
Wangxubin 3 years ago
parent bbe690f5ed
commit f7dab98746

Binary file not shown.

File diff suppressed because one or more lines are too long

@ -4,15 +4,16 @@ import { localPath } from "./api.js";
// 门店员工获取手机短信验证码接口
export function getSmsCode(params) {
return service({
url: "/api" + "/demay/ssm/staffLogin/getCode",
url: "/api" + "/demay/ssm/staffLogin/getSmsCode",
method: "post",
data: params
});
}
// 门店员工手机验证码登陆获取token接口
export function phoneLogin(params) {
return service({
url: "/api" + "/demay/ssm/staffLogin/phoneLogin",
url: "/api" + "/demay/ssm/staffLogin/getSmsCode",
method: "post",
data: params
});
@ -25,6 +26,14 @@ export function upcashPassword(params){
data: params
});
}
// 获取手机验证码
export function getCode(params){
return service({
url: "/api" + "/demay/ssm/staffLogin/getCode",
method: "post",
data: params
});
};
// 校验验证码
export function chekeMsg(params){

@ -1,7 +1,8 @@
<template>
<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-cascader :options="projectOptions" filterable :props="{ multiple: true,checkStrictly: true }" clearable size="small" @change="optionsChange" v-model="optionsValue"></el-cascader>
<el-input class="form-width-m margin-left-xs " 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>
@ -29,10 +30,13 @@
</template>
<script>
import { propage, setAchiCommList } from "@/api/storeManage.js";
import { propage, setAchiCommList,proTypeList } from "@/api/storeManage.js";
import { handleTree } from "@/utils/index";
export default {
data() {
return {
optionsValue:null,
projectOptions:[],
title: "",
listLoading: true,
dialogFormVisible: false,
@ -46,7 +50,11 @@ export default {
pageNum: 1,
pageSize: 10,
roleName: undefined,
projectNature:0,
userId: undefined,
export:0,
parentId: "",
projectTypeName:null
},
currentRow: null,
radio: null, //
@ -55,6 +63,32 @@ export default {
};
},
methods: {
optionsChange(val){
let list = []
val.forEach(item=>{
if(Array.isArray(item)){
list.push(item[item.length-1])
}
})
if(list.length){
this.queryForm.projectTypeName = list.join(',')
}else{
this.queryForm.projectTypeName = null
}
},
getOptions(){
proTypeList().then(res => {
res.rows = res.rows.map(item=>{return{ ...item,value:item.projectTypeName,label:item.projectTypeName+`(${item.projectTypeNum})`}})
res.rows.forEach(item => {
if (!item.parentId) {
item.parentId = 0;
}
});
this.projectOptions = handleTree(res.rows, "id", "parentId", "children", 0);
})
.catch(err => {
});
},
fetchData() {
propage(this.queryForm).then((res) => {
this.listLoading = false;
@ -81,7 +115,6 @@ export default {
//
handleSelectionChange(selection) {
this.selection = selection;
console.log(this.selection);
},
//
rowName({ row, rowIndex }) {
@ -125,14 +158,21 @@ export default {
},
//
show(form) {
this.optionsValue = null
this.form = { ...form };
this.selection = [];
this.dialogFormVisible = true;
this.fetchData();
},
},
created: function () {},
created(){
this.getOptions()
},
};
</script>
<style></style>
<style scoped>
/deep/ .el-cascader__tags{
display: none !important;
}
</style>

@ -38,7 +38,7 @@
</div>
</el-form-item>
<el-alert title="选中列表进行还款" type="info" show-icon></el-alert>
<el-table :data="list" @selection-change="selRoleChangeHand" :row-key="getRowKey" :expand-row-keys="expandRowKeys" :row-class-name="tableRowClassName" @row-click="handleRowClick" ref="multipleTable" highlight-current-row tooltip-effect="dark">
<el-table :data="list" @selection-change="selRoleChangeHand" :row-key="getRowKey" :expand-row-keys="expandRowKeys" :row-class-name="tableRowClassName" @row-click="handleRowClick" ref="multipleTable" highlight-current-row tooltip-effect="dark">
<el-table-column type="selection" width="30" align="center"></el-table-column>
<el-table-column type="expand" width="0">
<template slot-scope="scope">
@ -271,11 +271,10 @@ export default {
console.log(form);
// this.list.splice(row.index, 1, form);
},
//
openPro(row) {
let proList = [];
console.log('row---->',row)
this.list.forEach((item, index) => {
console.log(item);
item.proList.forEach((items) => {
if (items.payNumber > 0) {
items.courseRestCount = items.courseRestCount;
@ -287,13 +286,14 @@ export default {
this.$refs.pro.show(row);
},
proData(v) {
console.log(v);
let form = JSON.parse(JSON.stringify(v));
console.log(form);
this.list.splice(form.index, 1, form);
console.log(this.list);
// console.log(form);
// this.list.splice(form.index, 1, form);
// console.log('form--->',form,'form.index--->',form.index)
for(let key in form){
if(key!='recList')this.$set(this.list[form.index],key,form[key])
}
this.sumList();
// this.restPro(form);
},
restPro(form) {
if (form.courseMoney > 0) {
@ -328,9 +328,12 @@ export default {
},
recData(v) {
let form = JSON.parse(JSON.stringify(v));
this.list.splice(form.index, 1, form);
console.log(form,'index--->',form.index)
// this.list.splice(form.index, 1, form);
for(let key in form){
if(key!='proList')this.$set(this.list[form.index],key,form[key])
}
this.sumList();
// this.restRec(form);
},
restRec(form) {
if (form.recMoney > 0) {
@ -414,7 +417,11 @@ export default {
}
});
//
couAccountList({ memberId: this.form.id }).then((res) => {
console.log('这是form--->',this.form)
let params = {
memberId: this.form.id
}
couAccountList(params).then((res) => {
if (res.code == "000000") {
let proCopyList = [];
res.rows.forEach((item) => {
@ -632,7 +639,6 @@ export default {
setTimeout(() => {
form.proList = that.proCopyList;
form.recList = that.recCopyList;
console.log(form);
list.push(form);
}, 300);
} else {

@ -161,8 +161,6 @@ export default {
message: "输入不能小于0",
});
row.ratio = 0;
// });
let number = 0;
this.staffLists.forEach((item, index) => {
if (index != 0) {
@ -198,21 +196,21 @@ export default {
},
//
show(list, storeId) {
this.staffLists = [...list];
this.staffLists.forEach((item) => {
if (item.id || item.saleStaffId) {
item.staffNames = item.brandNumber + "-" + item.staffName;
} else {
item.staffNames = "";
}
});
if (storeId) {
this.storeId = storeId;
this.$nextTick(()=>{
this.staffLists = [...list];
console.log('list--->',this.staffLists)
this.staffLists.forEach((item) => {
if (item.id || item.saleStaffId) {
item.staffNames = item.brandNumber + "-" + item.saleStaffName;
} else {
item.saleStaffName = "";
}
});
if (storeId) {
this.storeId = storeId;
}
this.getData();
})
},
//
confirm() {
@ -248,20 +246,6 @@ export default {
});
arr = list;
});
// var list = that.staffLists
// .concat(that.staffListCopy)
// .filter(function (v) {
// return (
// that.staffLists.indexOf(v) === -1 ||
// that.staffListCopy.indexOf(v) === -1
// );
// });
// list.forEach((item) => {
// if (item.id) {
// arr.push(item);
// }
// });
this.staffList = this.noRepeat(arr);
},
//

@ -205,15 +205,20 @@ export default {
});
},
},
beforeRouteEnter(to,form,next){
if(form.path==='/login'){
next(vm=>vm.$router.go(0))
}else{
next()
}
},
mounted() {
console.log(12);
console.log("恭喜你发现了宝贝版本号1.0.0")
var that = this;
setTimeout(() => {
that.sessionStorageData = JSON.parse(
sessionStorage.getItem("sessionStorageData")
);
that.infoDialog = !that.sessionStorageData.guide;
// that.infoDialog = !that.sessionStorageData.guide;
that.infoDialog = false;
if (that.infoDialog) {
that.sessionStorageData = JSON.parse(
@ -258,10 +263,8 @@ export default {
}
}, 1000);
},
activated() {
created() {
// home
// console.log("");
// console.log("----------activated--------");
var that = this;
that.isShow = false;
setTimeout(() => {

@ -23,20 +23,20 @@
</div>
</div>
<div class="padding">
<transition name="fade" mode="out-in">
<!-- <keep-alive> -->
<transition name="fade" mode="out-in">
<keep-alive :include="keepList">
<router-view />
<!-- </keep-alive> -->
</keep-alive>
</transition>
</div>
</div>
</template>
<script>
import app from "../../style/app.css";
export default {
data() {
return {
keepList:['services','collectionList','reatment'],
tagsList: [
{ path: "/home", title: "首页" },
{ path: "/collectionList", title: "充值" },

@ -769,7 +769,7 @@ export default {
// number: "600600",
// },
{
name: "员工提成表",
name: "员工业绩提成表",
icon: "el-icon-warning-outline",
route: "/staffBrokerage",
index: "staffBrokerage",

@ -160,7 +160,6 @@ export default {
.catch(() => {});
},
submitPassword() {
console.log("恭喜你发现了宝贝版本号1.0.0")
this.loading = true;
setTimeout(() => {
this.loading = false;
@ -552,13 +551,10 @@ export default {
//
phonesubmit() {
this.loading = true;
setTimeout(() => {
this.loading = false;
}, 3000);
if (partten.phoneNum.test(this.form.mobilePhone)) {
phoneLoginNew(this.form).then((res) => {
this.loading = false;
if (res.code == "000000") {
console.log(res.data);
if (res.data.storeType == 2) {
localStorage.setItem("token", res.data.token);
sessionStorage.setItem("token", res.data.token);
@ -582,6 +578,7 @@ export default {
}
});
} else {
this.loading = false;
this.$alert("请输入正确格式的手机号", "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",

@ -195,6 +195,7 @@
<el-tag :type="scope.row.isCancel == 1 ? 'primary' : 'success'">{{ scope.row.isCancel==0?'正常':'作废' }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="storeName" label="门店" min-width="120"></el-table-column>
<el-table-column align="center" show-overflow-tooltip prop="rechargeNum" label="单号" min-width="110"></el-table-column>
<el-table-column align="center" show-overflow-tooltip prop="rechargeDate" label="日期" min-width="105"></el-table-column>
<el-table-column align="center" prop="isAddition" label="是否补单" min-width="50">
@ -391,6 +392,7 @@ import selec from "@/components/store/select/index";
import Template from "../../discount-coupon/issue/components/template.vue";
export default {
name:"collectionList",
components: {
member,
selec,
@ -494,8 +496,6 @@ export default {
};
},
methods: {
close() {
this.listDialogVisible = false;
},
@ -569,13 +569,9 @@ export default {
if (v != 0) {
this.getRecList();
}
if(this.form.rechargeTypeName){
this.form.rechargeTypeName=""
}
},
openRec(number) {
console.log(number);
@ -737,15 +733,12 @@ export default {
this.form = {};
this.form = form;
// console.log("🚀 ~ file: collectionList.vue ~ line 747 ~ recAccountOne ~ this.form", this.form)
});
},
//
openMember() {
this.$refs.member.show(this.vip);
},
},
//
memberData(v) {
this.form.mobilePhone = v.mobilePhone;

@ -14,6 +14,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="storeName" label="门店" min-width="120"></el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="100" prop="docNum" label="单据号"></el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="100" prop="docDate" label="时间"></el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="100" prop="memberName" label="会员名字"></el-table-column>

@ -117,7 +117,9 @@
<div v-else></div>
</template>
</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="100" align="center" prop="collectionAmount" label="实付金额">
<template slot-scope="scope">{{ scope.row.collectionCashAmount + scope.row.collectionRechargeAmount }}</template>
</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="collectionAmount" label="性别">
@ -241,9 +243,7 @@ export default {
},
//
show(form, title) {
console.log(form);
this.title = title;
this.form = { ...form };
this.list = form.projectList;
this.list.forEach((item, index) => {

@ -36,7 +36,6 @@
<span class="padding-left-sm ">员工</span>
<div class=" flex align-start flex-wrap padding-top">
<staffslesout ref="staffslesout" @staffslesData="staffslesDataout" :is-true="true"></staffslesout>
</div>
</div>
<div class="raisetable-sum">

@ -51,6 +51,7 @@
</template>
</el-table-column>
<el-table-column align="center" prop="storeName" label="门店" min-width="120"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="120" prop="docNum" label="单据号"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="105" prop="docDate" label="时间"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="100" prop="memberName" label="会员名字"></el-table-column>

@ -48,12 +48,13 @@
</el-form-item>
<el-form-item label="成交单价:">
<div class="form-width-ms pointer flex">
<div v-if="!menberShow" @click="(menberShow = true)">
<div >
<!-- v-if="!menberShow" @click="(menberShow = true)" -->
<span class="text-red text-price">{{ form.salesPrice?form.salesPrice:0 }}</span>
<i v-if="form.salesPrice" class="el-icon-edit text-cyan"></i>
<!-- <i v-if="form.salesPrice" class="el-icon-edit text-cyan"></i> -->
</div>
<el-input v-focus class="form-width-sm form-input-wdith-xs" v-else type="number" size="samll" v-model="form.salesPrice" @change="changesales" @blur="changesales" ref="priceinput"></el-input>
<span v-if="moneyRatio!=100" class="text-red padding-left-xs text-bold">{{moneyRatio}}%</span>
<!-- <el-input v-focus class="form-width-sm form-input-wdith-xs" v-else type="number" size="samll" v-model="form.salesPrice" @change="changesales" @blur="changesales" ref="priceinput"></el-input>
<span v-if="moneyRatio!=100" class="text-red padding-left-xs text-bold">{{moneyRatio}}%</span> -->
</div>
</el-form-item>
<br />
@ -72,13 +73,14 @@
</div>
</el-form-item>
<el-form-item label="成交金额:">
<div class="form-width-xl">
<div class="form-width-xl" v-if="!menberShow" @click="(menberShow = true)">
<span class="text-price text-red">{{ form.amount?form.amount:0 }}</span>
<i v-if="form.amount" class="el-icon-edit text-cyan"></i>
</div>
<el-input v-focus class="form-width-sm form-input-wdith-xs" v-else type="number" size="samll" v-model="form.amount" @change="changeDeal" @blur="changeDeal" ref="priceinput"></el-input>
</el-form-item>
<el-form-item label="待付金额:">
<div class="form-width-xl padding-rigth-xs" style="width:120px">
<!-- <span class="text-cyan text-price">{{ form.debtMoney>0?form.debtMoney:(form.debtMoney<0?''+form.debtMoney*-1:0) }}</span> -->
<span class="text-cyan text-price">{{ treatAmount }}</span>
</div>
</el-form-item>
@ -213,6 +215,7 @@
<el-tag :type="scope.row.isCancel == 1 ? 'primary' : 'success'">{{ scope.row.isCancel==0?'正常':'作废' }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="storeName" label="门店" min-width="120"></el-table-column>
<el-table-column align="center" show-overflow-tooltip prop="courseReatmentNum" label="单号" min-width="120"></el-table-column>
<el-table-column align="center" show-overflow-tooltip prop="date" label="日期" min-width="105"></el-table-column>
<el-table-column align="center" prop="isAddition" show-overflow-tooltip label="是否补单" min-width="50">
@ -412,6 +415,7 @@ import manager from "@/components/staffList/manager/index";
import staffsles from "@/components/staffList/staff/index";
import selec from "@/components/store/select/index";
export default {
name:"reatment",
components: {
staffsles,
manager,
@ -649,6 +653,24 @@ export default {
}
},
methods: {
changeDeal(val){
this.form.numberTimes?this.form.numberTimes*1:0 //
this.form.amount = val*1
if((val>(this.form.numberTimes*this.form.topPriceMember))||(val<(this.form.minumumPriceMember*this.form.numberTimes))){ //
this.$message.warning({
message:
"成交金额不能低于" +
this.form.minumumPriceMember*this.form.numberTimes +
"高于" +
this.form.numberTimes*this.form.topPriceMember,
});
this.form.amount = this.form.salesPrice*this.form.numberTimes
this.form.salesPrice = (this.form.amount/this.form.numberTimes).toFixed(2)*1
}else{
this.form.salesPrice = (this.form.amount/this.form.numberTimes).toFixed(2)*1
}
this.menberShow = false
},
close() {
this.listDialogVisible = false;
this.openCollNumber = 0;
@ -924,9 +946,7 @@ export default {
item.spendMoney = 0.0;
item.discoutMoney = 0.0;
item.cardOver = item.cardConsumeMoney;
// + item.giftConsumeMoney;
item.cardOvers = item.cardConsumeMoney;
// + item.giftConsumeMoney;
if (this.sessionStorageData.buycourse == true) {
if (item.type == 1) {
item.offsetMoney =
@ -936,11 +956,9 @@ export default {
item.offsetMoney = this.getDecimal(item.offsetMoney);
} else {
item.offsetMoney = item.cardConsumeMoney;
// item.giftConsumeMoney +
}
} else {
item.offsetMoney = item.cardConsumeMoney;
// item.giftConsumeMoney +
}
rechargeAccountList.push(item);
});
@ -999,7 +1017,6 @@ export default {
this.menberShow = false;
}
} else {
console.log('来到了这里')
this.menberShow = false;
}
this.form.amount =
@ -1031,10 +1048,7 @@ export default {
this.buysShow = false;
} else {
this.buysShow = false;
this.form.amount =
((this.form.salesPrice * 100 * this.form.numberTimes) / 100).toFixed(
2
) * 1;
this.form.salesPrice = (this.form.amount*1/this.form.numberTimes).toFixed(2)*1
this.form.debtMoney = this.form.amount;
this.resetAmount()
}
@ -1052,7 +1066,7 @@ export default {
if (!row.payMoney) {
row.payMoney = 0;
}
// ,0
// ,0
if(row.payMoney<=0){
row.payMoney = 0
}
@ -1122,6 +1136,7 @@ export default {
},
//
proConfirm(pros) {
console.log(pros)
this.proForm = pros;
if (this.form.memberId) {
this.form.projectName = this.proForm.projectName;

@ -223,6 +223,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="100" prop="storeName" label="门店"></el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="110" prop="refundNum" label="退款单号"></el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="105" prop="refundDate" label="退款时间"></el-table-column>
<el-table-column align="center" min-width="100" prop="memberName" label="会员名字">

@ -195,6 +195,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="100" prop="storeName" label="门店"></el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="100" prop="refundNum" label="退款单号"></el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="105" prop="refundDate" sortable label="退款时间"></el-table-column>
<el-table-column align="center" min-width="80" prop="memberName" label="会员"></el-table-column>
@ -338,7 +339,7 @@
</el-form-item>
<br />
<el-form-item prop="cause" label="附带文件:" required>
<div v-if="title=='明细'" v-for="(item,index) in filesList" :key="index">
<div v-show="title=='明细'" v-for="(item,index) in filesList" :key="index">
<div style="width:100px;cursor: pointer; margin:0 5px;">
<el-image @click="openImage(item,openImageDialog=true)" :src='item.url'>
<div slot="error" class="image-slot">

@ -481,6 +481,13 @@
</el-tag>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
align="center"
min-width="120"
prop="storeName"
label="门店"
></el-table-column>
<el-table-column
show-overflow-tooltip
align="center"

@ -70,7 +70,7 @@
</div>
</el-form-item>
<br />
<el-table class="margin-bottom-xs" style="max-width:1080px;margin-left:30px" max-height="500" :data="refCashLists" :row-class-name="rowClassName" :row-key='getRowKeys' @expand-change="expandSelect" :expand-row-keys="expand" v-if="refCashListsShow" @selection-change="selRoleChangeHand" @row-click="handleRowClick" ref="multipleTable" highlight-current-row row-key="index">
<el-table class="margin-bottom-xs" style="max-width:1080px;margin-left:30px" max-height="500" :data="refCashLists" :row-class-name="rowClassName" :row-key='getRowKeys' @expand-change="expandSelect" :expand-row-keys="expand" v-if="refCashListsShow" @selection-change="selRoleChangeHand" @row-click="handleRowClick" ref="multipleTable" highlight-current-row >
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column align="center" min-width="100" prop="settlementNum" label="消费单号"></el-table-column>
<el-table-column align="center" min-width="105" prop="inputDate" label="消费时间"></el-table-column>
@ -154,6 +154,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="100" prop="storeName" label="门店"></el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="100" prop="refundNum" label="退款单号"></el-table-column>
<el-table-column align="center" show-overflow-tooltip min-width="105" prop="refundDate" label="退款时间"></el-table-column>
<el-table-column align="center" min-width="80" prop="memberName" label="会员名字">

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

@ -5,7 +5,6 @@
<el-date-picker @change="getData" style="width: 200px" v-model="month" format="yyyy年 MM月" type="month" placeholder="选择日期"></el-date-picker>
<selec v-if="headOffice==1" ref="selec" @selecData="selecData"></selec>
</div>
<div>
<el-input size="medium" class="form-width-ms" v-model="queryForm.cashNum" placeholder="输入要查询的单据号" clearable></el-input>
<el-input size="medium" class="form-width-ms" v-model="queryForm.memberName" placeholder="输入要查询的会员名字" clearable></el-input>
@ -21,6 +20,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="storeName" label="门店" min-width="120"></el-table-column>
<el-table-column align="center" prop="cashNum" label="收款单号" min-width="120"></el-table-column>
<el-table-column align="center" prop="cashDate" label="收款时间" show-overflow-tooltip min-width="105"></el-table-column>
<el-table-column align="center" prop="isAddition" label="是否补单" min-width="75">

@ -27,6 +27,26 @@
{{ form.additionDate }}
</div>
</el-form-item>
<el-form-item label="疗程付:">
<div class="activeFormDiv">
<span class="text-price text-red">{{ form.Course }}</span>
</div>
</el-form-item>
<el-form-item label="卡付:">
<div class="activeFormDiv">
<span class="text-price text-red">{{ form.card }}</span>
</div>
</el-form-item>
<el-form-item label="现付:">
<div class="activeFormDiv">
<span class="text-price text-red">{{ form.cash }}</span>
</div>
</el-form-item>
<el-form-item label="结算:">
<div class="activeFormDiv">
<span class="text-price text-red">{{ form.total }}</span>
</div>
</el-form-item>
</el-form>
<div class="flex justify-start align-start" style="width:100%">
<div class="into-table-width">
@ -278,7 +298,17 @@ export default {
this.form = { ...form };
this.list = form.projectList;
console.log("🚀 ~ file: editform.vue ~ line 253 ~ show ~ this.list", this.list)
let card = eval(this.list.map(item=>{return item.collectionRechargeAmount?item.collectionRechargeAmount*1:0}).join("+"))
let cash = eval(this.list.map(item=>{return item.collectionCashAmount?item.collectionCashAmount*1:0}).join("+"))
let list = this.list.filter(item=>item.courseAccountId)
let Course = 0
if(list.length){
Course = eval(list.map(item=>{return item.transactionPrice?item.transactionPrice*1:0}).join("+"))
}else{
Course = 0
}
let total = (card+cash+Course).toFixed(2)*1
this.form = {...form,card,cash,Course,total}
this.list.forEach((item, index) => {
item.collectionAmount= item.collectionRechargeAmount*1+item.collectionCashAmount*1
item.rechargeConsumeList.forEach((items) => {

@ -35,12 +35,10 @@ export default {
that.form = JSON.parse(JSON.stringify(form));
that.payLists = [];
that.payLists = JSON.parse(JSON.stringify(list));
console.log('form传过来了嘛--->',form)
},
//.
editPay(row, index) {
this.payIndex = index;
console.log(this.form)
if (index = 0) {
row.payMoney = (this.form.collectionCashAmounts + row.payMoney).toFixed(2) * 1;
}
@ -85,6 +83,7 @@ export default {
row.payMoney = row.payMoney * 1;
}
this.sumNum();
this.$emit('updataCollection')
},
sumNum() {
let payMoney = 0;
@ -95,31 +94,6 @@ export default {
let form = { form: this.form, list: this.payLists };
this.$emit("paymentData", form);
},
// getSummariesPay(param) {
// const { columns, data } = param;
// const sums = [];
// columns.forEach((column, index) => {
// if (index === 0) {
// sums[index] = "";
// return;
// }
// const values = data.map((item) => Number(item[column.property]));
// if (column.property == "payMoney") {
// sums[index] = values.reduce((prev, curr) => {
// const value = Number(curr);
// if (!isNaN(value)) {
// return prev + curr;
// } else {
// sums[index] = "--";
// }
// }, 0);
// sums[index] += " ";
// } else {
// sums[index] = "--";
// }
// });
// return sums;
// },
},
};
</script>

@ -47,14 +47,14 @@
<el-input
style="height:100%;"
class="form-width-xss"
v-model="memberForm.man"
v-model="memberForm.manNumber"
type="number"
></el-input>
:
<el-input
style="height:100%;"
class="form-width-xss"
v-model="memberForm.woman"
v-model="memberForm.womanNumber"
type="number"
></el-input>
</div>
@ -152,7 +152,7 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
min-width="120"
min-width="150"
align="center"
prop="projectName"
label="项目名称"
@ -174,7 +174,7 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
min-width="170"
min-width="100"
align="center"
prop=""
label="支付类型"
@ -186,8 +186,9 @@
<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>
<!-- <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>
@ -224,18 +225,17 @@
align="center"
prop=""
label="充值卡付"
>
>
<template slot-scope="props">
<div v-if="props.row.isCardPay == 0">
<div
@click.stop="projectindex(props.$index)"
v-if="props.row.radio == 2"
>
<el-popover
placement="bottom"
width="900"
@show="openRec(props.row,props.$index)"
v-model='props.row.popover'
v-model='props.row.popover'
>
<div v-if="props.row.courseAccountId == null">
<el-table
@ -344,12 +344,9 @@
</el-table-column>
</el-table>
</div>
<el-button slot="reference">充值卡</el-button>
<el-button slot="reference" >充值卡</el-button>
</el-popover>
</div>
<div v-else>
不允许卡付
</div>
</div>
<div v-else></div>
</template>
@ -730,6 +727,22 @@
</el-table-column>
</el-table-column>
</el-table>
<div class="right">
<el-form ref="form" label-width="65px">
<el-form-item label="疗程付:">
<span class="text-price text-red">{{ formMoneys.Course?formMoneys.Course:0 }}</span>
</el-form-item>
<el-form-item label="卡付:">
<span class="text-price text-red">{{ formMoneys.card?formMoneys.card:0 }}</span>
</el-form-item>
<el-form-item label="现付:">
<span class="text-price text-red">{{ formMoneys.cash?formMoneys.cash:0 }}</span>
</el-form-item>
<el-form-item label="实收金额:">
<span class="text-price text-red">{{ formMoneys.total?formMoneys.total:0 }}</span>
</el-form-item>
</el-form>
</div>
</div>
<!-- <div class="right">
<el-form ref="form" label-width="65px">
@ -750,9 +763,9 @@
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 class=" ">总付金额:</span> -->
<span class="text-red ">
<!-- {{ total }} -->
</span>
</div>
<div class="form-width-m">
@ -800,7 +813,7 @@ import { Mixins } from './mixins'
import addmember from "@/components/member/edit/index";
import message from './detail/message.vue';
import captcha from './captcha.vue';
import { getSmsCode,chekeMsg,upcashPassword } from '@/api/login.js'
import { getCode,upcashPassword } from '@/api/login.js'
import {
selectList,
selectListType,
@ -826,6 +839,7 @@ import recash from "./recash";
import orders from "./detail/detail";
import { partten } from "@/utils/partten/index.js";
export default {
name:"services",
mixins:[Mixins],
components: {
member,
@ -844,6 +858,7 @@ export default {
},
data() {
return {
formMoneys:{},
cardList:[],
numlist:[{settlementNum:0,payNum:0}],
message:"",
@ -993,6 +1008,39 @@ export default {
}
},
methods: {
updataCollection(){
let card = 0; //
let Course = 0; //
let cash = 0; //
let total = 0 //
if(this.list.length){
this.list.forEach(item=>{
if(item.transactionPrice){
if(item.collectionRechargeAmount){
//
card+=((item.collectionRechargeAmount).toFixed(2)*1)
item.rechargeAccountList.forEach(item=>{ //
item.giftSpendMoney?item.giftSpendMoney:0
card+=item.giftSpendMoney
card = card.toFixed(2)*1
})
}
if(item.courseAccountId){
//
Course+=((item.transactionPrice).toFixed(2)*1)
}
}
})
try{
cash = eval(this.$refs.payment.payLists.map(item=>{return item.payMoney?item.payMoney*1:0}).join("+")) //
}catch(err){}
}
total = ((card*1+Course*1+cash*1))
total = total.toFixed(2)*1
this.formMoneys = {
card,Course,cash,total
}
},
// /
radioInput(row){
if(row.radio==1){
@ -1068,10 +1116,10 @@ export default {
let params = {
mobilePhone:this.memberForm.mobilePhone
}
getSmsCode(params).then(res=>{
if(res.code == '200007'){
getCode(params).then(res=>{
if(res.code == '000000'){
this.$message.success({ message: "验证码已发送,注意查看手机" });
}else{
}else if(res.code=='200007'){
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
@ -1198,6 +1246,7 @@ export default {
} //
}
this.cardListUpdata()
this.updataCollection()
},
//
editcard(row, index) {
@ -2020,7 +2069,10 @@ export default {
// transactionPrice
let form = { ...row };
if (this.cashNumber == 1) { //
if(row.radio == 2){
console.log('--->',row.radio)
if(row.radio == '2'){
//
console.log('---->',form.topPriceMember,form.transactionPrice * 1,form.minumumPriceMember)
if (form.topPriceMember < form.transactionPrice * 1 ||form.transactionPrice * 1 < form.minumumPriceMember){
this.$message.error({
message:
@ -2034,6 +2086,7 @@ export default {
form.amount = row.transactionPrice;
}
}else{
//
if (form.topPrice < form.transactionPrice * 1 ||form.transactionPrice * 1 < form.minumumPrice){
this.$message.error({
message: "价格不能低于" + form.minumumPrice + "高于" + form.topPrice
@ -2196,6 +2249,7 @@ export default {
}
this.list.splice(this.proIndex,1,[])
this.setProOne(v);
this.updataCollection()
},
// cashAmount
setProOne(row) {
@ -2209,6 +2263,7 @@ export default {
id: row.courseProjectId
}).then(res => {
if (res.code == "000000") {
// transactionPrice
form = {
payLists: this.payLists,
zhonggongList: [],
@ -2259,7 +2314,7 @@ export default {
cashNumber: this.cashNumber,
numberTimes: 1,
minumumTimes: res.data.minumumTimes,
radio:'2' //
// radio:'2' //
};
this.setRecList(form);
if (this.cashNumber == 1) {
@ -2277,6 +2332,21 @@ export default {
form.memberId = this.memberForm.id;
form.integral = this.memberForm.integral;
form.rechargeAccountList = JSON.parse(JSON.stringify(this.recListCopy));
if(!form.courseAccountId){ //使
if(!this.recListCopy.length){
//
form.radio = '1'
form.transactionPrice = form.price
console.log('没有充值卡--->散客价格')
}else{
console.log('充值卡存在---->',form.rechargeAccountList)
// ,,,
// cardOvers cardGiftOvers
let list = [{cardConsumeMoney:0,cardGiftMoney:0},{cardConsumeMoney:1,cardGiftMoney:0}]
form.radio = '2'
form.transactionPrice = form.priceMember
}
}
} else {
form.amount = res.data.price;
form.transactionPrice = res.data.price;
@ -2311,6 +2381,7 @@ export default {
this.expand.push(i);
this.expandedRows.push(this.list[i]);
}
this.updataCollection()
this.openRec(form);
this.sumAmont();
} else {
@ -2408,12 +2479,16 @@ export default {
let passShow = false;
this.list.forEach((item, index) => {
if (index == 0) {
item.man = this.notMemberForm.man
? this.notMemberForm.man
: this.memberForm.man;
item.woman = this.notMemberForm.woman
? this.notMemberForm.woman
: this.memberForm.woman;
item.manNumber = this.notMemberForm.manNumber
? this.notMemberForm.manNumber
: this.memberForm.manNumber;
item.womanNumber = this.notMemberForm.womanNumber
? this.notMemberForm.womanNumber
: this.memberForm.womanNumber;
let man = this.list.filter(item=>item.sex === 0)
let woman = this.list.filter(item=>item.sex === 1)
if(man.length)item.man=man.length
if(woman.length)item.woman = woman.length
}
if (item.courseAccountId != null) {
passShow = true;
@ -2508,6 +2583,7 @@ export default {
});
this.formData = new FormData();
this.notData();
this.updataCollection()
} else {
this.payLists = this.payListsCopy;
this.list.forEach(item => {
@ -2578,6 +2654,7 @@ export default {
});
this.sumAmont();
this.cardListUpdata()
this.updataCollection()
},
//
openMember() {
@ -2591,7 +2668,6 @@ export default {
},
reccardData(v) {},
courseData(v) {
console.log('这个v--->',v)
if (!v.courseAccountId) {
v.courseAccountId = null;
v.courseProjectId = v.id;
@ -2611,6 +2687,7 @@ export default {
let total = eval(this.$refs.payment.payLists.map(item=>{return item.payMoney?item.payMoney*1:0}).join("+"))///
this.numlist=[{settlementNum:total,payNum:total}]
}
this.updataCollection()
},
rowClassName({ row, rowIndex }) {
row.index = rowIndex;
@ -2710,7 +2787,6 @@ export default {
callback: action => {}
});
}
let list = [];
this.list.forEach((itemList, index) => {
var itemLists = {
@ -3178,6 +3254,7 @@ export default {
}, 500);
this.setPage();
console.log('点击了清空界面')
this.updataCollection()
},
setPage() {
this.getDetail();
@ -3188,7 +3265,19 @@ export default {
},
created() {
this.notData()
}
},
// services
beforeRouteLeave(to, from, next) {
//
if (to.name == "services") {
//
from.meta.keepAlive = true;
} else {
// C
from.meta.keepAlive = false;
}
next();
},
};
</script>
@ -3210,6 +3299,7 @@ export default {
width: 8%;
}
.right{
margin-top: 15px;
padding: 0 40px 10px 0;
font-size: 12px;
line-height: 12px;
@ -3217,7 +3307,8 @@ export default {
border: 1px solid #ccc;
background: white;
border-radius: 10px;
height: 0.45rem;
height: 0.9rem;
width: 200px;
}
.el-icon-edit-outline {
padding-left: 5px;

@ -85,7 +85,7 @@
</el-table>
</div>
<div class="right">
<payment style="width:100%" ref="payment" :payLists='payLists' :pay='pay'/>
<payment style="width:100%" ref="payment" :payLists='pay'/>
</div>
</div>
</div>
@ -106,6 +106,14 @@ export default {
}
},
watch:{
pay:{
handler(val){
if(val){
console.log('val是什么--->',val)
}
},
immediate:true
},
lists:{
handler(arr){
if(arr){
@ -113,7 +121,7 @@ export default {
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)
numAmount:(item.rechargeMoneys?item.rechargeMoneys*1:0)+(item.coursexMoneys?item.coursexMoneys*1:0)+(item.coursekMoney?item.coursekMoney*1:0)+(item.cashierCashMoney?item.cashierCashMoney*1:0)
}
})
}else{
@ -122,25 +130,6 @@ export default {
},
immediate:true
},
pay:{
handler(arr){
try{
for(let i=0;i<this.payLists.length;i++){
this.$set(this.payLists[i],'payMoney',0)
for(let j=0;j<arr.length;j++){
if(this.payLists[i].collectionTypeName === arr[j].payName){
this.$set(this.payLists[i],'payMoney',arr[j].payMoney)
}
}
}
}catch(err){
this.payLists.forEach(item=>{
this.$set(item,'payMoney',0)
})
}
},
immediate:true
}
},
data () {
return {
@ -166,8 +155,6 @@ export default {
},
},
created(){
this.initpay()
console.log(this.$route.path ==='/storeDaily')
},
}
</script>

@ -3,7 +3,7 @@
<div style="width:100%">
<el-table :data="payLists" style="max-width:280px" class='border'
:header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee' }">
<el-table-column align="center" prop="collectionTypeName" min-width="100" 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" min-width="80" label="本次支付 ">
<template slot-scope="scope">
{{ scope.row.payMoney?scope.row.payMoney:0 }}
@ -20,10 +20,6 @@ export default {
type:Array,
default:()=>([])
},
pay:{
type:Array,
default:()=>([])
}
},
data() {
return {

@ -111,9 +111,13 @@ export default {
storeDailys(this.queryForm).then((res) => {
this.$refs.form.loading = false
if (res.code == "000000") {
console.log('这是什么----->',res)
console.log('这是什么----->',res.data.payLists)
this.tableDate = res.data.lists;
this.payLists = res.data.payLists
if(this.payLists == null){
this.payLists = []
}
console.log('this.payLists---->',this.payLists)
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",

@ -31,6 +31,9 @@
>
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
<el-button size="mini" type="primary" @click="selectQuery"
>确认</el-button
>
<el-button size="mini" type="primary" @click="searchDialog = true"
>条件搜索</el-button
>
@ -41,6 +44,7 @@
@click="getData((refreshtext = true))"
>刷新</el-button
>
<!-- -->
<el-button size="mini" type="primary" @click="download()"
>下载模板</el-button
>
@ -1010,6 +1014,15 @@
</div>
</template>
<script>
const searchForm= {
//
state: null,
projectName: null,
projectTypeName: null,
projectNum: null,
directConsumption: null,
export: 0
}
import { handleTree } from "@/utils/index";
import wage from "./wage/wage";
import excel from "../../../components/excel";
@ -1083,6 +1096,10 @@ export default {
};
},
methods: {
selectQuery(){
this.searchForm.selectNumName = this.input
this.search()
},
//
editData() {
this.getData();
@ -1478,6 +1495,7 @@ export default {
},
//
async getData() {
if(this.refreshtext == true)this.searchForm = {...searchForm}
this.queryForm.pageNum = this.pageNum;
this.queryForm.pageSize = this.pageSize;
if (this.radioRow) {
@ -1528,22 +1546,8 @@ export default {
this.format = this.format.replace([x], obj[x]);
// x replace[x]replace[x]obj[x]
}
console.log(this.format);
// res.pageInfo.list.forEach(item => {
// if (item.unifiedDue < this.format) {
// item.state = 0;
// }else{
// item.state = 1;
// }
// });
console.log(
"🚀 ~ file: chargeType.vue ~ line 730 ~ TypePage ~ res.pageInfo.tableList",
res.pageInfo.tableList
);
res.pageInfo.tableList = res.pageInfo.list;
this.pageInfo = res.pageInfo;
}
} else {
@ -1598,17 +1602,17 @@ export default {
//
tableData() {
var search = this.input.toString().toLowerCase(); //
if (search) {
return this.pageInfo.tableList.filter(function(dataNews) {
return Object.keys(dataNews).some(function(key) {
return (
String(dataNews[key])
.toLowerCase()
.indexOf(search) > -1
);
});
});
}
// if (search) {
// return this.pageInfo.tableList.filter(function(dataNews) {
// return Object.keys(dataNews).some(function(key) {
// return (
// String(dataNews[key])
// .toLowerCase()
// .indexOf(search) > -1
// );
// });
// });
// }
return this.pageInfo.tableList;
}
}

@ -43,7 +43,7 @@
<el-table-column align="center" sortable prop="label" :show-overflow-tooltip="true" label="标签" min-width="75"></el-table-column>
<el-table-column align="center" prop="storeName" :show-overflow-tooltip="true" label="所属门店" min-width="100"></el-table-column>
</el-table>
<el-pagination background :current-page="queryForm.pageNum" :page-size="queryForm.pageSize" :layout="layout" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange"></el-pagination>
<el-pagination background :current-page="queryForm.pageNum" :page-size="queryForm.pageSize" :layout="layout" :page-sizes="[10,20,50,100,1000,10000]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange"></el-pagination>
<div slot="footer" class="dialog-footer">
<el-button size="mini" @click="close"> </el-button>
<el-button type="primary" size="mini" @click="save"> </el-button>

@ -6,7 +6,29 @@
</el-date-picker>
</div>
<el-table :data="list" @row-dblclick="confirm" stripe style="width: 100%;margin-top:5px" show-summary :row-class-name="rowClassName" :header-cell-style=" {background: 'linear-gradient(#6cb3ff, #1873d4)' , color: '#eeeeee' , }">
<el-table-column align="center" prop="deptNames" label="部门" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="deptNames" label="部门" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" label="充值业绩" min-width="80" show-overflow-tooltip>
<el-table-column align="center" prop="recharge" label="总业绩" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="rechargecar" label="充值" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="repaymentRecharge" label="还款" min-width="80" show-overflow-tooltip> </el-table-column>
</el-table-column>
<el-table-column align="center" label="疗程业绩" min-width="80" show-overflow-tooltip>
<el-table-column align="center" prop="courseSum" label="总业绩" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="course" label="疗程" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="courseRepay" label="还款" min-width="80" show-overflow-tooltip> </el-table-column>
</el-table-column>
<el-table-column align="center" label="服务" min-width="80" show-overflow-tooltip>
<el-table-column align="center" prop="cashierCash" label="现付" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="cashierRecharge" label="充值卡付" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="cashierCard" label="疗程卡付" min-width="80" show-overflow-tooltip> </el-table-column>
</el-table-column>
<el-table-column align="center" prop="courseCard" label="充值卡购买疗程" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" label="退款" min-width="80" show-overflow-tooltip>
<el-table-column align="center" prop="refundRechagre" label="充值" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="courseYj" label="疗程" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="refundCash" label="消费" min-width="80" show-overflow-tooltip> </el-table-column>
</el-table-column>
<!-- <el-table-column align="center" prop="deptNames" label="部门" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="recharge" label="充值" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" label="疗程">
<el-table-column align="center" prop="courseTotal" label="总业绩" min-width="80" show-overflow-tooltip> </el-table-column>
@ -40,7 +62,7 @@
</el-table-column>
<el-table-column align="center" prop="cashReceipts" label="现金收款" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="courseYj" label="疗程业绩" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="cashYj" label="服务业绩" min-width="80" show-overflow-tooltip> </el-table-column>
<el-table-column align="center" prop="cashYj" label="服务业绩" min-width="80" show-overflow-tooltip> </el-table-column> -->
</el-table>
<!-- <div class="block" style="margin-top: 10px">
<el-pagination 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>

@ -18,6 +18,7 @@
v-model="input">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
<el-button size="mini" type="primary" @click="initQueryList"></el-button>
<el-button size="mini" type="primary" @click="searchDialog = true">条件搜索</el-button>
<el-button
size="mini"
@ -591,6 +592,10 @@ export default {
};
},
methods: {
initQueryList(){
this.pageInfo.slectPhoneName = this.input
this.getData()
},
//
sendPhone() {
authCodes({
@ -867,7 +872,8 @@ export default {
pageSize: this.pageInfo.pageSize,
pageNum: this.pageInfo.pageNum,
state: this.state,
storeId: sessionStorage.getItem("parentId")
storeId: sessionStorage.getItem("parentId"),
slectPhoneName:this.pageInfo.slectPhoneName
};
storeMemberpage(page).then(res => {
if (res.code == "000000") {
@ -887,9 +893,7 @@ export default {
});
}
res.pageInfo.tableList = res.pageInfo.list;
console.log("🚀 ~ file: memberList.vue ~ line 902 ~ storeMemberpage ~ res.pageInfo.tableList", res.pageInfo.list)
this.pageInfo = res.pageInfo;
console.log("🚀 ~ file: memberList.vue ~ line 899 ~ storeMemberpage ~ this.pageInfo", this.pageInfo)
} else {
this.$alert(res.message, "提示", {
confirmButtonText: "确定",
@ -1119,17 +1123,9 @@ export default {
computed: {
//
tableData() {
var search = this.input.toString().toLowerCase(); //
// var search = this.input.toString().toLowerCase(); //
var search = ''; //
if (search) {
// return this.pageInfo.tableList.filter(function(dataNews) {
// return Object.keys(dataNews).some(function(key) {
// return (
// String(dataNews[key])
// .toLowerCase()
// .indexOf(search) > -1
// );
// });
// });
//
return this.pageInfo.tableList.filter((item,index)=>{
item.mobilePhone += ''

@ -87,7 +87,7 @@ export default {
},
//
getOtherStore(id){
allStores({ storeId:id }).then(res=>{
allStores({ storeId:id,type:0 }).then(res=>{
if(res.code == '000000'){
let params = {}
res.rows.forEach((item)=>{

@ -147,6 +147,15 @@
</span>
</div>
</el-form-item>
<br />
<el-form-item prop="superPasswd" label="超级支付密码 : " title="超级支付密码" v-if="passShow">
<div>
<span>
<span v-show="!editInput"> ****** </span>
<el-input v-show="editInput" v-model="dataList.superPasswd" show-password></el-input>
</span>
</div>
</el-form-item>
</el-col>
<el-col class="div2" :xl="2">
<el-form-item>
@ -344,6 +353,7 @@ export default {
},
data() {
return {
passShow:false,
isTrue:null,
headOffice: sessionStorage.getItem("headOffice") * 1, // 0 1
buttonShow: false, //
@ -395,7 +405,7 @@ export default {
this.isTrue = true
},
// number
getData(number,storeId) {
getData(number,storeId,isTrue) {
var page = { page: '' };
if (number == 1) {
pagesorganizationone(page).then((res) => {
@ -412,6 +422,7 @@ export default {
if(storeId){
page = { storeId }
}
if(isTrue)page.type = 0
storeParaList(page).then((res) => {
if (res.code == "000000") {
this.toPar(res.rows);
@ -544,7 +555,6 @@ export default {
if (item.paramentName == "buycourse") {
dataList.buycourse = item.paramentValue;
}
if (item.paramentName == "memberPay") {
dataList.memberPay = item.paramentValue * 1;
}
@ -552,10 +562,13 @@ export default {
dataList.refundRechargeType = item.paramentValue * 1;
}
// if (item.paramentName == "replacementOderChia") {
// dataList.replacementOderChia = item.paramentValue * 1;
// }
if (item.paramentName == "superPasswd") {
dataList.superPasswd = item.paramentValue;
this.passShow = true
}else{
this.passShow = false
}
if (item.paramentName == "expMoneyByIntegral") {
dataList.expMoneyByIntegral = item.paramentValue;
}
@ -757,6 +770,9 @@ export default {
this.loading = false;
}, 2500);
var dataList = { ...this.dataList };
if(dataList.superPasswd){
dataList.superPasswd = dataList.superPasswd + "|" + "超级支付密码";
}
if (dataList.minimum == true) {
dataList.minimum = 1;
} else {

@ -1,7 +1,7 @@
<template>
<div>
<el-table border v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText" @row-dblclick="rowdbClick" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}">
<el-table-column show-overflow-tooltip align="center" min-width="80" prop="docTypeName" label="类别">
<el-table-column show-overflow-tooltip align="center" min-width="110" prop="docTypeName" label="类别">
<template slot-scope="scope">
<div>{{scope.row.isAddition==1?'(补)':''}}{{scope.row.docTypeName}}</div>
</template>
@ -253,6 +253,12 @@ export default {
if(item.accountType == 'recharge_groupon·'){
item.docTypeName = '团购卡'
}
if(item.accountType == 'project_consume'){
item.docTypeName = '加价转疗程转出'
}
if(item.accountType == 'project'){
item.docTypeName = '加价转疗程转入'
}
if (item.type == "card_repay") {
if (item.orderType == "course") {
item.docTypeName = "疗程" + item.docTypeName;

@ -34,7 +34,7 @@
<el-table-column align="center" prop="storeName" label="名称" min-width="180">
<template slot-scope="scope">
<el-select filterable default-first-option clearable @clear='clear(scope.row)' v-model="scope.row.storeName" @change="changeIn($event,scope.row)" placeholder="请选择">
<el-option v-for="(item,index) in storeList" :key="index" :label="item.storeName" :value="item.storeName">
<el-option v-for="(item,index) in storeList" :key="index" :label="item.storeNum + '-' + item.storeName" :value="item.storeName">
</el-option>
</el-select>
</template>
@ -87,7 +87,7 @@ export default {
this.form.storesId = item.id;
}
});
this.getData();
if(this.form.mobilePhone)this.query()
},
//
changeIn(e, row) {

@ -1,9 +1,17 @@
<template>
<!-- 停用 -->
<div class="displsy-mod">
<el-button size="mini" @click="edit" type="primary">疗程转门店</el-button>
<el-button size="mini" @click="quers" type="primary">批量确认</el-button>
<div class="flex">
<div class="left">
<el-button size="mini" @click="edit" type="primary">疗程转门店</el-button>
<el-button size="mini" @click="quers" type="primary">批量确认</el-button>
</div>
<div class="right">
<el-input v-model="queryForm.phone" placeholder="请输入手机号" size='small' oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*"></el-input>
<el-date-picker v-model="queryForm.date" type="date" placeholder="选择日期" format="yyyy-MM-dd" @change="dateChange" size='small'></el-date-picker>
<el-button size="mini" @click="queryInit" type="primary">搜索</el-button>
</div>
</div>
<el-table class="margin-top-xs" :data="list" ref="list" v-loading="listLoading" max-height="600" :element-loading-text="elementLoadingText" @row-click="getCurrentRow" :row-class-name="rowName" @selection-change="handleSelectionChange" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}">
<el-table-column type="selection" width="50"></el-table-column>
@ -34,7 +42,11 @@
<el-table-column align="center" prop="courseConsumeCount" label="可用次数" sortable min-width="100"></el-table-column>
<el-table-column align="center" prop="courseConsumePrice" label="可用金额" sortable min-width="100"></el-table-column>
</el-table-column>
<el-table-column align="center" fixed="right" label="创建时间" width="120">
<template slot-scope="scope">
{{ timestamp(scope.row.proposerDate) }}
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="操作" width="80">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="quer(scope.row)" plain>确认</el-button>
@ -56,6 +68,13 @@ import {
} from "@/api/storeManage.js";
export default {
components: { edit },
computed:{
timestamp(){
return function(time){
return new Date(parseInt(time)).toLocaleString().replace(/:\d{1,2}$/,' ').replace('/','-').replace('/','-')
}
}
},
data() {
return {
dialogFormVisible: false,
@ -70,6 +89,14 @@ export default {
};
},
methods: {
queryInit(){
this.getData()
},
dateChange(date){
if(!date){
this.queryForm.date = ''
}
},
//
show() {
@ -122,12 +149,10 @@ export default {
},
//
handleSizeChange(val) {
// console.log(` ${val} `);
this.queryForm.pageSize = val;
this.getData();
},
handleCurrentChange(val) {
// console.log(`: ${val}`);
this.queryForm.pageNum = val;
this.getData();
},
@ -155,6 +180,14 @@ export default {
};
</script>
<style scoped>
.flex{
display: flex;
align-items: center;
justify-content: space-between;
}
.right{
text-align: right;
}
.el-input {
width: 200px;
}

@ -268,7 +268,8 @@ const router = new VueRouter({
component: () => import("../pages/eashier/service/service.vue"),
meta: {
title: "直接收银",
index: "services"
index: "services",
keepAlive:true
}
},
{

@ -16,7 +16,7 @@ axios.defaults.headers.post["Content-Type"] = "application/json;charset=UTF-8";
// 创建axios实例
const service = axios.create({
// baseURL: baseURL,
timeout: 15000 // 请求超时时间
timeout: 120000 // 请求超时时间
});
// request拦截器
service.interceptors.request.use(

Loading…
Cancel
Save