@@ -79,7 +79,7 @@
diff --git a/src/components/staffList/admin/index.vue b/src/components/staffList/admin/index.vue
index 43fd348..4a2ac7d 100644
--- a/src/components/staffList/admin/index.vue
+++ b/src/components/staffList/admin/index.vue
@@ -135,8 +135,9 @@ export default {
this.$emit("adminData", list);
},
//改变员工 去除未选择员工列表中的员工
- changeStaff() {
+ changeStaff() {
var that = this;
+ let arr = [];
var list = that.staffLists
.concat(that.staffListCopy)
.filter(function (v) {
@@ -145,7 +146,12 @@ export default {
that.staffListCopy.indexOf(v) === -1
);
});
- this.staffList = list;
+ list.forEach((item) => {
+ if (item.id) {
+ arr.push(item);
+ }
+ });
+ this.staffList = arr;
},
//获取员工数据
//获取数据
diff --git a/src/components/staffList/manager/index.vue b/src/components/staffList/manager/index.vue
index 249d12e..5c3b826 100644
--- a/src/components/staffList/manager/index.vue
+++ b/src/components/staffList/manager/index.vue
@@ -131,6 +131,7 @@ export default {
//改变员工 去除未选择员工列表中的员工
changeStaff() {
var that = this;
+ let arr = [];
var list = that.staffLists
.concat(that.staffListCopy)
.filter(function (v) {
@@ -139,7 +140,12 @@ export default {
that.staffListCopy.indexOf(v) === -1
);
});
- this.staffList = list;
+ list.forEach((item) => {
+ if (item.id) {
+ arr.push(item);
+ }
+ });
+ this.staffList = arr;
},
//获取高管数据
//获取数据
diff --git a/src/components/staffList/staff/index.vue b/src/components/staffList/staff/index.vue
index c2a890e..2009177 100644
--- a/src/components/staffList/staff/index.vue
+++ b/src/components/staffList/staff/index.vue
@@ -137,6 +137,7 @@ export default {
//改变员工 去除未选择员工列表中的员工
changeStaff() {
var that = this;
+ let arr = [];
var list = that.staffLists
.concat(that.staffListCopy)
.filter(function (v) {
@@ -145,7 +146,12 @@ export default {
that.staffListCopy.indexOf(v) === -1
);
});
- this.staffList = list;
+ list.forEach((item) => {
+ if (item.id) {
+ arr.push(item);
+ }
+ });
+ this.staffList = arr;
},
//获取员工数据
//获取数据
diff --git a/src/login/login.vue b/src/login/login.vue
index 3a83025..84c766b 100644
--- a/src/login/login.vue
+++ b/src/login/login.vue
@@ -376,7 +376,7 @@ export default {
sessionStorage.setItem("staffName", res.data.staffName);
sessionStorage.setItem("roleName", res.data.roleName);
sessionStorage.setItem("storeName", res.data.storeName);
- sessionStorage.setItem("storeId", res.data.id);
+ sessionStorage.setItem("storeId", res.data.storeId);
sessionStorage.setItem("mobilePhone", res.data.mobilePhone);
sessionStorage.setItem("userInfo", JSON.stringify(res.data));
@@ -521,7 +521,7 @@ export default {
sessionStorage.setItem("staffName", res.data.staffName);
sessionStorage.setItem("roleName", res.data.roleName);
sessionStorage.setItem("storeName", res.data.storeName);
- sessionStorage.setItem("storeId", res.data.id);
+ sessionStorage.setItem("storeId", res.data.storeId);
sessionStorage.setItem("mobilePhone", res.data.mobilePhone);
sessionStorage.setItem("userInfo", JSON.stringify(res.data));
@@ -655,11 +655,7 @@ export default {
sessionStorage.setItem("staffName", res.data.staffName);
sessionStorage.setItem("roleName", res.data.roleName);
sessionStorage.setItem("storeName", res.data.storeName);
- sessionStorage.setItem("storeId", res.data.id);
- sessionStorage.setItem("storeId", res.data.id);
-
- sessionStorage.setItem("storeId", res.data.id);
-
+ sessionStorage.setItem("storeId", res.data.storeId);
sessionStorage.setItem("mobilePhone", res.data.mobilePhone);
sessionStorage.setItem("userInfo", JSON.stringify(res.data));
sessionStorage.setItem("list", JSON.stringify(res.data.list));
diff --git a/src/pages/eashier/coursetorec/components/index.vue b/src/pages/eashier/coursetorec/components/index.vue
index 2c3136f..abfaa94 100644
--- a/src/pages/eashier/coursetorec/components/index.vue
+++ b/src/pages/eashier/coursetorec/components/index.vue
@@ -1,518 +1,506 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/pages/eashier/raiseReatment/components/index.vue b/src/pages/eashier/raiseReatment/components/index.vue
index e51f303..d10e085 100644
--- a/src/pages/eashier/raiseReatment/components/index.vue
+++ b/src/pages/eashier/raiseReatment/components/index.vue
@@ -578,29 +578,8 @@ export default {
}
},
empty() {
- this.proForm = {
- additionDate: new Date(),
- manageStaffName: null,
- mobilePhone: null,
- outList: [],
- inList: [],
- payLists: [], //现付列表
- staffLists: [{ ratio: 100 }], //员工占比初始化
- managerLists: [{ ratio: 100 }], //员工占比初始化
- adminList: [{ ratio: 100 }], //员工占比初始化
- };
- var that = this;
- setTimeout(() => {
- that.$refs.staffsles.show(that.proForm.staffLists);
- that.$refs.manager.show(that.proForm.managerLists);
- that.$refs.admin.show(that.proForm.adminList);
- }, 1000);
- this.debtMoney = 0;
- this.inMoneys = 0;
- this.outMoneys = 0;
- this.selectList();
- this.ctlist();
- this.proForm.additionDate = this.formatTime(new Date(), "YYYY-MM-DD");
+ Object.assign(this.$data, this.$options.data.call(this));
+ this.setPage();
},
raiseProList() {
@@ -704,15 +683,18 @@ export default {
}
});
},
+ setPage() {
+ this.selectList();
+ this.ctlist();
+ this.setStaffRatio();
+ this.sessionStorageData = JSON.parse(
+ sessionStorage.getItem("sessionStorageData")
+ );
+ this.proForm.additionDate = this.formatTime(new Date(), "YYYY-MM-DD");
+ },
},
created() {
- this.selectList();
- this.ctlist();
- this.setStaffRatio();
- this.sessionStorageData = JSON.parse(
- sessionStorage.getItem("sessionStorageData")
- );
- this.proForm.additionDate = this.formatTime(new Date(), "YYYY-MM-DD");
+ this.setPage();
},
};
diff --git a/src/pages/eashier/reatment/reatment.vue b/src/pages/eashier/reatment/reatment.vue
index 975b3c8..e1ad240 100644
--- a/src/pages/eashier/reatment/reatment.vue
+++ b/src/pages/eashier/reatment/reatment.vue
@@ -1196,33 +1196,6 @@ export default {
}
},
empty() {
- // this.form = {
- // mobilePhone: null,
- // integralCheckbox: false,
- // description: "",
- // salesPrice: "",
- // numberTimes: "",
- // menberShow: false,
- // courseReatmentAmount: 0,
- // isDebt: false,
- // collectionRechargeAmount: 0,
- // collectionCashAmount: 0,
- // collectionIntegralAmount: 0,
- // integral: 0,
- // integralMoney: 0,
- // consumeIntegral: 0,
- // debtMoney: 0,
- // };
- // this.debtMoneys = 0;
- // this.staffLists = [{ brandNumber: "", staffName: "", ratio: 100 }];
- // this.rechargeAccountList = [];
- // this.rechargeAccountLis = [];
- // this.payLists = [];
- // this.managerLists = [{ ratio: 100 }];
- // this.adminList = [{ ratio: 100 }];
- // this.activeName = "现付";
- // this.ctlist();
- // this.setStaffRatio();
Object.assign(this.$data, this.$options.data.call(this));
this.setPage();
},
diff --git a/src/pages/eashier/refund/refund.vue b/src/pages/eashier/refund/refund.vue
index 6f4d5ea..293497e 100644
--- a/src/pages/eashier/refund/refund.vue
+++ b/src/pages/eashier/refund/refund.vue
@@ -1,1792 +1,1781 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
- {{proForm.memberName}}
-
-
- {{proForm.additionDate }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 转出疗程 添加
-
-
- 总金额 : {{outMoneys}}
-
- {{scope.row.rollOffCount}}
-
-
-
- {{scope.row.rollOffMoney}}
-
-
-
-
-
-
-
-
-
-
-
-
- 转入充值 添加
- 撤销
-
- 总金额 : {{inMoneys}}
-
- {{scope.row.rechargeInMoney}}
-
-
-
-
-
- 清空
- 补单
- 加价
- 列表
- 提交
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/eashier/proceeds/components/edit.vue b/src/pages/eashier/proceeds/components/edit.vue
index 6d03c57..63ec1cd 100644
--- a/src/pages/eashier/proceeds/components/edit.vue
+++ b/src/pages/eashier/proceeds/components/edit.vue
@@ -854,7 +854,6 @@ export default {
collectionIntegralAmount: 0,
collectionAmount: 0,
projectId: res.data.id,
- projectName: res.data.projectName,
// cashNum: res.data.cashNum,
storeId: res.data.storeId,
storeName: res.data.storeName,
@@ -883,6 +882,11 @@ export default {
}
form.memberId = this.memberForm.id;
form.integral = this.memberForm.integral;
+ if (this.proIndex != -1) {
+ // if (this.list[this.proIndex].projectName) {
+ // this.czRecList(this.list[this.proIndex]);
+ // }
+ }
form.rechargeAccountList = this.recListCopy;
} else {
form.amount = res.data.price;
@@ -901,6 +905,9 @@ export default {
}
if (this.proIndex != -1) {
+ if (this.list[this.proIndex].projectName) {
+ this.czRecList(this.list[this.proIndex]);
+ }
form.index = this.proIndex;
this.list.splice(this.proIndex, 1, form);
this.expand.push(this.proIndex);
@@ -1185,8 +1192,29 @@ export default {
this.list.push(list);
},
delPro(row) {
+ this.czRecList(row);
this.list.splice(row.index, 1);
},
+ czRecList(row) {
+ let list = [];
+ row.rechargeAccountList.forEach((item) => {
+ if (item.spendMoney > 0) {
+ list.push(item);
+ }
+ });
+ this.recListCopy.forEach((item) => {
+ list.forEach((items) => {
+ if (item.id == items.id) {
+ item.cardOver = (item.cardOver + items.spendMoney).toFixed(2) * 1;
+ item.cardOvers = (item.cardOvers + items.spendMoney).toFixed(2) * 1;
+ item.cardGiftOvers =
+ (item.giftConsumeMoney + items.giftSpendMoney).toFixed(2) * 1;
+ item.giftConsumeMoney =
+ (item.giftConsumeMoney + items.giftSpendMoney).toFixed(2) * 1;
+ }
+ });
+ });
+ },
//打开选择会员弹窗
openMember() {
this.cashNumber = 1;
diff --git a/src/pages/eashier/proceeds/detail/printform.vue b/src/pages/eashier/proceeds/detail/printform.vue
index 688943f..9a62faf 100644
--- a/src/pages/eashier/proceeds/detail/printform.vue
+++ b/src/pages/eashier/proceeds/detail/printform.vue
@@ -1,115 +1,122 @@
-
-
+
+
+
+
+ {{proForm.memberName}}
+
+
+ {{proForm.additionDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 转出疗程 添加
+
+
+ 总金额 : {{outMoneys}}
+
+ {{scope.row.rollOffCount}}
+
+
+
+ {{scope.row.rollOffMoney}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 转入充值 添加
+ 撤销
+
+ 总金额 : {{inMoneys}}
+
+ {{scope.row.rechargeInMoney}}
+
+
+
+
+
+ 清空
+ 补单
+ 加价
+ 列表
+ 提交
+
+
-
-
- {{ printForm.storeName }}
- {{ printForm.cashDate }}
- {{ printForm.cashNum }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ printForm.telephone }}
-
- {{ printForm.printDate | dateFormat }}
-
-
-
-
-
-
- 收银记录单
-
- -
- {{ printForm.memberName?printForm.memberName:'散客' }}/{{ printForm.mobilePhone?printForm.mobilePhone:'******' }}
-
- {{ staffName }}
- -
-
-
- {{ printForm.collectionRechargeAmount }}
-
-
- {{ printForm.collectionCashAmount }}
-
- -
- {{
- printForm.projectName
- }}
-
- {{ printForm.numPayMoney }}
- -
-
- ![]()
-
- -
-
-
+
+
+ {{ printForm.storeName }}
+ {{ printForm.cashDate }}
+ {{ printForm.cashNum }}
+
+
+
+
+
+
+ +
+
+
+
+
+ {{ printForm.telephone }}
+
+ {{ printForm.printDate | dateFormat }}
+
+
+
+
+
+
+ 收银记录单
+
+ +
+ {{ printForm.memberName?printForm.memberName:'散客' }}/{{ printForm.mobilePhone?printForm.mobilePhone:'******' }}
+
+ {{ staffName }}
+ +
+ +
+ 项目: {{item.projectName}}
+ 价格: {{item.transactionPrice}}
+ 卡付: {{item.collectionRechargeAmount}}
+ 现付: {{item.collectionCashAmount}}
+ 疗程付: {{item.transactionPrice}}0
+
+
+
+ +
+
+
+ ![]()
+
+ +
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 选取文件
- 上传消费退的附件，大小不超过10M,可以上传多个
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
- {{isVip?'会员':'散客'}}
-
-
-
-
-
-
- {{refund.memberName}}
-
-
-
-
-
- -
- 选择
-
-
- {{refund.sourceDocNum}}
-
- {{refund.cashDate}}
-
-
- {{summoney}}
-
-
-
- {{refundMoney}}
- - -
-
- {{compensation}}
-
-
- {{refundType}}
-
-
- {{refundAccount}}
-
-
- {{payee}}
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
{{scope.row.cashRefundMoney}}
-
-
- {{scope.row.cashCompensation}}
-
-
- 卡包支付
- 现付/卡付
-
-
-
- -
-
-
-
- 重 置
- 列表
- 提 交
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.cashNumber==1?'会员':'散客'}}
-
-
- {{scope.row.memberName?scope.row.memberName:'散客'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 条件搜索
- 刷新
-
-
-
- 删除
-
- 明细
- 修改
-
- 送审
- 回收
- 审核
- 反审核
- 打印
-
-
-
-
-
-
- 新创建
- 已送审
- 已回收
- 已审核
- 反审核
- 未划分
-
-
-
-
- {{scope.row.memberName==null?'散客':scope.row.memberName}}
-
-
-
-
-
-
-
-
-
-
- {{scope.row.refundMoney*1+scope.row.compensation*1}}
-
-
-
-
- {{scope.row.projectList.length}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 选取文件
- 上传消费退的附件，大小不超过10M,可以上传多个
-
-
-
-
-
-
-
-
-
-
-
- {{refund.mobilePhone}}
-
-
- {{refund.memberName}}
-
- -
- 选择
-
-
-
- {{refund.sourceDocNum}}
-
-
- {{refund.sourceDocNum}}
-
- {{refund.cashDate}}
-
-
- {{summoney}}
-
-
- {{refundMoney}}
-
- -
- {{compensation}}
-
-
-
-
- {{refundType}}
-
-
-
- {{refundType}}
-
-
-
- {{refundAccount}}
-
-
-
- {{refundAccount}}
-
-
-
- {{payee}}
-
-
-
- {{payee}}
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
- {{scope.row.cashRefundMoney}}
-
-
-
-
- {{scope.row.cashRefundMoney}}
-
-
- {{scope.row.cashCompensation}}
-
-
-
-
- {{scope.row.cashCompensation}}
-
- 卡包支付
- 现付/卡付
-
-
-
-
- {{refund.refundReason}}
-
-
-
- -
-
-
-
-
-
-
-
-
-
- {{item.fileName}}
-
-
-
-
-
-
-
-
-
- {{printForm.refundDate}}
-
-
- {{printForm.refundNum}}
-
-
-
- -
-
-
-
-
-
-
-
-
-
- {{printForm.telephone}}
-
-
- {{printForm.printDate | dateFormat}}
-
-
-
-
-
- 消费退记录单
- -
{{printForm.storeName}}
- -
-
{{printForm.memberName}}/{{printForm.mobilePhone}}
- - -
{{printForm.compensation}}
- {{printForm.refundMoney}}
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选取文件
+ 上传消费退的附件，大小不超过10M,可以上传多个
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/eashier/refundCourse/refundCourse.vue b/src/pages/eashier/refundCourse/refundCourse.vue
index 37b05eb..1c3f472 100644
--- a/src/pages/eashier/refundCourse/refundCourse.vue
+++ b/src/pages/eashier/refundCourse/refundCourse.vue
@@ -784,28 +784,8 @@ export default {
},
//重置清空
reset() {
- this.refund = {
- mobilePhone: null,
- memberName: "",
- memberId: "",
- courseProjectName: "",
- courseCompensation: 0,
- manageStaffName: "",
- refundNumber: null,
- courseRefundMoney: null,
- type: 0,
- };
- this.refundReason = "";
- this.staffLists = [{ ratio: 100 }];
- this.managerLists = [{ ratio: 100 }];
- this.adminList = [{ ratio: 100 }];
- this.fileList = [];
- this.loading = false;
- this.payee = "";
- this.refundAccount = "";
- this.refundType = "";
- this.giftMoney = null;
- this.toStaff();
+ Object.assign(this.$data, this.$options.data.call(this));
+ this.setPage();
},
//提交信息
@@ -1490,13 +1470,16 @@ export default {
this.getOrder();
}
},
+ setPage() {
+ this.toStaff();
+ this.editAtion = "/demay/ssm/refOrder/update";
+ this.sessionStorageData = JSON.parse(
+ sessionStorage.getItem("sessionStorageData")
+ );
+ },
},
created() {
- this.toStaff();
- this.editAtion = "/demay/ssm/refOrder/update";
- this.sessionStorageData = JSON.parse(
- sessionStorage.getItem("sessionStorageData")
- );
+ this.setPage();
},
watch: {
refDialogVisible(val, oldVal) {
diff --git a/src/pages/eashier/refundRecharge/refundRecharge.vue b/src/pages/eashier/refundRecharge/refundRecharge.vue
index be5f8e1..66ff0ea 100644
--- a/src/pages/eashier/refundRecharge/refundRecharge.vue
+++ b/src/pages/eashier/refundRecharge/refundRecharge.vue
@@ -1,1719 +1,1702 @@
-
-
-
+ {{isVip?'会员':'散客'}}
+
+
+
+
+
+
+ {{refund.memberName}}
+
+
+
+
+
+ +
+ 选择
+
+
+ {{refund.sourceDocNum}}
+
+ {{refund.cashDate}}
+
+
+ {{summoney}}
+
+
+
+ {{refundMoney}}
+ + +
+
+ {{compensation}}
+
+
+ {{refundType}}
+
+
+ {{refundAccount}}
+
+
+ {{payee}}
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
{{scope.row.cashRefundMoney}}
+
+
+ {{scope.row.cashCompensation}}
+
+
+ 卡包支付
+ 现付/卡付
+
+
+
+ +
+
+
+
+ 重 置
+ 列表
+ 提 交
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.cashNumber==1?'会员':'散客'}}
+
+
+ {{scope.row.memberName?scope.row.memberName:'散客'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 条件搜索
+ 刷新
+
+
+
+ 删除
+
+ 明细
+ 修改
+
+ 送审
+ 回收
+ 审核
+ 反审核
+ 打印
+
+
+
+
+
+
+ 新创建
+ 已送审
+ 已回收
+ 已审核
+ 反审核
+ 未划分
+
+
+
+
+ {{scope.row.memberName==null?'散客':scope.row.memberName}}
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.refundMoney*1+scope.row.compensation*1}}
+
+
+
+
+ {{scope.row.projectList.length}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选取文件
+ 上传消费退的附件，大小不超过10M,可以上传多个
+
+
+
+
+
+
+
+
+
+
+
+ {{refund.mobilePhone}}
+
+
+ {{refund.memberName}}
+
+ +
+ 选择
+
+
+
+ {{refund.sourceDocNum}}
+
+
+ {{refund.sourceDocNum}}
+
+ {{refund.cashDate}}
+
+
+ {{summoney}}
+
+
+ {{refundMoney}}
+
+ +
+ {{compensation}}
+
+
+
+
+ {{refundType}}
+
+
+
+ {{refundType}}
+
+
+
+ {{refundAccount}}
+
+
+
+ {{refundAccount}}
+
+
+
+ {{payee}}
+
+
+
+ {{payee}}
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+ {{scope.row.cashRefundMoney}}
+
+
+
+
+ {{scope.row.cashRefundMoney}}
+
+
+ {{scope.row.cashCompensation}}
+
+
+
+
+ {{scope.row.cashCompensation}}
+
+ 卡包支付
+ 现付/卡付
+
+
+
+
+ {{refund.refundReason}}
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ {{item.fileName}}
+
+
+
+
+
+
+
+
+
+ {{printForm.refundDate}}
+
+
+ {{printForm.refundNum}}
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ {{printForm.telephone}}
+
+
+ {{printForm.printDate | dateFormat}}
+
+
+
+
+
+ 消费退记录单
+ +
{{printForm.storeName}}
+ +
+
{{printForm.memberName}}/{{printForm.mobilePhone}}
+ + +
{{printForm.compensation}}
+ {{printForm.refundMoney}}
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 选取文件
- 上传充值退的附件，大小不超过10M，可以上传多个
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 选择日期( 月 ):
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
- {{refund.memberName}}
-
-
-
- {{refund.debtMoney}}
- 去还款
-
- -
-
- 选择
-
-
-
- 选择
-
- {{refund.cardRestMoney}}
- - -
{{refund.giftConsumeMoney}}
-
-
- {{refund.recCompensation}}
- {{refund.refundMoneys}}
-
-
- {{refund.refundMoney}}
- -
- 计算退款
- 充值单
-
- 消费记录
-
-
-
-
- {{refundType}}
-
-
-
-
- {{refundAccount}}
- -
-
-
- {{payee}}
-
-
-
-
-
- -
-
-
- 重 置
- 列 表
- 提 交
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 条件搜索
- 刷新
-
-
-
- 删除
- 明细
- 修改
- 送审
- 回收
- 审核
- 反审核
- 打印
-
-
-
-
-
-
-
-
-
- 新创建
- 已送审
- 已回收
- 已审核
- 反审核
- 已作废
- 未划分
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.refundMoney+scope.row.compensation}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{refund.mobilePhone}}
- {{refund.memberName}}
-
-
- {{refund.manageIdentity}}
- -
-
- {{refund.rechargeTypeNum}}
-
- {{refund.rechargeTypeNum}}
- 选择
-
-
-
- {{refund.rechargeTypeName}}
-
- {{refund.rechargeTypeName}}
- 选择
-
- {{refund.cardRestMoney}}
- -
{{refund.giftConsumeMoney}}
-
-
- {{refund.recCompensation}}
-
-
-
- {{refund.recCompensation}}
-
- {{refund.refundMoneys}}
-
-
-
- {{refund.refundMoney}}
-
-
-
- {{refund.refundMoney}}
- -
- 计算退款
- 充值单
- 消费记录
-
-
-
- {{refundType}}
-
-
- {{refundType}}
-
-
- {{refundAccount}}
-
-
-
-
- {{refundAccount}}
- -
-
- {{payee}}
-
-
- {{payee}}
-
-
- {{refundReason}}
- -
-
-
-
-
-
-
-
- {{item.fileName}}
-
-
- 选取文件
- 上传充值退的附件，大小不超过10M，可以上传多个
-
-
-
-
-
-
-
-
-
-
- {{printForm.refundDate}}
-
-
- {{printForm.refundNum}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{printForm.telephone}}
-
-
- {{printForm.printDate | dateFormat}}
-
-
-
-
-
-
- 充值退记录单
- -
{{printForm.storeName}}
- -
-
{{printForm.memberName}}/{{printForm.mobilePhone}}
- -
{{printForm.rechargeTypeName}} / 赠送卡 / 折扣卡
- -
{{printForm.cardRechargeMoney}}
- {{printForm.cardGiftMoney}}
- -
{{printForm.recRefundMoney}}
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{refund.rechargeTypeName}}
-
- 还款单
- 充值单
-
- {{refund.rechargeTypeName}}
-
- 购疗程
- 收银卡付
- 促销卡付
-
- -
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选取文件
+ 上传充值退的附件，大小不超过10M，可以上传多个
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择日期( 月 ):
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/promotion/recpromotion/components/edit.vue b/src/pages/promotion/recpromotion/components/edit.vue
index 0b85382..26c4ca4 100644
--- a/src/pages/promotion/recpromotion/components/edit.vue
+++ b/src/pages/promotion/recpromotion/components/edit.vue
@@ -1,198 +1,215 @@
-
-
+
+
+
+ {{refund.memberName}}
+
+
+
+ {{refund.debtMoney}}
+ 去还款
+
+ +
+
+ 选择
+
+
+
+ 选择
+
+ {{refund.cardRestMoney}}
+ + +
{{refund.giftConsumeMoney}}
+
+
+ {{refund.recCompensation}}
+ {{refund.refundMoneys}}
+
+
+ {{refund.refundMoney}}
+ +
+ 计算退款
+ 充值单
+
+ 消费记录
+
+
+
+
+ {{refundType}}
+
+
+
+
+ {{refundAccount}}
+ +
+
+
+ {{payee}}
+
+
+
+
+
+ +
+
+
+ 重 置
+ 列 表
+ 提 交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 条件搜索
+ 刷新
+
+
+
+ 删除
+ 明细
+ 修改
+ 送审
+ 回收
+ 审核
+ 反审核
+ 打印
+
+
+
+
+
+
+
+
+
+ 新创建
+ 已送审
+ 已回收
+ 已审核
+ 反审核
+ 已作废
+ 未划分
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.refundMoney+scope.row.compensation}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{refund.mobilePhone}}
+ {{refund.memberName}}
+
+
+ {{refund.manageIdentity}}
+ +
+
+ {{refund.rechargeTypeNum}}
+
+ {{refund.rechargeTypeNum}}
+ 选择
+
+
+
+ {{refund.rechargeTypeName}}
+
+ {{refund.rechargeTypeName}}
+ 选择
+
+ {{refund.cardRestMoney}}
+ +
{{refund.giftConsumeMoney}}
+
+
+ {{refund.recCompensation}}
+
+
+
+ {{refund.recCompensation}}
+
+ {{refund.refundMoneys}}
+
+
+
+ {{refund.refundMoney}}
+
+
+
+ {{refund.refundMoney}}
+ +
+ 计算退款
+ 充值单
+ 消费记录
+
+
+
+ {{refundType}}
+
+
+ {{refundType}}
+
+
+ {{refundAccount}}
+
+
+
+
+ {{refundAccount}}
+ +
+
+ {{payee}}
+
+
+ {{payee}}
+
+
+ {{refundReason}}
+ +
+
+
+
+
+
+
+
+ {{item.fileName}}
+
+
+ 选取文件
+ 上传充值退的附件，大小不超过10M，可以上传多个
+
+
+
+
+
+
+
+
+
+
+ {{printForm.refundDate}}
+
+
+ {{printForm.refundNum}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{printForm.telephone}}
+
+
+ {{printForm.printDate | dateFormat}}
+
+
+
+
+
+
+ 充值退记录单
+ +
{{printForm.storeName}}
+ +
+
{{printForm.memberName}}/{{printForm.mobilePhone}}
+ +
{{printForm.rechargeTypeName}} / 赠送卡 / 折扣卡
+ +
{{printForm.cardRechargeMoney}}
+ {{printForm.cardGiftMoney}}
+ +
{{printForm.recRefundMoney}}
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{refund.rechargeTypeName}}
+
+ 还款单
+ 充值单
+
+ {{refund.rechargeTypeName}}
+
+ 购疗程
+ 收银卡付
+ 促销卡付
+
+ +
+
-
-
-
-
-
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 以下导入 充值名称 存在重复 , 请检查修改后重新导入
-
-
-
- {{
- scope.row.type == 2 ? "活动卡" : "折扣卡"
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
- 添加
-
- 分店只能查看充值类别不能操作
-
-
-
- 下载模板
- 导入
- 导出
-
- -
-
-
-
-
-
-
- 启用中
- 已停用
-
-
-
+
+
+
+
+
+
+
+
+
+ 固
+ 比
+ {{scope.row.giftMoney}}
+ %
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 以下导入 充值名称 存在重复 , 请检查修改后重新导入
+
+
+
+ {{
+ scope.row.type == 2 ? "活动卡" : "折扣卡"
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/statistics/storeDaily/storeDaily.vue b/src/pages/statistics/storeDaily/storeDaily.vue
index d68518b..aa3e92b 100644
--- a/src/pages/statistics/storeDaily/storeDaily.vue
+++ b/src/pages/statistics/storeDaily/storeDaily.vue
@@ -13,7 +13,7 @@
+
+
+ 添加
+
+ 分店只能查看充值类别不能操作
+
+
+
+ 下载模板
+ 导入
+ 导出
+
+ +
+
+
+
+
+
+
+ 启用中
+ 已停用
+
+
+