{{ refundType }}
@@ -1166,6 +1116,7 @@ import selec from "@/components/store/select/index";
import rec from "@/components/recharge/index";
import dateExport from './components/dateExport.vue'
export default {
+ name:'refundRecharge',
components: {
staffsles,
manager,
@@ -1340,10 +1291,9 @@ export default {
})
},
storeConfirm(list){
- if(this.formDialog){
- this.refund.refundRechargeList = list
- this.refund.refundGiftMoney = (eval(this.refund.refundRechargeList.map(item=>item.refundGiftMoney?item.refundGiftMoney*1:0).join("+"))).toFixed(2)*1
- }
+ console.log(list)
+ this.refund.refundRechargeList = list
+ this.refund.refundGiftMoney = (eval(this.refund.refundRechargeList.map(item=>item.refundGiftMoney?item.refundGiftMoney*1:0).join("+"))).toFixed(2)*1
this.refund.rechargeAccountGiveList = list
},
handleStoreDeductions(){
@@ -1643,7 +1593,7 @@ export default {
delete this.refund.lastConsumeTime;
this.refund.staffLists = staffLists;
this.refund.recRefundMoney = this.refund.refundMoney;
- this.refund.refundGiftMoney=this.refund.refundGiftMoney?this.refund.refundGiftMoney:0
+ this.refund.refundGiftMoney=0
this.fileData.append("type", 0);
this.fileData.append("memberId", this.refund.memberId);
this.fileData.append("memberName", this.refund.memberName);
@@ -1656,6 +1606,7 @@ export default {
this.fileData.append("payee", this.payee);
this.fileData.append("refundReason", this.refundReason);
this.fileData.append("rechargeRequest", JSON.stringify(this.refund));
+ console.log(this.fileData)
addRefOrder(this.fileData).then(res => {
this.loading = false;
if (res.code == "000000") {
@@ -2047,6 +1998,7 @@ export default {
this.fileData.append("refundAccount", this.refundAccount);
this.fileData.append("payee", this.payee);
this.fileData.append("refundReason", this.refundReason);
+ this.refund.refundGiftMoney = 0
this.fileData.append("rechargeRequest", JSON.stringify(this.refund));
this.fileData.append("id", this.radiorefValueList.id);
editRefOrder(this.fileData).then(res => {
diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue
index 4699ceb..b9d462c 100644
--- a/src/pages/eashier/service/service.vue
+++ b/src/pages/eashier/service/service.vue
@@ -883,7 +883,6 @@ import {
selectListType,
storeMemberOne,
ctlist,
- couAccountList,
proOne,
addCash,
cashListByStore,
@@ -2499,11 +2498,12 @@ export default {
}
this.list.splice(this.proIndex,1,[])
this.numberTimes = v.addNum*1
- this.setProOne({...v});
+ this.setProOne({...v});
this.updataCollection()
},
// cashAmount courseProjectId courseAccountId
setProOne(row) {
+ // transactionPrice
if (row.courseAccountId == null) {
row.courseMoney = 0;
} else {
diff --git a/src/pages/eashier/service/staffratio.vue b/src/pages/eashier/service/staffratio.vue
index 413589a..b037655 100644
--- a/src/pages/eashier/service/staffratio.vue
+++ b/src/pages/eashier/service/staffratio.vue
@@ -96,7 +96,7 @@ export default {
number += item.ratio * 1;
}
});
- this.list[0].ratio = 100 - number;
+ this.list[0].ratio = (100 - number).toFixed(2)*1;
if (this.list[0].ratio < 0) {
this.$alert("第一个人员占比过低", "提示", {
confirmButtonText: "确定",
@@ -105,7 +105,7 @@ export default {
center: true,
callback: (action) => { },
});
- this.list[0].ratio = this.list[0].ratio + row.ratio
+ this.list[0].ratio = (this.list[0].ratio + row.ratio).toFixed(2)*1
row.ratio = 0;
}
this.changeStaff();
@@ -121,7 +121,7 @@ export default {
if (index != 0) {
number += item.ratio * 1;
}
- this.list[0].ratio = 100 - number;
+ this.list[0].ratio = (100 - number).toFixed(2)*1;
})
}
@@ -144,7 +144,7 @@ export default {
if (index != 0) {
number += item.ratio * 1;
}
- this.list[0].ratio = 100 - number;
+ this.list[0].ratio = (100 - number).toFixed(2)*1;
})
},
diff --git a/src/pages/eashier/within/components/edit.vue b/src/pages/eashier/within/components/edit.vue
index d53ec9c..61e1931 100644
--- a/src/pages/eashier/within/components/edit.vue
+++ b/src/pages/eashier/within/components/edit.vue
@@ -76,7 +76,6 @@
import rec from "@/components/recharge/index";
import rectype from "@/components/recharge/type/index";
import staffsles from "@/components/staffList/staff/index";
-
import {
addRechargeCardTransition,
updateRechargeCardTransition,
@@ -218,7 +217,15 @@ export default {
if (number == 0) {
this.$refs.rec.show(this.memberForm);
} else {
- this.$refs.rectype.show(this.form.outType);
+ this.$confirm('请选择卡类型', '选择类型', {
+ distinguishCancelAndClose: true,
+ confirmButtonText: '折扣卡',
+ cancelButtonText: '活动卡'
+ }).then(()=>{
+ this.$refs.rectype.show(1);
+ }).catch(()=>{
+ this.$refs.rectype.show(2);
+ })
}
},
endEdit(row, index) {
diff --git a/src/pages/promotion/components/suit.vue b/src/pages/promotion/components/suit.vue
index 1171f7b..307fe31 100644
--- a/src/pages/promotion/components/suit.vue
+++ b/src/pages/promotion/components/suit.vue
@@ -1,7 +1,7 @@
-
+
-
-
+
diff --git a/src/pages/promotion/group/index.vue b/src/pages/promotion/group/index.vue
index 5d64552..64559bd 100644
--- a/src/pages/promotion/group/index.vue
+++ b/src/pages/promotion/group/index.vue
@@ -72,7 +72,7 @@
审核
@@ -305,6 +306,7 @@ export default {
components: { edit, detail, excel },
data() {
return {
+ suditLoad:false,
form: {}, //主对象
listLoading: false, //list加载提示开启动画
elementLoadingText: "加载中...", //list加载提示文字
@@ -378,7 +380,11 @@ export default {
},
// 导出模板
Export(){
- Export(this.queryForm).then(res=>{
+ let params = {...this.queryForm}
+ if(this.radioRowValue){
+ params.id = this.radioRowValue
+ }
+ Export(params).then(res=>{
let blob = new Blob([res]);
var a = document.createElement("a");
var url = window.URL.createObjectURL(blob);
@@ -410,30 +416,76 @@ export default {
this.radioRowValue = row.id;
this.radioRowValueList = row;
},
- edit(number) {
+ edit(number,isNum) {
if (number == -1) {
this.$refs.edit.show("添加");
} else if (number == 0) {
this.$refs.edit.show(this.radioRowValueList);
} else {
- let form = { id: this.radioRowValueList.id, state: number };
- stateBaseGrouponCard(form).then(res => {
- if (res.code == "000000") {
- this.radioRowValueList.state = number;
- this.$message.success({
- message: "操作成功!"
+ if(isNum){
+ this.$confirm('是否发送短信?', '短信', {
+ distinguishCancelAndClose: true,
+ confirmButtonText: '是',
+ cancelButtonText: '否'
+ }).then(()=>{
+ let form = { id: this.radioRowValueList.id, state: number,isSendSms:1};
+ stateBaseGrouponCard(form).then(res => {
+ if (res.code == "000000") {
+ this.radioRowValueList.state = number;
+ this.$message.success({
+ message: "操作成功!"
+ });
+ this.getData();
+ } else {
+ this.$alert(res.message, "提示", {
+ confirmButtonText: "确定",
+ confirmButtonClass: "confirmbtnFalses",
+ type: "warning",
+ center: true,
+ callback: action => {}
+ });
+ }
});
- this.getData();
- } else {
- this.$alert(res.message, "提示", {
- confirmButtonText: "确定",
- confirmButtonClass: "confirmbtnFalses",
- type: "warning",
- center: true,
- callback: action => {}
+ }).catch(()=>{
+ let form = { id: this.radioRowValueList.id, state: number,isSendSms:0};
+ stateBaseGrouponCard(form).then(res => {
+ if (res.code == "000000") {
+ this.radioRowValueList.state = number;
+ this.$message.success({
+ message: "操作成功!"
+ });
+ this.getData();
+ } else {
+ this.$alert(res.message, "提示", {
+ confirmButtonText: "确定",
+ confirmButtonClass: "confirmbtnFalses",
+ type: "warning",
+ center: true,
+ callback: action => {}
+ });
+ }
});
- }
- });
+ })
+ }else{
+ let form = { id: this.radioRowValueList.id, state: number};
+ stateBaseGrouponCard(form).then(res => {
+ if (res.code == "000000") {
+ this.radioRowValueList.state = number;
+ this.$message.success({
+ message: "操作成功!"
+ });
+ this.getData();
+ } else {
+ this.$alert(res.message, "提示", {
+ confirmButtonText: "确定",
+ confirmButtonClass: "confirmbtnFalses",
+ type: "warning",
+ center: true,
+ callback: action => {}
+ });
+ }
+ });
+ }
}
},
//明细方法
diff --git a/src/pages/statistics/negativeCard/negativeCard.vue b/src/pages/statistics/negativeCard/negativeCard.vue
index 9edfb21..0e86446 100644
--- a/src/pages/statistics/negativeCard/negativeCard.vue
+++ b/src/pages/statistics/negativeCard/negativeCard.vue
@@ -5,6 +5,16 @@
+
+
刷新
@@ -13,25 +23,32 @@
+ :header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee' }" style="margin-bottom: 10%;width: 90%; margin-left: 5%;">
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -66,24 +83,8 @@
-
-
diff --git a/src/pages/storeManage/memberList/memberList.vue b/src/pages/storeManage/memberList/memberList.vue
index ac1a880..4790252 100644
--- a/src/pages/storeManage/memberList/memberList.vue
+++ b/src/pages/storeManage/memberList/memberList.vue
@@ -514,7 +514,7 @@
>
取 消
- 确 定
+ 确 定
@@ -544,6 +544,7 @@ export default {
components: { excel, edit, member, tostore },
data() {
return {
+ butLoad:false,
infoDialog: false, //上传文件弹窗开关
editPhoneDialog: false, //改号启用弹窗
searchDialog: false, //搜索弹窗开关
@@ -623,8 +624,9 @@ export default {
exits() {
this.searchForm.isMessage = 1;
this.searchForm.code = this.phoneForm.code;
+ this.butLoad = true
storeMemberExport(this.searchForm).then(res => {
- t;
+ this.butLoad = false
let blob = new Blob([res]);
console.log(blob);
var a = document.createElement("a");
diff --git a/src/pages/storeManage/rechargeType/components/detail.vue b/src/pages/storeManage/rechargeType/components/detail.vue
index 8dc3411..8fe2cc9 100644
--- a/src/pages/storeManage/rechargeType/components/detail.vue
+++ b/src/pages/storeManage/rechargeType/components/detail.vue
@@ -76,6 +76,15 @@ export default {
openRec(number) {
this.number = this.form.type;
this.$refs.rectype.show(this.number, this.form);
+ // this.$confirm('请选择卡类型', '选择类型', {
+ // distinguishCancelAndClose: true,
+ // confirmButtonText: '折扣卡',
+ // cancelButtonText: '活动卡'
+ // }).then(()=>{
+ // this.$refs.rectype.show(1, this.form);
+ // }).catch(()=>{
+ // this.$refs.rectype.show(2, this.form);
+ // })
},
//充值类别单选返回方法
recTypeData(v) {
diff --git a/src/router/index.js b/src/router/index.js
index 3b70162..fdb9cca 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -415,8 +415,6 @@ const router = new VueRouter({
index: "rece"
}
},
-
- //充值退 refundRecharge
{
path: "/refundRecharge",
component: () =>