现付金额:
@@ -1513,7 +1513,7 @@ export default {
goBack() {
this.$router.push({ query: {} });
- this.$router.push({ path: "/service" });
+ this.$router.push({ path: "/shareBill" });
this.notData();
},
getRecCard() {
@@ -1750,29 +1750,32 @@ export default {
this.setPage();
},
setPage() {
- let list = JSON.parse(this.$route.query.list);
- if (list.length != 0 || list === 0) {
- if (list == 0 || list == 1) {
- this.newOrder = true;
- this.orderNumber = list;
- this.isAddition = list;
- this.additionDate = this.formatTime(new Date(), "YYYY-MM-DD");
+ if (this.$route.query.list) {
+ let list = JSON.parse(this.$route.query.list);
+ if (list.length != 0 || list === 0) {
+ if (list == 0 || list == 1) {
+ this.newOrder = true;
+ this.orderNumber = list;
+ this.isAddition = list;
+ this.additionDate = this.formatTime(new Date(), "YYYY-MM-DD");
+ } else {
+ this.list = [...list];
+ this.dialogFormVisible = true;
+ console.log(this.list);
+ this.getData();
+ this.newOrder = false;
+ }
} else {
- this.list = [...list];
- this.dialogFormVisible = true;
- console.log(this.list);
- this.getData();
- this.newOrder = false;
+ this.goBack();
}
- } else {
- this.goBack();
}
this.getDetail();
},
},
- created() {
+ activated() {
this.setPage();
},
+ created() {},
};
diff --git a/src/pages/eashier/proceeds/components/payment.vue b/src/pages/eashier/proceeds/components/payment.vue
index 0c33433..4d11ac2 100644
--- a/src/pages/eashier/proceeds/components/payment.vue
+++ b/src/pages/eashier/proceeds/components/payment.vue
@@ -1,92 +1,92 @@
-
-
-
-
-
-
-
-
- {{ scope.row.payMoney }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ scope.row.payMoney }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/eashier/proceeds/detail/editform.vue b/src/pages/eashier/proceeds/detail/editform.vue
index ef49e43..a1426f6 100644
--- a/src/pages/eashier/proceeds/detail/editform.vue
+++ b/src/pages/eashier/proceeds/detail/editform.vue
@@ -1,601 +1,601 @@
-
-
-
-
-
-
- {{ form.cashNum }}
-
-
-
-
- {{ form.cashDate }}
-
-
-
-
- {{ form.memberName }}
-
-
-
-
- {{ form.mobilePhone }}
-
-
-
-
- {{ form.additionDate }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{scope.row.courseAccountId!=null?'疗程付':'卡付/现付'}}
-
-
- 卡付
-
- 现付
-
-
-
-
-
-
-
- {{scope.row.sex*1==0?'男':'女'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ form.cashNum }}
+
+
+
+
+ {{ form.cashDate }}
+
+
+
+
+ {{ form.memberName }}
+
+
+
+
+ {{ form.mobilePhone }}
+
+
+
+
+ {{ form.additionDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{scope.row.courseAccountId!=null?'疗程付':'卡付/现付'}}
+
+
+ 卡付
+
+ 现付
+
+
+
+
+
+
+
+ {{scope.row.sex*1==0?'男':'女'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/eashier/reatment/reatment.vue b/src/pages/eashier/reatment/reatment.vue
index 3e58021..975b3c8 100644
--- a/src/pages/eashier/reatment/reatment.vue
+++ b/src/pages/eashier/reatment/reatment.vue
@@ -1196,33 +1196,35 @@ 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();
+ // 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();
},
//保存确定方法
@@ -1339,9 +1341,16 @@ export default {
that.addCourse();
that.loading = false;
}
+ setTimeout(() => {
+ this.loading = false;
+ }, 3000);
},
addCourse() {
+ setTimeout(() => {
+ this.loading = false;
+ }, 3000);
addcourse(this.form).then((res) => {
+ this.loading = false;
if (res.code == "000000") {
this.empty();
this.$message.success({
@@ -1693,13 +1702,16 @@ export default {
});
return sums;
},
+ setPage() {
+ this.ctlist();
+ this.setStaffRatio();
+ this.sessionStorageData = JSON.parse(
+ sessionStorage.getItem("sessionStorageData")
+ );
+ },
},
created() {
- this.ctlist();
- this.setStaffRatio();
- this.sessionStorageData = JSON.parse(
- sessionStorage.getItem("sessionStorageData")
- );
+ this.setPage();
},
};
diff --git a/src/pages/eashier/refundCourse/refundCourse.vue b/src/pages/eashier/refundCourse/refundCourse.vue
index 1664763..3c9b80d 100644
--- a/src/pages/eashier/refundCourse/refundCourse.vue
+++ b/src/pages/eashier/refundCourse/refundCourse.vue
@@ -1,1657 +1,1587 @@
-
-
-
-
-
-
-
-
-
-
-
- {{refund.memberName}}
-
-
-
-
-
-
-
-
- {{debtMoneys}}
- 去还款
-
-
-
-
-
-
-
-
-
-
-
- 直接购买
- 促销购买
-
-
-
-
- {{refund.courseCount}}
-
-
- {{refund.courseProjectMoney}}
-
-
- {{refund.courseConsumeCount}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 选取文件
- 上传疗程退的附件，大小不超过10M，可以上传多个
-
-
-
-
- 重 置
- 列 表
- 提 交
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 直接购买
- 活动促销
- 促销赠送
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 条件搜索
- 刷新
-
-
-
- 删除
- 明细
-
- 修改
-
- 送审
- 回收
- 审核
- 反审核
- 打印
-
-
-
-
-
-
-
-
-
- 新创建
- 已送审
- 已回收
- 已审核
- 反审核
- 未划分
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.refundMoney+scope.row.compensation}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{refund.memberName}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 直接购买
- 促销购买
-
-
-
-
- {{refund.courseCount}}
-
-
- {{refund.courseProjectMoney}}
-
-
- {{refund.courseConsumeCount}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.fileName}}
-
-
-
-
-
-
- 选取文件
- 上传疗程退的附件，大小不超过10M，可以上传多个
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 疗程退记录单
-
-
-
- {{printForm.storeName}}
-
-
- {{printForm.refundDate}}
-
-
- {{printForm.refundNum}}
-
-
- {{printForm.memberName}}/{{printForm.mobilePhone}}
-
-
- {{printForm.compensation}}
-
-
- {{printForm.refundMoney}}
-
-
-
-
-
-
-
- {{printForm.telephone}}
-
-
- {{printForm.printDate | dateFormat}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{refund.memberName}}
+
+
+
+
+
+
+
+
+ {{debtMoneys}}
+ 去还款
+
+
+
+
+
+
+
+
+
+
+
+ 直接购买
+ 促销购买
+
+
+
+
+ {{refund.courseCount}}
+
+
+ {{refund.courseProjectMoney}}
+
+
+ {{refund.courseConsumeCount}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选取文件
+ 上传疗程退的附件，大小不超过10M，可以上传多个
+
+
+
+
+ 重 置
+ 列 表
+ 提 交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 直接购买
+ 活动促销
+ 促销赠送
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 条件搜索
+ 刷新
+
+
+
+ 删除
+ 明细
+
+ 修改
+
+ 送审
+ 回收
+ 审核
+ 反审核
+ 打印
+
+
+
+
+
+
+
+
+
+ 新创建
+ 已送审
+ 已回收
+ 已审核
+ 反审核
+ 未划分
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.refundMoney+scope.row.compensation}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{refund.memberName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 直接购买
+ 促销购买
+
+
+
+
+ {{refund.courseCount}}
+
+
+ {{refund.courseProjectMoney}}
+
+
+ {{refund.courseConsumeCount}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.fileName}}
+
+
+
+
+
+
+ 选取文件
+ 上传疗程退的附件，大小不超过10M，可以上传多个
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 疗程退记录单
+
+
+
+ {{printForm.storeName}}
+
+
+ {{printForm.refundDate}}
+
+
+ {{printForm.refundNum}}
+
+
+ {{printForm.memberName}}/{{printForm.mobilePhone}}
+
+
+ {{printForm.compensation}}
+
+
+ {{printForm.refundMoney}}
+
+
+
+
+
+
+
+ {{printForm.telephone}}
+
+
+ {{printForm.printDate | dateFormat}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/eashier/repayment/repayment.vue b/src/pages/eashier/repayment/repayment.vue
index 8e1e60a..bf66529 100644
--- a/src/pages/eashier/repayment/repayment.vue
+++ b/src/pages/eashier/repayment/repayment.vue
@@ -1,672 +1,680 @@
-
-
-
-
-
-
-
-
- 搜索
-
-
-
- 作废正常
-
-
-
-
-
- 否是
-
-
-
-
-
-
-
-
-
- {{scope.row.repayTradeLists.length}}
-
-
-
-
-
- 明 细
- 作 废
- 打 印
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 明细
- 送审
- 回收
- 审核
- 反审核
-
-
-
-
- {{''}}
-
-
- 新创建
- 已送审
- 已回收
- 已审核
- 反审核
- 已作废
- 未划分
-
-
-
-
-
-
- {{scope.row.docType=='card_use'?'疗程':scope.row.docType=='promotion_card_use'?'促销':scope.row.liftType==1?'升降级':'正常充值'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{cancelForm.memberName}}
-
-
- {{cancelForm.memberName}}
-
-
- {{cancelForm.tradeName}}
-
-
-
- {{cancelForm.tradeMoney}}
-
-
-
-
- {{cancelForm.debtMoney}}
-
-
-
-
- {{cancelForm.cancelMoney}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.cancelMoney}}
-
-
-
-
{{scope.row.cancelMoney}}
-
-
-
-
-
-
- {{scope.row.cancelNum}}
-
-
-
-
{{scope.row.cancelNum}}
-
-
-
-
-
-
- {{cancelForm.tradeName}}
-
-
-
- {{cancelForm.tradeMoney}}
-
-
-
-
- {{cancelForm.debtMoney}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 还款记录单
-
-
-
-
- {{printForm.storeName}}
-
-
- {{printForm.repayDate}}
-
-
- {{printForm.repayNum}}
-
-
- {{printForm.memberName}} / {{printForm.mobilePhone}}
-
-
- {{printForm.debtMoney}}
-
-
- {{printForm.payMoney}}
-
-
-
-
-
- {{item.tradeName}}
-
-
- 还款:
- {{item.repayMoney}}
-
-
-
-
-
-
-
-
-
-
- {{printForm.telephone}}
-
-
- {{printForm.printDate | dateFormat}}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+ 作废正常
+
+
+
+
+
+ 否是
+
+
+
+
+
+
+
+
+
+ {{scope.row.repayTradeLists.length}}
+
+
+
+
+
+ 明细
+
+
+
+
+ 作废
+
+
+
+
+ 打印
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 明细
+ 送审
+ 回收
+ 审核
+ 反审核
+
+
+
+
+ {{''}}
+
+
+ 新创建
+ 已送审
+ 已回收
+ 已审核
+ 反审核
+ 已作废
+ 未划分
+
+
+
+
+
+
+ {{scope.row.docType=='card_use'?'疗程':scope.row.docType=='promotion_card_use'?'促销':scope.row.liftType==1?'升降级':'正常充值'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{cancelForm.memberName}}
+
+
+ {{cancelForm.memberName}}
+
+
+ {{cancelForm.tradeName}}
+
+
+
+ {{cancelForm.tradeMoney}}
+
+
+
+
+ {{cancelForm.debtMoney}}
+
+
+
+
+ {{cancelForm.cancelMoney}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.cancelMoney}}
+
+
+
+
{{scope.row.cancelMoney}}
+
+
+
+
+
+
+ {{scope.row.cancelNum}}
+
+
+
+
{{scope.row.cancelNum}}
+
+
+
+
+
+
+ {{cancelForm.tradeName}}
+
+
+
+ {{cancelForm.tradeMoney}}
+
+
+
+
+ {{cancelForm.debtMoney}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 还款记录单
+
+
+
+
+ {{printForm.storeName}}
+
+
+ {{printForm.repayDate}}
+
+
+ {{printForm.repayNum}}
+
+
+ {{printForm.memberName}} / {{printForm.mobilePhone}}
+
+
+ {{printForm.debtMoney}}
+
+
+ {{printForm.payMoney}}
+
+
+
+
+
+ {{item.tradeName}}
+
+
+ 还款:
+ {{item.repayMoney}}
+
+
+
+
+
+
+
+
+
+
+ {{printForm.telephone}}
+
+
+ {{printForm.printDate | dateFormat}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/storeManage/baseStaff/components/edit.vue b/src/pages/storeManage/baseStaff/components/edit.vue
index 96018f5..555989f 100644
--- a/src/pages/storeManage/baseStaff/components/edit.vue
+++ b/src/pages/storeManage/baseStaff/components/edit.vue
@@ -64,7 +64,10 @@
-
+
+
+
+
@@ -146,6 +149,7 @@ import {
rolepage,
editStaff,
pageBasePost,
+ pageBaseWorkType,
} from "@/api/storeManage.js";
export default {
data() {
@@ -162,6 +166,7 @@ export default {
{ value: 1, label: "美容部" },
{ value: 2, label: "其他部" },
],
+ jobList: [],
rule: {},
rules: {
staffName: {
@@ -367,6 +372,13 @@ export default {
});
this.gradeList = res.pageInfo.list;
});
+ pageBaseWorkType({}).then((res) => {
+ res.data.forEach((item) => {
+ item.value = item.wordTypeNum;
+ item.label = item.wordTypeName;
+ });
+ this.jobList = res.data;
+ });
},
//选择角色改变时的方法
changeRole(v) {
@@ -405,12 +417,16 @@ export default {
}
},
//工种改变方法
- jobchange(row) {
- if (row) {
- row.forEach((item) => {
- this.form.job = item;
- });
- }
+ jobchange(e) {
+ console.log(e);
+ this.jobList.forEach((item) => {
+ if (item.id == e) {
+ this.form.wordTypeNum = item.wordTypeNum;
+ this.form.wordTypeName = item.wordTypeName;
+ this.form.wordTypeId = item.id;
+ console.log(this.form);
+ }
+ });
},
//确定返回方法
confirm() {
diff --git a/src/pages/storeManage/baseStaff/components/onJob.vue b/src/pages/storeManage/baseStaff/components/onJob.vue
index 4a586b3..f7e557f 100644
--- a/src/pages/storeManage/baseStaff/components/onJob.vue
+++ b/src/pages/storeManage/baseStaff/components/onJob.vue
@@ -18,7 +18,7 @@
-
+
diff --git a/src/pages/storeManage/baseStaff/components/tostore/edit.vue b/src/pages/storeManage/baseStaff/components/tostore/edit.vue
index ab60d50..c086283 100644
--- a/src/pages/storeManage/baseStaff/components/tostore/edit.vue
+++ b/src/pages/storeManage/baseStaff/components/tostore/edit.vue
@@ -1,233 +1,233 @@
-
-
-
-
-
-
-
-
-
-
- {{form.storesName}}
-
-
-
-
-
-
-
-
- 男
- 女
-
-
-
-
-
-
-
-
- {{scope.row.type==0?"高管":"普通员工"}}
-
-
-
-
- {{scope.row.source==0?"校招":scope.row.source==1?"社招":scope.row.source==2?"介绍":"其他"}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{form.storesName}}
+
+
+
+
+
+
+
+
+ 男
+ 女
+
+
+
+
+
+
+
+
+ {{scope.row.type==0?"高管":"普通员工"}}
+
+
+
+
+ {{scope.row.source==0?"校招":scope.row.source==1?"社招":scope.row.source==2?"介绍":"其他"}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/storeManage/staffVipSum/staffVipSum.vue b/src/pages/storeManage/staffVipSum/staffVipSum.vue
index 650959f..5ba34fa 100644
--- a/src/pages/storeManage/staffVipSum/staffVipSum.vue
+++ b/src/pages/storeManage/staffVipSum/staffVipSum.vue
@@ -1,281 +1,281 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 明细
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.sex==1?'男':'女'}}
-
-
- {{scope.row.mobilePhone | phone}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 明细
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.sex==1?'男':'女'}}
+
+
+ {{scope.row.mobilePhone | phone}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+