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

提交--

Browse Source
master
Wangxubin 4 years ago
parent d7623a1a17
commit 32a4658883
22 changed files with 543 additions and 99 deletions
Show Stats Download Patch File Download Diff File

2
partten/partten.js
Unescape Escape View File

@ -15,7 +15,7 @@ if (new Date().getMonth() + 1 < 10) {
month = "0" + (new Date().getMonth() + 1); month = "0" + (new Date().getMonth() + 1);
} else { } else {
month = new Date().getMonth() + 1; month = new Date().getMonth() + 1;
dabao; // dabao;
} }
var day = ""; var day = "";

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

@ -9,6 +9,33 @@ export function succsee() {
}); });
} }
// 充值短信重发
export function rechargeReissue(data){
return service({
url:"/api"+'/demay/ssm/rec/retransmission',
data,
method: "post"
})
}
// 疗程短信重发
export function courseReissue(data){
return service({
url:"/api" + '/demay/ssm/course/retransmission',
method: "post",
data
})
}
// 收银短信重发
export function sms(data){
return service({
url:"/api"+'/demay/ssm/cash/retransmission',
method: "post",
data
})
}
// 门店明细查询 平台端-门店管理-门店审核-门店明细查询 // 门店明细查询 平台端-门店管理-门店审核-门店明细查询
export function storeOne(params) { export function storeOne(params) {
return service({ return service({

20
src/api/promotion.js
Unescape Escape View File

@ -149,6 +149,17 @@ export function editBaseZengka(params) {
data: params data: params
}); });
} }
// 赠卡导出
export function exportCard(params){
return service({
url:"/api" + '/demay/ssm/baseZengka/export',
method: "post",
data:params,
responseType: "blob",
})
}
// 赠卡page // 赠卡page
export function baseZengkaPage(params) { export function baseZengkaPage(params) {
return service({ return service({
@ -205,6 +216,15 @@ export function stateBaseGrouponCard(params) {
data: params data: params
}); });
} }
// 导出团购卡
export function Export(params){
return service({
url:"/api" + '/demay/ssm/baseGrouponCard/export',
method: "post",
data: params,
responseType: "blob",
})
}
// 添加团购人名单 // 添加团购人名单
export function addBaseGrouponList(params) { export function addBaseGrouponList(params) {
return service({ return service({

3
src/components/store/select/index.vue
Unescape Escape View File

@ -15,6 +15,9 @@ export default {
storeIds: [], storeIds: [],
}; };
}, },
created(){
this.show()
},
methods: { methods: {
getData() { getData() {
console.log(this.storeIds); console.log(this.storeIds);

68
src/layout/components/asider.vue
Unescape Escape View File

@ -13,10 +13,18 @@
<span slot="title">{{item.name}}</span> <span slot="title">{{item.name}}</span>
</template> </template>
<router-link v-for="(items) in item.menuLists" :key="items.id" :to="items.route" v-role='items.number' tag="p"> <router-link v-for="(items) in item.menuLists" :key="items.id" :to="items.route" v-role='items.number' tag="p">
<el-menu-item :index="items.index" @click="rowClick(items)"> <el-menu-item :index="items.index" @click="rowClick(items)" v-if="!items.level">
<i :class="items.icon"></i>
<span slot="title">{{items.name}}</span> <span slot="title">{{items.name}}</span>
</el-menu-item> </el-menu-item>
<el-submenu :index="items.index" v-else class="submenu">
<span slot="title">{{ items.name }}</span>
<router-link v-for="(ite) in items.children" :key="ite.id" :to="ite.route" v-role='ite.number' tag="p">
<el-menu-item :index="ite.index" @click="rowClick(ite)">
<i :class="ite.icon"></i>
<span slot="title">{{ite.name}}</span>
</el-menu-item>
</router-link>
</el-submenu>
</router-link> </router-link>
</el-submenu> </el-submenu>
</template> </template>
@ -387,6 +395,14 @@ export default {
number: "500400", number: "500400",
id:"8008006", id:"8008006",
}, },
{
name: "充值内调单",
icon: "el-icon-sort",
route: "/within",
index: "within",
number: "500410",
id:"8008009",
},
{ {
name: "加价转疗程", name: "加价转疗程",
icon: "el-icon-connection", icon: "el-icon-connection",
@ -419,14 +435,41 @@ export default {
number: "5001800", number: "5001800",
id:"8008027", id:"8008027",
}, },
{ // {
name: "充值内调单", // level:true,
icon: "el-icon-sort", // name:"内调单",
route: "/within", // index:"/within",
index: "within", // number:"500410",
number: "500410", // id:'99999999',
id:"8008009", // route:"/within",
}, // icon: "el-icon-sort",
// children:[
// {
// name: "充值内调单",
// icon: "el-icon-sort",
// route: "/within",
// index: "within",
// number: "500410",
// id:"8008009",
// },
// {
// name: "加价转疗程",
// icon: "el-icon-connection",
// route: "/raiseReatment",
// index: "raiseReatment",
// number: "500410",
// id:"8008007",
// },
// {
// name: "疗程转充值",
// icon: "el-icon-connection",
// route: "/coursetorec",
// index: "coursetorec",
// number: "500410",
// id:"8008008",
// },
// ]
// },
{ {
name: "会员转卡", name: "会员转卡",
icon: "el-icon-sort", icon: "el-icon-sort",
@ -1141,7 +1184,10 @@ export default {
.el-menu { .el-menu {
border: none; border: none;
} }
*>>> .el-menu-item, .el-submenu__title{
height: 0.175rem;
line-height: 0.175rem;
}
/* .asider-icon{ /* .asider-icon{
} */ } */

181
src/pages/eashier/accountSet/accountSet.vue
Unescape Escape View File

@ -156,42 +156,55 @@
</el-table-column> </el-table-column>
<el-table-column v-if="radioAccount==1" label="剩余次数" align="center" width="160"> <el-table-column v-if="radioAccount==1" label="剩余次数" align="center" width="160">
<template slot-scope='scope'> <template slot-scope='scope'>
<el-input @change="changeInput(scope.row,scope.$index )" @blur="scope.row.courseRestCountNew==''?scope.row.courseRestCountNew=0:scope.row.courseRestCountNew" oninput="this.value=this.value.replace(/[^\-?\d.]/g,'')" v-if="scope.$index==1" v-model="scope.row.courseRestCountModify"></el-input> <el-input @change="changeInput(scope.row,4 )" @blur="scope.row.courseRestCountNew==''?scope.row.courseRestCountNew=0:scope.row.courseRestCountNew" oninput="this.value=this.value.replace(/[^\-?\d.]/g,'')" v-if="scope.$index==1" v-model="scope.row.courseRestCountModify"></el-input>
<span v-else>{{scope.$index==0?scope.row.courseRestCount:scope.row.courseRestCountNew}}</span> <span v-else>{{scope.$index==0?scope.row.courseRestCount:scope.row.courseRestCountNew}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="radioAccount==1" label="可用次数" align="center" width="160"> <el-table-column v-if="radioAccount==1" label="可用次数" align="center" width="160">
<template slot-scope='scope'> <template slot-scope='scope'>
<el-input oninput="this.value=this.value.replace(/[^\-?\d.]/g,'')" @change="changeInput(scope.row,scope.$index )" v-if="scope.$index==1" v-model="scope.row.courseConsumeCountModify"></el-input> <el-input oninput="this.value=this.value.replace(/[^\-?\d.]/g,'')" @change="changeInput(scope.row,5 )" v-if="scope.$index==1" v-model="scope.row.courseConsumeCountModify"></el-input>
<span v-else>{{scope.$index==0?scope.row.courseConsumeCount:scope.row.courseConsumeCountNew}}</span> <span v-else>{{scope.$index==0?scope.row.courseConsumeCount:scope.row.courseConsumeCountNew}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="tradeMoney" v-if="radioAccount==0" label="剩余金额" align="center" min-width="80"> <el-table-column prop="tradeMoney" v-if="radioAccount==0" label="剩余金额" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input @change="changeInput(scope.row,scope.$index )" v-if="scope.$index==1" v-model="scope.row.cardRestMoneyModify"></el-input> <el-input oninput="this.value=this.value.replace(/[^\-?\d.]/g,'')" @change="changeInput(scope.row,0 )" v-if="scope.$index==1" v-model="scope.row.cardRestMoneyModify"></el-input>
<span v-else>{{scope.$index==0?scope.row.cardRestMoney:scope.row.cardRestMoneyNew}}</span> <span v-else>{{scope.$index==0?scope.row.cardRestMoney:scope.row.cardRestMoneyNew}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="tradeMoney" v-if="radioAccount==0" label="可用金额" align="center" min-width="80"> <el-table-column prop="tradeMoney" v-if="radioAccount==0" label="可用金额" align="center" min-width="80">
<template slot-scope='scope'> <template slot-scope='scope'>
<el-input @change="changeInput(scope.row,scope.$index )" v-if="scope.$index==1" v-model="scope.row.cardConsumeMoneyModify"></el-input> <el-input oninput="this.value=this.value.replace(/[^\-?\d.]/g,'')" @change="changeInput(scope.row,1 )" v-if="scope.$index==1" v-model="scope.row.cardConsumeMoneyModify"></el-input>
<span v-else>{{scope.$index==0?scope.row.cardConsumeMoney:scope.row.cardConsumeMoneyNew}}</span> <span v-else>{{scope.$index==0?scope.row.cardConsumeMoney:scope.row.cardConsumeMoneyNew}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="tradeMoney" v-if="radioAccount==0" label="赠送剩余金额" align="center" min-width="80"> <el-table-column prop="tradeMoney" v-if="radioAccount==0" label="赠送剩余金额" align="center" min-width="80">
<template slot-scope='scope'> <template slot-scope='scope'>
<el-input @change="changeInput(scope.row,scope.$index )" v-if="scope.$index==1&&scope.row.type==0" v-model="scope.row.cardGiftMoneyModify"> <el-input @change="changeInput(scope.row,2 )" v-if="scope.$index==1&&scope.row.type==0" v-model="scope.row.cardGiftMoneyModify">
</el-input> </el-input>
<span v-else>{{scope.$index==0?scope.row.cardGiftMoney:scope.row.cardGiftMoneyNew}}</span> <span v-else>{{scope.$index==0?scope.row.cardGiftMoney:scope.row.cardGiftMoneyNew}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="giftConsumeMoney" v-if="radioAccount==0" label="赠送可用金额" align="center" min-width="80"> <el-table-column prop="giftConsumeMoney" v-if="radioAccount==0" label="赠送可用金额" align="center" min-width="80">
<template slot-scope='scope'> <template slot-scope='scope'>
<el-input @change="changeInput(scope.row,scope.$index )" v-if="scope.$index==1&&scope.row.type==0" v-model="scope.row.giftConsumeMoneyModify"> <el-input @change="changeInput(scope.row,3 )" v-if="scope.$index==1&&scope.row.type==0" v-model="scope.row.giftConsumeMoneyModify">
</el-input> </el-input>
<span v-else>{{scope.$index==0?scope.row.giftConsumeMoney:scope.row.giftConsumeMoneyNew}}</span> <span v-else>{{scope.$index==0?scope.row.giftConsumeMoney:scope.row.giftConsumeMoneyNew}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="异常说明" min-width="150" v-if="radioAccount==0||radioAccount==1">
<template slot-scope='scope'>
<div style="width:250px">
<el-input
type="textarea"
maxlength="100"
show-word-limit
:autosize="{ minRows: 2, maxRows: 4}"
placeholder="请输入内容"
v-model="scope.row.textarea"/>
</div>
</template>
</el-table-column>
</el-table> </el-table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="mini" type="primary" plain @click="handleClose">取 消</el-button> <el-button size="mini" type="primary" plain @click="handleClose">取 消</el-button>
@ -300,10 +313,138 @@ export default {
console.log("value", value); console.log("value", value);
console.log("index", index); console.log("index", index);
}, },
changeInput(row, index) { changeInput(row,index){
console.log(row); console.log(row)
// 0剩余金额 1可用金额 2赠送金额 3赠送可用金额 4剩余次数 5可用次数
// courseRestCountModify剩余次数 courseConsumeCountModify可用次数 cardRestMoneyModify剩余金额 cardConsumeMoneyModify可用金额 cardGiftMoneyModify赠送剩余金额 giftConsumeMoneyModify赠送可用金额
// courseRestCountNew新账户剩余次数 courseConsumeCountNew新账户可用次数 cardRestMoneyNew新账户剩余金额 cardConsumeMoneyNew新账户可用金额 cardGiftMoneyNew新账户赠送剩余金额 giftConsumeMoneyNew新账户赠送可用金额
switch (index) {
case 0:
if(row.cardRestMoneyModify*1||row.cardRestMoneyModify*1===0){
// 修改了剩余金额
let total = row.cardRestMoneyModify*1
// 剩余金额小于可用金额时
if(total < row.cardConsumeMoneyModify*1){
row.cardRestMoneyModify = 0
this.accountList[2].cardRestMoneyNew = 0
this.$alert("剩余金额不能小于可用金额", "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}else{
this.$set(this.accountList[2],'cardRestMoneyNew',total)
// this.accountList[2].cardRestMoneyNew = total
}
}
break;
case 1:
if(row.cardConsumeMoneyModify*1||row.cardConsumeMoneyModify*1===0){
// 修改了可用金额
let total = row.cardConsumeMoneyModify*1
// 输入的可用金额大于剩余金额时
if( total>row.cardRestMoneyModify*1 ){
row.cardConsumeMoneyModify = 0
this.accountList[2].cardConsumeMoneyNew = 0
this.$alert("可用金额不能大于剩余金额", "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}else{
// this.accountList[2].cardConsumeMoneyNew = total
this.$set(this.accountList[2],'cardConsumeMoneyNew',total)
console.log(this.accountList[2])
}
}
break;
case 2:
if(row.cardGiftMoneyModify*1||row.cardGiftMoneyModify*1===0){
// 操作了赠送剩余金额
let total = row.cardGiftMoneyModify*1
// 赠送剩余金额小于赠送可用金额时
if(total < row.giftConsumeMoneyModify*1){
row.cardGiftMoneyModify = 0
this.accountList[2].cardGiftMoneyNew = 0
this.$alert("赠送剩余金额不能小于赠送可用金额", "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}else{
this.accountList[2].cardGiftMoneyNew = total
}
}
break;
case 3:
if(row.giftConsumeMoneyModify*1||row.giftConsumeMoneyModify*1===0){
// 操作了赠送可用金额
let total = row.giftConsumeMoneyModify*1
// 赠送可用金额大于赠送金额时
if(total>row.cardGiftMoneyModify*1){
row.giftConsumeMoneyModify = 0
this.accountList[2].giftConsumeMoneyNew = 0
this.$alert("赠送可用金额不能大于赠送剩余金额", "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}else{
this.accountList[2].giftConsumeMoneyNew = total
}
}
break;
case 4:
if(row.courseRestCountModify*1||row.courseRestCountModify*1===0){
// 修改了剩余次数
let total = row.courseRestCountModify*1
// 剩余次数小于可用次数时
if(total<row.courseConsumeCountModify*1){
row.courseRestCountModify = 0
this.accountList[2].courseRestCountNew = 0
this.$alert("剩余次数不能小于可用次数", "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}else{
this.accountList[2].courseRestCountNew = total
}
}
break;
case 5:
if(row.courseConsumeCountModify*1||row.courseConsumeCountModify*1===0){
// 修改了可用次数
let total = row.courseConsumeCountModify*1
if(total > row.courseRestCountModify*1){
row.courseConsumeCountModify = 0
this.accountList[2].courseConsumeCountNew = 0
this.$alert("可用次数不能大于剩余次数", "提示", {
confirmButtonText: "确定",
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
callback: (action) => {},
});
}else{
this.accountList[2].courseConsumeCountNew = total
}
}
break;
}
},
changeInputActive(row, index) {
let list = [...this.accountList]; let list = [...this.accountList];
if (list[2].courseRestCountNew != undefined) { if (list[2].courseRestCountNew != undefined) {
list[2].courseRestCountNew = list[2].courseRestCountNew =
list[0].courseRestCount + list[1].courseRestCountModify * 1; list[0].courseRestCount + list[1].courseRestCountModify * 1;
@ -319,19 +460,20 @@ export default {
center: true, center: true,
callback: (action) => {}, callback: (action) => {},
}); });
this.accountList[1].courseConsumeCountModify = 0
this.changeInput(row)
} }
} }
if (list[2].cardRestMoneyNew != undefined) { if (list[2].cardRestMoneyNew) {
list[2].cardRestMoneyNew = list[2].cardRestMoneyNew =
list[0].cardRestMoney + list[1].cardRestMoneyModify * 1; list[0].cardRestMoney + list[1].cardRestMoneyModify * 1;
} }
if (list[2].cardGiftMoneyNew != undefined) { if (list[2].cardGiftMoneyNew) {
list[2].cardGiftMoneyNew = list[2].cardGiftMoneyNew =
list[0].cardGiftMoney + list[1].cardGiftMoneyModify * 1; list[0].cardGiftMoney + list[1].cardGiftMoneyModify * 1;
} }
if (list[2].cardConsumeMoneyNew != undefined) { if (list[2].cardConsumeMoneyNew) {
list[2].cardConsumeMoneyNew = list[2].cardConsumeMoneyNew = list[0].cardConsumeMoney + list[1].cardConsumeMoneyModify * 1;
list[0].cardConsumeMoney + list[1].cardConsumeMoneyModify * 1;
if (list[2].cardConsumeMoneyNew > list[2].cardRestMoneyNew) { if (list[2].cardConsumeMoneyNew > list[2].cardRestMoneyNew) {
this.$alert("可用金额不能大于剩余金额", "提示", { this.$alert("可用金额不能大于剩余金额", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -340,9 +482,11 @@ export default {
center: true, center: true,
callback: (action) => {}, callback: (action) => {},
}); });
this.accountList[1].cardConsumeMoneyModify = 0
this.changeInput(row)
} }
} }
if (list[2].giftConsumeMoneyNew != undefined) { if (list[2].giftConsumeMoneyNew) {
list[2].giftConsumeMoneyNew = list[2].giftConsumeMoneyNew =
list[0].giftConsumeMoney + list[1].giftConsumeMoneyModify * 1; list[0].giftConsumeMoney + list[1].giftConsumeMoneyModify * 1;
if (list[2].giftConsumeMoneyNew > list[2].cardGiftMoneyNew) { if (list[2].giftConsumeMoneyNew > list[2].cardGiftMoneyNew) {
@ -353,13 +497,10 @@ export default {
center: true, center: true,
callback: (action) => {}, callback: (action) => {},
}); });
this.accountList[1].giftConsumeMoneyModify = 0
this.changeInput(row)
} }
} }
console.log(list);
list.forEach((item) => {
console.log(item);
});
this.accountList = [...list]; this.accountList = [...list];
}, },
//确定返回方法 //确定返回方法

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

@ -116,6 +116,8 @@
<el-button size="mini" type="primary" @click="detailDialog=false">关闭</el-button> <el-button size="mini" type="primary" @click="detailDialog=false">关闭</el-button>
</span> </span>
<span v-else slot="footer" class="dialog-footer"> <span v-else slot="footer" class="dialog-footer">
<!-- 补单才需要短信重发 -->
<el-button size="mini" type="primary" @click="handleReissue" v-if="form.isAddition===1">短信重发</el-button>
<el-button size="mini" type="primary" plain @click="cancel()">取 消</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()">修 改</el-button>
</span> </span>
@ -123,7 +125,7 @@
</template> </template>
<script> <script>
import { recEditStaff, selectOne } from "@/api/eashier.js"; import { recEditStaff, selectOne,rechargeReissue } from "@/api/eashier.js";
import admin from "@/components/staffList/admin/index"; import admin from "@/components/staffList/admin/index";
import manager from "@/components/staffList/manager/index"; import manager from "@/components/staffList/manager/index";
import staffsles from "@/components/staffList/staff/index"; import staffsles from "@/components/staffList/staff/index";
@ -142,6 +144,22 @@ export default {
}; };
}, },
methods: { methods: {
// 短信重发
handleReissue(){
let params = {
collectionAmount:this.form['collectionAmount'],
additionDate:this.form['additionDate'],
mobilePhone:this.form['mobilePhone']
}
rechargeReissue(params).then(res=>{
// console.log(res)
if(res.code === '000000'){
return this.$message.success({
message: "操作成功!",
});
}
})
},
//关闭弹窗前的回调方法 //关闭弹窗前的回调方法
handleClose() { handleClose() {
this.form = Object.assign({}); this.form = Object.assign({});

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

@ -97,7 +97,7 @@
</el-table> </el-table>
</div> </div>
</div> </div>
</el-collapse-item> <!-- </el-collapse-item> -->
<div class="text-bold padding-xs">员工/门店管理层/高管业绩</div> <div class="text-bold padding-xs">员工/门店管理层/高管业绩</div>
<div class="flex justify-start align-start flex-wrap "> <div class="flex justify-start align-start flex-wrap ">
<staffsles ref="staffsles" @staffslesData="staffslesData"></staffsles> <staffsles ref="staffsles" @staffslesData="staffslesData"></staffsles>
@ -114,6 +114,8 @@
<el-button size="mini" type="primary" @click="detailDialog=false">关闭</el-button> <el-button size="mini" type="primary" @click="detailDialog=false">关闭</el-button>
</span> </span>
<span v-else slot="footer" class="dialog-footer"> <span v-else slot="footer" class="dialog-footer">
<!-- 补单才需要短信重发 -->
<el-button size="mini" type="primary" @click="handleReissue" v-if="form.isAddition===1">短信重发</el-button>
<el-button size="mini" type="primary" plain @click="cancel()">取 消</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()">修 改</el-button>
</span> </span>
@ -121,7 +123,7 @@
</template> </template>
<script> <script>
import { courseEditStaff, selectOne } from "@/api/eashier.js"; import { courseEditStaff, selectOne, courseReissue } from "@/api/eashier.js";
import admin from "@/components/staffList/admin/index"; import admin from "@/components/staffList/admin/index";
import manager from "@/components/staffList/manager/index"; import manager from "@/components/staffList/manager/index";
import staffsles from "@/components/staffList/staff/index"; import staffsles from "@/components/staffList/staff/index";
@ -142,6 +144,20 @@ export default {
}; };
}, },
methods: { methods: {
handleReissue(){
let params = {
additionDate:this.form['additionDate'],
mobilePhone:this.form['mobilePhone'],
projectName:this.form['projectName']
}
courseReissue(params).then(res=>{
if(res.code === '000000'){
return this.$message.success({
message: "操作成功!",
});
}
})
},
//关闭弹窗前的回调方法 //关闭弹窗前的回调方法
handleClose() { handleClose() {
this.form = Object.assign({}); this.form = Object.assign({});

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

@ -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;" 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 " 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>
@ -1805,6 +1805,9 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
>>>.el-input-group--append .el-input__inner{
width: 123px;
}
.reatmen { .reatmen {
background: white; background: white;
overflow: hidden; overflow: hidden;

41
src/pages/eashier/service/detail/detail.vue
Unescape Escape View File

@ -50,6 +50,9 @@
<span class="text-red">{{scope.row.woman?(' 女 '+scope.row.woman):''}}</span> <span class="text-red">{{scope.row.woman?(' 女 '+scope.row.woman):''}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column show-overflow-tooltip min-width="100" align="center" prop="payType" label="支付类型"></el-table-column>
<el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionRechargeAmount" label="卡付金额"></el-table-column>
<el-table-column show-overflow-tooltip min-width="75" align="center" prop="collectionCashAmount" label="现付金额"></el-table-column>
<el-table-column align="center" prop="inputBy" label="录单人" show-overflow-tooltip min-width="80"></el-table-column> <el-table-column align="center" prop="inputBy" label="录单人" show-overflow-tooltip min-width="80"></el-table-column>
<el-table-column align="center" prop="storeName" label="所属门店" show-overflow-tooltip min-width="100"></el-table-column> <el-table-column align="center" prop="storeName" label="所属门店" show-overflow-tooltip min-width="100"></el-table-column>
<el-table-column align="center" label="明细" width="76" fixed="right"> <el-table-column align="center" label="明细" width="76" fixed="right">
@ -157,7 +160,42 @@ export default {
}); });
} }
}, },
updataList(arr){
let list = arr
// 类型是 疗程付/卡付/现付/卡现付
// 支付类型payType 卡付金额collectionRechargeAmount 现付金额collectionCashAmount
arr.forEach(item=>{
if(item.projectList.length){
let itm = item.projectList[0]
// 当两个金额不存在时，返回类型为疗程付,现付和卡付金额都为0
if(!itm.collectionRechargeAmount&&!itm.collectionCashAmount){
item.payType = '疗程付'
item.collectionRechargeAmount = 0
item.collectionCashAmount = 0
return
}else if(itm.collectionRechargeAmount && itm.collectionCashAmount){
// 两个金额存在时,类型返回卡付/现付,同时返回现金/卡付金额
item.payType = '卡付/现付'
item.collectionRechargeAmount = itm.collectionRechargeAmount
item.collectionCashAmount = itm.collectionCashAmount
return
}else if(itm.collectionRechargeAmount && !itm.collectionCashAmount){
// 当卡付金额存在并且现付金额不存在时,返回类型为卡付,返回卡付金额,现付金额为0
item.payType = '卡付'
item.collectionRechargeAmount = itm.collectionRechargeAmount
item.collectionCashAmount = 0
return
}else{
// 都不存在时返回类型为现付,返回现付金额，卡付金额为0
item.payType = '现付'
item.collectionRechargeAmount = 0
item.collectionCashAmount = itm.collectionCashAmount
return
}
}
})
return list
},
//获取数据 //获取数据
async getData() { async getData() {
this.queryForm.selectDate = this.formatTime(this.month, "YYYYMM"); this.queryForm.selectDate = this.formatTime(this.month, "YYYYMM");
@ -165,6 +203,7 @@ export default {
if (res.code == "000000") { if (res.code == "000000") {
this.list = res.pageInfo.list; this.list = res.pageInfo.list;
this.total = res.pageInfo.total; this.total = res.pageInfo.total;
this.list = this.updataList(this.list)
} else { } else {
this.$alert(res.message, "提示", { this.$alert(res.message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",

19
src/pages/eashier/service/detail/editform.vue
Unescape Escape View File

@ -152,6 +152,8 @@
<el-button type="primary" plain size="mini" @click="dialogVisible = false">关闭</el-button> <el-button type="primary" plain size="mini" @click="dialogVisible = false">关闭</el-button>
</div> </div>
<div slot="footer" class="dialog-footer" v-else> <div slot="footer" class="dialog-footer" v-else>
<!-- 只有补单才需要重发短信 -->
<el-button type="primary" size="mini" @click="reissueSms()" v-if="form.isAddition===1">短信重发</el-button>
<el-button type="primary" plain size="mini" @click="handleClose">取消</el-button> <el-button type="primary" plain size="mini" @click="handleClose">取消</el-button>
<el-button :disabled="form.isCancel==1" type="primary" size="mini" @click="confirm()">{{title=='作废'?title:"确定"}}</el-button> <el-button :disabled="form.isCancel==1" type="primary" size="mini" @click="confirm()">{{title=='作废'?title:"确定"}}</el-button>
</div> </div>
@ -165,6 +167,7 @@ import {
QuerCompetent, QuerCompetent,
selectListType, selectListType,
selectOne, selectOne,
sms
} from "@/api/eashier.js"; } from "@/api/eashier.js";
import staffratio from "../staffratio"; import staffratio from "../staffratio";
export default { export default {
@ -183,6 +186,20 @@ export default {
}; };
}, },
methods: { methods: {
reissueSms(){
console.log(this.form)
let params = {
additionDate:this.form.additionDate,
projectList:this.form.projectList
}
sms(params).then(res=>{
if(res.code === '000000'){
return this.$message.success({
message: "操作成功!",
});
}
})
},
//关闭弹窗前的回调方法 //关闭弹窗前的回调方法
handleClose() { handleClose() {
console.log(123); console.log(123);
@ -264,8 +281,6 @@ export default {
this.list.forEach((item, index) => { this.list.forEach((item, index) => {
item.collectionAmount= item.collectionRechargeAmount*1+item.collectionCashAmount*1 item.collectionAmount= item.collectionRechargeAmount*1+item.collectionCashAmount*1
item.rechargeConsumeList.forEach((items) => { item.rechargeConsumeList.forEach((items) => {
items.cardOver = items.cardConsumeMoney; items.cardOver = items.cardConsumeMoney;
items.cardGiftOver = items.giftConsumeMoney; items.cardGiftOver = items.giftConsumeMoney;

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

@ -35,6 +35,8 @@
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属门店" min-width="110" show-overflow-tooltip prop="storeName"></el-table-column>
<el-table-column label="日期" min-width="110" show-overflow-tooltip prop="modifyDate"></el-table-column>
<el-table-column label="单据号" align="center" min-width="110" show-overflow-tooltip prop="initNum"> <el-table-column label="单据号" align="center" min-width="110" show-overflow-tooltip prop="initNum">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="cursor: pointer;">{{scope.row.initNum}}</div> <div style="cursor: pointer;">{{scope.row.initNum}}</div>
@ -265,6 +267,13 @@
</el-dialog> </el-dialog>
<el-dialog :close-on-click-modal="false" v-dialogDrag :title="addForm.cardType==0?'选择充值类别':'选择项目'" :visible.sync="electDialogFormVisible" :append-to-body="true"> <el-dialog :close-on-click-modal="false" v-dialogDrag :title="addForm.cardType==0?'选择充值类别':'选择项目'" :visible.sync="electDialogFormVisible" :append-to-body="true">
<div class="electform"> <div class="electform">
<!-- 模糊查询 -->
<div style="display:flex;align-items:center">
<el-input v-model="typeParams.name" placeholder="请输入名称" style="width:120px;margin-right:20px"></el-input>
<div slot="footer" class="dialog-footer">
<el-button type="primary" size='mini' @click="searchClick">确认</el-button>
</div>
</div>
<el-table :data="projectList" @row-click='radioRow' v-if="addForm.cardType==1" max-height="550" @row-dblclick="electConfirm(electDialogFormVisible=false)"> <el-table :data="projectList" @row-click='radioRow' v-if="addForm.cardType==1" max-height="550" @row-dblclick="electConfirm(electDialogFormVisible=false)">
<el-table-column label="选择" width="80"> <el-table-column label="选择" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
@ -327,6 +336,21 @@
<el-input maxlength="11" v-model="searchForm.tradeName" placeholder="输入要交易账户名称" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" clearable></el-input> <el-input maxlength="11" v-model="searchForm.tradeName" placeholder="输入要交易账户名称" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" clearable></el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="日期查询:" label-width="120px">
<div class="searchDiv">
<el-date-picker
style="width:200px"
v-model="searchForm.modifyDate"
type="daterange"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
</div>
</el-form-item>
<el-form-item label="门店查询" label-width="120px">
<div class="serachDiv">
<storesSelect style="width:200px" ref="storesSelect" @selecData='selecData'/>
</div>
</el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="mini" type="primary" plain @click="searchDialog = false"> 取 消</el-button> <el-button size="mini" type="primary" plain @click="searchDialog = false"> 取 消</el-button>
@ -341,6 +365,7 @@
</div> </div>
</template> </template>
<script> <script>
import storesSelect from '@/components/store/select'
import { partten } from "../../../../partten/index.js"; import { partten } from "../../../../partten/index.js";
import excel from "@/components/excel"; import excel from "@/components/excel";
import { propageNew, recTypePage } from "@/api/storeManage"; import { propageNew, recTypePage } from "@/api/storeManage";
@ -361,9 +386,11 @@ export default {
components: { components: {
excel, excel,
member, member,
storesSelect
}, },
data() { data() {
return { return {
typeParams:{},
searchDialog: false, //搜索弹窗开关 searchDialog: false, //搜索弹窗开关
searchForm: { searchForm: {
//搜索表单 //搜索表单
@ -408,28 +435,62 @@ export default {
activeName: "1", activeName: "1",
searchTrue: false, //搜索判断 searchTrue: false, //搜索判断
infoDialog: false, //上传文件弹窗开关 infoDialog: false, //上传文件弹窗开关
projectList:[],
rechargeTypeList:[]
}; };
}, },
watch:{
'typeParams.name':{
handler(val){
if(val == ''){
this.pages()
}
},
immediate:true
}
},
methods: { methods: {
searchClick(){
this.pages()
},
//关闭弹窗前的回调方法 //关闭弹窗前的回调方法
handleClose() { handleClose() {
this.addForm = {}; this.addForm = {};
this.dialogFormVisible = false; this.dialogFormVisible = false;
this.$refs.form.clearValidate(); this.$refs.form.clearValidate();
this.typeParams = {}
},
// 门店回调
selecData(ids){
this.searchForm.storeIds = ids
}, },
//搜索方法 //搜索方法
search() { search() {
this.searchForm.initState = this.activeName * 1; this.searchForm.initState = this.activeName * 1;
this.searchForm.pageNum = this.pageInfo.pageNum; this.searchForm.pageNum = this.pageInfo.pageNum;
this.searchForm.pageSize = this.pageInfo.pageSize; this.searchForm.pageSize = this.pageInfo.pageSize;
let params = { ...this.searchForm }
memberInitPage(this.searchForm).then((res) => { try{
// null.length会报错，所以try catch
if(params.modifyDate.length){
params['startDate'] = params['modifyDate'][0] + ' 00:00:00'
params['sendDate'] = params['modifyDate'][1] + ' 23:59:59'
delete params['modifyDate']
}
}catch(err){
delete params['modifyDate']
}
memberInitPage(params).then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
if (res.pageInfo.total == 0) { if (res.pageInfo.total == 0) {
this.$message.warning({ this.$message.warning({
message: "没有找到符合条件的数据", message: "没有找到符合条件的数据",
}); });
} }
// 确认清空选项
this.searchForm = {}
this.$refs.storesSelect.storeIds = []
res.pageInfo.importList = res.pageInfo.list; res.pageInfo.importList = res.pageInfo.list;
this.pageInfo = res.pageInfo; this.pageInfo = res.pageInfo;
this.searchTrue = true; this.searchTrue = true;
@ -706,6 +767,7 @@ export default {
submit() {}, submit() {},
change(row) { change(row) {
console.log(row); console.log(row);
this.typeParams = {}
let form = { let form = {
cardState: this.cardState, cardState: this.cardState,
memberName: this.addForm.memberName, memberName: this.addForm.memberName,
@ -819,17 +881,18 @@ export default {
} }
}, },
pages() { pages() {
var page1 = { let page1 = {
pageNum: 1, pageNum: 1,
pageSize: 1000, pageSize: 1000,
state: 1, state: 1,
directConsumption: 0, directConsumption: 0,
}; };
var page2 = { let page2 = {
pageNum: 1, pageNum: 1,
pageSize: 1000, pageSize: 1000,
state: 1, state: 1,
}; };
this.addForm.cardType?(this.typeParams.name?page1.projectName=this.typeParams.name:""):(this.typeParams.name?page2.rechargeTypeName=this.typeParams.name:"")
propageNew(page1).then((res) => { propageNew(page1).then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
res.pageInfo.list.forEach((item) => { res.pageInfo.list.forEach((item) => {
@ -838,6 +901,7 @@ export default {
delete item.id; delete item.id;
}); });
this.projectList = res.pageInfo.list; this.projectList = res.pageInfo.list;
console.log(this.projectList)
} else { } else {
} }
}); });

12
src/pages/eashier/within/components/detail.vue
Unescape Escape View File

@ -34,12 +34,22 @@
</div> </div>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="可用金额：" prop="inMoney">
<div class="form-width-ms">
{{form.cardConsumeMoney}}
</div>
</el-form-item>
<el-form-item label="转入金额：" prop="inMoney"> <el-form-item label="转入金额：" prop="inMoney">
<div class="form-width-ms"> <div class="form-width-ms">
{{form.inMoney}} {{form.inMoney}}
</div> </div>
</el-form-item> </el-form-item>
<br>
<el-form-item label="可用赠送：" prop="inMoney">
<div class="form-width-ms">
{{form.giftConsumeMoney}}
</div>
</el-form-item>
<el-form-item label="转入赠送：" prop="inGiftMoney"> <el-form-item label="转入赠送：" prop="inGiftMoney">
<div class="form-width-ms"> <div class="form-width-ms">
{{form.inGiftMoney}} {{form.inGiftMoney}}

16
src/pages/promotion/giftCards/index.vue
Unescape Escape View File

@ -9,6 +9,7 @@
<span v-show="">3 已审核</span> <span v-show="">3 已审核</span>
<span v-show="">4 反审核</span> <span v-show="">4 反审核</span>
<el-button size="mini" type="primary" @click="exportCard">导出</el-button>
<el-button size="mini" type="" @click="detail" :disabled="radioRowValueList.state == undefined">明细</el-button> <el-button size="mini" type="" @click="detail" :disabled="radioRowValueList.state == undefined">明细</el-button>
<el-button size="mini" type="primary" @click="edit(0)" :disabled=" <el-button size="mini" type="primary" @click="edit(0)" :disabled="
radioRowValueList.state == undefined || radioRowValueList.state == undefined ||
@ -106,7 +107,7 @@
<script> <script>
import edit from "./components/edit.vue"; import edit from "./components/edit.vue";
import detail from "./components/detail.vue"; import detail from "./components/detail.vue";
import { stateBaseZengka, baseZengkaPage } from "@/api/promotion.js"; import { stateBaseZengka, baseZengkaPage,exportCard } from "@/api/promotion.js";
export default { export default {
components: { edit, detail }, components: { edit, detail },
data() { data() {
@ -126,6 +127,19 @@ export default {
}; };
}, },
methods: { methods: {
// 赠卡导出
exportCard(){
exportCard(this.queryForm).then(res=>{
let blob = new Blob([res]);
var a = document.createElement("a");
var url = window.URL.createObjectURL(blob);
console.log(url);
a.href = url;
a.download = "赠卡导出表.xlsx";
a.click();
window.URL.revokeObjectURL(url);
})
},
//点击选中 //点击选中
rowClick(row) { rowClick(row) {
this.radioRowValue = row.id; this.radioRowValue = row.id;

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

@ -48,7 +48,7 @@
<admin ref="admin" @adminData="adminData"></admin> <admin ref="admin" @adminData="adminData"></admin>
<manager ref="manager" @managerData="managerData"></manager> <manager ref="manager" @managerData="managerData"></manager>
</div> </div>
<el-table v-if="title=='修改'" 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 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 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="memberName" label="会员名称"></el-table-column>
<el-table-column show-overflow-tooltip align="center" min-width="100" prop="mobilePhone" label="手机号码"> <el-table-column show-overflow-tooltip align="center" min-width="100" prop="mobilePhone" label="手机号码">
@ -74,7 +74,7 @@
<rec ref="rec" @recTypeData="recData"></rec> <rec ref="rec" @recTypeData="recData"></rec>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="mini" type="primary" plain @click="handleClose">取 消</el-button> <el-button size="mini" type="primary" plain @click="handleClose">取 消</el-button>
<el-button size="mini" type="primary" @click="confirm">确 定</el-button> <el-button size="mini" type="primary" @click="confirm" v-if="!type">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
@ -98,6 +98,7 @@ export default {
}, },
data() { data() {
return { return {
type:"",
rules: { rules: {
rechargeTypeNum: { rechargeTypeNum: {
required: true, required: true,
@ -206,16 +207,26 @@ export default {
this.form = JSON.parse(JSON.stringify(form)); this.form = JSON.parse(JSON.stringify(form));
}, },
//组件传值 //组件传值
show(form) { show(form,type) {
this.form = {}; this.form = {};
setTimeout(() => { setTimeout(() => {
this.$refs.form.clearValidate(); this.$refs.form.clearValidate();
}, 300); }, 300);
if (form == "添加") { if (form == "添加") {
this.title = form; this.title = form;
if(!type){
this.type = null
}
this.setStaff(); this.setStaff();
} else { } else {
this.title = "修改"; this.title = "修改";
if(type){
this.title = '明细'
this.type = type
}else{
this.type = null
}
console.log('type---',this.type)
this.form = { ...form }; this.form = { ...form };
this.form.storeNames = this.form.storeId + "-" + this.form.storeName; this.form.storeNames = this.form.storeId + "-" + this.form.storeName;
this.fileList; this.fileList;

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

@ -9,6 +9,7 @@
</div> </div>
<!-- <el-button size="mini" type="success" @click="exit()">导出</el-button> --> <!-- <el-button size="mini" type="success" @click="exit()">导出</el-button> -->
<div> <div>
<el-button type="primary" size="mini" @click="Export()">导出</el-button>
<el-button <el-button
size="mini" size="mini"
v-if="radioRowValueList.state != undefined" v-if="radioRowValueList.state != undefined"
@ -296,7 +297,8 @@ import {
baseGrouponCardPage, baseGrouponCardPage,
importBaseGrouponList, importBaseGrouponList,
downloadBaseGrouponList, downloadBaseGrouponList,
delBaseGrouponCard delBaseGrouponCard,
Export
} from "@/api/promotion.js"; } from "@/api/promotion.js";
export default { export default {
components: { edit, detail, excel }, components: { edit, detail, excel },
@ -373,7 +375,19 @@ export default {
window.URL.revokeObjectURL(url); window.URL.revokeObjectURL(url);
}); });
}, },
// 导出模板
Export(){
Export(this.queryForm).then(res=>{
let blob = new Blob([res]);
var a = document.createElement("a");
var url = window.URL.createObjectURL(blob);
console.log(url);
a.href = url;
a.download = "团购卡导出表.xlsx";
a.click();
window.URL.revokeObjectURL(url);
})
},
//导出方法 //导出方法
exit() { exit() {
if (this.searchForm.projectTypeName == "") { if (this.searchForm.projectTypeName == "") {
@ -424,7 +438,8 @@ export default {
}, },
//明细方法 //明细方法
detail() { detail() {
this.$refs.detail.show(this.radioRowValueList, this.queryForm); this.$refs.edit.show(this.radioRowValueList,1);
// this.$refs.detail.show(this.radioRowValueList, this.queryForm);
}, },
//修改返回方法 //修改返回方法
editData(v) { editData(v) {
@ -436,7 +451,8 @@ export default {
}, },
//列表数组双击方法 //列表数组双击方法
rowdbClick(row) { rowdbClick(row) {
this.$refs.detail.show(row); // this.$refs.detail.show(row);
this.$refs.edit.show(row,1);
}, },
del() { del() {
var id = { var id = {

40
src/pages/storeManage/rechargeType/components/edit.vue
Unescape Escape View File

@ -143,17 +143,18 @@ export default {
if (this.form.type == 1) { if (this.form.type == 1) {
this.form.giftMoney = null; this.form.giftMoney = null;
} }
this.form.validTime = this.form.validTime * 1; // this.form.validTime = this.form.validTime * 1;
if (this.title == "添加") { if (this.title == "添加") {
let flag = false; // let flag = false;
if (this.sessionStorageData.allowValid == 1) { // if (this.sessionStorageData.allowValid == 1) {
if (this.form.validTime >= 0) { // if (this.form.validTime >= 0) {
} else { // } else {
flag = true; // flag = true;
} // }
} // }
if (flag == false) { // if (flag == false) {
addrecType(this.form) let params = {...this.form,validTime:this.form.validTime * 1}
addrecType(params)
.then((res) => { .then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
this.$emit("editData"); this.$emit("editData");
@ -174,15 +175,16 @@ export default {
.catch((err) => { .catch((err) => {
//console.log(err); //console.log(err);
}); });
} else { // }
this.$alert("请设置有效期", "提示", { // else {
confirmButtonText: "确定", // this.$alert("请设置有效期", "提示", {
confirmButtonClass: "confirmbtnFalses", // confirmButtonText: "确定",
type: "warning", // confirmButtonClass: "confirmbtnFalses",
center: true, // type: "warning",
callback: (action) => {}, // center: true,
}); // callback: (action) => {},
} // });
// }
} else { } else {
delete this.form.rechargeTypeNum; delete this.form.rechargeTypeNum;
if (this.form.rechargeTypeName == this.rowForm.rechargeTypeName) { if (this.form.rechargeTypeName == this.rowForm.rechargeTypeName) {

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

@ -157,7 +157,11 @@
label="有效期(月)" label="有效期(月)"
min-width="100" min-width="100"
sortable sortable
></el-table-column> >
<template slot-scope="scope">
<span>{{ scope.row.validTime!==null?scope.row.validTime:"永久" }}</span>
</template>
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="founderStaff" prop="founderStaff"

6
src/pages/storeManage/trading/components/cash.vue
Unescape Escape View File

@ -213,16 +213,12 @@ export default {
}, },
//获取数据 //获取数据
async getData() { async getData() {
this.queryForm.inputDate = this.formatTime(
new Date(),
"YYYY-MM-DD hh:mm:ss"
);
if (this.form.month) { if (this.form.month) {
this.queryForm.inputDate = this.formatTime( this.queryForm.inputDate = this.formatTime(
this.form.month, this.form.month,
"YYYY-MM-DD hh:mm:ss" "YYYY-MM-DD hh:mm:ss"
); );
} else { } else{
this.queryForm.inputDate = this.formatTime( this.queryForm.inputDate = this.formatTime(
new Date(), new Date(),
"YYYY-MM-DD hh:mm:ss" "YYYY-MM-DD hh:mm:ss"

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

@ -76,7 +76,9 @@ export default {
}, },
methods: { methods: {
//时间改变方法 //时间改变方法
change() { change(date) {
// this.form.month = ''
console.log(date)
this.$refs.cash.show(this.form); this.$refs.cash.show(this.form);
}, },
//标签页改变 //标签页改变

4
src/pages/storeManage/transferNew/components/edit.vue
Unescape Escape View File

@ -97,7 +97,7 @@ export default {
}, },
methods: { methods: {
recData(v) { recData(v) {
console.log(v); console.log(v)
this.recList = [...v]; this.recList = [...v];
}, },
@ -234,7 +234,7 @@ export default {
this.recList = []; this.recList = [];
if (form == "添加") { if (form == "添加") {
this.title = form; this.title = form;
this.form.type = type; this.form = Object.assign({},{ type })
} else { } else {
this.title = "修改"; this.title = "修改";
this.form = { ...form }; this.form = { ...form };

25
src/pages/storeManage/transferNew/components/rec.vue
Unescape Escape View File

@ -23,23 +23,17 @@
<el-table-column show-overflow-tooltip min-width="75" align="center" prop="courseConsumeCount" label="可用次数"></el-table-column> <el-table-column show-overflow-tooltip min-width="75" align="center" prop="courseConsumeCount" label="可用次数"></el-table-column>
<el-table-column show-overflow-tooltip min-width="100" align="center" prop="outCardRestMoney" label="转出金额"> <el-table-column show-overflow-tooltip min-width="100" align="center" prop="outCardRestMoney" label="转出金额">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop=""> <el-input type="number" @click.stop.native v-model="scope.row.outCardRestMoney"></el-input>
<el-input type="number" v-model="scope.row.outCardRestMoney"></el-input>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column show-overflow-tooltip min-width="100" align="center" prop="outGiftConsumeMoney" label="转出赠送"> <el-table-column show-overflow-tooltip min-width="100" align="center" prop="outGiftConsumeMoney" label="转出赠送">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop=""> <el-input :disabled="scope.row.type==1" @click.stop.native type="number" v-model="scope.row.outGiftConsumeMoney"></el-input>
<el-input :disabled="scope.row.type==1" type="number" v-model="scope.row.outGiftConsumeMoney"></el-input>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column show-overflow-tooltip min-width="100" align="center" prop="outCourseRestCount" label="转出次数"> <el-table-column show-overflow-tooltip min-width="100" @click.stop.native align="center" prop="outCourseRestCount" label="转出次数">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop=""> <el-input :disabled="scope.row.type==0" type="number" @click.stop.native v-model="scope.row.outCourseRestCount"></el-input>
<el-input :disabled="scope.row.type==0" type="number" v-model="scope.row.outCourseRestCount"></el-input>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -60,17 +54,20 @@ export default {
methods: { methods: {
//多选方法 //多选方法
getCurrentRow(row) { getCurrentRow(row) {
let form = this.list[row.index]; return
form.isShow = !form.isShow; // let form = this.list[row.index];
this.list.splice(row.index, 1, form); // form.isShow = !form.isShow;
// this.list.splice(row.index, 1, form);
this.list[row.index].isShow = !this.list[row.index].isShow
this.$refs["list"].toggleRowSelection(row); this.$refs["list"].toggleRowSelection(row);
}, },
//多选变动方法 //多选变动方法
handleSelectionChange(selection) { handleSelectionChange(selection) {
console.log('触发了----')
selection.forEach((item) => { selection.forEach((item) => {
item.isShow = true; item.isShow = true;
}); });
this.$emit("recData", this.list); this.$emit("recData", selection);
}, },
//列表返回方法 //列表返回方法
rowName({ row, rowIndex }) { rowName({ row, rowIndex }) {

Write Preview
Loading…
Cancel
Save